tsp, bump cadl-ranch

typespec-extension/package.json

@@ -61,7 +61,6 @@
     "lodash": "~4.17.21"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "0.43.0",
     "@azure-tools/typespec-azure-core": "0.43.0",
     "@azure-tools/typespec-azure-resource-manager": "0.43.0",
     "@azure-tools/typespec-azure-rulesets": "0.43.0",

typespec-extension/src/code-model-builder.ts

@@ -305,6 +305,8 @@ export class CodeModelBuilder {
             extensions: {
               "x-ms-skip-url-encoding": schema instanceof UriSchema,
             },
+            // // make the logic same as TCGC, which takes the server-side default of host as client-side default
+            // clientDefaultValue: getDefaultValue(it.defaultValue),
           });
         }
 

typespec-extension/src/type-utils.ts

@@ -12,6 +12,7 @@ import {
   Type,
   TypeNameOptions,
   Union,
+  Value,
   getTypeName,
   isNullType,
   isTemplateDeclaration,
@@ -95,6 +96,20 @@ export function getNonNullSdkType(type: SdkType): SdkType {
   return type.kind === "nullable" ? type.type : type;
 }
 
+export function getDefaultValue(value: Value | undefined): any {
+  if (value) {
+    switch (value.valueKind) {
+      case "StringValue":
+        return value.value;
+      case "NumericValue":
+        return value.value;
+      case "BooleanValue":
+        return value.value;
+    }
+  }
+  return undefined;
+}
+
 export function getDurationFormat(encode: EncodeData): DurationSchema["format"] {
   let format: DurationSchema["format"] = "duration-rfc3339";
   // duration encoded as seconds

typespec-tests/Generate.ps1

@@ -35,16 +35,21 @@ $generateScript = {
   } elseif ($tspFile -match "type[\\/]enum[\\/]fixed[\\/]") {
     # override namespace for reserved keyword "enum"
     $tspOptions += " --option ""@azure-tools/typespec-java.namespace=com.type.enums.fixed"""
-  } elseif ($tspFile -match "resiliency[\\/]srv-driven[\\/]old.tsp") {
+  } elseif ($tspFile -match "resiliency[\\/]srv-driven[\\/]old\.tsp") {
     # override namespace for "resiliency/srv-driven/old.tsp" (make it different to that from "main.tsp")
     $tspOptions += " --option ""@azure-tools/typespec-java.namespace=com.resiliency.servicedriven.v1"""
     # enable advanced versioning for resiliency test
     $tspOptions += " --option ""@azure-tools/typespec-java.advanced-versioning=true"""
     $tspOptions += " --option ""@azure-tools/typespec-java.api-version=all"""
-  } elseif ($tspFile -match "resiliency[\\/]srv-driven[\\/]main.tsp") {
+  } elseif ($tspFile -match "resiliency[\\/]srv-driven[\\/]main\.tsp") {
     # enable advanced versioning for resiliency test
     $tspOptions += " --option ""@azure-tools/typespec-java.advanced-versioning=true"""
     $tspOptions += " --option ""@azure-tools/typespec-java.api-version=all"""
+  } elseif ($tspFile -match "azure[\\/]arm[\\/].*[\\/]main\.tsp") {
+    # for mgmt, do not generate tests due to random mock values
+    $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
+    # also generate with group-etag-headers=false since mgmt doesn't support etag grouping yet
+    $tspOptions += " --option ""@azure-tools/typespec-java.group-etag-headers=false"""
   } elseif ($tspFile -match "tsp[\\/]versioning.tsp") {
     # test generating from specific api-version
     $tspOptions += " --option ""@azure-tools/typespec-java.api-version=2022-09-01"""
@@ -61,6 +66,8 @@ $generateScript = {
     $tspOptions += " --option ""@azure-tools/typespec-java.stream-style-serialization=true"""
     # for mgmt, do not generate tests due to random mock values
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
+    # also generate with group-etag-headers=false since mgmt doesn't support etag grouping yet
+    $tspOptions += " --option ""@azure-tools/typespec-java.group-etag-headers=false"""
   }
 
   # Test customization for one of the TypeSpec definitions - naming.tsp

typespec-tests/package.json

@@ -9,7 +9,7 @@
     "testserver-run": "npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./cadl-ranch-coverage-java.json"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.33.4",
+    "@azure-tools/cadl-ranch-specs": "0.34.0",
     "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.17.0.tgz"
   },
   "devDependencies": {

typespec-tests/src/main/java/com/_specs_/azure/clientgenerator/core/usage/UsageAsyncClient.java

@@ -7,6 +7,7 @@
 import com._specs_.azure.clientgenerator.core.usage.implementation.ModelInOperationsImpl;
 import com._specs_.azure.clientgenerator.core.usage.models.InputModel;
 import com._specs_.azure.clientgenerator.core.usage.models.OutputModel;
+import com._specs_.azure.clientgenerator.core.usage.models.RoundTripModel;
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceClient;
@@ -96,6 +97,56 @@ public Mono<Response<BinaryData>> outputToInputOutputWithResponse(RequestOptions
         return this.serviceClient.outputToInputOutputWithResponseAsync(requestOptions);
     }
 
+    /**
+     * "ResultModel" should be usage=output, as it is read-only and does not exist in request body.
+     * 
+     * Expected body parameter:
+     * ```json
+     * {
+     * }
+     * ```
+     * 
+     * Expected response body:
+     * ```json
+     * {
+     * "name": &lt;any string&gt;
+     * }
+     * ```.
+     * <p><strong>Request Body Schema</strong></p>
+     * 
+     * <pre>{@code
+     * {
+     *     result (Required): {
+     *         name: String (Required)
+     *     }
+     * }
+     * }</pre>
+     * 
+     * <p><strong>Response Body Schema</strong></p>
+     * 
+     * <pre>{@code
+     * {
+     *     result (Required): {
+     *         name: String (Required)
+     *     }
+     * }
+     * }</pre>
+     * 
+     * @param body The body parameter.
+     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @return the response body along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<BinaryData>> modelInReadOnlyPropertyWithResponse(BinaryData body,
+        RequestOptions requestOptions) {
+        return this.serviceClient.modelInReadOnlyPropertyWithResponseAsync(body, requestOptions);
+    }
+
     /**
      * Expected body parameter:
      * ```json
@@ -144,4 +195,39 @@ public Mono<OutputModel> outputToInputOutput() {
         return outputToInputOutputWithResponse(requestOptions).flatMap(FluxUtil::toMono)
             .map(protocolMethodData -> protocolMethodData.toObject(OutputModel.class));
     }
+
+    /**
+     * "ResultModel" should be usage=output, as it is read-only and does not exist in request body.
+     * 
+     * Expected body parameter:
+     * ```json
+     * {
+     * }
+     * ```
+     * 
+     * Expected response body:
+     * ```json
+     * {
+     * "name": &lt;any string&gt;
+     * }
+     * ```.
+     * 
+     * @param body The body parameter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body on successful completion of {@link Mono}.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<RoundTripModel> modelInReadOnlyProperty(RoundTripModel body) {
+        // Generated convenience method for modelInReadOnlyPropertyWithResponse
+        RequestOptions requestOptions = new RequestOptions();
+        return modelInReadOnlyPropertyWithResponse(BinaryData.fromObject(body), requestOptions)
+            .flatMap(FluxUtil::toMono)
+            .map(protocolMethodData -> protocolMethodData.toObject(RoundTripModel.class));
+    }
 }

typespec-tests/src/main/java/com/_specs_/azure/clientgenerator/core/usage/UsageClient.java

@@ -7,6 +7,7 @@
 import com._specs_.azure.clientgenerator.core.usage.implementation.ModelInOperationsImpl;
 import com._specs_.azure.clientgenerator.core.usage.models.InputModel;
 import com._specs_.azure.clientgenerator.core.usage.models.OutputModel;
+import com._specs_.azure.clientgenerator.core.usage.models.RoundTripModel;
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceClient;
@@ -94,6 +95,55 @@ public Response<BinaryData> outputToInputOutputWithResponse(RequestOptions reque
         return this.serviceClient.outputToInputOutputWithResponse(requestOptions);
     }
 
+    /**
+     * "ResultModel" should be usage=output, as it is read-only and does not exist in request body.
+     * 
+     * Expected body parameter:
+     * ```json
+     * {
+     * }
+     * ```
+     * 
+     * Expected response body:
+     * ```json
+     * {
+     * "name": &lt;any string&gt;
+     * }
+     * ```.
+     * <p><strong>Request Body Schema</strong></p>
+     * 
+     * <pre>{@code
+     * {
+     *     result (Required): {
+     *         name: String (Required)
+     *     }
+     * }
+     * }</pre>
+     * 
+     * <p><strong>Response Body Schema</strong></p>
+     * 
+     * <pre>{@code
+     * {
+     *     result (Required): {
+     *         name: String (Required)
+     *     }
+     * }
+     * }</pre>
+     * 
+     * @param body The body parameter.
+     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @return the response body along with {@link Response}.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<BinaryData> modelInReadOnlyPropertyWithResponse(BinaryData body, RequestOptions requestOptions) {
+        return this.serviceClient.modelInReadOnlyPropertyWithResponse(body, requestOptions);
+    }
+
     /**
      * Expected body parameter:
      * ```json
@@ -140,4 +190,38 @@ public OutputModel outputToInputOutput() {
         RequestOptions requestOptions = new RequestOptions();
         return outputToInputOutputWithResponse(requestOptions).getValue().toObject(OutputModel.class);
     }
+
+    /**
+     * "ResultModel" should be usage=output, as it is read-only and does not exist in request body.
+     * 
+     * Expected body parameter:
+     * ```json
+     * {
+     * }
+     * ```
+     * 
+     * Expected response body:
+     * ```json
+     * {
+     * "name": &lt;any string&gt;
+     * }
+     * ```.
+     * 
+     * @param body The body parameter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public RoundTripModel modelInReadOnlyProperty(RoundTripModel body) {
+        // Generated convenience method for modelInReadOnlyPropertyWithResponse
+        RequestOptions requestOptions = new RequestOptions();
+        return modelInReadOnlyPropertyWithResponse(BinaryData.fromObject(body), requestOptions).getValue()
+            .toObject(RoundTripModel.class);
+    }
 }