tsp, bump cadl-ranch (#2869)

Author: weidongxu-microsoft

typespec-extension/package-lock.json

@@ -49,7 +49,7 @@
     "@azure-tools/typespec-azure-resource-manager": ">=0.44.0 <1.0.0",
     "@azure-tools/typespec-autorest": ">=0.44.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.44.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.44.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.44.1 <1.0.0",
     "@typespec/compiler": ">=0.58.0 <1.0.0",
     "@typespec/http": ">=0.58.0 <1.0.0",
     "@typespec/openapi": ">=0.58.0 <1.0.0",
@@ -67,7 +67,7 @@
     "@azure-tools/typespec-azure-resource-manager": "0.44.0",
     "@azure-tools/typespec-autorest": "0.44.0",
     "@azure-tools/typespec-azure-rulesets": "0.44.0",
-    "@azure-tools/typespec-client-generator-core": "0.44.0",
+    "@azure-tools/typespec-client-generator-core": "0.44.1",
     "@types/js-yaml": "~4.0.9",
     "@types/lodash": "~4.17.7",
     "@types/mocha": "~10.0.7",

typespec-extension/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.34.6",
+    "@azure-tools/cadl-ranch-specs": "0.34.7",
     "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.18.1.tgz"
   },
   "devDependencies": {

typespec-tests/package.json

@@ -109,8 +109,10 @@ public Mono<Response<BinaryData>> outputToInputOutputWithResponse(RequestOptions
      * Expected response body:
      * ```json
      * {
+     * "result": {
      * "name": &lt;any string&gt;
      * }
+     * }
      * ```.
      * <p><strong>Request Body Schema</strong></p>
      * 
@@ -208,8 +210,10 @@ public Mono<OutputModel> outputToInputOutput() {
      * Expected response body:
      * ```json
      * {
+     * "result": {
      * "name": &lt;any string&gt;
      * }
+     * }
      * ```.
      * 
      * @param body The body parameter.

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

@@ -107,8 +107,10 @@ public Response<BinaryData> outputToInputOutputWithResponse(RequestOptions reque
      * Expected response body:
      * ```json
      * {
+     * "result": {
      * "name": &lt;any string&gt;
      * }
+     * }
      * ```.
      * <p><strong>Request Body Schema</strong></p>
      * 
@@ -203,8 +205,10 @@ public OutputModel outputToInputOutput() {
      * Expected response body:
      * ```json
      * {
+     * "result": {
      * "name": &lt;any string&gt;
      * }
+     * }
      * ```.
      * 
      * @param body The body parameter.

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

@@ -240,8 +240,10 @@ public Response<BinaryData> outputToInputOutputWithResponse(RequestOptions reque
      * Expected response body:
      * ```json
      * {
+     * "result": {
      * "name": &lt;any string&gt;
      * }
+     * }
      * ```.
      * <p><strong>Request Body Schema</strong></p>
      * 
@@ -290,8 +292,10 @@ public Mono<Response<BinaryData>> modelInReadOnlyPropertyWithResponseAsync(Binar
      * Expected response body:
      * ```json
      * {
+     * "result": {
      * "name": &lt;any string&gt;
      * }
+     * }
      * ```.
      * <p><strong>Request Body Schema</strong></p>
      * 

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

@@ -45,8 +45,8 @@
         BytesClient.class,
         DatetimeOperationClient.class,
         DurationOperationClient.class,
-        PlaindateClient.class,
-        PlaintimeClient.class,
+        PlainDateClient.class,
+        PlainTimeClient.class,
         CollectionsByteClient.class,
         CollectionsModelClient.class,
         StringLiteralClient.class,
@@ -61,8 +61,8 @@
         BytesAsyncClient.class,
         DatetimeOperationAsyncClient.class,
         DurationOperationAsyncClient.class,
-        PlaindateAsyncClient.class,
-        PlaintimeAsyncClient.class,
+        PlainDateAsyncClient.class,
+        PlainTimeAsyncClient.class,
         CollectionsByteAsyncClient.class,
         CollectionsModelAsyncClient.class,
         StringLiteralAsyncClient.class,
@@ -319,23 +319,23 @@ public DurationOperationAsyncClient buildDurationOperationAsyncClient() {
     }
 
     /**
-     * Builds an instance of PlaindateAsyncClient class.
+     * Builds an instance of PlainDateAsyncClient class.
      * 
-     * @return an instance of PlaindateAsyncClient.
+     * @return an instance of PlainDateAsyncClient.
      */
     @Generated
-    public PlaindateAsyncClient buildPlaindateAsyncClient() {
-        return new PlaindateAsyncClient(buildInnerClient().getPlaindates());
+    public PlainDateAsyncClient buildPlainDateAsyncClient() {
+        return new PlainDateAsyncClient(buildInnerClient().getPlainDates());
     }
 
     /**
-     * Builds an instance of PlaintimeAsyncClient class.
+     * Builds an instance of PlainTimeAsyncClient class.
      * 
-     * @return an instance of PlaintimeAsyncClient.
+     * @return an instance of PlainTimeAsyncClient.
      */
     @Generated
-    public PlaintimeAsyncClient buildPlaintimeAsyncClient() {
-        return new PlaintimeAsyncClient(buildInnerClient().getPlaintimes());
+    public PlainTimeAsyncClient buildPlainTimeAsyncClient() {
+        return new PlainTimeAsyncClient(buildInnerClient().getPlainTimes());
     }
 
     /**
@@ -479,23 +479,23 @@ public DurationOperationClient buildDurationOperationClient() {
     }
 
     /**
-     * Builds an instance of PlaindateClient class.
+     * Builds an instance of PlainDateClient class.
      * 
-     * @return an instance of PlaindateClient.
+     * @return an instance of PlainDateClient.
      */
     @Generated
-    public PlaindateClient buildPlaindateClient() {
-        return new PlaindateClient(buildInnerClient().getPlaindates());
+    public PlainDateClient buildPlainDateClient() {
+        return new PlainDateClient(buildInnerClient().getPlainDates());
     }
 
     /**
-     * Builds an instance of PlaintimeClient class.
+     * Builds an instance of PlainTimeClient class.
      * 
-     * @return an instance of PlaintimeClient.
+     * @return an instance of PlainTimeClient.
      */
     @Generated
-    public PlaintimeClient buildPlaintimeClient() {
-        return new PlaintimeClient(buildInnerClient().getPlaintimes());
+    public PlainTimeClient buildPlainTimeClient() {
+        return new PlainTimeClient(buildInnerClient().getPlainTimes());
     }
 
     /**

typespec-tests/src/main/java/com/type/property/optional/OptionalClientBuilder.java

@@ -16,25 +16,25 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.FluxUtil;
-import com.type.property.optional.implementation.PlaindatesImpl;
-import com.type.property.optional.models.PlaindateProperty;
+import com.type.property.optional.implementation.PlainDatesImpl;
+import com.type.property.optional.models.PlainDateProperty;
 import reactor.core.publisher.Mono;
 
 /**
  * Initializes a new instance of the asynchronous OptionalClient type.
  */
 @ServiceClient(builder = OptionalClientBuilder.class, isAsync = true)
-public final class PlaindateAsyncClient {
+public final class PlainDateAsyncClient {
     @Generated
-    private final PlaindatesImpl serviceClient;
+    private final PlainDatesImpl serviceClient;
 
     /**
-     * Initializes an instance of PlaindateAsyncClient class.
+     * Initializes an instance of PlainDateAsyncClient class.
      * 
      * @param serviceClient the service client implementation.
      */
     @Generated
-    PlaindateAsyncClient(PlaindatesImpl serviceClient) {
+    PlainDateAsyncClient(PlainDatesImpl serviceClient) {
         this.serviceClient = serviceClient;
     }
 
@@ -146,11 +146,11 @@ public Mono<Response<Void>> putDefaultWithResponse(BinaryData body, RequestOptio
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PlaindateProperty> getAll() {
+    public Mono<PlainDateProperty> getAll() {
         // Generated convenience method for getAllWithResponse
         RequestOptions requestOptions = new RequestOptions();
         return getAllWithResponse(requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(PlaindateProperty.class));
+            .map(protocolMethodData -> protocolMethodData.toObject(PlainDateProperty.class));
     }
 
     /**
@@ -165,11 +165,11 @@ public Mono<PlaindateProperty> getAll() {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PlaindateProperty> getDefault() {
+    public Mono<PlainDateProperty> getDefault() {
         // Generated convenience method for getDefaultWithResponse
         RequestOptions requestOptions = new RequestOptions();
         return getDefaultWithResponse(requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(PlaindateProperty.class));
+            .map(protocolMethodData -> protocolMethodData.toObject(PlainDateProperty.class));
     }
 
     /**
@@ -186,7 +186,7 @@ public Mono<PlaindateProperty> getDefault() {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> putAll(PlaindateProperty body) {
+    public Mono<Void> putAll(PlainDateProperty body) {
         // Generated convenience method for putAllWithResponse
         RequestOptions requestOptions = new RequestOptions();
         return putAllWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono);
@@ -206,7 +206,7 @@ public Mono<Void> putAll(PlaindateProperty body) {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> putDefault(PlaindateProperty body) {
+    public Mono<Void> putDefault(PlainDateProperty body) {
         // Generated convenience method for putDefaultWithResponse
         RequestOptions requestOptions = new RequestOptions();
         return putDefaultWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono);

…perty/optional/PlaindateAsyncClient.java …perty/optional/PlainDateAsyncClient.javatypespec-tests/src/main/java/com/type/property/optional/PlaindateAsyncClient.java renamed to typespec-tests/src/main/java/com/type/property/optional/PlainDateAsyncClient.java typespec-tests/src/main/java/com/type/property/optional/PlaindateAsyncClient.java renamed to typespec-tests/src/main/java/com/type/property/optional/PlainDateAsyncClient.java

@@ -15,24 +15,24 @@
 import com.azure.core.http.rest.RequestOptions;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.BinaryData;
-import com.type.property.optional.implementation.PlaindatesImpl;
-import com.type.property.optional.models.PlaindateProperty;
+import com.type.property.optional.implementation.PlainDatesImpl;
+import com.type.property.optional.models.PlainDateProperty;
 
 /**
  * Initializes a new instance of the synchronous OptionalClient type.
  */
 @ServiceClient(builder = OptionalClientBuilder.class)
-public final class PlaindateClient {
+public final class PlainDateClient {
     @Generated
-    private final PlaindatesImpl serviceClient;
+    private final PlainDatesImpl serviceClient;
 
     /**
-     * Initializes an instance of PlaindateClient class.
+     * Initializes an instance of PlainDateClient class.
      * 
      * @param serviceClient the service client implementation.
      */
     @Generated
-    PlaindateClient(PlaindatesImpl serviceClient) {
+    PlainDateClient(PlainDatesImpl serviceClient) {
         this.serviceClient = serviceClient;
     }
 
@@ -142,10 +142,10 @@ public Response<Void> putDefaultWithResponse(BinaryData body, RequestOptions req
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public PlaindateProperty getAll() {
+    public PlainDateProperty getAll() {
         // Generated convenience method for getAllWithResponse
         RequestOptions requestOptions = new RequestOptions();
-        return getAllWithResponse(requestOptions).getValue().toObject(PlaindateProperty.class);
+        return getAllWithResponse(requestOptions).getValue().toObject(PlainDateProperty.class);
     }
 
     /**
@@ -160,10 +160,10 @@ public PlaindateProperty getAll() {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public PlaindateProperty getDefault() {
+    public PlainDateProperty getDefault() {
         // Generated convenience method for getDefaultWithResponse
         RequestOptions requestOptions = new RequestOptions();
-        return getDefaultWithResponse(requestOptions).getValue().toObject(PlaindateProperty.class);
+        return getDefaultWithResponse(requestOptions).getValue().toObject(PlainDateProperty.class);
     }
 
     /**
@@ -179,7 +179,7 @@ public PlaindateProperty getDefault() {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void putAll(PlaindateProperty body) {
+    public void putAll(PlainDateProperty body) {
         // Generated convenience method for putAllWithResponse
         RequestOptions requestOptions = new RequestOptions();
         putAllWithResponse(BinaryData.fromObject(body), requestOptions).getValue();
@@ -198,7 +198,7 @@ public void putAll(PlaindateProperty body) {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void putDefault(PlaindateProperty body) {
+    public void putDefault(PlainDateProperty body) {
         // Generated convenience method for putDefaultWithResponse
         RequestOptions requestOptions = new RequestOptions();
         putDefaultWithResponse(BinaryData.fromObject(body), requestOptions).getValue();

…e/property/optional/PlaindateClient.java …e/property/optional/PlainDateClient.javatypespec-tests/src/main/java/com/type/property/optional/PlaindateClient.java renamed to typespec-tests/src/main/java/com/type/property/optional/PlainDateClient.java typespec-tests/src/main/java/com/type/property/optional/PlaindateClient.java renamed to typespec-tests/src/main/java/com/type/property/optional/PlainDateClient.java

@@ -16,25 +16,25 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.FluxUtil;
-import com.type.property.optional.implementation.PlaintimesImpl;
+import com.type.property.optional.implementation.PlainTimesImpl;
 import com.type.property.optional.models.PlainTimeProperty;
 import reactor.core.publisher.Mono;
 
 /**
  * Initializes a new instance of the asynchronous OptionalClient type.
  */
 @ServiceClient(builder = OptionalClientBuilder.class, isAsync = true)
-public final class PlaintimeAsyncClient {
+public final class PlainTimeAsyncClient {
     @Generated
-    private final PlaintimesImpl serviceClient;
+    private final PlainTimesImpl serviceClient;
 
     /**
-     * Initializes an instance of PlaintimeAsyncClient class.
+     * Initializes an instance of PlainTimeAsyncClient class.
      * 
      * @param serviceClient the service client implementation.
      */
     @Generated
-    PlaintimeAsyncClient(PlaintimesImpl serviceClient) {
+    PlainTimeAsyncClient(PlainTimesImpl serviceClient) {
         this.serviceClient = serviceClient;
     }