Browse Source
EventBus refactor.
Instead to register EventHandlers we register Func<EventHandlers> which solves scope problems (having transient/scoped objects owned by singletons)pull/181/head
Eduard Tomas
7 years ago
13 changed files with 414 additions and 72 deletions
Split View
Diff Options
-
+51 -0eShopOnContainers-ServicesAndWebApps.sln
-
+22 -0src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
-
+56 -0src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
-
+11 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEvent.cs
-
+23 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEventHandler.cs
-
+23 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationOtherEventHandler.cs
-
+8 -2src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
-
+26 -0src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
-
+115 -0src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
-
+58 -62src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
-
+17 -8src/Services/Basket/Basket.API/Startup.cs
-
+2 -0src/Services/Catalog/Catalog.API/Startup.cs
-
+2 -0src/Services/Ordering/Ordering.API/Startup.cs
+ 51
- 0
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 22
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
View File
| @ -0,0 +1,22 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> | |||
| <PackageReference Include="xunit" Version="2.2.0" /> | |||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||
| <ProjectReference Include="..\EventBus\EventBus.csproj" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 56
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
View File
| @ -0,0 +1,56 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus; | |||
| using System; | |||
| using System.Linq; | |||
| using Xunit; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class InMemory_SubscriptionManager_Tests | |||
| { | |||
| [Fact] | |||
| public void After_Creation_Should_Be_Empty() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| Assert.True(manager.IsEmpty); | |||
| } | |||
| [Fact] | |||
| public void After_One_Event_Subscription_Should_Contain_The_Event() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.AddSubscription<TestIntegrationEvent,TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| Assert.True(manager.HasSubscriptionsForEvent<TestIntegrationEvent>()); | |||
| } | |||
| [Fact] | |||
| public void After_All_Subscriptions_Are_Deleted_Event_Should_No_Longer_Exists() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(); | |||
| Assert.False(manager.HasSubscriptionsForEvent<TestIntegrationEvent>()); | |||
| } | |||
| [Fact] | |||
| public void Deleting_Last_Subscription_Should_Raise_On_Deleted_Event() | |||
| { | |||
| bool raised = false; | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.OnEventRemoved += (o, e) => raised = true; | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(); | |||
| Assert.True(raised); | |||
| } | |||
| [Fact] | |||
| public void Get_Handlers_For_Event_Should_Return_All_Handlers() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationOtherEventHandler>(() => new TestIntegrationOtherEventHandler()); | |||
| var handlers = manager.GetHandlersForEvent<TestIntegrationEvent>(); | |||
| Assert.Equal(2, handlers.Count()); | |||
| } | |||
| } | |||
| } | |||
+ 11
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEvent.cs
View File
| @ -0,0 +1,11 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class TestIntegrationEvent : IntegrationEvent | |||
| { | |||
| } | |||
| } | |||
+ 23
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEventHandler.cs
View File
| @ -0,0 +1,23 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class TestIntegrationOtherEventHandler : IIntegrationEventHandler<TestIntegrationEvent> | |||
| { | |||
| public bool Handled { get; private set; } | |||
| public TestIntegrationOtherEventHandler() | |||
| { | |||
| Handled = false; | |||
| } | |||
| public async Task Handle(TestIntegrationEvent @event) | |||
| { | |||
| Handled = true; | |||
| } | |||
| } | |||
| } | |||
+ 23
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationOtherEventHandler.cs
View File
| @ -0,0 +1,23 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class TestIntegrationEventHandler : IIntegrationEventHandler<TestIntegrationEvent> | |||
| { | |||
| public bool Handled { get; private set; } | |||
| public TestIntegrationEventHandler() | |||
| { | |||
| Handled = false; | |||
| } | |||
| public async Task Handle(TestIntegrationEvent @event) | |||
| { | |||
| Handled = true; | |||
| } | |||
| } | |||
| } | |||
+ 8
- 2
src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
View File
| @ -1,11 +1,17 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions | |||
| { | |||
| public interface IEventBus | |||
| { | |||
| void Subscribe<T>(IIntegrationEventHandler<T> handler) where T: IntegrationEvent; | |||
| void Unsubscribe<T>(IIntegrationEventHandler<T> handler) where T : IntegrationEvent; | |||
| void Subscribe<T, TH>(Func<TH> handler) | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T>; | |||
| void Unsubscribe<T, TH>() | |||
| where TH : IIntegrationEventHandler<T> | |||
| where T : IntegrationEvent; | |||
| void Publish(IntegrationEvent @event); | |||
| } | |||
| } | |||
+ 26
- 0
src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
View File
| @ -0,0 +1,26 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus | |||
| { | |||
| public interface IEventBusSubscriptionsManager | |||
| { | |||
| bool IsEmpty { get; } | |||
| event EventHandler<string> OnEventRemoved; | |||
| void AddSubscription<T, TH>(Func<TH> handler) | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T>; | |||
| void RemoveSubscription<T, TH>() | |||
| where TH : IIntegrationEventHandler<T> | |||
| where T : IntegrationEvent; | |||
| bool HasSubscriptionsForEvent<T>() where T : IntegrationEvent; | |||
| bool HasSubscriptionsForEvent(string eventName); | |||
| Type GetEventTypeByName(string eventName); | |||
| void Clear(); | |||
| IEnumerable<Delegate> GetHandlersForEvent<T>() where T : IntegrationEvent; | |||
| IEnumerable<Delegate> GetHandlersForEvent(string eventName); | |||
| } | |||
| } | |||
+ 115
- 0
src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
View File
| @ -0,0 +1,115 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Reflection; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus | |||
| { | |||
| public class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager | |||
| { | |||
| private readonly Dictionary<string, List<Delegate>> _handlers; | |||
| private readonly List<Type> _eventTypes; | |||
| public event EventHandler<string> OnEventRemoved; | |||
| public InMemoryEventBusSubscriptionsManager() | |||
| { | |||
| _handlers = new Dictionary<string, List<Delegate>>(); | |||
| _eventTypes = new List<Type>(); | |||
| } | |||
| public bool IsEmpty => !_handlers.Keys.Any(); | |||
| public void Clear() => _handlers.Clear(); | |||
| public void AddSubscription<T, TH>(Func<TH> handler) | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T> | |||
| { | |||
| var key = GetEventKey<T>(); | |||
| if (!HasSubscriptionsForEvent<T>()) | |||
| { | |||
| _handlers.Add(key, new List<Delegate>()); | |||
| } | |||
| _handlers[key].Add(handler); | |||
| _eventTypes.Add(typeof(T)); | |||
| } | |||
| public void RemoveSubscription<T, TH>() | |||
| where TH : IIntegrationEventHandler<T> | |||
| where T : IntegrationEvent | |||
| { | |||
| var handlerToRemove = FindHandlerToRemove<T, TH>(); | |||
| if (handlerToRemove != null) | |||
| { | |||
| var key = GetEventKey<T>(); | |||
| _handlers[key].Remove(handlerToRemove); | |||
| if (!_handlers[key].Any()) | |||
| { | |||
| _handlers.Remove(key); | |||
| var eventType = _eventTypes.SingleOrDefault(e => e.Name == key); | |||
| if (eventType != null) | |||
| { | |||
| _eventTypes.Remove(eventType); | |||
| RaiseOnEventRemoved(eventType.Name); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| public IEnumerable<Delegate> GetHandlersForEvent<T>() where T : IntegrationEvent | |||
| { | |||
| var key = GetEventKey<T>(); | |||
| return GetHandlersForEvent(key); | |||
| } | |||
| public IEnumerable<Delegate> GetHandlersForEvent(string eventName) => _handlers[eventName]; | |||
| private void RaiseOnEventRemoved(string eventName) | |||
| { | |||
| var handler = OnEventRemoved; | |||
| if (handler != null) | |||
| { | |||
| OnEventRemoved(this, eventName); | |||
| } | |||
| } | |||
| private Delegate FindHandlerToRemove<T, TH>() | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T> | |||
| { | |||
| if (!HasSubscriptionsForEvent<T>()) | |||
| { | |||
| return null; | |||
| } | |||
| var key = GetEventKey<T>(); | |||
| foreach (var func in _handlers[key]) | |||
| { | |||
| var genericArgs = func.GetType().GetGenericArguments(); | |||
| if (genericArgs.SingleOrDefault() == typeof(TH)) | |||
| { | |||
| return func; | |||
| } | |||
| } | |||
| return null; | |||
| } | |||
| public bool HasSubscriptionsForEvent<T>() where T : IntegrationEvent | |||
| { | |||
| var key = GetEventKey<T>(); | |||
| return HasSubscriptionsForEvent(key); | |||
| } | |||
| public bool HasSubscriptionsForEvent(string eventName) => _handlers.ContainsKey(eventName); | |||
| public Type GetEventTypeByName(string eventName) => _eventTypes.Single(t => t.Name == eventName); | |||
| private string GetEventKey<T>() | |||
| { | |||
| return typeof(T).Name; | |||
| } | |||
| } | |||
| } | |||