tsp, json-merge-patch, discriminator, only add "kind" to 'updatedProperties' when SSS enabled (#2709)

haolingdong-msft · web-flow · commit 032741052ef7 · 2024-04-19T02:57:58.000Z
* only add the line when SSS enabled

* bum version
diff --git a/javagen/src/main/java/com/azure/autorest/template/ModelTemplate.java b/javagen/src/main/java/com/azure/autorest/template/ModelTemplate.java
@@ -821,7 +821,7 @@ private void addModelConstructor(ClientModel model, JavaVisibility constructorVi
                 if (modelDefinesProperty(model, polymorphicProperty)) {
                     constructor.line("this." + polymorphicProperty.getName() + " = " + discriminatorValue + ";");
                 }
-                if (ClientModelUtil.isJsonMergePatchModel(model)) {
+                if (settings.isStreamStyleSerialization() && ClientModelUtil.isJsonMergePatchModel(model)) {
                     constructor.line("this.updatedProperties.add(\"" + polymorphicProperty.getName() + "\");");
                 }
 //                else {
diff --git a/typespec-extension/changelog.md b/typespec-extension/changelog.md
@@ -1,6 +1,10 @@
 # Release History
 
-## 0.15.12 (2024-04-19)
+## 0.15.12 (2024-04-20)
+
+Compatible with compiler 0.55.
+
+## 0.15.11 (2024-04-19)
 
 Compatible with compiler 0.55.
 
diff --git a/typespec-extension/package-lock.json b/typespec-extension/package-lock.json
diff --git a/typespec-extension/package.json b/typespec-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.15.11",
+  "version": "0.15.12",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
diff --git a/typespec-tests/package.json b/typespec-tests/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.11.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.12.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "~0.55.0",

Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ private void addModelConstructor(ClientModel model, JavaVisibility constructorVi`
`821`	`821`	`if (modelDefinesProperty(model, polymorphicProperty)) {`
`822`	`822`	`constructor.line("this." + polymorphicProperty.getName() + " = " + discriminatorValue + ";");`
`823`	`823`	`}`
`824`		`- if (ClientModelUtil.isJsonMergePatchModel(model)) {`
	`824`	`+ if (settings.isStreamStyleSerialization() && ClientModelUtil.isJsonMergePatchModel(model)) {`
`825`	`825`	`constructor.line("this.updatedProperties.add(\"" + polymorphicProperty.getName() + "\");");`
`826`	`826`	`}`
`827`	`827`	`// else {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@azure-tools/typespec-java",`
`3`		`- "version": "0.15.11",`
	`3`	`+ "version": "0.15.12",`
`4`	`4`	`"description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"TypeSpec"`