Merge pull request #216 from atc-net/hotfix/apioptions

perkops · web-flow · commit 9711965f6247 · 2025-01-22T10:53:10.000+01:00
Ensure proper reading of ApiOptions for AspNetOutputType and SwaggerMode
diff --git a/README.md b/README.md
@@ -390,12 +390,12 @@ By using these options, you can effectively organize generated files into meanin
 
 The `projectSuffixName` extend `projectName` like the example:
 
-| projectName | projectSuffixName | Generated project name | Reson |
-|-------------|-------------------|------------------------|-------|
+| projectName | projectSuffixName | Generated project name | Reason                     |
+|-------------|-------------------|------------------------|----------------------------|
 | PetStore    |                   | PetStore.Api.Generated | default is `Api.Generated` |
-| PetStore    | MyApi             | PetStore.MyApi         | |
-| PetStore    | Foo.Api           | PetStore.Foo.Api       | |
-| PetStore    | Bar-Api           | PetStore.Bar.Api       | |
+| PetStore    | MyApi             | PetStore.MyApi         |                            |
+| PetStore    | Foo.Api           | PetStore.Foo.Api       |                            |
+| PetStore    | Bar-Api           | PetStore.Bar.Api       |                            |
 
 ## PetStore Example
 
diff --git a/src/Atc.Rest.ApiGenerator.CLI/ApiOptionsHelper.cs b/src/Atc.Rest.ApiGenerator.CLI/ApiOptionsHelper.cs
@@ -132,13 +132,13 @@ private static void ApplyGeneratorOverrides(
     {
         if (settings is BaseServerCommandSettings serverCommandSettings)
         {
-            if (serverCommandSettings.AspNetOutputType.IsSet ||
+            if (serverCommandSettings.AspNetOutputType.IsSet &&
                 serverCommandSettings.AspNetOutputType.Value != apiOptions.Generator.AspNetOutputType)
             {
                 apiOptions.Generator.AspNetOutputType = serverCommandSettings.AspNetOutputType.Value;
             }
 
-            if (serverCommandSettings.SwaggerThemeMode.IsSet ||
+            if (serverCommandSettings.SwaggerThemeMode.IsSet &&
                 serverCommandSettings.SwaggerThemeMode.Value != apiOptions.Generator.SwaggerThemeMode)
             {
                 apiOptions.Generator.SwaggerThemeMode = serverCommandSettings.SwaggerThemeMode.Value;
@@ -149,10 +149,7 @@ private static void ApplyGeneratorOverrides(
                 apiOptions.Generator.Response.UseProblemDetailsAsDefaultBody = serverCommandSettings.UseProblemDetailsAsDefaultResponseBody;
             }
 
-            if (serverCommandSettings.ProjectPrefixName is not null)
-            {
-                apiOptions.Generator.ProjectName = serverCommandSettings.ProjectPrefixName;
-            }
+            apiOptions.Generator.ProjectName = serverCommandSettings.ProjectPrefixName;
 
             if (serverCommandSettings.EndpointsLocation is not null &&
                 serverCommandSettings.EndpointsLocation.IsSet)
@@ -215,10 +212,7 @@ private static void ApplyGeneratorOverrides(
                     apiOptions.Generator.Response.UseProblemDetailsAsDefaultBody = clientApiCommandSettings.UseProblemDetailsAsDefaultResponseBody;
                 }
 
-                if (clientApiCommandSettings.ProjectPrefixName is not null)
-                {
-                    apiOptions.Generator.ProjectName = clientApiCommandSettings.ProjectPrefixName;
-                }
+                apiOptions.Generator.ProjectName = clientApiCommandSettings.ProjectPrefixName;
 
                 if (clientApiCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings)
                 {

Original file line number	Diff line number	Diff line change
`@@ -132,13 +132,13 @@ private static void ApplyGeneratorOverrides(`
`132`	`132`	`{`
`133`	`133`	`if (settings is BaseServerCommandSettings serverCommandSettings)`
`134`	`134`	`{`
`135`		`- if (serverCommandSettings.AspNetOutputType.IsSet \|\|`
	`135`	`+ if (serverCommandSettings.AspNetOutputType.IsSet &&`
`136`	`136`	`serverCommandSettings.AspNetOutputType.Value != apiOptions.Generator.AspNetOutputType)`
`137`	`137`	`{`
`138`	`138`	`apiOptions.Generator.AspNetOutputType = serverCommandSettings.AspNetOutputType.Value;`
`139`	`139`	`}`
`140`	`140`
`141`		`- if (serverCommandSettings.SwaggerThemeMode.IsSet \|\|`
	`141`	`+ if (serverCommandSettings.SwaggerThemeMode.IsSet &&`
`142`	`142`	`serverCommandSettings.SwaggerThemeMode.Value != apiOptions.Generator.SwaggerThemeMode)`
`143`	`143`	`{`
`144`	`144`	`apiOptions.Generator.SwaggerThemeMode = serverCommandSettings.SwaggerThemeMode.Value;`
`@@ -149,10 +149,7 @@ private static void ApplyGeneratorOverrides(`
`149`	`149`	`apiOptions.Generator.Response.UseProblemDetailsAsDefaultBody = serverCommandSettings.UseProblemDetailsAsDefaultResponseBody;`
`150`	`150`	`}`
`151`	`151`
`152`		`- if (serverCommandSettings.ProjectPrefixName is not null)`
`153`		`- {`
`154`		`- apiOptions.Generator.ProjectName = serverCommandSettings.ProjectPrefixName;`
`155`		`- }`
	`152`	`+ apiOptions.Generator.ProjectName = serverCommandSettings.ProjectPrefixName;`
`156`	`153`
`157`	`154`	`if (serverCommandSettings.EndpointsLocation is not null &&`
`158`	`155`	`serverCommandSettings.EndpointsLocation.IsSet)`
`@@ -215,10 +212,7 @@ private static void ApplyGeneratorOverrides(`
`215`	`212`	`apiOptions.Generator.Response.UseProblemDetailsAsDefaultBody = clientApiCommandSettings.UseProblemDetailsAsDefaultResponseBody;`
`216`	`213`	`}`
`217`	`214`
`218`		`- if (clientApiCommandSettings.ProjectPrefixName is not null)`
`219`		`- {`
`220`		`- apiOptions.Generator.ProjectName = clientApiCommandSettings.ProjectPrefixName;`
`221`		`- }`
	`215`	`+ apiOptions.Generator.ProjectName = clientApiCommandSettings.ProjectPrefixName;`
`222`	`216`
`223`	`217`	`if (clientApiCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings)`
`224`	`218`	`{`