Update options.ts for rename-model (#3174)

Author: weidongxu-microsoft

core

@@ -97,6 +97,7 @@ Settings can be provided on the command line through `--name:value` or in a READ
 |`--enable-page-size`|Indicates that `maxpagesize` query parameter be supplied via `byPage` API in `PagedFlux` or `PagedIterable`, instead of via client method parameter.|
 |`--use-key-credential`|Indicates that builder uses `KeyCredential` for API key.|
 |`--graal-vm-config`|Generates GraalVM config under `resources/META-INF/native-image`.|
+|`--rename-model`|CSV. Rename classes. Each item is of pattern `from:to`.|
 
 ## Settings for minimal data-plane clients
 

readme.md

@@ -8,6 +8,7 @@ export interface DevOptions {
   "debug"?: boolean;
   "loglevel"?: "off" | "debug" | "info" | "warn" | "error";
   "java-temp-dir"?: string; // working directory for java codegen, e.g. transformed code-model file
+  profile?: boolean; // enable performance profiling
 }
 
 // see EmitterOptionsDev in code-model-builder.ts for a full list of options
@@ -116,13 +117,13 @@ export const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
         "Specify the Java class that to be executed by emitter for [code customization](https://github.com/Azure/autorest.java/blob/main/customization-base/README.md), during post-process.",
       nullable: true,
     },
-    // "rename-model": {
-    //   type: ["string", "object"],
-    //   description:
-    //     "Rename the model classes, in case they cannot be renamed via TCGC. E.g., anonymous models or templated models. Format should be in key-value form. This option is for management-plane SDK.",
-    //   additionalProperties: true,
-    //   nullable: true,
-    // },
+    "rename-model": {
+      type: ["string", "object"],
+      description:
+        "Rename the model classes, in case they cannot be renamed via TCGC. E.g., anonymous models or templated models. Format should be in key-value form.",
+      additionalProperties: true,
+      nullable: true,
+    },
     // "add-inner": {
     //   type: ["string", "array"],
     //   description:
@@ -140,7 +141,7 @@ export const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
     // "preserve-model": {
     //   type: ["string", "array"],
     //   description:
-    //     "Generate the model cleasses, even if it is not used by any API. Format should be in array form. This option is for management-plane SDK.",
+    //     "Generate the model classes, even if it is not used by any API. Format should be in array form. This option is for management-plane SDK.",
     //   items: { type: "string" },
     //   nullable: true,
     // },
@@ -149,6 +150,13 @@ export const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
     //   description: "Generate async APIs in Clients. This option is for management-plane SDK.",
     //   nullable: true,
     // },
+    // "property-include-always": {
+    //   type: ["string", "array"],
+    //   description:
+    //     "Specify that properties should always be serialized to JSON, even if its value is `null`. Format should be in array form. Each element be in form `<modelName>.<propertyName>`. This option is for management-plane SDK.",
+    //   items: { type: "string" },
+    //   nullable: true,
+    // },
     // "resource-collection-associations": {
     //   type: "array",
     //   description:

typespec-extension/src/options.ts

@@ -96,6 +96,8 @@ $generateScript = {
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
     # test service-name
     $tspOptions += " --option ""@azure-tools/typespec-java.service-name=Arm Resource Provider"""
+    # test property-include-always
+    $tspOptions += " --option ""@azure-tools/typespec-java.property-include-always=FunctionConfiguration.input"""
   } elseif ($tspFile -match "subclient.tsp") {
     $tspOptions += " --option ""@azure-tools/typespec-java.enable-subclient=true"""
     # test for include-api-view-properties

typespec-tests/Generate.ps1

@@ -86,7 +86,11 @@ public void validate() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("input", this.input);
+        if (input() != null) {
+            jsonWriter.writeStringField("input", this.input);
+        } else {
+            jsonWriter.writeNullField("input");
+        }
         jsonWriter.writeStringField("output", this.output);
         return jsonWriter.writeEndObject();
     }

typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionConfiguration.java

@@ -12,11 +12,13 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.utils.ArmUtils;
 import reactor.core.publisher.Mono;
+import tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration;
 import tsptest.armstreamstyleserialization.models.Error;
 import tsptest.armstreamstyleserialization.models.Priority;
 import tsptest.armstreamstyleserialization.models.SawShark;
@@ -85,6 +87,22 @@ public void testExpandableEnum() {
         Assertions.assertThrows(RuntimeException.class, () -> manager.priorities().setPriority(Priority.HIGH));
     }
 
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testPropertyWithNullValue() {
+        FunctionConfiguration functionConfiguration = new FunctionConfiguration();
+        Map<String, Object> jsonDict
+            = (Map<String, Object>) BinaryData.fromObject(functionConfiguration).toObject(Map.class);
+        Assertions.assertTrue(jsonDict.containsKey("input"));
+        Assertions.assertNull(jsonDict.get("input"));
+        Assertions.assertFalse(jsonDict.containsKey("output"));
+
+        functionConfiguration = new FunctionConfiguration().withInput("input");
+        jsonDict = (Map<String, Object>) BinaryData.fromObject(functionConfiguration).toObject(Map.class);
+        Assertions.assertTrue(jsonDict.containsKey("input"));
+        Assertions.assertEquals("input", jsonDict.get("input"));
+    }
+
     private static HttpClient createExpandableEnumHttpClient() {
         AtomicInteger callCount = new AtomicInteger();
         HttpClient httpClient = request -> {