tsp, bug fix multiple content-type + json-patch+json (#2870)

Author: weidongxu-microsoft

javagen/src/main/java/com/azure/autorest/mapper/ClientMethodMapper.java

@@ -233,7 +233,7 @@ private List<ClientMethod> createClientMethods(Operation operation, boolean isPr
                         .map(parameter, isProtocolMethod);
 
                     if (isJsonPatch) {
-                        clientMethodParameter = CustomClientParameterMapper.getInstance().map(parameter);
+                        clientMethodParameter = CustomClientParameterMapper.getInstance().map(parameter, isProtocolMethod);
                     }
 
                     // If the codemodel parameter and proxy method parameter types don't match, update the client

javagen/src/main/java/com/azure/autorest/mapper/ClientParameterMapper.java

@@ -51,7 +51,6 @@ public ClientMethodParameter map(Parameter parameter, boolean isProtocolMethod)
                 : parameter.getLanguage().getJava().getName();
         name = CodeNamer.getEscapedReservedClientMethodParameterName(name);
 
-        JavaSettings settings = JavaSettings.getInstance();
         ClientMethodParameter.Builder builder = new ClientMethodParameter.Builder()
                 .name(name)
                 .required(parameter.isRequired())

javagen/src/main/java/com/azure/autorest/mapper/CustomClientParameterMapper.java

@@ -7,11 +7,12 @@
 import com.azure.autorest.extension.base.model.codemodel.ArraySchema;
 import com.azure.autorest.extension.base.model.codemodel.ConstantSchema;
 import com.azure.autorest.extension.base.model.codemodel.Parameter;
-import com.azure.autorest.extension.base.plugin.JavaSettings;
 import com.azure.autorest.model.clientmodel.ClassType;
 import com.azure.autorest.model.clientmodel.ClientMethodParameter;
 import com.azure.autorest.model.clientmodel.IType;
 import com.azure.autorest.util.CodeNamer;
+import com.azure.autorest.util.MethodUtil;
+import com.azure.autorest.util.SchemaUtil;
 
 import java.util.ArrayList;
 
@@ -28,11 +29,14 @@ public static CustomClientParameterMapper getInstance() {
 
     @Override
     public ClientMethodParameter map(Parameter parameter) {
+        return map(parameter, false);
+    }
+
+    public ClientMethodParameter map(Parameter parameter, boolean isProtocolMethod) {
         String name = parameter.getOriginalParameter() != null && parameter.getLanguage().getJava().getName().equals(parameter.getOriginalParameter().getLanguage().getJava().getName())
                 ? CodeNamer.toCamelCase(parameter.getOriginalParameter().getSchema().getLanguage().getJava().getName()) + CodeNamer.toPascalCase(parameter.getLanguage().getJava().getName())
                 : parameter.getLanguage().getJava().getName();
 
-        JavaSettings settings = JavaSettings.getInstance();
         ClientMethodParameter.Builder builder = new ClientMethodParameter.Builder()
                 .name(name)
                 .required(parameter.isRequired())
@@ -46,6 +50,10 @@ public ClientMethodParameter map(Parameter parameter) {
             }
         }
 
+        if (isProtocolMethod) {
+            wireType = SchemaUtil.removeModelFromParameter(parameter.getProtocol().getHttp().getIn(), wireType);
+        }
+
         if (parameter.isNullable() || !parameter.isRequired()) {
             wireType = wireType.asNullable();
         }
@@ -62,15 +70,8 @@ public ClientMethodParameter map(Parameter parameter) {
         }
         builder.constant(isConstant).defaultValue(defaultValue);
 
-        if (parameter.getSchema() != null && parameter.getSchema().getLanguage() != null) {
-            String description = parameter.getSchema().getLanguage().getDefault().getDescription();
-            if (description == null || description.isEmpty()) {
-                if (parameter.getLanguage() != null) {
-                    description = parameter.getLanguage().getDefault().getDescription();
-                }
-            }
-            builder.description(description);
-        }
+        builder.description(MethodUtil.getMethodParameterDescription(parameter, name, isProtocolMethod));
+
         return builder.build();
     }
 }

typespec-extension/changelog.md

@@ -1,5 +1,9 @@
 # Release History
 
+## 0.18.2 (2024-07-22)
+
+Compatible with compiler 0.58.
+
 ## 0.18.1 (2024-07-17)
 
 Compatible with compiler 0.58.

typespec-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"

typespec-tests/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@azure-tools/cadl-ranch-specs": "0.34.7",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.18.1.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.18.2.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "~0.58.0",

typespec-tests/src/main/java/com/cadl/multicontenttypes/MultipleContentTypesOnRequestAsyncClient.java

@@ -47,7 +47,7 @@ public final class MultipleContentTypesOnRequestAsyncClient {
      * }</pre>
      * 
      * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.

typespec-tests/src/main/java/com/cadl/multicontenttypes/MultipleContentTypesOnRequestClient.java

@@ -45,7 +45,7 @@ public final class MultipleContentTypesOnRequestClient {
      * }</pre>
      * 
      * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.

typespec-tests/src/main/java/com/cadl/multicontenttypes/implementation/MultipleContentTypesOnRequestsImpl.java

@@ -150,7 +150,7 @@ Response<Void> uploadJsonOrBytesWithMultiBodyTypesForMultiContentTypesSync(
      * }</pre>
      * 
      * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -177,7 +177,7 @@ public Mono<Response<Void>> uploadBytesWithSingleBodyTypeForMultiContentTypesWit
      * }</pre>
      * 
      * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.

typespec-tests/tsp/multiple-content-types.tsp

@@ -42,7 +42,11 @@ interface MultipleContentTypesOnRequest {
   @post
   uploadBytesWithSingleBodyTypeForMultiContentTypes(
     @body data: bytes,
-    @header contentType: "application/octet-stream" | "image/jpeg" | "image/png",
+    @header contentType:
+      | "application/octet-stream"
+      | "image/jpeg"
+      | "image/png"
+      | "application/json-patch+json",
   ): void;
 
   @doc("multiple data types map to multiple content types using shared route")