http-client-java, support client parameter to client (microsoft#4415)

This is only part of the support for Azure/autorest.java#2428 cadl-ranch Azure/cadl-ranch#727 user code ```java InitializationClient client = new InitializationClientBuilder() .name("client1") .buildClient(); client.action(); ```
m-nash · Sep 12, 2024 · deae32e · deae32e
1 parent f9ae0a1
commit deae32e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 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
@@ -1148,10 +1148,19 @@ export class CodeModelBuilder {
         }
       }
 
+      // TODO: use param.onClient after TCGC fix
+      const parameterOnClient =
+        !isApiVersion(this.sdkContext, param) &&
+        param.correspondingMethodParams &&
+        param.correspondingMethodParams.length > 0 &&
+        param.correspondingMethodParams[0].onClient;
+
       const nullable = param.type.kind === "nullable";
       const parameter = new Parameter(param.name, param.details ?? "", schema, {
         summary: param.description,
-        implementation: ImplementationLocation.Method,
+        implementation: parameterOnClient
+          ? ImplementationLocation.Client
+          : ImplementationLocation.Method,
         required: !param.optional,
         nullable: nullable,
         protocol: {
@@ -1169,6 +1178,10 @@ export class CodeModelBuilder {
       });
       op.addParameter(parameter);
 
+      if (parameterOnClient) {
+        clientContext.addGlobalParameter(parameter);
+      }
+
       this.trackSchemaUsage(schema, { usage: [SchemaContext.Input] });
 
       if (op.convenienceApi) {

diff --git a/packages/http-client-java/emitter/src/models.ts b/packages/http-client-java/emitter/src/models.ts
@@ -31,7 +31,12 @@ export class ClientContext {
   }
 
   addGlobalParameter(parameter: Parameter) {
-    if (!this.globalParameters.includes(parameter)) {
+    if (
+      !this.globalParameters.includes(parameter) &&
+      !this.globalParameters.some(
+        (it) => it.language.default.name === parameter.language.default.name
+      )
+    ) {
       this.globalParameters.push(parameter);
     }
   }

diff --git a/...in/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java b/...in/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java
@@ -209,8 +209,10 @@ protected List<ServiceClientProperty> processClientProperties(Client client, Str
                 continue;
             }
 
-            String serviceClientPropertyDescription =
+            String description =
                     p.getDescription() != null ? p.getDescription() : p.getLanguage().getJava().getDescription();
+            String summary = p.getSummary();
+            description = SchemaUtil.mergeSummaryWithDescription(summary, description);
 
             String serviceClientPropertyName = CodeNamer.getPropertyName(p.getLanguage().getJava().getName());
 
@@ -233,7 +235,7 @@ protected List<ServiceClientProperty> processClientProperties(Client client, Str
             if (serviceClientPropertyClientType != ClassType.TOKEN_CREDENTIAL) {
                 ServiceClientProperty serviceClientProperty =
                         new ServiceClientProperty.Builder()
-                                .description(serviceClientPropertyDescription)
+                                .description(description)
                                 .type(serviceClientPropertyClientType)
                                 .name(serviceClientPropertyName)
                                 .readOnly(serviceClientPropertyIsReadOnly)

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
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "clean": "rimraf ./node_modules/@typespec/http-client-java ./package-lock.json",
+    "clean": "rimraf ./node_modules/@typespec/http-client-java ./package-lock.json ./tsp-output",
     "format": "npm run -s prettier -- --write",
     "check-format": "npm run prettier -- --check",
     "prettier": "prettier --config ./.prettierrc.yaml **/*.tsp",