updated samples

Author: HugoMario

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"]

samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Filters/BasePathFilter.cs

@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using Microsoft.OpenApi.Models;
 
 namespace IO.Swagger.Filters
 {
@@ -28,11 +29,11 @@ public BasePathFilter(string basePath)
         /// <summary>
         /// Apply the filter
         /// </summary>
-        /// <param name="swaggerDoc">SwaggerDocument</param>
+        /// <param name="swaggerDoc">OpenApiDocument</param>
         /// <param name="context">FilterContext</param>
-        public void Apply(SwaggerDocument swaggerDoc, DocumentFilterContext context)
+        public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
         {
-            swaggerDoc.BasePath = this.BasePath;
+            swaggerDoc.Servers.Add(new OpenApiServer() { Url = this.BasePath });
 
             var pathsToModify = swaggerDoc.Paths.Where(p => p.Key.StartsWith(this.BasePath)).ToList();
 

samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Filters/GeneratePathParamsValidationFilter.cs

@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using Microsoft.OpenApi.Models;
 
 namespace IO.Swagger.Filters
 {
@@ -16,7 +17,7 @@ public class GeneratePathParamsValidationFilter : IOperationFilter
         /// </summary>
         /// <param name="operation">Operation</param>
         /// <param name="context">OperationFilterContext</param>
-        public void Apply(Operation operation, OperationFilterContext context)
+        public void Apply(OpenApiOperation operation, OperationFilterContext context)
         {
             var pars = context.ApiDescription.ParameterDescriptions;
 
@@ -40,9 +41,9 @@ public void Apply(Operation operation, OperationFilterContext context)
                     if (regexAttr != null)
                     {
                         string regex = (string)regexAttr.ConstructorArguments[0].Value;
-                        if (swaggerParam is NonBodyParameter)
+                        if (swaggerParam is OpenApiParameter)
                         {
-                            ((NonBodyParameter)swaggerParam).Pattern = regex;
+                            ((OpenApiParameter)swaggerParam).Schema.Pattern = regex;
                         }
                     }
 
@@ -70,10 +71,10 @@ public void Apply(Operation operation, OperationFilterContext context)
                         maxLength = (int)maxLengthAttr.ConstructorArguments[0].Value;
                     }
 
-                    if (swaggerParam is NonBodyParameter)
+                    if (swaggerParam is OpenApiParameter)
                     {
-                        ((NonBodyParameter)swaggerParam).MinLength = minLenght;
-                        ((NonBodyParameter)swaggerParam).MaxLength = maxLength;
+                        ((OpenApiParameter)swaggerParam).Schema.MinLength = minLenght;
+                        ((OpenApiParameter)swaggerParam).Schema.MaxLength = maxLength;
                     }
 
                     // Range [Range]
@@ -83,10 +84,10 @@ public void Apply(Operation operation, OperationFilterContext context)
                         int rangeMin = (int)rangeAttr.ConstructorArguments[0].Value;
                         int rangeMax = (int)rangeAttr.ConstructorArguments[1].Value;
 
-                        if (swaggerParam is NonBodyParameter)
+                        if (swaggerParam is OpenApiParameter)
                         {
-                            ((NonBodyParameter)swaggerParam).Minimum = rangeMin;
-                            ((NonBodyParameter)swaggerParam).Maximum = rangeMax;
+                            ((OpenApiParameter)swaggerParam).Schema.Minimum = rangeMin;
+                            ((OpenApiParameter)swaggerParam).Schema.Maximum = rangeMax;
                         }
                     }
                 }

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

@@ -2,18 +2,19 @@
   <PropertyGroup>
     <Description>IO.Swagger</Description>
     <Copyright>IO.Swagger</Copyright>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>IO.Swagger</AssemblyName>
     <PackageId>IO.Swagger</PackageId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0"/>
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="3.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4"/>
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.0.0-rc4"/>
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0-rc4"/>
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-rc4" />
   </ItemGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
   </ItemGroup>
 </Project>

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

@@ -10,28 +10,29 @@
 
 using System;
 using System.IO;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.OpenApi.Models;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using IO.Swagger.Filters;
 using IO.Swagger.Security;
 
-using Microsoft.AspNetCore.Authentication;
-
 namespace IO.Swagger
 {
     /// <summary>
     /// Startup
     /// </summary>
     public class Startup
     {
-        private readonly IHostingEnvironment _hostingEnv;
+        private readonly IWebHostEnvironment _hostingEnv;
 
         private IConfiguration Configuration { get; }
 
@@ -40,7 +41,7 @@ public class Startup
         /// </summary>
         /// <param name="env"></param>
         /// <param name="configuration"></param>
-        public Startup(IHostingEnvironment env, IConfiguration configuration)
+        public Startup(IWebHostEnvironment env, IConfiguration configuration)
         {
             _hostingEnv = env;
             Configuration = configuration;
@@ -54,13 +55,15 @@ public void ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
             services
-                .AddMvc()
-                .AddJsonOptions(opts =>
+                .AddMvc(options =>
+                {
+                    options.InputFormatters.RemoveType<Microsoft.AspNetCore.Mvc.Formatters.SystemTextJsonInputFormatter>();
+                    options.OutputFormatters.RemoveType<Microsoft.AspNetCore.Mvc.Formatters.SystemTextJsonOutputFormatter>();
+                })
+                .AddNewtonsoftJson(opts =>
                 {
                     opts.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
-                    opts.SerializerSettings.Converters.Add(new StringEnumConverter {
-                        CamelCaseText = true
-                    });
+                    opts.SerializerSettings.Converters.Add(new StringEnumConverter(new CamelCaseNamingStrategy()));
                 })
                 .AddXmlSerializerFormatters();
 
@@ -71,21 +74,20 @@ public void ConfigureServices(IServiceCollection services)
             services
                 .AddSwaggerGen(c =>
                 {
-                    c.SwaggerDoc("1.0.0", new Info
+                    c.SwaggerDoc("1.0.0", new OpenApiInfo
                     {
                         Version = "1.0.0",
                         Title = "Swagger Petstore",
-                        Description = "Swagger Petstore (ASP.NET Core 2.0)",
-                        Contact = new Contact()
+                        Description = "Swagger Petstore (ASP.NET Core 3.0)",
+                        Contact = new OpenApiContact()
                         {
                            Name = "Swagger Codegen Contributors",
-                           Url = "https://github.com/swagger-api/swagger-codegen",
+                           Url = new Uri("https://github.com/swagger-api/swagger-codegen"),
                            Email = "[email protected]"
                         },
-                        TermsOfService = "http://swagger.io/terms/"
+                        TermsOfService = new Uri("http://swagger.io/terms/")
                     });
-                    c.CustomSchemaIds(type => type.FriendlyId(true));
-                    c.DescribeAllEnumsAsStrings();
+                    c.CustomSchemaIds(type => type.FullName);
                     c.IncludeXmlComments($"{AppContext.BaseDirectory}{Path.DirectorySeparatorChar}{_hostingEnv.ApplicationName}.xml");
                     // Sets the basePath property in the Swagger document generated
                     c.DocumentFilter<BasePathFilter>("/v2");
@@ -102,21 +104,32 @@ public void ConfigureServices(IServiceCollection services)
         /// <param name="app"></param>
         /// <param name="env"></param>
         /// <param name="loggerFactory"></param>
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {
-            app
-                .UseMvc()
-                .UseDefaultFiles()
-                .UseStaticFiles()
-                .UseSwagger()
-                .UseSwaggerUI(c =>
-                {
-                    //TODO: Either use the SwaggerGen generated Swagger contract (generated from C# classes)
-                    c.SwaggerEndpoint("/swagger/1.0.0/swagger.json", "Swagger Petstore");
+            app.UseRouting();
 
-                    //TODO: Or alternatively use the original Swagger contract that's included in the static files
-                    // c.SwaggerEndpoint("/swagger-original.json", "Swagger Petstore Original");
-                });
+            //TODO: Uncomment this if you need wwwroot folder
+            // app.UseStaticFiles();
+
+            app.UseAuthorization();
+
+            app.UseSwagger();
+            app.UseSwaggerUI(c =>
+            {
+                //TODO: Either use the SwaggerGen generated Swagger contract (generated from C# classes)
+                c.SwaggerEndpoint("/swagger/1.0.0/swagger.json", "Swagger Petstore");
+
+                //TODO: Or alternatively use the original Swagger contract that's included in the static files
+                // c.SwaggerEndpoint("/swagger-original.json", "Swagger Petstore Original");
+            });
+
+            //TODO: Use Https Redirection
+            // app.UseHttpsRedirection();
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
 
             if (env.IsDevelopment())
             {
@@ -125,7 +138,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             else
             {
                 //TODO: Enable production exception handling (https://docs.microsoft.com/en-us/aspnet/core/fundamentals/error-handling)
-                // app.UseExceptionHandler("/Home/Error");
+                app.UseExceptionHandler("/Error");
+                
+                app.UseHsts();
             }
         }
     }