Release: v10.0.33

CR.Exceptions.AspNet.UnitTests/ExceptionMappingOptionsTests.cs

@@ -1,4 +1,5 @@
-using FluentAssertions;
+using CR.Exceptions.AspNet.Options;
+using FluentAssertions;
 using Microsoft.AspNetCore.Http;
 
 namespace CR.Exceptions.AspNet.UnitTests;

CR.Exceptions.AspNet/CR.Exceptions.AspNet.csproj

@@ -7,7 +7,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-	<Description>ASP.NET Core integration for CR.Exceptions.</Description>
+    <Description>ASP.NET Core integration for CR.Exceptions.</Description>
+    <PackageId>$(NuGetPackagePrefix).Exceptions.AspNet</PackageId>
   </PropertyGroup>
 
   <ItemGroup>

CR.Exceptions.AspNet/CrExceptionHandler.Logger.cs

@@ -12,21 +12,21 @@ public sealed partial class CrExceptionHandler
     [LoggerMessage(
         Level = LogLevel.Warning,
         Message = "No HTTP status code mapping found for exception type '{ExceptionType}'. Using 500 Internal Server Error.")]
-    private static partial void LogMissingHttpStatusMapping(ILogger logger, Exception exception, string? exceptionType);
+    private static partial void LogMissingHttpStatusMapping(ILogger logger, Exception exception, string exceptionType);
 
     [LoggerMessage(
         Level = LogLevel.Debug,
         Message = "Application exception of type '{ExceptionType}' occurred.")]
-    private static partial void LogApplicationException(ILogger logger, Exception exception, string? exceptionType);
+    private static partial void LogApplicationException(ILogger logger, Exception exception, string exceptionType);
 
     [LoggerMessage(
         Level = LogLevel.Error,
         Message = "An unexpected exception of type '{ExceptionType}' occurred.")]
-    private static partial void LogUnhandledException(ILogger logger, Exception exception, string? exceptionType);
+    private static partial void LogUnhandledException(ILogger logger, Exception exception, string exceptionType);
 
     [LoggerMessage(
         Level = LogLevel.Warning,
-        Message = "ProblemDetails extension key '{Key}' already exists. The value was overwritten.")]
+        Message = "The ProblemDetails extension '{Key}' was overwritten while building the error response.")]
     private static partial void LogProblemDetailsExtensionOverwritten(ILogger logger, string key);
 
     [LoggerMessage(

CR.Exceptions.AspNet/CrExceptionHandler.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Diagnostics;
+using CR.Exceptions.AspNet.Options;
+using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.WebUtilities;
@@ -10,18 +11,18 @@ namespace CR.Exceptions.AspNet;
 
 public sealed partial class CrExceptionHandler : IExceptionHandler
 {
-    private static readonly CrError[] FallbackInternalErrors =
+    private static readonly CrError[] DefaultInternalErrors =
     [
         new(ErrorCodes.InternalError, "An unexpected internal error occurred.")
     ];
 
     private readonly IProblemDetailsService _problemDetailsService;
-    private readonly ExceptionMappingOptions _options;
+    private readonly CrExceptionOptions _options;
     private readonly ILogger<CrExceptionHandler> _logger;
 
     public CrExceptionHandler(
         IProblemDetailsService problemDetailsService,
-        IOptions<ExceptionMappingOptions> options,
+        IOptions<CrExceptionOptions> options,
         ILogger<CrExceptionHandler> logger)
     {
         _problemDetailsService = problemDetailsService;
@@ -38,7 +39,8 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
         }
 
         var httpStatusCode = StatusCodes.Status500InternalServerError;
-        var exceptionTypeFullName = exception.GetType().FullName;
+        var exceptionType = exception.GetType();
+        var exceptionTypeName = exceptionType.FullName ?? exceptionType.Name;
 
         CrError[] errors;
         string detail;
@@ -48,25 +50,25 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
             detail = crException.Message;
             errors = crException.Errors;
 
-            var statusCode = _options.FindHttpStatusCode(crException);
+            var statusCode = _options.ExceptionMapping.FindHttpStatusCode(crException);
 
             if (statusCode is null)
             {
-                LogMissingHttpStatusMapping(_logger, exception, exceptionTypeFullName);
+                LogMissingHttpStatusMapping(_logger, exception, exceptionTypeName);
             }
             else
             {
                 httpStatusCode = statusCode.Value;
             }
 
-            LogApplicationException(_logger, exception, exceptionTypeFullName);
+            LogApplicationException(_logger, exception, exceptionTypeName);
         }
         else
         {
             detail = "An unexpected error occurred.";
-            errors = FallbackInternalErrors;
+            errors = DefaultInternalErrors;
 
-            LogUnhandledException(_logger, exception, exceptionTypeFullName);
+            LogUnhandledException(_logger, exception, exceptionTypeName);
         }
 
         var traceId = Activity.Current?.TraceId.ToHexString() ?? httpContext.TraceIdentifier;
@@ -77,7 +79,7 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
             Exception = exception,
             ProblemDetails =
             {
-                Type = "about:blank",
+                Type = _options.ProblemDetails.Type,
                 Status = httpStatusCode,
                 Title = string.IsNullOrWhiteSpace(title) ? "An error occurred" : title,
                 Detail = detail,
@@ -104,8 +106,8 @@ private void AddProblemDetailsExtension(ProblemDetails problemDetails, string ke
     {
         if (!problemDetails.Extensions.TryAdd(key, value))
         {
-            LogProblemDetailsExtensionOverwritten(_logger, key);
             problemDetails.Extensions[key] = value;
+            LogProblemDetailsExtensionOverwritten(_logger, key);
         }
     }
 }

CR.Exceptions.AspNet/ExceptionMappingOptionsExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http;
+using CR.Exceptions.AspNet.Options;
+using Microsoft.AspNetCore.Http;
 
 namespace CR.Exceptions.AspNet;
 

CR.Exceptions.AspNet/Options/CrExceptionOptions.cs

@@ -0,0 +1,7 @@
+namespace CR.Exceptions.AspNet.Options;
+
+public sealed class CrExceptionOptions
+{
+    public ExceptionMappingOptions ExceptionMapping { get; init; } = new();
+    public ProblemDetailsOptions ProblemDetails { get; init; } = new();
+}

CR.Exceptions.AspNet/ExceptionMappingOptions.cs → CR.Exceptions.AspNet/Options/ExceptionMappingOptions.cs

@@ -1,4 +1,4 @@
-namespace CR.Exceptions.AspNet;
+namespace CR.Exceptions.AspNet.Options;
 
 public sealed class ExceptionMappingOptions
 {

CR.Exceptions.AspNet/Options/ProblemDetailsOptions.cs

@@ -0,0 +1,6 @@
+namespace CR.Exceptions.AspNet.Options;
+
+public sealed class ProblemDetailsOptions
+{
+    public string Type { get; set; } = "about:blank";
+}

CR.Exceptions.AspNet/ServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using CR.Exceptions.AspNet.Options;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace CR.Exceptions.AspNet;
 
@@ -10,11 +11,11 @@ public IServiceCollection AddCrExceptionHandler()
         {
             return services.AddCrExceptionHandler(options =>
             {
-                options.AddDefaultMappings();
+                options.ExceptionMapping.AddDefaultMappings();
             });
         }
 
-        public IServiceCollection AddCrExceptionHandler(Action<ExceptionMappingOptions> setupAction)
+        public IServiceCollection AddCrExceptionHandler(Action<CrExceptionOptions> setupAction)
         {
             ArgumentNullException.ThrowIfNull(setupAction);
 

CR.Exceptions/CR.Exceptions.csproj

@@ -7,7 +7,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-	<Description>Common exception abstractions and error models for .NET applications.</Description>
+    <Description>Common exception abstractions and error models for .NET applications.</Description>
+    <PackageId>$(NuGetPackagePrefix).Exceptions</PackageId>
   </PropertyGroup>
 
 </Project>

Directory.Build.props

@@ -12,6 +12,8 @@
 
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+
+    <NuGetPackagePrefix>CrCore</NuGetPackagePrefix>
   </PropertyGroup>
 
   <ItemGroup>

README.md

@@ -15,8 +15,8 @@ Or configure custom exception mappings.
 ```csharp
 builder.Services.AddCrExceptionHandler(options =>
 {
-    options.AddDefaultMappings();
-    options.Map<MyCustomException>(499);
+    options.ExceptionMapping.AddDefaultMappings();
+    options.ExceptionMapping.Map<MyCustomException>(499);
 });
 ```
 
@@ -35,21 +35,14 @@ Example:
 ```csharp
 public sealed class UserNotFoundException : NotFoundException
 {
-    public UserNotFoundException(Guid userId)
-        : base(
-        [
-            new CrError(
-                "UserNotFound",
-                $"User '{userId}' was not found.")
-        ],
+    public UserNotFoundException(Guid userId) : base(
+	[new CrError("UserNotFound", $"User '{userId}' was not found.")],
         "User was not found.")
     {
     }
 }
 ```
 
-Each `CrException` contains one or more `CrError` objects.
-
 ```csharp
 public sealed record class CrError(string Code, string Message);
 ```