[http-client-csharp] remove unused emitter options (microsoft#5803)

fixes: microsoft#5746 Follow up autorest PR to migrate the removed options: Azure/autorest.csharp#5227
pinterest · Jan 31, 2025 · 0a6c595 · 0a6c595
1 parent fcb4421
commit 0a6c595
Show file tree

Hide file tree

Showing 70 changed files with 68 additions and 255 deletions.
diff --git a/packages/http-client-csharp/emitter/src/emitter.ts b/packages/http-client-csharp/emitter/src/emitter.ts
@@ -74,7 +74,7 @@ export async function $onEmit(context: EmitContext<NetEmitterOptions>) {
       process.exit(1);
     }
     const tspNamespace = root.Name; // this is the top-level namespace defined in the typespec file, which is actually always different from the namespace of the SDK
-    // await program.host.writeFile(outPath, prettierOutput(JSON.stringify(root, null, 2)));
+
     if (root) {
       const generatedFolder = resolvePath(outputFolder, "src", "Generated");
 
@@ -93,37 +93,8 @@ export async function $onEmit(context: EmitContext<NetEmitterOptions>) {
         "output-folder": ".",
         namespace: namespace,
         "library-name": options["library-name"] ?? namespace,
-        "single-top-level-client": options["single-top-level-client"],
         "unreferenced-types-handling": options["unreferenced-types-handling"],
-        "keep-non-overloadable-protocol-signature":
-          options["keep-non-overloadable-protocol-signature"],
         "model-namespace": options["model-namespace"],
-        "models-to-treat-empty-string-as-null": options["models-to-treat-empty-string-as-null"],
-        "intrinsic-types-to-treat-empty-string-as-null": options[
-          "models-to-treat-empty-string-as-null"
-        ]
-          ? options["additional-intrinsic-types-to-treat-empty-string-as-null"].concat(
-              ["Uri", "Guid", "ResourceIdentifier", "DateTimeOffset"].filter(
-                (item) =>
-                  options["additional-intrinsic-types-to-treat-empty-string-as-null"].indexOf(
-                    item,
-                  ) < 0,
-              ),
-            )
-          : undefined,
-        "methods-to-keep-client-default-value": options["methods-to-keep-client-default-value"],
-        "head-as-boolean": options["head-as-boolean"],
-        "deserialize-null-collection-as-null-value":
-          options["deserialize-null-collection-as-null-value"],
-        flavor: options["flavor"],
-        //only emit these if they are not the default values
-        "generate-sample-project":
-          options["generate-sample-project"] === true
-            ? undefined
-            : options["generate-sample-project"],
-        "generate-test-project":
-          options["generate-test-project"] === false ? undefined : options["generate-test-project"],
-        "use-model-reader-writer": options["use-model-reader-writer"] ?? true,
         "disable-xml-docs":
           options["disable-xml-docs"] === false ? undefined : options["disable-xml-docs"],
       };
@@ -142,9 +113,6 @@ export async function $onEmit(context: EmitContext<NetEmitterOptions>) {
         Logger.getInstance().info(`Checking if ${csProjFile} exists`);
         const newProjectOption =
           options["new-project"] || !checkFile(csProjFile) ? "--new-project" : "";
-        const existingProjectOption = options["existing-project-folder"]
-          ? `--existing-project-folder ${options["existing-project-folder"]}`
-          : "";
         const debugFlag = (options.debug ?? false) ? "--debug" : "";
 
         const emitterPath = options["emitter-extension-path"] ?? import.meta.url;
@@ -153,7 +121,7 @@ export async function $onEmit(context: EmitContext<NetEmitterOptions>) {
           projectRoot + "/dist/generator/Microsoft.Generator.CSharp.dll",
         );
 
-        const command = `dotnet --roll-forward Major ${generatorPath} ${outputFolder} -p ${options["plugin-name"]}${constructCommandArg(newProjectOption)}${constructCommandArg(existingProjectOption)}${constructCommandArg(debugFlag)}`;
+        const command = `dotnet --roll-forward Major ${generatorPath} ${outputFolder} -p ${options["plugin-name"]}${constructCommandArg(newProjectOption)}${constructCommandArg(debugFlag)}`;
         Logger.getInstance().info(command);
 
         try {
@@ -167,7 +135,6 @@ export async function $onEmit(context: EmitContext<NetEmitterOptions>) {
               "-p",
               options["plugin-name"],
               newProjectOption,
-              existingProjectOption,
               debugFlag,
             ],
             { stdio: "inherit" },

diff --git a/packages/http-client-csharp/emitter/src/options.ts b/packages/http-client-csharp/emitter/src/options.ts
@@ -9,27 +9,14 @@ export interface NetEmitterOptions extends SdkEmitterOptions {
   logFile?: string;
   namespace: string;
   "library-name": string;
-  "single-top-level-client"?: boolean;
   skipSDKGeneration?: boolean;
   "unreferenced-types-handling"?: "removeOrInternalize" | "internalize" | "keepAll";
   "new-project"?: boolean;
   "clear-output-folder"?: boolean;
   "save-inputs"?: boolean;
   "model-namespace"?: boolean;
-  "existing-project-folder"?: string;
-  "keep-non-overloadable-protocol-signature"?: boolean;
   debug?: boolean;
-  "models-to-treat-empty-string-as-null"?: string[];
-  "additional-intrinsic-types-to-treat-empty-string-as-null"?: string[];
-  "methods-to-keep-client-default-value"?: string[];
-  "deserialize-null-collection-as-null-value"?: boolean;
   logLevel?: LoggerLevel;
-  "package-dir"?: string;
-  "head-as-boolean"?: boolean;
-  flavor?: string;
-  "generate-sample-project"?: boolean;
-  "generate-test-project"?: boolean;
-  "use-model-reader-writer"?: boolean;
   "disable-xml-docs"?: boolean;
   "plugin-name"?: string;
   "emitter-extension-path"?: string;
@@ -47,7 +34,6 @@ export const NetEmitterOptionsSchema: JSONSchemaType<NetEmitterOptions> = {
     logFile: { type: "string", nullable: true },
     namespace: { type: "string" },
     "library-name": { type: "string" },
-    "single-top-level-client": { type: "boolean", nullable: true },
     skipSDKGeneration: { type: "boolean", default: false, nullable: true },
     "unreferenced-types-handling": {
       type: "string",
@@ -62,50 +48,12 @@ export const NetEmitterOptionsSchema: JSONSchemaType<NetEmitterOptions> = {
     "generate-convenience-methods": { type: "boolean", nullable: true },
     "flatten-union-as-enum": { type: "boolean", nullable: true },
     "package-name": { type: "string", nullable: true },
-    "existing-project-folder": { type: "string", nullable: true },
-    "keep-non-overloadable-protocol-signature": {
-      type: "boolean",
-      nullable: true,
-    },
     debug: { type: "boolean", nullable: true },
-    "models-to-treat-empty-string-as-null": {
-      type: "array",
-      nullable: true,
-      items: { type: "string" },
-    },
-    "additional-intrinsic-types-to-treat-empty-string-as-null": {
-      type: "array",
-      nullable: true,
-      items: { type: "string" },
-    },
-    "methods-to-keep-client-default-value": {
-      type: "array",
-      nullable: true,
-      items: { type: "string" },
-    },
-    "deserialize-null-collection-as-null-value": {
-      type: "boolean",
-      nullable: true,
-    },
     logLevel: {
       type: "string",
       enum: [LoggerLevel.INFO, LoggerLevel.DEBUG, LoggerLevel.VERBOSE],
       nullable: true,
     },
-    "package-dir": { type: "string", nullable: true },
-    "head-as-boolean": { type: "boolean", nullable: true },
-    flavor: { type: "string", nullable: true },
-    "generate-sample-project": {
-      type: "boolean",
-      nullable: true,
-      default: true,
-    },
-    "generate-test-project": {
-      type: "boolean",
-      nullable: true,
-      default: false,
-    },
-    "use-model-reader-writer": { type: "boolean", nullable: true },
     "disable-xml-docs": { type: "boolean", nullable: true },
     "plugin-name": { type: "string", nullable: true },
     "emitter-extension-path": { type: "string", nullable: true },
@@ -125,13 +73,7 @@ export const defaultOptions = {
   "generate-convenience-methods": true,
   "package-name": undefined,
   debug: undefined,
-  "models-to-treat-empty-string-as-null": undefined,
-  "additional-intrinsic-types-to-treat-empty-string-as-null": [],
-  "methods-to-keep-client-default-value": undefined,
-  "deserialize-null-collection-as-null-value": undefined,
   logLevel: LoggerLevel.INFO,
-  flavor: undefined,
-  "generate-test-project": false,
   "plugin-name": "ClientModelPlugin",
   "emitter-extension-path": undefined,
 };

diff --git a/packages/http-client-csharp/emitter/src/type/configuration.ts b/packages/http-client-csharp/emitter/src/type/configuration.ts
@@ -5,19 +5,7 @@ export interface Configuration {
   "output-folder": string;
   namespace: string;
   "library-name": string | null;
-  flavor?: string;
-  "single-top-level-client"?: boolean;
   "unreferenced-types-handling"?: "removeOrInternalize" | "internalize" | "keepAll";
   "model-namespace"?: boolean;
-  "models-to-treat-empty-string-as-null"?: string[];
-  "additional-intrinsic-types-to-treat-empty-string-as-null"?: string[];
-  "methods-to-keep-client-default-value"?: string[];
-  "keep-non-overloadable-protocol-signature"?: boolean;
-  "intrinsic-types-to-treat-empty-string-as-null"?: string[];
-  "head-as-boolean"?: boolean;
-  "deserialize-null-collection-as-null-value"?: boolean;
-  "generate-sample-project"?: boolean;
-  "generate-test-project"?: boolean;
-  "use-model-reader-writer"?: boolean;
   "disable-xml-docs"?: boolean;
 }
diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Configuration.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Configuration.cs
@@ -44,9 +44,6 @@ private Configuration(
             string outputPath,
             Dictionary<string, BinaryData> additionalConfigOptions,
             bool clearOutputFolder,
-            bool generateModelFactory,
-            bool generateSampleProject,
-            bool generateTestProject,
             string libraryName,
             bool useModelNamespace,
             string libraryNamespace,
@@ -56,9 +53,6 @@ private Configuration(
             OutputDirectory = outputPath;
             AdditionalConfigOptions = additionalConfigOptions;
             ClearOutputFolder = clearOutputFolder;
-            GenerateModelFactory = generateModelFactory;
-            GenerateSampleProject = generateSampleProject;
-            GenerateTestProject = generateTestProject;
             LibraryName = libraryName;
             UseModelNamespace = useModelNamespace;
             RootNamespace = GetCleanNameSpace(libraryNamespace);
@@ -129,9 +123,6 @@ private static int GetSegmentCount(string libraryNamespace)
         private static class Options
         {
             public const string ClearOutputFolder = "clear-output-folder";
-            public const string GenerateModelFactory = "generate-model-factory";
-            public const string GenerateSampleProject = "generate-sample-project";
-            public const string GenerateTestProject = "generate-test-project";
             public const string LibraryName = "library-name";
             public const string Namespace = "namespace";
             public const string UseModelNamespace = "use-model-namespace";
@@ -220,9 +211,6 @@ internal static Configuration Load(string outputPath, string? json = null)
                 Path.GetFullPath(outputPath),
                 ParseAdditionalConfigOptions(root),
                 ReadOption(root, Options.ClearOutputFolder),
-                ReadOption(root, Options.GenerateModelFactory),
-                ReadOption(root, Options.GenerateSampleProject),
-                ReadOption(root, Options.GenerateTestProject),
                 ReadRequiredStringOption(root, Options.LibraryName),
                 ReadOption(root, Options.UseModelNamespace),
                 ReadRequiredStringOption(root, Options.Namespace),
@@ -236,10 +224,7 @@ internal static Configuration Load(string outputPath, string? json = null)
         private static readonly Dictionary<string, bool> _defaultBoolOptionValues = new()
         {
             { Options.UseModelNamespace, true },
-            { Options.GenerateModelFactory, true },
-            { Options.GenerateSampleProject, true },
             { Options.ClearOutputFolder, true },
-            { Options.GenerateTestProject, false },
             { Options.DisableXmlDocs, false },
         };
 
@@ -249,9 +234,6 @@ internal static Configuration Load(string outputPath, string? json = null)
         private static readonly HashSet<string> _knownOptions = new()
         {
             Options.ClearOutputFolder,
-            Options.GenerateModelFactory,
-            Options.GenerateSampleProject,
-            Options.GenerateTestProject,
             Options.LibraryName,
             Options.UseModelNamespace,
             Options.Namespace,

diff --git a/...nt-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/Configuration.json b/...nt-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Authentication.ApiKey",
-  "library-name": "Authentication.ApiKey",
-  "use-model-reader-writer": true
+  "library-name": "Authentication.ApiKey"
 }
diff --git a/...sharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/Configuration.json b/...sharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Authentication.Http.Custom",
-  "library-name": "Authentication.Http.Custom",
-  "use-model-reader-writer": true
+  "library-name": "Authentication.Http.Custom"
 }
diff --git a/...ent-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/Configuration.json b/...ent-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Authentication.OAuth2",
-  "library-name": "Authentication.OAuth2",
-  "use-model-reader-writer": true
+  "library-name": "Authentication.OAuth2"
 }
diff --git a/...ient-csharp/generator/TestProjects/CadlRanch/http/authentication/union/Configuration.json b/...ient-csharp/generator/TestProjects/CadlRanch/http/authentication/union/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Authentication.Union",
-  "library-name": "Authentication.Union",
-  "use-model-reader-writer": true
+  "library-name": "Authentication.Union"
 }
diff --git a/...http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/Configuration.json b/...http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Client.Naming",
-  "library-name": "Client.Naming",
-  "use-model-reader-writer": true
+  "library-name": "Client.Naming"
 }
diff --git a/...or/TestProjects/CadlRanch/http/client/structure/client-operation-group/Configuration.json b/...or/TestProjects/CadlRanch/http/client/structure/client-operation-group/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Client.Structure.Service",
-  "library-name": "Client.Structure.Service",
-  "use-model-reader-writer": true
+  "library-name": "Client.Structure.Service"
 }
diff --git a/...-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json b/...-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Client.Structure.Service.Default",
-  "library-name": "Client.Structure.Service.Default",
-  "use-model-reader-writer": true
+  "library-name": "Client.Structure.Service.Default"
 }
diff --git a/...rp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/Configuration.json b/...rp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Client.Structure.Service.Multi.Client",
-  "library-name": "Client.Structure.Service.Multi.Client",
-  "use-model-reader-writer": true
+  "library-name": "Client.Structure.Service.Multi.Client"
 }
diff --git a/...nerator/TestProjects/CadlRanch/http/client/structure/renamed-operation/Configuration.json b/...nerator/TestProjects/CadlRanch/http/client/structure/renamed-operation/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Client.Structure.Service.Renamed.Operation",
-  "library-name": "Client.Structure.Service.Renamed.Operation",
-  "use-model-reader-writer": true
+  "library-name": "Client.Structure.Service.Renamed.Operation"
 }
diff --git a/...rator/TestProjects/CadlRanch/http/client/structure/two-operation-group/Configuration.json b/...rator/TestProjects/CadlRanch/http/client/structure/two-operation-group/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Client.Structure.Service.TwoOperationGroup",
-  "library-name": "Client.Structure.Service.TwoOperationGroup",
-  "use-model-reader-writer": true
+  "library-name": "Client.Structure.Service.TwoOperationGroup"
 }
diff --git a/.../http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/Configuration.json b/.../http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Encode.Bytes",
-  "library-name": "Encode.Bytes",
-  "use-model-reader-writer": true
+  "library-name": "Encode.Bytes"
 }
diff --git a/...tp-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/Configuration.json b/...tp-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Encode.Datetime",
-  "library-name": "Encode.Datetime",
-  "use-model-reader-writer": true
+  "library-name": "Encode.Datetime"
 }
diff --git a/...tp-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/Configuration.json b/...tp-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Encode.Duration",
-  "library-name": "Encode.Duration",
-  "use-model-reader-writer": true
+  "library-name": "Encode.Duration"
 }
diff --git a/...ttp-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/Configuration.json b/...ttp-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Encode.Numeric",
-  "library-name": "Encode.Numeric",
-  "use-model-reader-writer": true
+  "library-name": "Encode.Numeric"
 }
diff --git a/...p-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/Configuration.json b/...p-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Parameters.Basic",
-  "library-name": "Parameters.Basic",
-  "use-model-reader-writer": true
+  "library-name": "Parameters.Basic"
 }
diff --git a/...harp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/Configuration.json b/...harp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Parameters.BodyOptionality",
-  "library-name": "Parameters.BodyOptionality",
-  "use-model-reader-writer": true
+  "library-name": "Parameters.BodyOptionality"
 }
diff --git a/...arp/generator/TestProjects/CadlRanch/http/parameters/collection-format/Configuration.json b/...arp/generator/TestProjects/CadlRanch/http/parameters/collection-format/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Parameters.CollectionFormat",
-  "library-name": "Parameters.CollectionFormat",
-  "use-model-reader-writer": true
+  "library-name": "Parameters.CollectionFormat"
 }
diff --git a/...-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/Configuration.json b/...-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/Configuration.json
@@ -1,6 +1,5 @@
 {
   "output-folder": ".",
   "namespace": "Parameters.Spread",
-  "library-name": "Parameters.Spread",
-  "use-model-reader-writer": true
+  "library-name": "Parameters.Spread"
 }