http-client-java, emitter, bump tcgc version to 0.46.1 (#4476)

TCGC breaking changes here: https://github.com/Azure/typespec-azure/blob/release/september-2024/packages/typespec-client-generator-core/CHANGELOG.md#0461
microsoft · Sep 20, 2024 · 594dc97 · 594dc97
1 parent 0b08449
commit 594dc97
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts
@@ -542,15 +542,15 @@ export class CodeModelBuilder {
         if (initializationProperty.kind === "endpoint") {
           let sdkPathParameters: SdkPathParameter[] = [];
           if (initializationProperty.type.kind === "union") {
-            if (initializationProperty.type.values.length === 2) {
+            if (initializationProperty.type.variantTypes.length === 2) {
               // only get the sdkPathParameters from the endpoint whose serverUrl is not {"endpoint"}
-              for (const endpointType of initializationProperty.type.values) {
+              for (const endpointType of initializationProperty.type.variantTypes) {
                 if (endpointType.kind === "endpoint" && endpointType.serverUrl !== "{endpoint}") {
                   sdkPathParameters = endpointType.templateArguments;
                   baseUri = endpointType.serverUrl;
                 }
               }
-            } else if (initializationProperty.type.values.length > 2) {
+            } else if (initializationProperty.type.variantTypes.length > 2) {
               throw new Error("Multiple server url defined for one client is not supported yet.");
             }
           } else if (initializationProperty.type.kind === "endpoint") {
@@ -867,20 +867,32 @@ export class CodeModelBuilder {
     }
 
     // responses
-    for (const [code, response] of sdkMethod.operation.responses) {
-      this.processResponse(codeModelOperation, code, response, lroMetadata.longRunning, false);
+    for (const response of sdkMethod.operation.responses) {
+      this.processResponse(
+        codeModelOperation,
+        response.statusCodes,
+        response,
+        lroMetadata.longRunning,
+        false,
+      );
     }
 
     // exception
-    for (const [code, response] of sdkMethod.operation.exceptions) {
-      this.processResponse(codeModelOperation, code, response, lroMetadata.longRunning, true);
+    for (const response of sdkMethod.operation.exceptions) {
+      this.processResponse(
+        codeModelOperation,
+        response.statusCodes,
+        response,
+        lroMetadata.longRunning,
+        true,
+      );
     }
 
     // check for paged
     this.processRouteForPaged(codeModelOperation, sdkMethod.operation.responses, sdkMethod);
 
     // check for long-running operation
-    this.processRouteForLongRunning(codeModelOperation, sdkMethod.operation.responses, lroMetadata);
+    this.processRouteForLongRunning(codeModelOperation, lroMetadata);
 
     operationGroup.addOperation(codeModelOperation);
 
@@ -889,11 +901,11 @@ export class CodeModelBuilder {
 
   private processRouteForPaged(
     op: CodeModelOperation,
-    responses: Map<number | HttpStatusCodeRange, SdkHttpResponse>,
+    responses: SdkHttpResponse[],
     sdkMethod: SdkMethod<SdkHttpOperation>,
   ) {
     if (sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging") {
-      for (const [_, response] of responses) {
+      for (const response of responses) {
         const bodyType = response.type;
         if (bodyType && bodyType.kind === "model") {
           const itemName = sdkMethod.response.resultPath;
@@ -1014,11 +1026,7 @@ export class CodeModelBuilder {
     return new LongRunningMetadata(false);
   }
 
-  private processRouteForLongRunning(
-    op: CodeModelOperation,
-    responses: Map<number | HttpStatusCodeRange, SdkHttpResponse>,
-    lroMetadata: LongRunningMetadata,
-  ) {
+  private processRouteForLongRunning(op: CodeModelOperation, lroMetadata: LongRunningMetadata) {
     if (lroMetadata.longRunning) {
       op.extensions = op.extensions ?? {};
       op.extensions["x-ms-long-running-operation"] = true;
@@ -1783,7 +1791,7 @@ export class CodeModelBuilder {
       return this.processIntegerSchema(type, nameHint, integerSize);
     } else {
       switch (type.kind) {
-        case "any":
+        case "unknown":
           return this.processAnySchema();
 
         case "string":
@@ -2211,7 +2219,7 @@ export class CodeModelBuilder {
       summary: type.description,
     });
     unionSchema.anyOf = [];
-    type.values.forEach((it) => {
+    type.variantTypes.forEach((it) => {
       const variantName = this.getUnionVariantName(it.__raw, { depth: 0 });
       const modelName = variantName + baseName;
       const propertyName = "value";

diff --git a/packages/http-client-java/package-lock.json b/packages/http-client-java/package-lock.json
diff --git a/packages/http-client-java/package.json b/packages/http-client-java/package.json
@@ -63,7 +63,7 @@
     "@azure-tools/typespec-azure-core": "0.46.0",
     "@azure-tools/typespec-azure-resource-manager": "0.46.0",
     "@azure-tools/typespec-azure-rulesets": "0.46.0",
-    "@azure-tools/typespec-client-generator-core": "0.46.0",
+    "@azure-tools/typespec-client-generator-core": "0.46.1",
     "@microsoft/api-extractor": "^7.47.8",
     "@microsoft/api-extractor-model": "^7.29.7",
     "@types/js-yaml": "~4.0.9",