http-client-java, upgrade tcgc 0.48.3 (#5230)

For now, ignore pageable in unbranded.
microsoft · Nov 29, 2024 · b9e5648 · b9e5648
1 parent b6dcb04
commit b9e5648
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 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
@@ -167,8 +167,8 @@ export class CodeModelBuilder {
   private program: Program;
   private typeNameOptions: TypeNameOptions;
   private namespace: string;
-  private baseJavaNamespace: string = ""; // it will be set at the start of "build" function
-  private legacyJavaNamespace: boolean = false; // backward-compatible mode, that emitter ignores clientNamespace from TCGC
+  private baseJavaNamespace!: string;
+  private legacyJavaNamespace!: boolean; // backward-compatible mode, that emitter ignores clientNamespace from TCGC
   private sdkContext!: SdkContext;
   private options: EmitterOptions;
   private codeModel: CodeModel;
@@ -386,7 +386,7 @@ export class CodeModelBuilder {
   }
 
   private isBranded(): boolean {
-    return !this.options["flavor"] || this.options["flavor"].toLocaleLowerCase() === "azure";
+    return this.options["flavor"]?.toLocaleLowerCase() === "azure";
   }
 
   private processModels() {
@@ -957,6 +957,11 @@ export class CodeModelBuilder {
     responses: SdkHttpResponse[],
     sdkMethod: SdkMethod<SdkHttpOperation>,
   ) {
+    if (!this.isBranded()) {
+      // TODO: currently unbranded does not support paged operation
+      return;
+    }
+
     if (sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging") {
       for (const response of responses) {
         const bodyType = response.type;

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
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@azure-tools/cadl-ranch-specs": "0.39.4",
-    "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.1.tgz",
+    "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.2.tgz",
     "@typespec/http-client-java-tests": "file:"
   },
   "overrides": {
@@ -24,7 +24,7 @@
     "@typespec/openapi": "~0.62.0",
     "@typespec/xml": "~0.62.0",
     "@azure-tools/typespec-azure-core": "~0.48.0",
-    "@azure-tools/typespec-client-generator-core": "~0.48.0",
+    "@azure-tools/typespec-client-generator-core": "~0.48.3",
     "@azure-tools/typespec-azure-resource-manager": "~0.48.0",
     "@azure-tools/typespec-autorest": "~0.48.0"
   },

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
@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-java",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
@@ -44,7 +44,7 @@
   "peerDependencies": {
     "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0",
     "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.48.2 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.48.3 <1.0.0",
     "@typespec/compiler": ">=0.62.0 <1.0.0",
     "@typespec/http": ">=0.62.0 <1.0.0",
     "@typespec/openapi": ">=0.62.0 <1.0.0",
@@ -63,7 +63,7 @@
     "@azure-tools/typespec-azure-core": "0.48.0",
     "@azure-tools/typespec-azure-resource-manager": "0.48.0",
     "@azure-tools/typespec-azure-rulesets": "0.48.0",
-    "@azure-tools/typespec-client-generator-core": "0.48.2",
+    "@azure-tools/typespec-client-generator-core": "0.48.3",
     "@microsoft/api-extractor": "^7.47.11",
     "@microsoft/api-extractor-model": "^7.29.8",
     "@types/js-yaml": "~4.0.9",