http-client-java, update cadl-ranch, handle TCGC multipart logic (mic…

…rosoft#4352) pending issue at Azure/typespec-azure#1488
sarangan12 · Sep 16, 2024 · 2459675 · 2459675
1 parent cf75bae
commit 2459675
Show file tree

Hide file tree

Showing 123 changed files with 13,992 additions and 819 deletions.
diff --git a/packages/http-client-java/Setup.ps1 b/packages/http-client-java/Setup.ps1
@@ -1,15 +1,4 @@
-param (
-    [switch] $RebuildJar = $false
-)
-
-if ($RebuildJar) {
-    mvn clean install -f generator/pom.xml -DskipTests
-    if ($LASTEXITCODE -ne 0) {
-        exit $LASTEXITCODE
-    }
-}
-
 # re-build http-client-java
 npm install 
 npm run clean && npm run build
-
+npm pack
diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts
@@ -2163,6 +2163,15 @@ export class CodeModelBuilder {
       // TODO: handle MultipartOptions.isMulti
       if (prop.multipartOptions.isFilePart) {
         schema = this.processMultipartFormDataFilePropertySchemaFromSdkType(prop);
+      } else if (
+        prop.type.kind === "model" &&
+        prop.type.properties.some((it) => it.kind === "body")
+      ) {
+        // TODO: this is HttpPart of non-File. TCGC should help handle this.
+        schema = this.processSchemaFromSdkType(
+          prop.type.properties.find((it) => it.kind === "body")!.type,
+          ""
+        );
       } else {
         schema = this.processSchemaFromSdkType(nonNullType, "");
       }

diff --git a/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 b/packages/http-client-java/generator/http-client-generator-test/Generate.ps1
@@ -123,16 +123,16 @@ Set-Location ./generator/http-client-generator-test
 
 
 if (Test-Path node_modules) {
-    Remove-Item node_modules -Recurse -Force
+  Remove-Item node_modules -Recurse -Force
 }
 
 if (Test-Path package-lock.json) {
-    Remove-Item package-lock.json
+  Remove-Item package-lock.json
 }
 
 # delete output
 if (Test-Path tsp-output) {
-    Remove-Item tsp-output -Recurse -Force
+  Remove-Item tsp-output -Recurse -Force
 }
 npm install 
 

diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json
@@ -11,7 +11,7 @@
     "testserver-stop": "npx cadl-ranch server stop"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.36.1",
+    "@azure-tools/cadl-ranch-specs": "0.37.1",
     "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.0.tgz",
     "@typespec/http-client-java-tests": "file:"
   },

diff --git a/...nproperty/FlattenPropertyAsyncClient.java → ...nproperty/FlattenPropertyAsyncClient.java b/...nproperty/FlattenPropertyAsyncClient.java → ...nproperty/FlattenPropertyAsyncClient.java
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty;
+package com._specs_.azure.clientgenerator.core.flattenproperty;
 
-import com.azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl;
-import com.azure.clientgenerator.core.flattenproperty.models.FlattenModel;
-import com.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel;
+import com._specs_.azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl;
+import com._specs_.azure.clientgenerator.core.flattenproperty.models.FlattenModel;
+import com._specs_.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel;
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceClient;

diff --git a/...lattenproperty/FlattenPropertyClient.java → ...lattenproperty/FlattenPropertyClient.java b/...lattenproperty/FlattenPropertyClient.java → ...lattenproperty/FlattenPropertyClient.java
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty;
+package com._specs_.azure.clientgenerator.core.flattenproperty;
 
-import com.azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl;
-import com.azure.clientgenerator.core.flattenproperty.models.FlattenModel;
-import com.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel;
+import com._specs_.azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl;
+import com._specs_.azure.clientgenerator.core.flattenproperty.models.FlattenModel;
+import com._specs_.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel;
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceClient;

diff --git a/...roperty/FlattenPropertyClientBuilder.java → ...roperty/FlattenPropertyClientBuilder.java b/...roperty/FlattenPropertyClientBuilder.java → ...roperty/FlattenPropertyClientBuilder.java
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty;
+package com._specs_.azure.clientgenerator.core.flattenproperty;
 
-import com.azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl;
+import com._specs_.azure.clientgenerator.core.flattenproperty.implementation.FlattenPropertyClientImpl;
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ServiceClientBuilder;
 import com.azure.core.client.traits.ConfigurationTrait;
@@ -51,7 +51,7 @@ public final class FlattenPropertyClientBuilder implements HttpTrait<FlattenProp
 
     @Generated
     private static final Map<String, String> PROPERTIES
-        = CoreUtils.getProperties("azure-clientgenerator-core-flattenproperty.properties");
+        = CoreUtils.getProperties("_specs_-azure-clientgenerator-core-flattenproperty.properties");
 
     @Generated
     private final List<HttpPipelinePolicy> pipelinePolicies;

diff --git a/...ementation/FlattenPropertyClientImpl.java → ...ementation/FlattenPropertyClientImpl.java b/...ementation/FlattenPropertyClientImpl.java → ...ementation/FlattenPropertyClientImpl.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty.implementation;
+package com._specs_.azure.clientgenerator.core.flattenproperty.implementation;
 
 import com.azure.core.annotation.BodyParam;
 import com.azure.core.annotation.ExpectedResponses;

diff --git a/...property/implementation/package-info.java → ...property/implementation/package-info.java b/...property/implementation/package-info.java → ...property/implementation/package-info.java
@@ -8,4 +8,4 @@
  * Illustrates the model flatten cases.
  * <!-- end generated doc -->
  */
-package com.azure.clientgenerator.core.flattenproperty.implementation;
+package com._specs_.azure.clientgenerator.core.flattenproperty.implementation;
diff --git a/...tenproperty/models/ChildFlattenModel.java → ...tenproperty/models/ChildFlattenModel.java b/...tenproperty/models/ChildFlattenModel.java → ...tenproperty/models/ChildFlattenModel.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty.models;
+package com._specs_.azure.clientgenerator.core.flattenproperty.models;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.Immutable;

diff --git a/...re/flattenproperty/models/ChildModel.java → ...re/flattenproperty/models/ChildModel.java b/...re/flattenproperty/models/ChildModel.java → ...re/flattenproperty/models/ChildModel.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty.models;
+package com._specs_.azure.clientgenerator.core.flattenproperty.models;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.Immutable;

diff --git a/.../flattenproperty/models/FlattenModel.java → .../flattenproperty/models/FlattenModel.java b/.../flattenproperty/models/FlattenModel.java → .../flattenproperty/models/FlattenModel.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty.models;
+package com._specs_.azure.clientgenerator.core.flattenproperty.models;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.Immutable;

diff --git a/...enproperty/models/NestedFlattenModel.java → ...enproperty/models/NestedFlattenModel.java b/...enproperty/models/NestedFlattenModel.java → ...enproperty/models/NestedFlattenModel.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.clientgenerator.core.flattenproperty.models;
+package com._specs_.azure.clientgenerator.core.flattenproperty.models;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.Immutable;

diff --git a/.../flattenproperty/models/package-info.java → .../flattenproperty/models/package-info.java b/.../flattenproperty/models/package-info.java → .../flattenproperty/models/package-info.java
@@ -8,4 +8,4 @@
  * Illustrates the model flatten cases.
  * <!-- end generated doc -->
  */
-package com.azure.clientgenerator.core.flattenproperty.models;
+package com._specs_.azure.clientgenerator.core.flattenproperty.models;
diff --git a/...or/core/flattenproperty/package-info.java → ...or/core/flattenproperty/package-info.java b/...or/core/flattenproperty/package-info.java → ...or/core/flattenproperty/package-info.java
@@ -8,4 +8,4 @@
  * Illustrates the model flatten cases.
  * <!-- end generated doc -->
  */
-package com.azure.clientgenerator.core.flattenproperty;
+package com._specs_.azure.clientgenerator.core.flattenproperty;
diff --git a/...tp-client-generator-test/src/main/java/com/_specs_/azure/core/basic/BasicAsyncClient.java b/...tp-client-generator-test/src/main/java/com/_specs_/azure/core/basic/BasicAsyncClient.java
@@ -7,6 +7,7 @@
 import com._specs_.azure.core.basic.implementation.BasicClientImpl;
 import com._specs_.azure.core.basic.implementation.JsonMergePatchHelper;
 import com._specs_.azure.core.basic.models.User;
+import com._specs_.azure.core.basic.models.UserList;
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceClient;
@@ -295,6 +296,45 @@ public Mono<Response<BinaryData>> exportWithResponse(int id, String format, Requ
         return this.serviceClient.exportWithResponseAsync(id, format, requestOptions);
     }
 
+    /**
+     * Exports all users.
+     * 
+     * Exports all users.
+     * <p><strong>Response Body Schema</strong></p>
+     * 
+     * <pre>{@code
+     * {
+     *     users (Required): [
+     *          (Required){
+     *             id: int (Required)
+     *             name: String (Optional, Required on create)
+     *             orders (Optional): [
+     *                  (Optional){
+     *                     id: int (Required)
+     *                     userId: int (Optional, Required on create)
+     *                     detail: String (Optional, Required on create)
+     *                 }
+     *             ]
+     *             etag: String (Required)
+     *         }
+     *     ]
+     * }
+     * }</pre>
+     * 
+     * @param format The format of the data.
+     * @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>> exportAllUsersWithResponse(String format, RequestOptions requestOptions) {
+        return this.serviceClient.exportAllUsersWithResponseAsync(format, requestOptions);
+    }
+
     /**
      * Adds a user or updates a user's fields.
      * 
@@ -521,4 +561,27 @@ public Mono<User> export(int id, String format) {
         return exportWithResponse(id, format, requestOptions).flatMap(FluxUtil::toMono)
             .map(protocolMethodData -> protocolMethodData.toObject(User.class));
     }
+
+    /**
+     * Exports all users.
+     * 
+     * Exports all users.
+     * 
+     * @param format The format of the data.
+     * @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<UserList> exportAllUsers(String format) {
+        // Generated convenience method for exportAllUsersWithResponse
+        RequestOptions requestOptions = new RequestOptions();
+        return exportAllUsersWithResponse(format, requestOptions).flatMap(FluxUtil::toMono)
+            .map(protocolMethodData -> protocolMethodData.toObject(UserList.class));
+    }
 }
diff --git a/...or/http-client-generator-test/src/main/java/com/_specs_/azure/core/basic/BasicClient.java b/...or/http-client-generator-test/src/main/java/com/_specs_/azure/core/basic/BasicClient.java
@@ -7,6 +7,7 @@
 import com._specs_.azure.core.basic.implementation.BasicClientImpl;
 import com._specs_.azure.core.basic.implementation.JsonMergePatchHelper;
 import com._specs_.azure.core.basic.models.User;
+import com._specs_.azure.core.basic.models.UserList;
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceClient;
@@ -288,6 +289,45 @@ public Response<BinaryData> exportWithResponse(int id, String format, RequestOpt
         return this.serviceClient.exportWithResponse(id, format, requestOptions);
     }
 
+    /**
+     * Exports all users.
+     * 
+     * Exports all users.
+     * <p><strong>Response Body Schema</strong></p>
+     * 
+     * <pre>{@code
+     * {
+     *     users (Required): [
+     *          (Required){
+     *             id: int (Required)
+     *             name: String (Optional, Required on create)
+     *             orders (Optional): [
+     *                  (Optional){
+     *                     id: int (Required)
+     *                     userId: int (Optional, Required on create)
+     *                     detail: String (Optional, Required on create)
+     *                 }
+     *             ]
+     *             etag: String (Required)
+     *         }
+     *     ]
+     * }
+     * }</pre>
+     * 
+     * @param format The format of the data.
+     * @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> exportAllUsersWithResponse(String format, RequestOptions requestOptions) {
+        return this.serviceClient.exportAllUsersWithResponse(format, requestOptions);
+    }
+
     /**
      * Adds a user or updates a user's fields.
      * 
@@ -485,4 +525,26 @@ public User export(int id, String format) {
         RequestOptions requestOptions = new RequestOptions();
         return exportWithResponse(id, format, requestOptions).getValue().toObject(User.class);
     }
+
+    /**
+     * Exports all users.
+     * 
+     * Exports all users.
+     * 
+     * @param format The format of the data.
+     * @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 UserList exportAllUsers(String format) {
+        // Generated convenience method for exportAllUsersWithResponse
+        RequestOptions requestOptions = new RequestOptions();
+        return exportAllUsersWithResponse(format, requestOptions).getValue().toObject(UserList.class);
+    }
 }