remove used code

Author: Mehdi Yousefi

CQRS/Gufel.Dispatcher.csproj

@@ -9,7 +9,7 @@
 		<PackageId>Gufel.Dispatcher</PackageId>
 		<Title>Gufel Dispatcher (CQRS And Mediator)</Title>
 		<Authors>mahdiit</Authors>
-		<Version>1.0.3</Version>
+		<Version>1.0.4</Version>
 		<Description>CQRS And Mediator with pipeline handler and message publisher</Description>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<RepositoryUrl>https://github.com/mahdiit/Gufel.CQRS</RepositoryUrl>
@@ -34,8 +34,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
 	</ItemGroup>

CQRS/Implement/Dispatcher.cs

@@ -1,65 +1,35 @@
 using Gufel.Dispatcher.Base.Dispatcher;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Gufel.Dispatcher.Implement
 {
-    public class Dispatcher : IDispatcher, IDisposable
+    public sealed class Dispatcher(IServiceProvider serviceProvider) : IDispatcher
     {
-        private readonly IServiceScope? _serviceScope;
-        private readonly IServiceProvider _serviceProvider;
-
-        public Dispatcher(
-            IServiceScopeFactory serviceScope, 
-            IHttpContextAccessor httpContextAccessor)
-        {
-            if (httpContextAccessor.HttpContext != null)
-            {
-                _serviceProvider = httpContextAccessor.HttpContext.RequestServices;
-            }
-            else
-            {
-                _serviceScope = serviceScope.CreateScope();
-                _serviceProvider = _serviceScope.ServiceProvider;
-            }
-        }
-
         public async Task Dispatch<TRequest>(TRequest request, CancellationToken cancellation)
             where TRequest: IRequest
         {
-            var pipeLines = _serviceProvider.GetServices<IPipelineHandler<TRequest>>();
+            var pipeLines = serviceProvider.GetServices<IPipelineHandler<TRequest>>();
             foreach (var pipeline in pipeLines)
             {
                 await pipeline.Handle(request, cancellation);
             }
 
-            var handler = _serviceProvider.GetRequiredService<IRequestHandler<TRequest>>();
+            var handler = serviceProvider.GetRequiredService<IRequestHandler<TRequest>>();
             await handler.Handle(request, cancellation);
         }
 
         public async Task<TResponse> Dispatch<TRequest, TResponse>(TRequest request, CancellationToken cancellation)
             where TRequest : IRequest<TResponse>
             where TResponse : IResponse
         {
-            var pipeLines = _serviceProvider.GetServices<IPipelineHandler<TRequest, TResponse>>();
+            var pipeLines = serviceProvider.GetServices<IPipelineHandler<TRequest, TResponse>>();
             foreach (var pipeline in pipeLines)
             {
                 await pipeline.Handle(request, cancellation);
             }
 
-            var handler = _serviceProvider.GetRequiredService<IRequestHandler<TRequest, TResponse>>();
+            var handler = serviceProvider.GetRequiredService<IRequestHandler<TRequest, TResponse>>();
             return await handler.Handle(request, cancellation);
         }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            _serviceScope?.Dispose();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
     }
 }

CQRS/Implement/MessagePublisher.cs

@@ -1,51 +1,16 @@
-using System.Collections;
-using System.Collections.Concurrent;
-using Gufel.Dispatcher.Base.MessagePublisher;
-using Microsoft.AspNetCore.Http;
+using Gufel.Dispatcher.Base.MessagePublisher;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace Gufel.Dispatcher.Implement
 {
-    public class MessagePublisher : IMessagePublisher, IDisposable
+    public sealed class MessagePublisher(IServiceProvider serviceProvider,
+        IMessagePublishStrategy strategy) : IMessagePublisher
     {
-        private readonly IServiceScope? _serviceScope;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IMessagePublishStrategy _strategy;
-
-        public MessagePublisher(
-            IServiceScopeFactory serviceScope,
-            IHttpContextAccessor httpContextAccessor,
-            IMessagePublishStrategy strategy)
-        {
-            _strategy = strategy;
-            if (httpContextAccessor.HttpContext != null)
-            {
-                _serviceProvider = httpContextAccessor.HttpContext.RequestServices;
-            }
-            else
-            {
-                _serviceScope = serviceScope.CreateScope();
-                _serviceProvider = _serviceScope.ServiceProvider;
-            }
-        }
-
         public void Publish<T>(string topic, T value)
         {
-            var subscribers = _serviceProvider.GetServices<ISubscribeHandler<T>>()
+            var subscribers = serviceProvider.GetServices<ISubscribeHandler<T>>()
                 .Where(x => x.Topic == topic);
-            _strategy.SendMessage(subscribers, value);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            _serviceScope?.Dispose();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            strategy.SendMessage(subscribers, value);
         }
     }
 }

CQRS/Implement/RegisterDispatcherHelper.cs

@@ -1,7 +1,6 @@
 using System.Reflection;
 using Gufel.Dispatcher.Base.Dispatcher;
 using Gufel.Dispatcher.Base.MessagePublisher;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Gufel.Dispatcher.Implement
@@ -24,18 +23,8 @@ private static void RegisterTypeImplement(IServiceCollection services, Assembly
                 });
         }
 
-        private static void AddHttpContextAccessor(IServiceCollection services)
-        {
-            if (services.All(sd => sd.ServiceType != typeof(IHttpContextAccessor)))
-            {
-                services.AddHttpContextAccessor();
-            }
-        }
-
         public static void AddDispatcher(this IServiceCollection services, Assembly assembly)
         {
-            AddHttpContextAccessor(services);
-
             RegisterTypeImplement(services, assembly,
                 typeof(IPipelineHandler<,>),
                 typeof(IRequestHandler<,>),
@@ -47,8 +36,6 @@ public static void AddDispatcher(this IServiceCollection services, Assembly asse
 
         public static void AddMessagePublisher(this IServiceCollection services, IMessagePublishStrategy? strategy = null)
         {
-            AddHttpContextAccessor(services);
-
             services.AddSingleton(x => strategy ?? new ParallelMessagePublishStrategy());
 
             services.AddScoped<IMessagePublisher, MessagePublisher>();

UnitTest/DispatcherTests.cs

@@ -60,8 +60,7 @@ public class DispatcherTests
 
     public DispatcherTests()
     {
-        var services = new ServiceCollection()
-            .AddHttpContextAccessor();
+        var services = new ServiceCollection();
 
         _pipelineHandler = new TestPipelineHandler();
         _pipelineHandlerWithResponse = new TestPipelineHandlerWithResponse();