further improvements

Author: FabianGosebrink

SampleWebApiAspNetCore/Controllers/v1/FoodsController.cs

@@ -12,10 +12,10 @@
 
 namespace SampleWebApiAspNetCore.v1.Controllers
 {
+    [ApiController]
     [ApiVersion("1.0")]
     [Route("api/v{version:apiVersion}/[controller]")]
     //[Route("api/[controller]")]
-    [ApiController]
     public class FoodsController : ControllerBase
     {
         private readonly IFoodRepository _foodRepository;
@@ -203,13 +203,12 @@ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters,
             var links = new List<LinkDto>();
 
             // self 
-            links.Add(
-             new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
-             {
-                 pagecount = queryParameters.PageCount,
-                 page = queryParameters.Page,
-                 orderby = queryParameters.OrderBy
-             }), "self", "GET"));
+            links.Add(new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
+            {
+                pagecount = queryParameters.PageCount,
+                page = queryParameters.Page,
+                orderby = queryParameters.OrderBy
+            }), "self", "GET"));
 
             links.Add(new LinkDto(_urlHelper.Link(nameof(GetAllFoods), new
             {

SampleWebApiAspNetCore/Controllers/v2/FoodsController.cs

@@ -2,6 +2,7 @@
 
 namespace SampleWebApiAspNetCore.v2.Controllers
 {
+    [ApiController]
     [ApiVersion("2.0")]
     [Route("api/v{version:apiVersion}/[controller]")]
     public class FoodsController : ControllerBase

SampleWebApiAspNetCore/Startup.cs

@@ -51,10 +51,11 @@ public void ConfigureServices(IServiceCollection services)
             services.AddScoped<IFoodRepository, EfFoodRepository>();
             services.AddRouting(options => options.LowercaseUrls = true);
             services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
-            services.AddScoped<IUrlHelper>(implementationFactory =>
+            services.AddScoped<IUrlHelper>(x =>
             {
-                var actionContext = implementationFactory.GetService<IActionContextAccessor>().ActionContext;
-                return new UrlHelper(actionContext);
+                var actionContext = x.GetRequiredService<IActionContextAccessor>().ActionContext;
+                var factory = x.GetRequiredService<IUrlHelperFactory>();
+                return factory.GetUrlHelper(actionContext);
             });
 
 
@@ -68,8 +69,23 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             services.AddVersionedApiExplorer(o => o.GroupNameFormat = "'v'VVV");
-            services.AddTransient<IConfigureOptions<SwaggerGenOptions>, ConfigureSwaggerOptions>();
-            services.AddSwaggerGen();
+            services.AddSwaggerGen(
+               options =>
+               {
+                   var provider = services.BuildServiceProvider()
+                                       .GetRequiredService<IApiVersionDescriptionProvider>();
+
+                   foreach (var description in provider.ApiVersionDescriptions)
+                   {
+                       options.SwaggerDoc(
+                           description.GroupName,
+                           new Info()
+                           {
+                               Title = $"Sample API {description.ApiVersion}",
+                               Version = description.ApiVersion.ToString()
+                           });
+                   }
+               });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -126,26 +142,4 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory,
                 });
         }
     }
-
-    public class ConfigureSwaggerOptions : IConfigureOptions<SwaggerGenOptions>
-    {
-        readonly IApiVersionDescriptionProvider provider;
-
-        public ConfigureSwaggerOptions(IApiVersionDescriptionProvider provider) =>
-          this.provider = provider;
-
-        public void Configure(SwaggerGenOptions options)
-        {
-            foreach (var description in provider.ApiVersionDescriptions)
-            {
-                options.SwaggerDoc(
-                  description.GroupName,
-                    new Info()
-                    {
-                        Title = $"Sample API {description.ApiVersion}",
-                        Version = description.ApiVersion.ToString(),
-                    });
-            }
-        }
-    }
 }