Option for backward compatible, prepare release 0.36.1 (#3212)

weidongxu-microsoft · web-flow · commit 2202a667bed0 · 2025-10-24T10:33:36.000+08:00
diff --git a/core b/core
@@ -1 +1 @@
-Subproject commit 3f0f3f88cd1e496973a0f4adfe59d2a2c50f3fd1
+Subproject commit ce15007566269104613652ab7b0bf584a08a116f
diff --git a/typespec-extension/changelog.md b/typespec-extension/changelog.md
@@ -1,5 +1,14 @@
 # Release History
 
+## 0.36.1 (2025-10-23)
+
+Compatible with compiler 1.5.0.
+
+- Supported `float32-as-double` emitter option, default is `true`.
+- Supported `uuid-as-string` emitter option, default is `true`.
+
+Both options are for backward compatibility.
+
 ## 0.36.0 (2025-10-20)
 
 Compatible with compiler 1.5.0.
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.36.0",
+  "version": "0.36.1",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
@@ -70,14 +70,14 @@
     "@azure-tools/typespec-azure-core": "0.61.0",
     "@azure-tools/typespec-azure-resource-manager": "0.61.0",
     "@azure-tools/typespec-azure-rulesets": "0.61.0",
-    "@azure-tools/typespec-client-generator-core": "0.61.1",
+    "@azure-tools/typespec-client-generator-core": "0.61.2",
     "@azure-tools/typespec-liftr-base": "0.11.0",
-    "@microsoft/api-extractor": "^7.53.1",
+    "@microsoft/api-extractor": "^7.53.2",
     "@types/js-yaml": "~4.0.9",
     "@types/lodash": "~4.17.20",
-    "@types/node": "~24.8.0",
-    "@typescript-eslint/eslint-plugin": "~8.46.1",
-    "@typescript-eslint/parser": "~8.46.1",
+    "@types/node": "~24.9.1",
+    "@typescript-eslint/eslint-plugin": "~8.46.2",
+    "@typescript-eslint/parser": "~8.46.2",
     "@typespec/compiler": "1.5.0",
     "@typespec/events": "0.75.0",
     "@typespec/http": "1.5.0",
@@ -88,22 +88,22 @@
     "@typespec/tspd": "0.73.0",
     "@typespec/versioning": "0.75.0",
     "@typespec/xml": "0.75.0",
-    "@vitest/coverage-v8": "^3.2.4",
-    "@vitest/ui": "^3.2.4",
+    "@vitest/coverage-v8": "^4.0.1",
+    "@vitest/ui": "^4.0.1",
     "c8": "~10.1.3",
-    "eslint": "~9.37.0",
+    "eslint": "~9.38.0",
     "eslint-plugin-deprecation": "~3.0.0",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-unicorn": "^61.0.2",
     "prettier": "~3.6.2",
     "rimraf": "~6.0.1",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.46.1",
-    "vitest": "^3.2.4"
+    "typescript-eslint": "^8.46.2",
+    "vitest": "^4.0.1"
   },
   "overrides": {
-    "eslint": "~9.37.0",
-    "@typescript-eslint/eslint-plugin": "~8.46.1",
-    "@typescript-eslint/parser": "~8.46.1"
+    "eslint": "~9.38.0",
+    "@typescript-eslint/eslint-plugin": "~8.46.2",
+    "@typescript-eslint/parser": "~8.46.2"
   }
 }
diff --git a/typespec-extension/src/options.ts b/typespec-extension/src/options.ts
@@ -85,6 +85,20 @@ export const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
       nullable: true,
       default: false,
     },
+    "float32-as-double": {
+      type: "boolean",
+      description:
+        "When set to `true`, the emitter generates Java `double` for TypeSpec `float32`; otherwise, the emitter generates `float`. Default value is `true`. This option is for backward-compatibility.",
+      nullable: true,
+      default: true,
+    },
+    "uuid-as-string": {
+      type: "boolean",
+      description:
+        "When set to `true`, the emitter generates Java `String` for TypeSpec `Azure.Core.uuid`; otherwise, the emitter generates `UUID`. Default value is `true`. This option is for backward-compatibility.",
+      nullable: true,
+      default: true,
+    },
 
     // customization
     ...UnbrandedSdkEmitterOptions["generate-protocol-methods"],
diff --git a/typespec-tests/Generate.ps1 b/typespec-tests/Generate.ps1
@@ -72,7 +72,7 @@ $generateScript = {
     # TODO https://github.com/Azure/autorest.java/issues/2964
     # also serve as a test for "use-object-for-unknown" emitter option
     $tspOptions += " --option ""@azure-tools/typespec-java.use-object-for-unknown=true"""
-  } elseif ($tspFile -match "arm.tsp") {
+  } elseif ($tspFile -match "tsp[\\/]arm.tsp") {
     # for mgmt, do not generate tests due to random mock values
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
     # test service-name
@@ -87,7 +87,10 @@ $generateScript = {
     $tspOptions += " --option ""@azure-tools/typespec-java.remove-inner=NginxConfigurationResponse"""
     # generate async methods
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-async-methods=true"""
-  } elseif ($tspFile -match "arm-stream-style-serialization.tsp") {
+    # backward compatible options
+    $tspOptions += " --option ""@azure-tools/typespec-java.float32-as-double=false"""
+    $tspOptions += " --option ""@azure-tools/typespec-java.uuid-as-string=false"""
+  } elseif ($tspFile -match "tsp[\\/]arm-stream-style-serialization.tsp") {
     # for mgmt, do not generate tests due to random mock values
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
     # test service-name
@@ -96,12 +99,12 @@ $generateScript = {
     $tspOptions += " --option ""@azure-tools/typespec-java.property-include-always=FunctionConfiguration.input"""
     # enable client side validations
     $tspOptions += " --option ""@azure-tools/typespec-java.client-side-validations=true"""
-  } elseif ($tspFile -match "arm-customization.tsp") {
+  } elseif ($tspFile -match "tsp[\\/]arm-customization.tsp") {
     # for mgmt, do not generate tests due to random mock values
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
     # add customization code
     $tspOptions += " --option ""@azure-tools/typespec-java.customization-class=../../customization/src/main/java/KeyVaultCustomization.java"""
-  } elseif ($tspFile -match "subclient.tsp") {
+  } elseif ($tspFile -match "tsp[\\/]subclient.tsp") {
     $tspOptions += " --option ""@azure-tools/typespec-java.enable-subclient=true"""
     # test for include-api-view-properties
     $tspOptions += " --option ""@azure-tools/typespec-java.include-api-view-properties=false"""
diff --git a/typespec-tests/package.json b/typespec-tests/package.json
@@ -13,7 +13,7 @@
     "@typespec/spector": "0.1.0-alpha.19",
     "@typespec/http-specs": "0.1.0-alpha.27",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.31",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.36.0.tgz"
+  "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.36.1.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "^1.5.0",
diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceInner.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceInner.java
@@ -219,6 +219,15 @@ public TopLevelArmResourceInner withStartTimeStamp(OffsetDateTime startTimeStamp
         return this;
     }
 
+    /**
+     * Get the size property: The size property.
+     * 
+     * @return the size value.
+     */
+    public Float size() {
+        return this.innerProperties() == null ? null : this.innerProperties().size();
+    }
+
     /**
      * Get the provisioningState property: The status of the last operation.
      * 
diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceProperties.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/models/TopLevelArmResourceProperties.java
@@ -46,6 +46,11 @@ public final class TopLevelArmResourceProperties implements JsonSerializable<Top
      */
     private OffsetDateTime startTimeStamp;
 
+    /*
+     * The size property.
+     */
+    private Float size;
+
     /*
      * The status of the last operation.
      */
@@ -146,6 +151,15 @@ public TopLevelArmResourceProperties withStartTimeStamp(OffsetDateTime startTime
         return this;
     }
 
+    /**
+     * Get the size property: The size property.
+     * 
+     * @return the size value.
+     */
+    public Float size() {
+        return this.size;
+    }
+
     /**
      * Get the provisioningState property: The status of the last operation.
      * 
@@ -198,6 +212,8 @@ public static TopLevelArmResourceProperties fromJson(JsonReader jsonReader) thro
                 } else if ("configurationEndpoints".equals(fieldName)) {
                     List<String> configurationEndpoints = reader.readArray(reader1 -> reader1.getString());
                     deserializedTopLevelArmResourceProperties.configurationEndpoints = configurationEndpoints;
+                } else if ("size".equals(fieldName)) {
+                    deserializedTopLevelArmResourceProperties.size = reader.getNullable(JsonReader::getFloat);
                 } else if ("provisioningState".equals(fieldName)) {
                     deserializedTopLevelArmResourceProperties.provisioningState
                         = ProvisioningState.fromString(reader.getString());
diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceImpl.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/implementation/TopLevelArmResourceImpl.java
@@ -77,6 +77,10 @@ public OffsetDateTime startTimeStamp() {
         return this.innerModel().startTimeStamp();
     }
 
+    public Float size() {
+        return this.innerModel().size();
+    }
+
     public ProvisioningState provisioningState() {
         return this.innerModel().provisioningState();
     }
diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/models/ManagedServiceIdentity.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/models/ManagedServiceIdentity.java
@@ -11,6 +11,7 @@
 import com.azure.json.JsonWriter;
 import java.io.IOException;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * Managed service identity (system assigned and/or user assigned identities).
@@ -21,13 +22,13 @@ public final class ManagedServiceIdentity implements JsonSerializable<ManagedSer
      * The service principal ID of the system assigned identity. This property will only be provided for a system
      * assigned identity.
      */
-    private String principalId;
+    private UUID principalId;
 
     /*
      * The tenant ID of the system assigned identity. This property will only be provided for a system assigned
      * identity.
      */
-    private String tenantId;
+    private UUID tenantId;
 
     /*
      * The type of managed identity assigned to this resource.
@@ -51,7 +52,7 @@ public ManagedServiceIdentity() {
      * 
      * @return the principalId value.
      */
-    public String principalId() {
+    public UUID principalId() {
         return this.principalId;
     }
 
@@ -61,7 +62,7 @@ public String principalId() {
      * 
      * @return the tenantId value.
      */
-    public String tenantId() {
+    public UUID tenantId() {
         return this.tenantId;
     }
 
@@ -136,9 +137,11 @@ public static ManagedServiceIdentity fromJson(JsonReader jsonReader) throws IOEx
                 if ("type".equals(fieldName)) {
                     deserializedManagedServiceIdentity.type = ManagedServiceIdentityType.fromString(reader.getString());
                 } else if ("principalId".equals(fieldName)) {
-                    deserializedManagedServiceIdentity.principalId = reader.getString();
+                    deserializedManagedServiceIdentity.principalId
+                        = reader.getNullable(nonNullReader -> UUID.fromString(nonNullReader.getString()));
                 } else if ("tenantId".equals(fieldName)) {
-                    deserializedManagedServiceIdentity.tenantId = reader.getString();
+                    deserializedManagedServiceIdentity.tenantId
+                        = reader.getNullable(nonNullReader -> UUID.fromString(nonNullReader.getString()));
                 } else if ("userAssignedIdentities".equals(fieldName)) {
                     Map<String, UserAssignedIdentity> userAssignedIdentities
                         = reader.readMap(reader1 -> UserAssignedIdentity.fromJson(reader1));
diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/models/TopLevelArmResource.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/models/TopLevelArmResource.java
@@ -93,6 +93,13 @@ public interface TopLevelArmResource {
      */
     OffsetDateTime startTimeStamp();
 
+    /**
+     * Gets the size property: The size property.
+     * 
+     * @return the size value.
+     */
+    Float size();
+
     /**
      * Gets the provisioningState property: The status of the last operation.
      * 
diff --git a/typespec-tests/src/main/java/tsptest/armresourceprovider/models/UserAssignedIdentity.java b/typespec-tests/src/main/java/tsptest/armresourceprovider/models/UserAssignedIdentity.java
@@ -10,6 +10,7 @@
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
 import java.io.IOException;
+import java.util.UUID;
 
 /**
  * User assigned identity properties.
@@ -19,12 +20,12 @@ public final class UserAssignedIdentity implements JsonSerializable<UserAssigned
     /*
      * The principal ID of the assigned identity.
      */
-    private String principalId;
+    private UUID principalId;
 
     /*
      * The client ID of the assigned identity.
      */
-    private String clientId;
+    private UUID clientId;
 
     /**
      * Creates an instance of UserAssignedIdentity class.
@@ -37,7 +38,7 @@ public UserAssignedIdentity() {
      * 
      * @return the principalId value.
      */
-    public String principalId() {
+    public UUID principalId() {
         return this.principalId;
     }
 
@@ -46,7 +47,7 @@ public String principalId() {
      * 
      * @return the clientId value.
      */
-    public String clientId() {
+    public UUID clientId() {
         return this.clientId;
     }
 
@@ -75,9 +76,11 @@ public static UserAssignedIdentity fromJson(JsonReader jsonReader) throws IOExce
                 reader.nextToken();
 
                 if ("principalId".equals(fieldName)) {
-                    deserializedUserAssignedIdentity.principalId = reader.getString();
+                    deserializedUserAssignedIdentity.principalId
+                        = reader.getNullable(nonNullReader -> UUID.fromString(nonNullReader.getString()));
                 } else if ("clientId".equals(fieldName)) {
-                    deserializedUserAssignedIdentity.clientId = reader.getString();
+                    deserializedUserAssignedIdentity.clientId
+                        = reader.getNullable(nonNullReader -> UUID.fromString(nonNullReader.getString()));
                 } else {
                     reader.skipChildren();
                 }
diff --git a/typespec-tests/src/main/java/tsptest/builtin/BuiltinAsyncClient.java b/typespec-tests/src/main/java/tsptest/builtin/BuiltinAsyncClient.java
@@ -98,6 +98,7 @@ public final class BuiltinAsyncClient {
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
@@ -159,6 +160,7 @@ public Mono<Response<BinaryData>> readWithResponse(String queryParam, String que
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
diff --git a/typespec-tests/src/main/java/tsptest/builtin/BuiltinClient.java b/typespec-tests/src/main/java/tsptest/builtin/BuiltinClient.java
@@ -96,6 +96,7 @@ public final class BuiltinClient {
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
@@ -157,6 +158,7 @@ public Response<BinaryData> readWithResponse(String queryParam, String queryPara
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
diff --git a/typespec-tests/src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java b/typespec-tests/src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java
@@ -158,6 +158,7 @@ Response<Void> writeSync(@HostParam("endpoint") String endpoint,
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
@@ -236,6 +237,7 @@ public Mono<Response<BinaryData>> readWithResponseAsync(String queryParam, Strin
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
@@ -298,6 +300,7 @@ public Response<BinaryData> readWithResponse(String queryParam, String queryPara
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
@@ -358,6 +361,7 @@ public Mono<Response<Void>> writeWithResponseAsync(BinaryData body, RequestOptio
      *         unknownDateTimeFormat: String (Optional)
      *         unknownBytes: String (Optional)
      *     }
+     *     uuid: String (Required)
      * }
      * }
      * </pre>
diff --git a/typespec-tests/src/main/java/tsptest/builtin/models/Builtin.java b/typespec-tests/src/main/java/tsptest/builtin/models/Builtin.java
diff --git a/typespec-tests/tsp/arm.tsp b/typespec-tests/tsp/arm.tsp
diff --git a/typespec-tests/tsp/builtin.tsp b/typespec-tests/tsp/builtin.tsp

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,10 @@ public OffsetDateTime startTimeStamp() {`
`77`	`77`	`return this.innerModel().startTimeStamp();`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ public Float size() {`
	`81`	`+ return this.innerModel().size();`
	`82`	`+ }`
	`83`	`+`
`80`	`84`	`public ProvisioningState provisioningState() {`
`81`	`85`	`return this.innerModel().provisioningState();`
`82`	`86`	`}`