Merge pull request #1173 from christianhelle/cli-fix-refitter-settings-file

Allow input file to be empty when using --settings-file argument in CLI Tool

Author: christianhelle

src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/RefitterCommand.cs

@@ -25,18 +25,10 @@ public RefitterCommand(
         this.factory = factory;
         this.options = options;
     }
-    
-    [Option(
-        ShortName = "sf",
-        LongName = "settings-file",
-        Description = "Path to a .refitter settings file to use for code generation")]
-    [FileExists]
-    public string? SettingsFile { get; set; }
 
     public override ICodeGenerator CreateGenerator() =>
         factory.Create(SettingsFile ?? SwaggerFile, DefaultNamespace, options);
-        
-    // Use 'new' instead of 'override' since the base method is not marked as virtual
+
     public new int OnExecute()
     {
         // If a settings file is specified, validate it exists
@@ -45,7 +37,7 @@ public override ICodeGenerator CreateGenerator() =>
             // Use settings file as the SwaggerFile
             SwaggerFile = SettingsFile;
         }
-        
+
         // Call the base implementation
         return base.OnExecute();
     }
@@ -117,4 +109,11 @@ public bool GenerateMultipleFiles
         get => options.GenerateMultipleFiles;
         set => options.GenerateMultipleFiles = value;
     }
+    
+    [Option(
+        ShortName = "sf",
+        LongName = "settings-file",
+        Description = "Path to a .refitter settings file to use for code generation")]
+    [FileExists]
+    public string? SettingsFile { get; set; }
 }

src/CLI/ApiClientCodeGen.CLI/Commands/CodeGeneratorCommand.cs

@@ -22,7 +22,6 @@ protected CodeGeneratorCommand(IConsoleOutput console, IProgressReporter? progre
             this.progressReporter = progressReporter ?? throw new ArgumentNullException(nameof(progressReporter));
         }
 
-        [Required]
         [FileExists]
         [Argument(0, "swaggerFile", "Path to the Swagger / Open API specification file")]
         [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

test/petstore.refitter

@@ -0,0 +1,54 @@
+{
+  "openApiPath": "https://petstore3.swagger.io/api/v3/openapi.json",
+  "namespace": "PetStore.Api.Client",
+  "contractsNamespace": "PetStore.Api.Client.Models",
+  "naming": {
+    "useOpenApiTitle": true,
+    "interfaceName": "IPetStoreClient"
+  },
+  "generateContracts": true,
+  "generateXmlDocCodeComments": true,
+  "generateStatusCodeComments": true,
+  "addAutoGeneratedHeader": true,
+  "addAcceptHeaders": true,
+  "returnIApiResponse": false,
+  "generateOperationHeaders": true,
+  "typeAccessibility": "Public",
+  "useCancellationTokens": true,
+  "useIsoDateFormat": true,
+  "multipleInterfaces": "ByTag",
+  "generateDeprecatedOperations": true,
+  "operationNameTemplate": "{operationName}Async",
+  "optionalParameters": false,
+  "outputFolder": "./GeneratedCode",
+  "generateMultipleFiles": true,
+  "contractsOutputFolder": "./GeneratedCode/Models",
+  "includeTags": [
+    "pet",
+    "store",
+    "user"
+  ],
+  "trimUnusedSchema": true,
+  "keepSchemaPatterns": [
+    "^Pet$", 
+    "^Order$", 
+    "^User$"
+  ],
+  "generateDefaultAdditionalProperties": true,
+  "operationNameGenerator": "Default",
+  "immutableRecords": false,
+  "useDynamicQuerystringParameters": false,
+  "usePolymorphicSerialization": true,
+  "generateDisposableClients": false,
+  "collectionFormat": "Multi",
+  "dependencyInjectionSettings": {
+    "baseUrl": "https://petstore3.swagger.io/api/v3",
+    "httpMessageHandlers": [
+      "LoggingHandler",
+      "AuthorizationHandler"
+    ],
+    "transientErrorHandler": "HttpResilience",
+    "maxRetryCount": 3,
+    "firstBackoffRetryInSeconds": 1.0
+  }
+}