Update dependencies and refactor logging components

giovanninocco · giovanninocco · commit fd0ecc36de5a · 2024-12-30T20:29:46.000+01:00
- Bump `Roslynator.Analyzers` to version `4.12.10`.
- Remove project references to `Genocs.Core` and `Genocs.HTTP`.
- Add `Genocs.Logging` reference in multiple projects.
- Refactor `CommandHandlerLoggingDecorator` and `EventHandlerLoggingDecorator` for improved clarity and type safety.
- Remove unnecessary `Serilog.Expressions` package reference.
- Disable `consul` and `fabio` settings in `appsettings.json`.
- Clean up project references across various `.csproj` files.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -26,7 +26,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
+        <PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Genocs.Auth/Genocs.Auth.csproj b/src/Genocs.Auth/Genocs.Auth.csproj
@@ -18,12 +18,10 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <ProjectReference Include="..\Genocs.Core\Genocs.Core.csproj" />
         <ProjectReference Include="..\Genocs.Security\Genocs.Security.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <PackageReference Include="Genocs.Core" Version="7.2.1" />
         <PackageReference Include="Genocs.Security" Version="7.2.1" />
     </ItemGroup>
 
diff --git a/src/Genocs.Core.Demo.Worker/Genocs.Core.Demo.Worker.csproj b/src/Genocs.Core.Demo.Worker/Genocs.Core.Demo.Worker.csproj
@@ -29,6 +29,7 @@
     <ItemGroup>
         <ProjectReference Include="..\Genocs.Core.Demo.Contracts\Genocs.Core.Demo.Contracts.csproj" />
         <ProjectReference Include="..\Genocs.Core.Demo.Domain\Genocs.Core.Demo.Domain.csproj" />
+        <ProjectReference Include="..\Genocs.Logging\Genocs.Logging.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Genocs.Discovery.Consul/Genocs.Discovery.Consul.csproj b/src/Genocs.Discovery.Consul/Genocs.Discovery.Consul.csproj
@@ -18,13 +18,10 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <ProjectReference Include="..\Genocs.Core\Genocs.Core.csproj" />
         <ProjectReference Include="..\Genocs.HTTP\Genocs.HTTP.csproj" />
-
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <PackageReference Include="Genocs.Core" Version="7.2.1" />
         <PackageReference Include="Genocs.HTTP" Version="7.2.1" />
     </ItemGroup>
 
diff --git a/src/Genocs.HTTP.RestEase/Genocs.HTTP.RestEase.csproj b/src/Genocs.HTTP.RestEase/Genocs.HTTP.RestEase.csproj
@@ -18,16 +18,10 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <ProjectReference Include="..\Genocs.Core\Genocs.Core.csproj" />
-        <ProjectReference Include="..\Genocs.HTTP\Genocs.HTTP.csproj" />
-        <ProjectReference Include="..\Genocs.Discovery.Consul\Genocs.Discovery.Consul.csproj" />
         <ProjectReference Include="..\Genocs.LoadBalancing.Fabio\Genocs.LoadBalancing.Fabio.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <PackageReference Include="Genocs.Core" Version="7.2.1" />
-        <PackageReference Include="Genocs.HTTP" Version="7.2.1" />
-        <PackageReference Include="Genocs.Discovery.Consul" Version="7.2.1" />
         <PackageReference Include="Genocs.LoadBalancing.Fabio" Version="7.2.1" />
     </ItemGroup>
 
diff --git a/src/Genocs.LoadBalancing.Fabio/Genocs.LoadBalancing.Fabio.csproj b/src/Genocs.LoadBalancing.Fabio/Genocs.LoadBalancing.Fabio.csproj
@@ -18,14 +18,10 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <ProjectReference Include="..\Genocs.Core\Genocs.Core.csproj" />
-        <ProjectReference Include="..\Genocs.HTTP\Genocs.HTTP.csproj" />
         <ProjectReference Include="..\Genocs.Discovery.Consul\Genocs.Discovery.Consul.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <PackageReference Include="Genocs.Core" Version="7.2.1" />
-        <PackageReference Include="Genocs.HTTP" Version="7.2.1" />
         <PackageReference Include="Genocs.Discovery.Consul" Version="7.2.1" />
     </ItemGroup>
 </Project>
diff --git a/src/Genocs.Logging/CQRS/Decorators/CommandHandlerLoggingDecorator.cs b/src/Genocs.Logging/CQRS/Decorators/CommandHandlerLoggingDecorator.cs
@@ -6,21 +6,13 @@
 
 namespace Genocs.Logging.CQRS.Decorators;
 
-[DecoratorAttribute]
-internal sealed class CommandHandlerLoggingDecorator<TCommand> : ICommandHandler<TCommand>
+[Decorator]
+internal sealed class CommandHandlerLoggingDecorator<TCommand>(ICommandHandler<TCommand> handler, ILogger<CommandHandlerLoggingDecorator<TCommand>> logger, IServiceProvider serviceProvider) : ICommandHandler<TCommand>
     where TCommand : class, ICommand
 {
-    private readonly ICommandHandler<TCommand> _handler;
-    private readonly ILogger<CommandHandlerLoggingDecorator<TCommand>> _logger;
-    private readonly IMessageToLogTemplateMapper _mapper;
-
-    public CommandHandlerLoggingDecorator(ICommandHandler<TCommand> handler,
-        ILogger<CommandHandlerLoggingDecorator<TCommand>> logger, IServiceProvider serviceProvider)
-    {
-        _handler = handler;
-        _logger = logger;
-        _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();
-    }
+    private readonly ICommandHandler<TCommand> _handler = handler;
+    private readonly ILogger<CommandHandlerLoggingDecorator<TCommand>> _logger = logger;
+    private readonly IMessageToLogTemplateMapper _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();
 
     public async Task HandleAsync(TCommand command, CancellationToken cancellationToken = default)
     {
@@ -40,14 +32,14 @@ public async Task HandleAsync(TCommand command, CancellationToken cancellationTo
         }
         catch (Exception ex)
         {
-            var exceptionTemplate = template.GetExceptionTemplate(ex);
+            string? exceptionTemplate = template.GetExceptionTemplate(ex);
 
             Log(command, exceptionTemplate, isError: true);
             throw;
         }
     }
 
-    private void Log(TCommand command, string message, bool isError = false)
+    private void Log(TCommand command, string? message, bool isError = false)
     {
         if (string.IsNullOrEmpty(message))
         {
diff --git a/src/Genocs.Logging/CQRS/Decorators/EventHandlerLoggingDecorator.cs b/src/Genocs.Logging/CQRS/Decorators/EventHandlerLoggingDecorator.cs
@@ -6,20 +6,13 @@
 
 namespace Genocs.Logging.CQRS.Decorators;
 
-[DecoratorAttribute]
-internal sealed class EventHandlerLoggingDecorator<TEvent> : IEventHandler<TEvent> where TEvent : class, IEvent
+[Decorator]
+internal sealed class EventHandlerLoggingDecorator<TEvent>(IEventHandler<TEvent> handler, ILogger<EventHandlerLoggingDecorator<TEvent>> logger, IServiceProvider serviceProvider) : IEventHandler<TEvent>
+    where TEvent : class, IEvent
 {
-    private readonly IEventHandler<TEvent> _handler;
-    private readonly ILogger<EventHandlerLoggingDecorator<TEvent>> _logger;
-    private readonly IMessageToLogTemplateMapper _mapper;
-
-    public EventHandlerLoggingDecorator(IEventHandler<TEvent> handler,
-        ILogger<EventHandlerLoggingDecorator<TEvent>> logger, IServiceProvider serviceProvider)
-    {
-        _handler = handler;
-        _logger = logger;
-        _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();
-    }
+    private readonly IEventHandler<TEvent> _handler = handler;
+    private readonly ILogger<EventHandlerLoggingDecorator<TEvent>> _logger = logger;
+    private readonly IMessageToLogTemplateMapper _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();
 
     public async Task HandleAsync(TEvent @event, CancellationToken cancellationToken = default)
     {
@@ -39,14 +32,14 @@ public async Task HandleAsync(TEvent @event, CancellationToken cancellationToken
         }
         catch (Exception ex)
         {
-            var exceptionTemplate = template.GetExceptionTemplate(ex);
+            string? exceptionTemplate = template.GetExceptionTemplate(ex);
 
             Log(@event, exceptionTemplate, isError: true);
             throw;
         }
     }
 
-    private void Log(TEvent @event, string message, bool isError = false)
+    private void Log(TEvent @event, string? message, bool isError = false)
     {
         if (string.IsNullOrEmpty(message))
         {
@@ -64,10 +57,11 @@ private void Log(TEvent @event, string message, bool isError = false)
     }
 
     /// <summary>
-    /// Null Message to log template
+    /// Null Message to log template.
     /// </summary>
     private class EmptyMessageToLogTemplateMapper : IMessageToLogTemplateMapper
     {
-        public HandlerLogTemplate? Map<TMessage>(TMessage message) where TMessage : class => null;
+        public HandlerLogTemplate? Map<TMessage>(TMessage message)
+            where TMessage : class => null;
     }
 }
diff --git a/src/Genocs.Logging/CQRS/Extensions.cs b/src/Genocs.Logging/CQRS/Extensions.cs
@@ -28,12 +28,12 @@ private static IGenocsBuilder AddHandlerLogging(this IGenocsBuilder builder, Typ
 
         handlers.ForEach(ch => GetExtensionMethods()
             .FirstOrDefault(mi => !mi.IsGenericMethod && mi.Name == "TryDecorate")?
-            .Invoke(builder.Services, new object[]
-            {
+            .Invoke(builder.Services,
+            [
                 builder.Services,
                 ch.GetInterfaces().FirstOrDefault(),
                 decoratorType.MakeGenericType(ch.GetInterfaces().FirstOrDefault()?.GenericTypeArguments.First())
-            }));
+            ]));
 
         return builder;
     }
@@ -48,6 +48,7 @@ from method in type.GetMethods(BindingFlags.Static | BindingFlags.Public | Bindi
                     where method.IsDefined(typeof(ExtensionAttribute), false)
                     where method.GetParameters()[0].ParameterType == typeof(IServiceCollection)
                     select method;
+
         return query;
     }
 }
diff --git a/src/Genocs.Logging/Extensions.cs b/src/Genocs.Logging/Extensions.cs
@@ -49,9 +49,7 @@ public static IHostBuilder UseLogging(
                     configure?.Invoke(context, loggerConfiguration);
                 });
 
-    public static IEndpointConventionBuilder MapLogLevelHandler(
-                                                                this IEndpointRouteBuilder builder,
-                                                                string endpointRoute = "~/logging/level")
+    public static IEndpointConventionBuilder MapLogLevelHandler(this IEndpointRouteBuilder builder, string endpointRoute = "~/logging/level")
         => builder.MapPost(endpointRoute, LevelSwitch);
 
     private static void MapOptions(
diff --git a/src/Genocs.Logging/Genocs.Logging.csproj b/src/Genocs.Logging/Genocs.Logging.csproj
@@ -10,7 +10,7 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <MinClientVersion>5.0.0</MinClientVersion>
         <Authors>Nocco Giovanni Emanuele</Authors>
-        <PackageTags>aggregate architecture boilerplate ddd ddd-architecture design-patterns domain-driven-design dotnet dotnetcore dotnet-core microservice microservices solid solid-principles</PackageTags>
+        <PackageTags>architecture boilerplate ddd ddd-architecture design-patterns domain-driven-design dotnet dotnetcore dotnet-core microservice microservices solid solid-principles</PackageTags>
         <PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
         <PackageReleaseNotes>Upgraded to NET9.0</PackageReleaseNotes>
         <EnableNETAnalyzers>True</EnableNETAnalyzers>
@@ -28,11 +28,10 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+        <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
         <PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" />
         <PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
         <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
-        <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
-        <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
         <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
         <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
diff --git a/src/Genocs.Logging/LoggingService.cs b/src/Genocs.Logging/LoggingService.cs
@@ -6,6 +6,4 @@ public void SetLoggingLevel(string logEventLevel)
         => Extensions.LoggingLevelSwitch.MinimumLevel = Extensions.GetLogEventLevel(logEventLevel);
 }
 
-public class LoggingService : ILoggingService
-{
-}
+public class LoggingService : ILoggingService;
diff --git a/src/Genocs.OpenTelemetry/Configurations/AzureOptions.cs b/src/Genocs.OpenTelemetry/Configurations/AzureOptions.cs
@@ -1,7 +1,7 @@
 ﻿namespace Genocs.GnxOpenTelemetry.Configurations;
 
 /// <summary>
-/// ConsoleOptions Settings.
+/// Azure configuration Settings.
 /// </summary>
 public class AzureOptions
 {
diff --git a/src/Genocs.OpenTelemetry/Configurations/ConsoleOptions.cs b/src/Genocs.OpenTelemetry/Configurations/ConsoleOptions.cs
@@ -1,7 +1,7 @@
 ﻿namespace Genocs.GnxOpenTelemetry.Configurations;
 
 /// <summary>
-/// ConsoleOptions Settings.
+/// Console Section Settings.
 /// </summary>
 public class ConsoleOptions
 {
diff --git a/src/Genocs.OpenTelemetry/Extensions.cs b/src/Genocs.OpenTelemetry/Extensions.cs
@@ -15,8 +15,7 @@ namespace Genocs.GnxOpenTelemetry;
 
 public static class OpenTelemetryExtensions
 {
-    public static IGenocsBuilder AddOpenTelemetry(
-                                            this IGenocsBuilder builder)
+    public static IGenocsBuilder AddOpenTelemetry(this IGenocsBuilder builder)
     {
         AppOptions appOptions = builder.GetOptions<AppOptions>(AppOptions.Position)
             ?? throw new GenocsException.InvalidConfigurationException("app config section is missing. AddOpenTelemetry requires those configuration.");
diff --git a/src/Genocs.OpenTelemetry/Genocs.OpenTelemetry.csproj b/src/Genocs.OpenTelemetry/Genocs.OpenTelemetry.csproj
@@ -19,23 +19,16 @@
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
         <ProjectReference Include="..\Genocs.Core\Genocs.Core.csproj" />
-        <ProjectReference Include="..\Genocs.HTTP\Genocs.HTTP.csproj" />
-        <ProjectReference Include="..\Genocs.Discovery.Consul\Genocs.Discovery.Consul.csproj" />
-        <ProjectReference Include="..\Genocs.LoadBalancing.Fabio\Genocs.LoadBalancing.Fabio.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
         <PackageReference Include="Genocs.Core" Version="7.2.1" />
-        <PackageReference Include="Genocs.HTTP" Version="7.2.1" />
-        <PackageReference Include="Genocs.Discovery.Consul" Version="7.2.1" />
-        <PackageReference Include="Genocs.LoadBalancing.Fabio" Version="7.2.1" />
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
         <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
         <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
-
         <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
         <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
diff --git a/src/Genocs.WebApi.CQRS/Genocs.WebApi.CQRS.csproj b/src/Genocs.WebApi.CQRS/Genocs.WebApi.CQRS.csproj
@@ -18,13 +18,11 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <ProjectReference Include="..\Genocs.Core\Genocs.Core.csproj" />
         <ProjectReference Include="..\Genocs.WebApi\Genocs.WebApi.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
         <PackageReference Include="Genocs.WebApi" Version="7.2.1" />
-        <PackageReference Include="Genocs.Core" Version="7.2.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/apps/api-gateway/APIGateway.WebApi/APIGateway.WebApi.csproj b/src/apps/api-gateway/APIGateway.WebApi/APIGateway.WebApi.csproj
@@ -10,7 +10,6 @@
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
         <ProjectReference Include="..\..\..\Genocs.Auth\Genocs.Auth.csproj" />
-        <ProjectReference Include="..\..\..\Genocs.Logging\Genocs.Logging.csproj" />
         <ProjectReference Include="..\..\..\Genocs.MessageBrokers\Genocs.MessageBrokers.csproj" />
         <ProjectReference Include="..\..\..\Genocs.MessageBrokers.RabbitMQ\Genocs.MessageBrokers.RabbitMQ.csproj" />
         <ProjectReference Include="..\..\..\Genocs.Metrics\Genocs.Metrics.csproj" />
@@ -23,7 +22,6 @@
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
         <PackageReference Include="Genocs.Auth" Version="7.2.1" />
-        <PackageReference Include="Genocs.Logging" Version="7.2.1" />
         <PackageReference Include="Genocs.MessageBrokers" Version="7.2.1" />
         <PackageReference Include="Genocs.MessageBrokers.RabbitMQ" Version="7.2.1" />
         <PackageReference Include="Genocs.Metrics" Version="7.2.1" />
diff --git a/src/apps/api-gateway/APIGateway.WebApi/Startup.cs b/src/apps/api-gateway/APIGateway.WebApi/Startup.cs
@@ -51,7 +51,8 @@ private async Task ConfigureServicesAsync(IServiceCollection services)
             .Build();
 
         services.AddReverseProxy()
-                .LoadFromDatabase(Configuration);
+                .LoadFromConfig(Configuration.GetSection("ReverseProxy"));
+                //.LoadFromDatabase(Configuration);
 
         //services.AddAuthorization(options =>
         //{
diff --git a/src/apps/api-gateway/APIGateway.WebApi/appsettings.json b/src/apps/api-gateway/APIGateway.WebApi/appsettings.json
@@ -8,7 +8,7 @@
     "displayVersion": true
   },
   "consul": {
-    "enabled": true,
+    "enabled": false,
     "url": "http://localhost:8500",
     "service": "api-gateway",
     "address": "docker.for.mac.localhost",
@@ -20,7 +20,7 @@
     "requestRetries": 3
   },
   "fabio": {
-    "enabled": true,
+    "enabled": false,
     "url": "http://localhost:9999",
     "service": "api-gateway",
     "requestRetries": 3
diff --git a/src/apps/identity/Identities.WebApi/Identities.WebApi.csproj b/src/apps/identity/Identities.WebApi/Identities.WebApi.csproj
@@ -11,10 +11,12 @@
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
         <ProjectReference Include="..\..\..\Genocs.Discovery.Consul\Genocs.Discovery.Consul.csproj" />
+        <ProjectReference Include="..\..\..\Genocs.Logging\Genocs.Logging.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
         <PackageReference Include="Genocs.Discovery.Consul" Version="7.2.1" />
+        <PackageReference Include="Genocs.Logging" Version="7.2.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/apps/orders/Orders.WebApi/appsettings.json b/src/apps/orders/Orders.WebApi/appsettings.json
@@ -8,7 +8,7 @@
     "displayVersion": true
   },
   "consul": {
-    "enabled": true,
+    "enabled": false,
     "url": "http://localhost:8500",
     "service": "orders-service",
     "address": "docker.for.mac.localhost",
@@ -20,13 +20,13 @@
     "requestRetries": 3
   },
   "fabio": {
-    "enabled": true,
+    "enabled": false,
     "url": "http://localhost:9999",
     "service": "orders-service",
     "requestRetries": 3
   },
   "httpClient": {
-    "type": "fabio",
+    "type": "",
     "retries": 3,
     "services": {
       "products": "products-service"
diff --git a/src/apps/products/Products.WebApi/Products.WebApi.csproj b/src/apps/products/Products.WebApi/Products.WebApi.csproj
diff --git a/src/apps/products/Products.WebApi/appsettings.json b/src/apps/products/Products.WebApi/appsettings.json
diff --git a/src/apps/signalr/SignalR.WebApi/SignalR.WebApi.csproj b/src/apps/signalr/SignalR.WebApi/SignalR.WebApi.csproj

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,13 @@`
`6`	`6`
`7`	`7`	`namespace Genocs.Logging.CQRS.Decorators;`
`8`	`8`
`9`		`-[DecoratorAttribute]`
`10`		`-internal sealed class CommandHandlerLoggingDecorator<TCommand> : ICommandHandler<TCommand>`
	`9`	`+[Decorator]`
	`10`	`+internal sealed class CommandHandlerLoggingDecorator<TCommand>(ICommandHandler<TCommand> handler, ILogger<CommandHandlerLoggingDecorator<TCommand>> logger, IServiceProvider serviceProvider) : ICommandHandler<TCommand>`
`11`	`11`	`where TCommand : class, ICommand`
`12`	`12`	`{`
`13`		`- private readonly ICommandHandler<TCommand> _handler;`
`14`		`- private readonly ILogger<CommandHandlerLoggingDecorator<TCommand>> _logger;`
`15`		`- private readonly IMessageToLogTemplateMapper _mapper;`
`16`		`-`
`17`		`- public CommandHandlerLoggingDecorator(ICommandHandler<TCommand> handler,`
`18`		`- ILogger<CommandHandlerLoggingDecorator<TCommand>> logger, IServiceProvider serviceProvider)`
`19`		`- {`
`20`		`- _handler = handler;`
`21`		`- _logger = logger;`
`22`		`- _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();`
`23`		`- }`
	`13`	`+ private readonly ICommandHandler<TCommand> _handler = handler;`
	`14`	`+ private readonly ILogger<CommandHandlerLoggingDecorator<TCommand>> _logger = logger;`
	`15`	`+ private readonly IMessageToLogTemplateMapper _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();`
`24`	`16`
`25`	`17`	`public async Task HandleAsync(TCommand command, CancellationToken cancellationToken = default)`
`26`	`18`	`{`
`@@ -40,14 +32,14 @@ public async Task HandleAsync(TCommand command, CancellationToken cancellationTo`
`40`	`32`	`}`
`41`	`33`	`catch (Exception ex)`
`42`	`34`	`{`
`43`		`- var exceptionTemplate = template.GetExceptionTemplate(ex);`
	`35`	`+ string? exceptionTemplate = template.GetExceptionTemplate(ex);`
`44`	`36`
`45`	`37`	`Log(command, exceptionTemplate, isError: true);`
`46`	`38`	`throw;`
`47`	`39`	`}`
`48`	`40`	`}`
`49`	`41`
`50`		`- private void Log(TCommand command, string message, bool isError = false)`
	`42`	`+ private void Log(TCommand command, string? message, bool isError = false)`
`51`	`43`	`{`
`52`	`44`	`if (string.IsNullOrEmpty(message))`
`53`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,13 @@`
`6`	`6`
`7`	`7`	`namespace Genocs.Logging.CQRS.Decorators;`
`8`	`8`
`9`		`-[DecoratorAttribute]`
`10`		`-internal sealed class EventHandlerLoggingDecorator<TEvent> : IEventHandler<TEvent> where TEvent : class, IEvent`
	`9`	`+[Decorator]`
	`10`	`+internal sealed class EventHandlerLoggingDecorator<TEvent>(IEventHandler<TEvent> handler, ILogger<EventHandlerLoggingDecorator<TEvent>> logger, IServiceProvider serviceProvider) : IEventHandler<TEvent>`
	`11`	`+ where TEvent : class, IEvent`
`11`	`12`	`{`
`12`		`- private readonly IEventHandler<TEvent> _handler;`
`13`		`- private readonly ILogger<EventHandlerLoggingDecorator<TEvent>> _logger;`
`14`		`- private readonly IMessageToLogTemplateMapper _mapper;`
`15`		`-`
`16`		`- public EventHandlerLoggingDecorator(IEventHandler<TEvent> handler,`
`17`		`- ILogger<EventHandlerLoggingDecorator<TEvent>> logger, IServiceProvider serviceProvider)`
`18`		`- {`
`19`		`- _handler = handler;`
`20`		`- _logger = logger;`
`21`		`- _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();`
`22`		`- }`
	`13`	`+ private readonly IEventHandler<TEvent> _handler = handler;`
	`14`	`+ private readonly ILogger<EventHandlerLoggingDecorator<TEvent>> _logger = logger;`
	`15`	`+ private readonly IMessageToLogTemplateMapper _mapper = serviceProvider.GetService<IMessageToLogTemplateMapper>() ?? new EmptyMessageToLogTemplateMapper();`
`23`	`16`
`24`	`17`	`public async Task HandleAsync(TEvent @event, CancellationToken cancellationToken = default)`
`25`	`18`	`{`
`@@ -39,14 +32,14 @@ public async Task HandleAsync(TEvent @event, CancellationToken cancellationToken`
`39`	`32`	`}`
`40`	`33`	`catch (Exception ex)`
`41`	`34`	`{`
`42`		`- var exceptionTemplate = template.GetExceptionTemplate(ex);`
	`35`	`+ string? exceptionTemplate = template.GetExceptionTemplate(ex);`
`43`	`36`
`44`	`37`	`Log(@event, exceptionTemplate, isError: true);`
`45`	`38`	`throw;`
`46`	`39`	`}`
`47`	`40`	`}`
`48`	`41`
`49`		`- private void Log(TEvent @event, string message, bool isError = false)`
	`42`	`+ private void Log(TEvent @event, string? message, bool isError = false)`
`50`	`43`	`{`
`51`	`44`	`if (string.IsNullOrEmpty(message))`
`52`	`45`	`{`
`@@ -64,10 +57,11 @@ private void Log(TEvent @event, string message, bool isError = false)`
`64`	`57`	`}`
`65`	`58`
`66`	`59`	`/// <summary>`
`67`		`- /// Null Message to log template`
	`60`	`+ /// Null Message to log template.`
`68`	`61`	`/// </summary>`
`69`	`62`	`private class EmptyMessageToLogTemplateMapper : IMessageToLogTemplateMapper`
`70`	`63`	`{`
`71`		`- public HandlerLogTemplate? Map<TMessage>(TMessage message) where TMessage : class => null;`
	`64`	`+ public HandlerLogTemplate? Map<TMessage>(TMessage message)`
	`65`	`+ where TMessage : class => null;`
`72`	`66`	`}`
`73`	`67`	`}`