clean up (#2)

John assisted in cleaning up the DI in Program.cs

ExceptionAll.APIExample/Program.cs

@@ -32,8 +32,6 @@
 
 var app = builder.Build();
 
-app.Services.AddExceptionAll();
-
 // Configure the HTTP request pipeline.
 
 app.UseSwagger();

ExceptionAll/Helpers/ServiceCollectionHelper.cs

@@ -9,33 +9,23 @@ public static class ServiceCollectionHelper
     /// <returns></returns>
     public static IServiceCollection AddExceptionAll<T>(this IServiceCollection services) where T : class, IExceptionAllConfiguration
     {
-        services.AddSingleton<IErrorResponseService, ErrorResponseService>();
         services.AddSingleton<IActionResultService, ActionResultService>();
-        services.AddSingleton<IContextConfigurationService, ContextConfigurationService>();
 
         services.Scan(
             x => x.FromAssemblyOf<T>()
                   .AddClasses(c => c.AssignableTo<IExceptionAllConfiguration>())
                   .AsImplementedInterfaces()
                   .WithSingletonLifetime());
 
-        var serviceProvider      = services.BuildServiceProvider();
-        var actionResultService  = serviceProvider.GetRequiredService<IActionResultService>();
-        var contextConfiguration = serviceProvider.GetRequiredService<IContextConfigurationService>();
-        var configuration        = serviceProvider.GetRequiredService<IExceptionAllConfiguration>();
-        //var errorResponseService = serviceProvider.GetRequiredService<IErrorResponseService>();
-
-        //errorResponseService?.AddErrorResponses(configuration.ErrorResponses.ToList());
-
-        if (configuration.ContextConfiguration is not null)
-            contextConfiguration.Configure(configuration.ContextConfiguration);
+        services.AddSingleton<IContextConfigurationService, ContextConfigurationService>();
+        services.AddSingleton<IErrorResponseService, ErrorResponseService>();
 
         // Adds an exception filter to
         services.AddMvc(options => { options.Filters.Add<ExceptionFilter>(); });
 
         // Removes the default response from being returned on validation error
-        services.Configure<ApiBehaviorOptions>(
-            options =>
+        services.AddOptions<ApiBehaviorOptions>()
+            .Configure<IActionResultService>((options, ars) =>
             {
                 options.InvalidModelStateResponseFactory = context =>
                 {
@@ -45,7 +35,7 @@ public static IServiceCollection AddExceptionAll<T>(this IServiceCollection serv
                         errors.AddRange(value.Errors.Select(error => new ErrorDetail(key, error.ErrorMessage)));
                     }
 
-                    return actionResultService.GetResponse<BadRequestDetails>(
+                    return ars.GetResponse<BadRequestDetails>(
                         context,
                         "Invalid request model",
                         errors.Any() ? errors : null);
@@ -79,41 +69,4 @@ public static IServiceCollection WithExceptionAllSwaggerExamples(this IServiceCo
     {
         return services.AddSwaggerExamplesFromAssemblyOf<BadRequestDetailsExample>();
     }
-
-    /// <summary>
-    /// Applies the configuration provided by the user to the error response container
-    /// </summary>
-    /// <param name="services"></param>
-    /// <exception cref="ArgumentNullException"></exception>
-    public static void AddExceptionAll(this IServiceProvider services)
-    {
-        var contextConfiguration = services.GetService<IContextConfigurationService>();
-        var errorResponseService = services.GetService<IErrorResponseService>();
-        var configuration        = services.GetService<IExceptionAllConfiguration>();
-
-        if (configuration is null || contextConfiguration is null) return;
-
-        errorResponseService?.AddErrorResponses(configuration.ErrorResponses.ToList());
-
-        if (configuration.ContextConfiguration is not null)
-            contextConfiguration.Configure(configuration.ContextConfiguration);
-    }
-
-    /// <summary>
-    /// Add all error responses into the response collection
-    /// </summary>
-    /// <param name="service"></param>
-    /// <param name="errorResponses"></param>
-    private static void AddErrorResponses(
-        this IErrorResponseService service,
-        List<IErrorResponse> errorResponses)
-    {
-        if (errorResponses == null || !errorResponses.Any())
-            throw new ArgumentNullException(nameof(errorResponses));
-
-        foreach (var errorResponse in errorResponses)
-        {
-            service.AddErrorResponse(errorResponse);
-        }
-    }
 }

ExceptionAll/Interfaces/IContextConfigurationService.cs

@@ -4,12 +4,6 @@ namespace ExceptionAll.Interfaces;
 
 public interface IContextConfigurationService
 {
-    /// <summary>
-    /// Allows the user to configure additional properties shown in the response which can be derived from the HttpContext
-    /// </summary>
-    /// <param name="configuration"></param>
-    void Configure(Dictionary<string, Func<HttpContext, object>> configuration);
-
     /// <summary>
     /// Reads data from the HttpContext and maps it according to the configuration provided
     /// </summary>

ExceptionAll/Services/ContextConfigurationService.cs

@@ -4,11 +4,12 @@ namespace ExceptionAll.Services;
 
 public class ContextConfigurationService : IContextConfigurationService
 {
-    private Dictionary<string, Func<HttpContext, object>>? _contextMappings;
+    private readonly Dictionary<string, Func<HttpContext, object>>? _contextMappings;
 
-    public void Configure(Dictionary<string, Func<HttpContext, object>> configuration)
+    public ContextConfigurationService(IExceptionAllConfiguration configuration)
     {
-        _contextMappings = new Dictionary<string, Func<HttpContext, object>>(configuration);
+        if (configuration.ContextConfiguration is not null)
+            _contextMappings = new(configuration.ContextConfiguration);
     }
 
     public IReadOnlyDictionary<string, object>? GetContextDetails(HttpContext context, List<ErrorDetail>? errors = null)

ExceptionAll/Services/ErrorResponseService.cs

@@ -5,9 +5,20 @@ public class ErrorResponseService : IErrorResponseService
     private readonly ILogger<IErrorResponseService> _logger;
     private Dictionary<Type, IErrorResponse> ErrorResponses { get; } = new();
 
-    public ErrorResponseService(ILogger<IErrorResponseService> logger)
+    public ErrorResponseService(ILogger<IErrorResponseService> logger, IExceptionAllConfiguration configuration)
     {
         _logger = logger;
+
+        AddErrorResponses(configuration.ErrorResponses);
+    }
+
+    private void AddErrorResponses(List<IErrorResponse> errorResponses)
+    {
+        if (errorResponses == null || !errorResponses.Any())
+            throw new ArgumentNullException(nameof(errorResponses));
+
+        foreach (var errorResponse in errorResponses)
+            AddErrorResponse(errorResponse);
     }
 
     public void AddErrorResponse(IErrorResponse response)