tsp, json-merge-patch, fix issue on patch for discriminator property (#2704)

* fix kind property is not serialized issue

* regen

* add test case

* re-generate test code

* modify according to comments

* bump version

* update lock file

* add changelog

* update release date

---------

Co-authored-by: actions-user <[email protected]>

Author: haolingdong-msft

javagen/src/main/java/com/azure/autorest/template/ModelTemplate.java

@@ -821,6 +821,9 @@ private void addModelConstructor(ClientModel model, JavaVisibility constructorVi
                 if (modelDefinesProperty(model, polymorphicProperty)) {
                     constructor.line("this." + polymorphicProperty.getName() + " = " + discriminatorValue + ";");
                 }
+                if (ClientModelUtil.isJsonMergePatchModel(model)) {
+                    constructor.line("this.updatedProperties.add(\"" + polymorphicProperty.getName() + "\");");
+                }
 //                else {
 //                    constructor.line(polymorphicProperty.getSetterName() + "(" + discriminatorValue + ");");
 //                }

javagen/src/main/java/com/azure/autorest/template/StreamSerializationModelTemplate.java

@@ -383,7 +383,7 @@ private static void serializeJsonProperty(JavaBlock methodBlock, ClientModelProp
             propertyValueGetter);
         if (fieldSerializationMethod != null) {
             if (isJsonMergePatch && wireType instanceof ClassType && ((ClassType) wireType).isSwaggerType()) {
-                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, true);", clientType.toString(), propertyValueGetter));
+                methodBlock.line("JsonMergePatchHelper.get" + clientType.toString() + "Accessor().prepareModelForJsonMergePatch(" + propertyValueGetter + ", true);");
             }
             if (fromSuperType && clientType != wireType && clientType.isNullable()) {
                 // If the property is from a super type and the client type is different from the wire type then a null
@@ -394,7 +394,7 @@ private static void serializeJsonProperty(JavaBlock methodBlock, ClientModelProp
                 methodBlock.line(fieldSerializationMethod + ";");
             }
             if (isJsonMergePatch && wireType instanceof ClassType && ((ClassType) wireType).isSwaggerType()) {
-                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, false);", clientType.toString(), propertyValueGetter));
+                methodBlock.line("JsonMergePatchHelper.get" + clientType.toString() + "Accessor().prepareModelForJsonMergePatch(" + propertyValueGetter + ", false);");
             }
         } else if (wireType == ClassType.OBJECT) {
             methodBlock.line("jsonWriter.writeUntypedField(\"" + serializedName + "\", " + propertyValueGetter + ");");
@@ -482,11 +482,11 @@ private static void serializeJsonContainerProperty(JavaBlock methodBlock, String
                     methodBlock.block("", codeBlock -> {
                         codeBlock.ifBlock(elementName + "!=null", ifBlock -> {
                             if (elementType instanceof ClassType && ((ClassType) elementType).isSwaggerType()) {
-                                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, true);", ((ClassType) elementType).getName(), elementName));
+                                methodBlock.line("JsonMergePatchHelper.get" + ((ClassType) elementType).getName() + "Accessor().prepareModelForJsonMergePatch(" + elementName + ", true);");
                             }
                             ifBlock.line(valueSerializationMethod + ";");
                             if (elementType instanceof ClassType && ((ClassType) elementType).isSwaggerType()) {
-                                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, false);", ((ClassType) elementType).getName(), elementName));
+                                methodBlock.line("JsonMergePatchHelper.get" + ((ClassType) elementType).getName() + "Accessor().prepareModelForJsonMergePatch(" + elementName + ", false);");
                             }
                         }).elseBlock(elseBlock -> elseBlock.line(lambdaWriterName + ".writeNull();"));
                     });

typespec-extension/changelog.md

@@ -1,5 +1,11 @@
 # Release History
 
+## 0.15.12 (2024-04-19)
+
+Compatible with compiler 0.55.
+
+- Bug fix on supporting `application/merge-patch+json`.
+
 ## 0.15.10 (2024-04-17)
 
 Compatible with compiler 0.55.

typespec-extension/package-lock.json

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

typespec-extension/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@azure-tools/cadl-ranch-specs": "0.31.8",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.10.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.11.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "~0.55.0",

typespec-tests/package.json

@@ -77,6 +77,7 @@ void serializeAsJsonMergePatch(boolean jsonMergePatch) {
     @Generated
     public Fish() {
         this.kind = "Fish";
+        this.updatedProperties.add("kind");
     }
 
     /**

typespec-tests/src/main/java/com/cadl/patch/models/Fish.java

@@ -72,6 +72,7 @@ void serializeAsJsonMergePatch(boolean jsonMergePatch) {
      */
     @Generated
     public Salmon() {
+        this.updatedProperties.add("kind");
     }
 
     /**

typespec-tests/src/main/java/com/cadl/patch/models/Salmon.java

@@ -51,6 +51,7 @@ void serializeAsJsonMergePatch(boolean jsonMergePatch) {
      */
     @Generated
     public Shark() {
+        this.updatedProperties.add("kind");
     }
 
     /**

typespec-tests/src/main/java/com/cadl/patch/models/Shark.java

@@ -132,8 +132,8 @@ public void testSerializationForHierarchicalProperty() throws JsonProcessingExce
         String json = BinaryData.fromObject(resource).toString();
         JsonNode node = OBJECT_MAPPER.readTree(json);
         Assertions.assertEquals(JsonNodeType.NULL, node.get("fish").get("color").getNodeType());
-        // TODO: once supported, we should uncomment this validation.
-//        Assertions.assertEquals("shark", node.get("fish").get("kind"));
+        Assertions.assertEquals("shark", node.get("fish").get("kind").asText());
+        Assertions.assertEquals(2, node.get("fish").get("age").asInt());
     }
 
     @Test