updated di and middleware extension methods

DavidEggenberger · Mar 9, 2024 · f64e9ef · f64e9ef
1 parent f63328a
commit f64e9ef
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 28 deletions.
diff --git a/Source/Shared/Features/CQRS/Registrator.cs b/Source/Shared/Features/CQRS/Registrator.cs
@@ -10,7 +10,7 @@ namespace Shared.Features.CQRS
 {
     public static class Registrator
     {
-        public static IServiceCollection RegisterCQRS(this IServiceCollection services, Assembly[] assemblies)
+        public static IServiceCollection AddCQRS(this IServiceCollection services, Assembly[] assemblies)
         {
             services.TryAddScoped<ICommandDispatcher, CommandDispatcher>();
             services.TryAddScoped<IQueryDispatcher, QueryDispatcher>();

diff --git a/Source/Shared/Features/EFCore/Registrator.cs b/Source/Shared/Features/EFCore/Registrator.cs
@@ -8,7 +8,7 @@ namespace Shared.Features.EFCore
 {
     public static class Registrator
     {
-        public static IServiceCollection RegisterEFCore(this IServiceCollection services, IConfiguration configuration)
+        public static IServiceCollection AddEFCore(this IServiceCollection services, IConfiguration configuration)
         {
             services.Configure<EFCoreConfiguration>(configuration.GetSection(nameof(EFCoreConfiguration)));
             services.AddScoped(sp => sp.GetRequiredService<IOptions<EFCoreConfiguration>>().Value);

diff --git a/Source/Shared/Features/EmailSender/Registrator.cs b/Source/Shared/Features/EmailSender/Registrator.cs
@@ -6,7 +6,7 @@ namespace Shared.Features.EmailSender
 {
     public static class Registrator
     {
-        public static IServiceCollection RegisterEmailSender(this IServiceCollection services, IConfiguration configuration)
+        public static IServiceCollection AddEmailSender(this IServiceCollection services, IConfiguration configuration)
         {
             //services.Configure<SendGridEmailOptions>(configuration);
             services.AddTransient<IEmailSender, SendGridEmailSender>();

diff --git a/Source/Shared/Features/Modules/Registrator.cs b/Source/Shared/Features/Modules/Registrator.cs
@@ -30,7 +30,7 @@ public static void AddModules(this IServiceCollection services)
 
             var startupModules = serviceProvider.GetRequiredService<IEnumerable<Module>>();
 
-            services.RegisterCQRS(startupModules.Where(sm => sm.Startup.FeaturesAssembly is not null).Select(sm => sm.Startup.FeaturesAssembly).ToArray());
+            services.AddCQRS(startupModules.Where(sm => sm.Startup.FeaturesAssembly is not null).Select(sm => sm.Startup.FeaturesAssembly).ToArray());
         }
 
         public static IApplicationBuilder UseModulesMiddleware(this IApplicationBuilder app, IHostEnvironment env)

diff --git a/Source/Shared/Features/Registrator.cs b/Source/Shared/Features/Registrator.cs
@@ -18,9 +18,9 @@ public static IServiceCollection AddSharedFeatures(this IServiceCollection servi
             var configuration = serviceProvider.GetRequiredService<IConfiguration>();
             var startupModules = serviceProvider.GetRequiredService<IEnumerable<Module>>();
 
-            services.RegisterCQRS(startupModules.Where(sm => sm.Startup.FeaturesAssembly is not null).Select(x => x.Startup.FeaturesAssembly).ToArray());
-            services.RegisterEFCore(configuration);
-            services.RegisterEmailSender(configuration);
+            services.AddCQRS(startupModules.Where(sm => sm.Startup.FeaturesAssembly is not null).Select(x => x.Startup.FeaturesAssembly).ToArray());
+            services.AddEFCore(configuration);
+            services.AddEmailSender(configuration);
 
             services.AddServerExecutionContext();
 

diff --git a/Source/Web/Server/BuildingBlocks/APIVersioning/Registrator.cs b/Source/Web/Server/BuildingBlocks/APIVersioning/Registrator.cs
@@ -7,7 +7,7 @@ namespace Web.Server.BuildingBlocks.APIVersioning
 {
     public static class Registrator
     {
-        public static IServiceCollection RegisterApiVersioning(this IServiceCollection serviceCollection)
+        public static IServiceCollection Add_ApiVersioning(this IServiceCollection serviceCollection)
         {
             serviceCollection.AddApiVersioning(options =>
             {
@@ -19,7 +19,7 @@ public static IServiceCollection RegisterApiVersioning(this IServiceCollection s
             return serviceCollection;
         }
 
-        public static IApplicationBuilder RegisterApiVersioning(this IApplicationBuilder applicationBuilder)
+        public static IApplicationBuilder UseApiVersioningMiddleware(this IApplicationBuilder applicationBuilder)
         {
             applicationBuilder.UseApiVersioning();
 

diff --git a/Source/Web/Server/BuildingBlocks/AntiforgeryToken/Registrator.cs b/Source/Web/Server/BuildingBlocks/AntiforgeryToken/Registrator.cs
@@ -5,7 +5,7 @@ namespace WebServer.Modules.AntiforgeryToken
 {
     public static class Registrator
     {
-        public static IServiceCollection RegisterAntiforgeryToken(this IServiceCollection services)
+        public static IServiceCollection AddAntiforgeryToken(this IServiceCollection services)
         {
             return services.AddAntiforgery(options =>
             {

diff --git a/Source/Web/Server/BuildingBlocks/ExceptionHandling/Registrator.cs b/Source/Web/Server/BuildingBlocks/ExceptionHandling/Registrator.cs
@@ -4,7 +4,7 @@ namespace Web.Server.BuildingBlocks.ExceptionHandling
 {
     public static class Registrator
     {
-        public static IApplicationBuilder RegisterExceptionHandling(this IApplicationBuilder applicationBuilder)
+        public static IApplicationBuilder UseExceptionHandlingMiddleware(this IApplicationBuilder applicationBuilder)
         {
             return applicationBuilder.UseExceptionHandler("/exceptionHandler");
         }

diff --git a/Source/Web/Server/BuildingBlocks/Logging/Registrator.cs b/Source/Web/Server/BuildingBlocks/Logging/Registrator.cs
@@ -5,14 +5,14 @@ namespace Web.Server.BuildingBlocks.Logging
 {
     public static class Registrator
     {
-        public static IServiceCollection RegisterLogging(this IServiceCollection serviceCollection)
+        public static IServiceCollection Add_Logging(this IServiceCollection serviceCollection)
         {
             return serviceCollection.AddHttpLogging(options =>
             {
             });
         }
 
-        public static IApplicationBuilder RegisterLogging(this IApplicationBuilder application)
+        public static IApplicationBuilder UseLoggingMiddleware(this IApplicationBuilder application)
         {
             return application.UseHttpLogging();
         }

diff --git a/Source/Web/Server/BuildingBlocks/ModelValidation/Registrator.cs b/Source/Web/Server/BuildingBlocks/ModelValidation/Registrator.cs
@@ -7,7 +7,7 @@ namespace Web.Server.BuildingBlocks.ModelValidation
 {
     public static class Registrator
     {
-        public static IServiceCollection RegisterModelValidation(this IServiceCollection services)
+        public static IServiceCollection AddModelValidation(this IServiceCollection services)
         {
             services.RegisterModelValidationService();
 

diff --git a/Source/Web/Server/BuildingBlocks/Registrator.cs b/Source/Web/Server/BuildingBlocks/Registrator.cs
@@ -14,23 +14,22 @@ public static class Registrator
     {
         public static IServiceCollection AddBuildingBlocks(this IServiceCollection services)
         {
-            services.RegisterAntiforgeryToken();
-            services.RegisterApiVersioning();
-            services.RegisterLogging();
-            services.RegisterModelValidation();
-            services.RegisterSwagger();
-            services.RegisterModelValidation();
+            services.AddAntiforgeryToken();
+            services.Add_ApiVersioning();
+            services.Add_Logging();
+            services.AddModelValidation();
+            services.AddSwagger();
 
             return services;
         }
 
         public static IApplicationBuilder UseBuildingBlocksMiddleware(this IApplicationBuilder applicationBuilder)
         {
-            applicationBuilder.RegisterApiVersioning();
-            applicationBuilder.RegisterExceptionHandling();
-            applicationBuilder.RegisterLogging();
-            applicationBuilder.RegisterSecurityHeaders();
-            applicationBuilder.RegisterSwagger();
+            applicationBuilder.UseApiVersioningMiddleware();
+            applicationBuilder.UseExceptionHandlingMiddleware();
+            applicationBuilder.UseLoggingMiddleware();
+            applicationBuilder.UseSecurityHeadersMiddleware();
+            applicationBuilder.UseSwaggerMiddleware();
 
             return applicationBuilder;
         }

diff --git a/Source/Web/Server/BuildingBlocks/SecurityHeaders/Registrator.cs b/Source/Web/Server/BuildingBlocks/SecurityHeaders/Registrator.cs
@@ -4,7 +4,7 @@ namespace Web.Server.BuildingBlocks.SecurityHeaders
 {
     public static class Registrator
     {
-        public static IApplicationBuilder RegisterSecurityHeaders(this IApplicationBuilder applicationBuilder)
+        public static IApplicationBuilder UseSecurityHeadersMiddleware(this IApplicationBuilder applicationBuilder)
         {
             return applicationBuilder.Use((context, next) =>
             {

diff --git a/Source/Web/Server/BuildingBlocks/Swagger/Registrator.cs b/Source/Web/Server/BuildingBlocks/Swagger/Registrator.cs
@@ -7,7 +7,7 @@ namespace Web.Server.BuildingBlocks.Swagger
 {
     public static class SwaggerDIDIRegistrator
     {
-        public static IServiceCollection RegisterSwagger(this IServiceCollection serviceCollection)
+        public static IServiceCollection AddSwagger(this IServiceCollection serviceCollection)
         {
             serviceCollection.AddSwaggerGen(options =>
             {
@@ -33,7 +33,7 @@ public static IServiceCollection RegisterSwagger(this IServiceCollection service
             return serviceCollection;
         }
 
-        public static IApplicationBuilder RegisterSwagger(this IApplicationBuilder applicationBuilder)
+        public static IApplicationBuilder UseSwaggerMiddleware(this IApplicationBuilder applicationBuilder)
         {
             applicationBuilder.UseSwagger();
             applicationBuilder.UseSwaggerUI(options =>