From 552d36eea7a12d60c6e913340e580af2cd715787 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 13 Nov 2021 08:14:36 -0600 Subject: [PATCH] =?UTF-8?q?fix(swagger):=20=E2=9C=A8=20support=20NRTs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/Archival/FilterLists.Archival.Api/Program.cs | 1 + ...ggerExtensions.cs => SwaggerConfigurationExtensions.cs} | 7 ++++--- .../SwaggerConfigurationExtensions.cs | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) rename services/Archival/FilterLists.Archival.Api/{SwaggerExtensions.cs => SwaggerConfigurationExtensions.cs} (88%) diff --git a/services/Archival/FilterLists.Archival.Api/Program.cs b/services/Archival/FilterLists.Archival.Api/Program.cs index abb2aace6..5f82a16af 100644 --- a/services/Archival/FilterLists.Archival.Api/Program.cs +++ b/services/Archival/FilterLists.Archival.Api/Program.cs @@ -1,6 +1,7 @@ using System.Text.Json.Serialization; using FilterLists.Archival.Application; using FilterLists.SharedKernel.Logging; +using FilterLists.Archival.Api; var builder = WebApplication.CreateBuilder(args); diff --git a/services/Archival/FilterLists.Archival.Api/SwaggerExtensions.cs b/services/Archival/FilterLists.Archival.Api/SwaggerConfigurationExtensions.cs similarity index 88% rename from services/Archival/FilterLists.Archival.Api/SwaggerExtensions.cs rename to services/Archival/FilterLists.Archival.Api/SwaggerConfigurationExtensions.cs index a46ef700e..31712ea62 100644 --- a/services/Archival/FilterLists.Archival.Api/SwaggerExtensions.cs +++ b/services/Archival/FilterLists.Archival.Api/SwaggerConfigurationExtensions.cs @@ -3,12 +3,14 @@ namespace FilterLists.Archival.Api; -internal static class SwaggerExtensions +internal static class SwaggerConfigurationExtensions { public static void AddSwaggerGen(this IServiceCollection services) { services.AddSwaggerGen(o => { + o.SupportNonNullableReferenceTypes(); + o.SwaggerDoc("v1", new OpenApiInfo { Title = "FilterLists Archival API", @@ -25,8 +27,7 @@ public static void AddSwaggerGen(this IServiceCollection services) }); var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; - var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); - o.IncludeXmlComments(xmlPath); + o.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, xmlFile)); }); } diff --git a/services/Directory/FilterLists.Directory.Api/SwaggerConfigurationExtensions.cs b/services/Directory/FilterLists.Directory.Api/SwaggerConfigurationExtensions.cs index eb6650cde..c340b60e4 100644 --- a/services/Directory/FilterLists.Directory.Api/SwaggerConfigurationExtensions.cs +++ b/services/Directory/FilterLists.Directory.Api/SwaggerConfigurationExtensions.cs @@ -9,6 +9,8 @@ public static void AddSwaggerGen(this IServiceCollection services) { services.AddSwaggerGen(o => { + o.SupportNonNullableReferenceTypes(); + o.SwaggerDoc("v1", new OpenApiInfo {