tsp, json-merge-patch, fix the access issue on patch model property (#2702)

haolingdong-msft · actions-user · web-flow · commit e2acc6f8d50b · 2024-04-17T16:45:42.000+08:00
* use accessor pattern to enable json merge patch for model property.

* regenerate

* re-generate test code

---------

Co-authored-by: actions-user &lt;action@github.com&gt;
diff --git a/javagen/src/main/java/com/azure/autorest/template/StreamSerializationModelTemplate.java b/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(propertyValueGetter + ".serializeAsJsonMergePatch(true);");
+                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, true);", clientType.toString(), propertyValueGetter));
             }
             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(propertyValueGetter + ".serializeAsJsonMergePatch(false);");
+                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, false);", clientType.toString(), propertyValueGetter));
             }
         } 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()) {
-                                codeBlock.line(elementName + ".serializeAsJsonMergePatch(true);");
+                                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, true);", ((ClassType) elementType).getName(), elementName));
                             }
                             ifBlock.line(valueSerializationMethod + ";");
                             if (elementType instanceof ClassType && ((ClassType) elementType).isSwaggerType()) {
-                                codeBlock.line(elementName + ".serializeAsJsonMergePatch(false);");
+                                methodBlock.line(String.format("JsonMergePatchHelper.get%1$sAccessor().prepareModelForJsonMergePatch(%2$s, false);", ((ClassType) elementType).getName(), elementName));
                             }
                         }).elseBlock(elseBlock -> elseBlock.line(lambdaWriterName + ".writeNull();"));
                     });
diff --git a/typespec-tests/src/main/java/com/cadl/flatten/models/UpdatePatchRequest.java b/typespec-tests/src/main/java/com/cadl/flatten/models/UpdatePatchRequest.java
@@ -100,9 +100,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             if (this.patch == null) {
                 jsonWriter.writeNullField("patch");
             } else {
-                this.patch.serializeAsJsonMergePatch(true);
+                JsonMergePatchHelper.getTodoItemPatchAccessor().prepareModelForJsonMergePatch(this.patch, true);
                 jsonWriter.writeJsonField("patch", this.patch);
-                this.patch.serializeAsJsonMergePatch(false);
+                JsonMergePatchHelper.getTodoItemPatchAccessor().prepareModelForJsonMergePatch(this.patch, false);
             }
         }
         return jsonWriter.writeEndObject();
diff --git a/typespec-tests/src/main/java/com/cadl/patch/models/Resource.java b/typespec-tests/src/main/java/com/cadl/patch/models/Resource.java
@@ -353,9 +353,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             } else {
                 jsonWriter.writeMapField("map", this.map, (writer, element) -> {
                     if (element != null) {
-                        element.serializeAsJsonMergePatch(true);
+                        JsonMergePatchHelper.getInnerModelAccessor().prepareModelForJsonMergePatch(element, true);
                         writer.writeJson(element);
-                        element.serializeAsJsonMergePatch(false);
+                        JsonMergePatchHelper.getInnerModelAccessor().prepareModelForJsonMergePatch(element, false);
                     } else {
                         writer.writeNull();
                     }
@@ -387,9 +387,11 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             if (this.innerModelProperty == null) {
                 jsonWriter.writeNullField("wireNameForInnerModelProperty");
             } else {
-                this.innerModelProperty.serializeAsJsonMergePatch(true);
+                JsonMergePatchHelper.getInnerModelAccessor()
+                    .prepareModelForJsonMergePatch(this.innerModelProperty, true);
                 jsonWriter.writeJsonField("wireNameForInnerModelProperty", this.innerModelProperty);
-                this.innerModelProperty.serializeAsJsonMergePatch(false);
+                JsonMergePatchHelper.getInnerModelAccessor()
+                    .prepareModelForJsonMergePatch(this.innerModelProperty, false);
             }
         }
         if (updatedProperties.contains("array")) {
@@ -403,9 +405,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             if (this.fish == null) {
                 jsonWriter.writeNullField("fish");
             } else {
-                this.fish.serializeAsJsonMergePatch(true);
+                JsonMergePatchHelper.getFishAccessor().prepareModelForJsonMergePatch(this.fish, true);
                 jsonWriter.writeJsonField("fish", this.fish);
-                this.fish.serializeAsJsonMergePatch(false);
+                JsonMergePatchHelper.getFishAccessor().prepareModelForJsonMergePatch(this.fish, false);
             }
         }
         return jsonWriter.writeEndObject();
diff --git a/typespec-tests/src/main/java/com/cadl/patch/models/Salmon.java b/typespec-tests/src/main/java/com/cadl/patch/models/Salmon.java
@@ -227,9 +227,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             } else {
                 jsonWriter.writeMapField("hate", this.hate, (writer, element) -> {
                     if (element != null) {
-                        element.serializeAsJsonMergePatch(true);
+                        JsonMergePatchHelper.getFishAccessor().prepareModelForJsonMergePatch(element, true);
                         writer.writeJson(element);
-                        element.serializeAsJsonMergePatch(false);
+                        JsonMergePatchHelper.getFishAccessor().prepareModelForJsonMergePatch(element, false);
                     } else {
                         writer.writeNull();
                     }
@@ -240,9 +240,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             if (this.partner == null) {
                 jsonWriter.writeNullField("partner");
             } else {
-                this.partner.serializeAsJsonMergePatch(true);
+                JsonMergePatchHelper.getFishAccessor().prepareModelForJsonMergePatch(this.partner, true);
                 jsonWriter.writeJsonField("partner", this.partner);
-                this.partner.serializeAsJsonMergePatch(false);
+                JsonMergePatchHelper.getFishAccessor().prepareModelForJsonMergePatch(this.partner, false);
             }
         }
         return jsonWriter.writeEndObject();
diff --git a/typespec-tests/src/main/java/com/payload/jsonmergepatch/models/ResourcePatch.java b/typespec-tests/src/main/java/com/payload/jsonmergepatch/models/ResourcePatch.java
@@ -290,9 +290,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             } else {
                 jsonWriter.writeMapField("map", this.map, (writer, element) -> {
                     if (element != null) {
-                        element.serializeAsJsonMergePatch(true);
+                        JsonMergePatchHelper.getInnerModelAccessor().prepareModelForJsonMergePatch(element, true);
                         writer.writeJson(element);
-                        element.serializeAsJsonMergePatch(false);
+                        JsonMergePatchHelper.getInnerModelAccessor().prepareModelForJsonMergePatch(element, false);
                     } else {
                         writer.writeNull();
                     }
@@ -324,9 +324,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {
             if (this.innerModel == null) {
                 jsonWriter.writeNullField("innerModel");
             } else {
-                this.innerModel.serializeAsJsonMergePatch(true);
+                JsonMergePatchHelper.getInnerModelAccessor().prepareModelForJsonMergePatch(this.innerModel, true);
                 jsonWriter.writeJsonField("innerModel", this.innerModel);
-                this.innerModel.serializeAsJsonMergePatch(false);
+                JsonMergePatchHelper.getInnerModelAccessor().prepareModelForJsonMergePatch(this.innerModel, false);
             }
         }
         if (updatedProperties.contains("intArray")) {

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,9 @@ private JsonWriter toJsonMergePatch(JsonWriter jsonWriter) throws IOException {`
`100`	`100`	`if (this.patch == null) {`
`101`	`101`	`jsonWriter.writeNullField("patch");`
`102`	`102`	`} else {`
`103`		`- this.patch.serializeAsJsonMergePatch(true);`
	`103`	`+ JsonMergePatchHelper.getTodoItemPatchAccessor().prepareModelForJsonMergePatch(this.patch, true);`
`104`	`104`	`jsonWriter.writeJsonField("patch", this.patch);`
`105`		`- this.patch.serializeAsJsonMergePatch(false);`
	`105`	`+ JsonMergePatchHelper.getTodoItemPatchAccessor().prepareModelForJsonMergePatch(this.patch, false);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`return jsonWriter.writeEndObject();`