feature(#52): Replace MediatR package with simpler implementation

fusonic · Mar 29, 2024 · f1802a6 · f1802a6
1 parent 74d0fcd
commit f1802a6
Show file tree

Hide file tree

Showing 53 changed files with 692 additions and 109 deletions.
diff --git a/Extensions.sln b/Extensions.sln
@@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Email", "src\Email\src\Emai
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Email.Tests", "src\Email\test\Email.Tests.csproj", "{C0FDFA5A-5421-40A1-8653-823FB9C94E5C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR", "src\MediatR\src\MediatR.csproj", "{EE5FCA64-B743-423C-B329-A12C0F689636}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator", "src\Mediator\src\Mediator.csproj", "{EE5FCA64-B743-423C-B329-A12C0F689636}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hosting", "src\Hosting\src\Hosting.csproj", "{29CAAEDE-46F0-4C0E-A594-9B6E78E760BF}"
 EndProject
@@ -57,6 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.ServiceProvider",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.EntityFrameworkCore.SqlServer", "src\UnitTests.EntityFrameworkCore.SqlServer\src\UnitTests.EntityFrameworkCore.SqlServer.csproj", "{E8DFCBE3-2CBD-4F2B-81DD-CAE85C117239}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mediator.Tests", "src\Mediator\test\Mediator.Tests.csproj", "{286BFD1A-837D-4B26-8071-56B04148A864}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -147,6 +149,10 @@ Global
 		{E8DFCBE3-2CBD-4F2B-81DD-CAE85C117239}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8DFCBE3-2CBD-4F2B-81DD-CAE85C117239}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8DFCBE3-2CBD-4F2B-81DD-CAE85C117239}.Release|Any CPU.Build.0 = Release|Any CPU
+		{286BFD1A-837D-4B26-8071-56B04148A864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{286BFD1A-837D-4B26-8071-56B04148A864}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{286BFD1A-837D-4B26-8071-56B04148A864}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{286BFD1A-837D-4B26-8071-56B04148A864}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -160,6 +166,7 @@ Global
 		{68F735B4-D3E5-477F-8071-F65D1C2137E2} = {95D2383B-80C5-46AA-9190-826A0377A156}
 		{94896282-9BBC-4373-B543-7FAC9F268695} = {95D2383B-80C5-46AA-9190-826A0377A156}
 		{86B0E8DD-25F8-46DF-95D5-781ECC1BCB13} = {95D2383B-80C5-46AA-9190-826A0377A156}
+		{286BFD1A-837D-4B26-8071-56B04148A864} = {95D2383B-80C5-46AA-9190-826A0377A156}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DCAD7035-5EC8-4B6E-82B5-769C5A4892EA}

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Provides Hangfire extensions, especially suited for CQRS developement. (Out of b
 Provides services and extensions for hosting. See the [documentation](docs/Hosting/README.md) for more details.
 
 [![NuGet](https://img.shields.io/nuget/v/Fusonic.Extensions.MediatR.svg?label=Fusonic.Extensions.MediatR&style=plastic)](https://www.nuget.org/packages/Fusonic.Extensions.MediatR/)
-Provides abstractions for MediatR. See the [documentation](docs/MediatR/README.md) for more details.
+Provides simple mediator implementation. See the [documentation](docs/Mediator/README.md) for more details.
 
 [![NuGet](https://img.shields.io/nuget/v/Fusonic.Extensions.UnitTests.svg?label=Fusonic.Extensions.UnitTests&style=plastic)](https://www.nuget.org/packages/Fusonic.Extensions.UnitTests/)
 Xunit-based testing base classes with support for dependency injection. Libraries supporting specific DI containers (SimpleInjector, ServiceProvider) are in separate packages. See the [unit test documentation](docs/UnitTests/README.md) for more details.

diff --git a/docs/MediatR/README.md → docs/Mediator/README.md b/docs/MediatR/README.md → docs/Mediator/README.md
@@ -1,13 +1,13 @@
-# MediatR
+# Mediator
 
-This project contains some abstractions for MediatR.
+This project contains a simple implementation of the common mediator pattern. The implementation focused on simplifying version 11.1.0 of the MediatR package. The pipelining was removed and a pure mediator implementation remains.
 
 `ICommand`, `IQuery`: Use those instead of directly using the `IRequest` interfaces to clearly distinguish between commands and queries.  
 `OutOfBandAttribute`: You can put this on your `Handler`-class. When used together with the [Hangfire-Decorator](../Hangfire/README.md), the execution of the handler will be queued as a background job automatically.  
 
-## MediatR transaction handling
+## Mediator transaction handling
 
-There are decorators to run all MediatR-requests and notifications within a transaction.  
+There are decorators to run all requests and notifications within a transaction.  
 To enable this feature use the following SimpleInjector-Configuration:
 ```cs
 Container.RegisterDecorator(typeof(IRequestHandler<,>), typeof(TransactionalRequestHandlerDecorator<,>));

diff --git a/src/AspNetCore/src/AspNetCore.csproj b/src/AspNetCore/src/AspNetCore.csproj
@@ -19,11 +19,8 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MediatR" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Common\src\Common.csproj" />
+    <ProjectReference Include="..\..\Mediator\src\Mediator.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/AspNetCore/src/Validation/RequestValidationDecorator.cs b/src/AspNetCore/src/Validation/RequestValidationDecorator.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Fusonic GmbH. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
-using MediatR;
+using Fusonic.Extensions.Mediator;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 

diff --git a/src/AspNetCore/test/Validation/RequestValidationDecoratorTests.cs b/src/AspNetCore/test/Validation/RequestValidationDecoratorTests.cs
@@ -3,7 +3,7 @@
 
 using FluentAssertions;
 using Fusonic.Extensions.AspNetCore.Validation;
-using MediatR;
+using Fusonic.Extensions.Mediator;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using NSubstitute;

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -11,7 +11,6 @@
     <PackageVersion Include="Hangfire.Core" Version="1.8.6" />
     <PackageVersion Include="Hangfire.PostgreSql" Version="1.20.4" />
     <PackageVersion Include="MailKit" Version="4.3.0" />
-    <PackageVersion Include="MediatR" Version="[11.1.0,12.0.0)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />

diff --git a/src/Email/src/ContainerExtensions.cs b/src/Email/src/ContainerExtensions.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection;
 using Fusonic.Extensions.AspNetCore.Razor;
-using MediatR;
+using Fusonic.Extensions.Mediator;
 using Microsoft.AspNetCore.Mvc.Localization;
 using SimpleInjector;
 

diff --git a/src/Email/src/Email.csproj b/src/Email/src/Email.csproj
@@ -17,7 +17,7 @@
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" Version="3.1.1" />
         <ProjectReference Include="..\..\AspNetCore\src\AspNetCore.csproj" />
-        <ProjectReference Include="..\..\MediatR\src\MediatR.csproj" />
+        <ProjectReference Include="..\..\Mediator\src\Mediator.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Email/src/SendEmail.cs b/src/Email/src/SendEmail.cs
@@ -2,8 +2,7 @@
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
 using System.Globalization;
-using Fusonic.Extensions.MediatR;
-using MediatR;
+using Fusonic.Extensions.Mediator;
 using MimeKit;
 
 namespace Fusonic.Extensions.Email;

diff --git a/src/Email/test/TestBase.cs b/src/Email/test/TestBase.cs
@@ -2,9 +2,9 @@
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
 using System.Diagnostics;
+using Fusonic.Extensions.Mediator;
 using Fusonic.Extensions.UnitTests;
 using Fusonic.Extensions.UnitTests.SimpleInjector;
-using MediatR;
 
 namespace Fusonic.Extensions.Email.Tests;
 

diff --git a/src/Email/test/TestFixture.cs b/src/Email/test/TestFixture.cs
@@ -3,9 +3,8 @@
 
 using System.Diagnostics;
 using System.Reflection;
+using Fusonic.Extensions.Mediator;
 using Fusonic.Extensions.UnitTests.SimpleInjector;
-using MediatR;
-using MediatR.Pipeline;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Localization;
@@ -33,20 +32,10 @@ protected sealed override void RegisterCoreDependencies(Container container)
         container.Register<RazorEmailRenderingService>();
 
         var mediatorAssemblies = new[] { typeof(IMediator).Assembly, typeof(SendEmail).Assembly };
-        container.Register(() => new ServiceFactory(container.GetInstance), Lifestyle.Singleton);
-        container.RegisterSingleton<IMediator, Mediator>();
+        container.RegisterSingleton<IMediator, SimpleInjectorMediator>();
         container.Register(typeof(IRequestHandler<,>), mediatorAssemblies);
 
         container.Collection.Register(typeof(INotificationHandler<>), mediatorAssemblies);
-        container.Collection.Register(typeof(IPipelineBehavior<,>),
-            new[]
-            {
-                    typeof(RequestPreProcessorBehavior<,>),
-                    typeof(RequestPostProcessorBehavior<,>)
-            });
-
-        container.Collection.Register(typeof(IRequestPreProcessor<>), mediatorAssemblies);
-        container.Collection.Register(typeof(IRequestPostProcessor<,>), mediatorAssemblies);
 
         var services = new ServiceCollection();
         services.AddRazorPages()

diff --git a/src/Hangfire/src/ContainerExtensions.cs b/src/Hangfire/src/ContainerExtensions.cs
@@ -2,10 +2,9 @@
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
 using System.Reflection;
-using Fusonic.Extensions.MediatR;
 using Fusonic.Extensions.Common.Security;
-using MediatR;
 using SimpleInjector;
+using Fusonic.Extensions.Mediator;
 
 namespace Fusonic.Extensions.Hangfire;
 

diff --git a/src/Hangfire/src/Hangfire.csproj b/src/Hangfire/src/Hangfire.csproj
@@ -22,6 +22,6 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Common\src\Common.csproj" />
-        <ProjectReference Include="..\..\MediatR\src\MediatR.csproj" />
+        <ProjectReference Include="..\..\Mediator\src\Mediator.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/Hangfire/src/JobProcessor.cs b/src/Hangfire/src/JobProcessor.cs
@@ -3,8 +3,8 @@
 
 using System.Globalization;
 using Fusonic.Extensions.Common.Security;
+using Fusonic.Extensions.Mediator;
 using Hangfire.Server;
-using MediatR;
 using SimpleInjector;
 
 namespace Fusonic.Extensions.Hangfire;

diff --git a/src/Hangfire/src/NotificationDispatcher`1.cs b/src/Hangfire/src/NotificationDispatcher`1.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Fusonic GmbH. All rights reserved.
+// Copyright (c) Fusonic GmbH. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
-using MediatR;
+using Fusonic.Extensions.Mediator;
 using SimpleInjector;
 
 namespace Fusonic.Extensions.Hangfire;

diff --git a/src/Hangfire/src/OutOfBandNotificationHandlerDecorator.cs b/src/Hangfire/src/OutOfBandNotificationHandlerDecorator.cs
@@ -3,8 +3,8 @@
 
 using System.Globalization;
 using Fusonic.Extensions.Common.Security;
+using Fusonic.Extensions.Mediator;
 using Hangfire;
-using MediatR;
 
 namespace Fusonic.Extensions.Hangfire;
 

diff --git a/src/Hangfire/src/OutOfBandRequestHandlerDecorator.cs b/src/Hangfire/src/OutOfBandRequestHandlerDecorator.cs
@@ -3,8 +3,8 @@
 
 using System.Globalization;
 using Fusonic.Extensions.Common.Security;
+using Fusonic.Extensions.Mediator;
 using Hangfire;
-using MediatR;
 
 namespace Fusonic.Extensions.Hangfire;
 

diff --git a/src/Hangfire/test/ContainerExtensionsTests.cs b/src/Hangfire/test/ContainerExtensionsTests.cs
@@ -2,8 +2,8 @@
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
 using Fusonic.Extensions.Common.Security;
+using Fusonic.Extensions.Mediator;
 using Hangfire;
-using MediatR;
 using NSubstitute;
 using SimpleInjector;
 using SimpleInjector.Lifestyles;

diff --git a/src/Hangfire/test/DecoratorTests.cs b/src/Hangfire/test/DecoratorTests.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Fusonic GmbH. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
+using Fusonic.Extensions.Mediator;
 using Hangfire;
-using MediatR;
 using NSubstitute;
 using NSubstitute.ClearExtensions;
 using Xunit;

diff --git a/src/Hangfire/test/Hangfire.Tests.csproj b/src/Hangfire/test/Hangfire.Tests.csproj
@@ -22,7 +22,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="MediatR" />
         <PackageReference Include="SimpleInjector" />
     </ItemGroup>
 

diff --git a/src/Hangfire/test/HelperTypes.cs b/src/Hangfire/test/HelperTypes.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Fusonic GmbH. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
-using Fusonic.Extensions.MediatR;
-using MediatR;
+using Fusonic.Extensions.Mediator;
 
 namespace Fusonic.Extensions.Hangfire.Tests;
 
@@ -63,22 +62,10 @@ public Task Handle(OutOfBandNotification notification, CancellationToken cancell
     }
 }
 
-public class SyncNotificationHandler : NotificationHandler<Notification>
-{
-    protected override void Handle(Notification notification) { }
-}
-
 public class Request : IRequest { }
 
 public class RequestHandler : AsyncRequestHandler<Request>
 {
     protected override Task Handle(Request request, CancellationToken cancellationToken)
         => Task.CompletedTask;
 }
-
-public class SyncRequest : IRequest { }
-
-public class SyncRequestHandler : RequestHandler<SyncRequest>
-{
-    protected override void Handle(SyncRequest request) { }
-}
diff --git a/src/Hangfire/test/JobProcessorTests.cs b/src/Hangfire/test/JobProcessorTests.cs
@@ -5,11 +5,10 @@
 using System.Security.Claims;
 using FluentAssertions;
 using Fusonic.Extensions.Common.Security;
-using Fusonic.Extensions.MediatR;
+using Fusonic.Extensions.Mediator;
 using Hangfire;
 using Hangfire.Server;
 using Hangfire.Storage;
-using MediatR;
 using NSubstitute;
 using NSubstitute.ClearExtensions;
 using Xunit;
@@ -32,24 +31,12 @@ public async Task CanProcessNotification()
         await GetJobProcessor().ProcessAsync(new MediatorHandlerContext(new Notification(), typeof(NotificationHandler).AssemblyQualifiedName!), CreatePerformContext());
     }
 
-    [Fact]
-    public async Task CanProcessNotificationSync()
-    {
-        await GetJobProcessor().ProcessAsync(new MediatorHandlerContext(new Notification(), typeof(SyncNotificationHandler).AssemblyQualifiedName!), CreatePerformContext());
-    }
-
     [Fact]
     public async Task CanProcessRequest()
     {
         await GetJobProcessor().ProcessAsync(new MediatorHandlerContext(new Request(), typeof(RequestHandler).AssemblyQualifiedName!), CreatePerformContext());
     }
 
-    [Fact]
-    public async Task CanProcessRequestSync()
-    {
-        await GetJobProcessor().ProcessAsync(new MediatorHandlerContext(new SyncRequest(), typeof(SyncRequestHandler).AssemblyQualifiedName!), CreatePerformContext());
-    }
-
     [Fact]
     public async Task RestoreCulture()
     {

diff --git a/src/Hangfire/test/TestBase.cs b/src/Hangfire/test/TestBase.cs
@@ -2,8 +2,8 @@
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
 using System.Diagnostics;
+using Fusonic.Extensions.Mediator;
 using Fusonic.Extensions.UnitTests.EntityFrameworkCore;
-using MediatR;
 
 namespace Fusonic.Extensions.Hangfire.Tests;
 
@@ -23,4 +23,4 @@ protected TestBase(TFixture fixture) : base(fixture)
     [DebuggerStepThrough]
     protected Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request)
         => ScopedAsync(() => GetInstance<IMediator>().Send(request));
-}
+}
diff --git a/src/Hangfire/test/TestFixture.cs b/src/Hangfire/test/TestFixture.cs
@@ -3,19 +3,18 @@
 
 using Fusonic.Extensions.Common.Security;
 using Fusonic.Extensions.Common.Transactions;
-using Fusonic.Extensions.UnitTests.EntityFrameworkCore.Npgsql;
+using Fusonic.Extensions.Mediator;
 using Fusonic.Extensions.UnitTests.EntityFrameworkCore;
+using Fusonic.Extensions.UnitTests.EntityFrameworkCore.Npgsql;
 using Fusonic.Extensions.UnitTests.SimpleInjector;
 using Hangfire;
-using MediatR;
+using Hangfire.PostgreSql;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Npgsql;
 using NSubstitute;
 using SimpleInjector;
-using Hangfire.PostgreSql;
-using MediatR.Pipeline;
-using Npgsql;
 
 namespace Fusonic.Extensions.Hangfire.Tests;
 
@@ -46,19 +45,9 @@ protected sealed override void RegisterCoreDependencies(Container container)
     private static void RegisterMediator(Container container)
     {
         var mediatorAssemblies = new[] { typeof(IMediator).Assembly, typeof(TestFixture).Assembly };
-        container.Register(() => new ServiceFactory(container.GetInstance), Lifestyle.Singleton);
-        container.RegisterSingleton<IMediator, Mediator>();
+        container.RegisterSingleton<IMediator, SimpleInjectorMediator>();
         container.Register(typeof(IRequestHandler<,>), mediatorAssemblies);
         container.Collection.Register(typeof(INotificationHandler<>), mediatorAssemblies);
-
-        container.Collection.Register(typeof(IPipelineBehavior<,>), new[]
-        {
-            typeof(RequestPreProcessorBehavior<,>),
-            typeof(RequestPostProcessorBehavior<,>)
-        });
-
-        container.Collection.Register(typeof(IRequestPreProcessor<>), mediatorAssemblies);
-        container.Collection.Register(typeof(IRequestPostProcessor<,>), mediatorAssemblies);
     }
 
     private void RegisterDatabase(IServiceCollection services)