Merge pull request #10197 from swagger-api/issue-10059

check complex type for enum in order to avoid duplicated code.

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java

@@ -516,6 +516,7 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         super.postProcessOperations(objs);
         if (objs != null) {
+            boolean hasAuthMethods = false;
             Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
             if (operations != null) {
                 List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
@@ -564,8 +565,13 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
                     }
 
                     processOperation(operation);
+
+                    if (operation.hasAuthMethods) {
+                        hasAuthMethods = true;
+                    }
                 }
             }
+            objs.put("hasAuthMethods", hasAuthMethods);
         }
 
         return objs;

modules/swagger-codegen/src/main/resources/aspnetcore/3.0/Startup.mustache

@@ -14,7 +14,7 @@ using Newtonsoft.Json.Serialization;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using {{packageName}}.Filters;
-using {{packageName}}.Security;
+{{#hasAuthMethods}}using {{packageName}}.Security;{{/hasAuthMethods}}
 
 namespace {{packageName}}
 {

modules/swagger-codegen/src/main/resources/aspnetcore/3.0/controller.mustache

@@ -7,7 +7,7 @@ using Swashbuckle.AspNetCore.SwaggerGen;
 using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 using {{packageName}}.Attributes;
-using {{packageName}}.Security;
+{{#hasAuthMethods}}using {{packageName}}.Security;{{/hasAuthMethods}}
 using Microsoft.AspNetCore.Authorization;
 using {{modelPackage}};
 

modules/swagger-codegen/src/main/resources/aspnetcore/model.mustache

@@ -19,7 +19,7 @@ namespace {{packageName}}.Models
     /// </summary>
     [DataContract]
     public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}>
-    { {{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{>enumClass}}{{/items}}{{/items.isEnum}}
+    { {{#vars}}{{#isEnum}}{{^complexType}}{{>enumClass}}{{/complexType}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{^complexType}}{{>enumClass}}{{/complexType}}{{/items}}{{/items.isEnum}}
         /// <summary>
         /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
         /// </summary>

samples/server/petstore/aspnetcore-interface-controller/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.6-SNAPSHOT
+2.4.14-SNAPSHOT

samples/server/petstore/aspnetcore-interface-controller/README.md

@@ -1,4 +1,4 @@
-# IO.Swagger - ASP.NET Core 2.0 Server
+# IO.Swagger - ASP.NET Core 3.0 Server
 
 This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 

samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Controllers/IPetApi.cs

@@ -93,8 +93,8 @@ public interface IPetApiController
 
         /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
+        /// <param name="_file">file to upload</param>
         /// <response code="200">successful operation</response>
-        IActionResult UploadFile([FromRoute][Required]long? petId, [FromForm]string additionalMetadata, [FromForm]System.IO.Stream file);
+        IActionResult UploadFile([FromRoute][Required]long? petId, [FromForm]string additionalMetadata, [FromForm]System.IO.Stream _file);
     }
 }

samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Controllers/PetApi.cs

@@ -219,14 +219,14 @@ public virtual IActionResult UpdatePetWithForm([FromRoute][Required]long? petId,
 
         /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
+        /// <param name="_file">file to upload</param>
         /// <response code="200">successful operation</response>
         [HttpPost]
         [Route("/v2/pet/{petId}/uploadImage")]
         [ValidateModelState]
         [SwaggerOperation("UploadFile")]
         [SwaggerResponse(statusCode: 200, type: typeof(ApiResponse), description: "successful operation")]
-        public virtual IActionResult UploadFile([FromRoute][Required]long? petId, [FromForm]string additionalMetadata, [FromForm]System.IO.Stream file)
+        public virtual IActionResult UploadFile([FromRoute][Required]long? petId, [FromForm]string additionalMetadata, [FromForm]System.IO.Stream _file)
         { 
             //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ...
             // return StatusCode(200, default(ApiResponse));

samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Controllers/UserApi.cs

@@ -16,7 +16,7 @@
 using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 using IO.Swagger.Attributes;
-using IO.Swagger.Security;
+
 using Microsoft.AspNetCore.Authorization;
 using IO.Swagger.Models;
 

samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore-build:2.0 AS build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS build-env
 WORKDIR /app
 
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
@@ -12,7 +12,7 @@ COPY . ./
 RUN dotnet publish -c Release -o out
 
 # build runtime image
-FROM microsoft/aspnetcore:2.0
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "IO.Swagger.dll"]