Issue eventflow#907: Provide event naming strategies by DI container …

…instead of EventFlowConfiguration
SeWaS · Dec 3, 2024 · c3748c8 · c3748c8
1 parent 28fad0b
commit c3748c8
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 60 deletions.
diff --git a/Source/EventFlow.Tests/IntegrationTests/UnicodeTests.cs b/Source/EventFlow.Tests/IntegrationTests/UnicodeTests.cs
@@ -26,6 +26,7 @@
 using EventFlow.Aggregates;
 using EventFlow.Commands;
 using EventFlow.Configuration;
+using EventFlow.Configuration.EventNamingStrategy;
 using EventFlow.Core;
 using EventFlow.EventStores;
 using EventFlow.Extensions;
@@ -95,7 +96,7 @@ public void UnicodeEvents()
             var eventDefinitionService = new EventDefinitionService(
                 Mock<ILogger<EventDefinitionService>>(),
                 Mock<ILoadedVersionedTypes>(),
-                new EventFlowConfiguration());
+                new VoidStrategy());
 
             // Act
             Action action = () => eventDefinitionService.Load(typeof(Püng1Event));
@@ -111,6 +112,7 @@ public async Task UnicodeIntegration()
                 .AddEvents(typeof(Püng1Event))
                 .AddCommands(typeof(Cömmand))
                 .AddCommandHandlers(typeof(CömmandHändler))
+                .RegisterServices(s => s.AddScoped<IEventNamingStrategy, NamespaceAndClassNameStrategy>())
                 .ServiceCollection.BuildServiceProvider();
 
             var bus = resolver.GetRequiredService<ICommandBus>();

diff --git a/...ow.Tests/UnitTests/Configuration/EventNamingStrategy/NamespaceAndClassNameStrategyTest.cs b/...ow.Tests/UnitTests/Configuration/EventNamingStrategy/NamespaceAndClassNameStrategyTest.cs
@@ -1,7 +1,6 @@
 // The MIT License (MIT)
 // 
-// Copyright (c) 2015-2022 Rasmus Mikkelsen
-// Copyright (c) 2015-2021 eBay Software Foundation
+// Copyright (c) 2015-2024 Rasmus Mikkelsen
 // https://github.com/eventflow/EventFlow
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -37,7 +36,7 @@ private class Any {}
         public void EventNameShouldBeNamespaceAndClassName()
         {
             // Arrange
-            var strategy = BuiltInEventNamingStrategies.NamespaceAndClassName;
+            var strategy = new NamespaceAndClassNameStrategy();
 
             // Act
             var name = strategy.CreateEventName(1, typeof(Any), "OriginalName");

diff --git a/...entFlow.Tests/UnitTests/Configuration/EventNamingStrategy/NamespaceAndNameStrategyTest.cs b/...entFlow.Tests/UnitTests/Configuration/EventNamingStrategy/NamespaceAndNameStrategyTest.cs
@@ -1,7 +1,6 @@
 // The MIT License (MIT)
 // 
-// Copyright (c) 2015-2022 Rasmus Mikkelsen
-// Copyright (c) 2015-2021 eBay Software Foundation
+// Copyright (c) 2015-2024 Rasmus Mikkelsen
 // https://github.com/eventflow/EventFlow
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -36,7 +35,7 @@ private class Any {}
         public void EventNameShouldBeNamespaceAndClassName()
         {
             // Arrange
-            var strategy = BuiltInEventNamingStrategies.NamespaceAndName;
+            var strategy = new NamespaceAndNameStrategy();
 
             // Act
             var name = strategy.CreateEventName(1, typeof(Any), "NameFromAttribute");

diff --git a/Source/EventFlow.Tests/UnitTests/Configuration/EventNamingStrategy/VoidStrategyTest.cs b/Source/EventFlow.Tests/UnitTests/Configuration/EventNamingStrategy/VoidStrategyTest.cs
@@ -1,7 +1,6 @@
 // The MIT License (MIT)
 // 
-// Copyright (c) 2015-2022 Rasmus Mikkelsen
-// Copyright (c) 2015-2021 eBay Software Foundation
+// Copyright (c) 2015-2024 Rasmus Mikkelsen
 // https://github.com/eventflow/EventFlow
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -37,7 +36,7 @@ private class Any {}
         public void EventNameShouldBeUnchanged()
         {
             // Arrange
-            var strategy = BuiltInEventNamingStrategies.Void;
+            var strategy = new VoidStrategy();
 
             // Act
             var name = strategy.CreateEventName(1, typeof(Any), "OriginalName");

diff --git a/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentFilesEventPersistanceTests.cs b/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentFilesEventPersistanceTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using EventFlow.Aggregates;
 using EventFlow.Configuration;
+using EventFlow.Configuration.EventNamingStrategy;
 using EventFlow.Core;
 using EventFlow.EventStores;
 using EventFlow.EventStores.Files;
@@ -64,7 +65,7 @@ public void SetUp()
             var definitionService = new EventDefinitionService(
                 Mock<ILogger<EventDefinitionService>>(),
                 Mock<ILoadedVersionedTypes>(),
-                new EventFlowConfiguration());
+                new NamespaceAndNameStrategy());
             definitionService.Load(typeof(ThingyPingEvent));
 
             _serializer = new EventJsonSerializer(new JsonSerializer(), definitionService, factory);

diff --git a/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentInMemoryEventPersistanceTests.cs b/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentInMemoryEventPersistanceTests.cs
@@ -28,6 +28,7 @@
 using System.Threading.Tasks;
 using EventFlow.Aggregates;
 using EventFlow.Configuration;
+using EventFlow.Configuration.EventNamingStrategy;
 using EventFlow.Core;
 using EventFlow.EventStores;
 using EventFlow.EventStores.InMemory;
@@ -86,7 +87,7 @@ private EventStoreBase CreateStore()
             var factory = new DomainEventFactory();
             var persistence = new InMemoryEventPersistence(Logger<InMemoryEventPersistence>());
             var upgradeManager = new EventUpgradeManager(Logger<EventUpgradeManager>(), serviceProvider, new EventUpgradeContextFactory());
-            var definitionService = new EventDefinitionService(Logger<EventDefinitionService>(), Mock<ILoadedVersionedTypes>(), new EventFlowConfiguration());
+            var definitionService = new EventDefinitionService(Logger<EventDefinitionService>(), Mock<ILoadedVersionedTypes>(), new NamespaceAndClassNameStrategy());
             definitionService.Load(typeof(ThingyPingEvent));
             var serializer = new EventJsonSerializer(new JsonSerializer(), definitionService, factory);
 

diff --git a/Source/EventFlow.Tests/UnitTests/EventStores/EventDefinitionServiceTests.cs b/Source/EventFlow.Tests/UnitTests/EventStores/EventDefinitionServiceTests.cs
@@ -41,7 +41,7 @@ public class EventDefinitionServiceTests : VersionedTypeDefinitionServiceTestSui
         [SetUp]
         public void SetUp()
         {
-            Inject<IEventFlowConfiguration>(new EventFlowConfiguration());
+            Inject<IEventNamingStrategy>(new VoidStrategy());
         }
 
         [Test]
@@ -75,7 +75,7 @@ public void GetDefinitions_OnEventWithMultipleDefinitions_ReturnsThemAll()
         public void GetDefinitions_OnEventWithMultipleDefinitionsAndNonDefaultNamingStrategy_ReturnsThemAll()
         {
             // Arrange
-            Inject<IEventFlowConfiguration>(new EventFlowConfiguration {EventNamingStrategy = BuiltInEventNamingStrategies.NamespaceAndClassName});
+            Inject<IEventNamingStrategy>(new NamespaceAndClassNameStrategy());
             Sut.Load(typeof(MultiNamesEvent));
 
             // Act

diff --git a/Source/EventFlow/Configuration/EventFlowConfiguration.cs b/Source/EventFlow/Configuration/EventFlowConfiguration.cs
@@ -100,7 +100,6 @@ internal EventFlowConfiguration()
             IsAsynchronousSubscribersEnabled = false;
             CancellationBoundary = CancellationBoundary.BeforeCommittingEvents;
             ForwardOptimisticConcurrencyExceptions = false;
-            EventNamingStrategy = BuiltInEventNamingStrategies.Void;
         }
     }
 }
diff --git a/Source/EventFlow/Configuration/EventNamingStrategy/BuiltInEventNamingStrategies.cs b/Source/EventFlow/Configuration/EventNamingStrategy/BuiltInEventNamingStrategies.cs
diff --git a/Source/EventFlow/Configuration/EventNamingStrategy/IEventNamingStrategy.cs b/Source/EventFlow/Configuration/EventNamingStrategy/IEventNamingStrategy.cs
@@ -1,7 +1,6 @@
 // The MIT License (MIT)
 // 
-// Copyright (c) 2015-2022 Rasmus Mikkelsen
-// Copyright (c) 2015-2021 eBay Software Foundation
+// Copyright (c) 2015-2024 Rasmus Mikkelsen
 // https://github.com/eventflow/EventFlow
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/Source/EventFlow/Configuration/EventNamingStrategy/NamespaceAndClassNameStrategy.cs b/Source/EventFlow/Configuration/EventNamingStrategy/NamespaceAndClassNameStrategy.cs
@@ -1,7 +1,6 @@
 // The MIT License (MIT)
 // 
-// Copyright (c) 2015-2022 Rasmus Mikkelsen
-// Copyright (c) 2015-2021 eBay Software Foundation
+// Copyright (c) 2015-2024 Rasmus Mikkelsen
 // https://github.com/eventflow/EventFlow
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/Source/EventFlow/Configuration/EventNamingStrategy/NamespaceAndNameStrategy.cs b/Source/EventFlow/Configuration/EventNamingStrategy/NamespaceAndNameStrategy.cs
@@ -1,7 +1,6 @@
 // The MIT License (MIT)
 // 
-// Copyright (c) 2015-2022 Rasmus Mikkelsen
-// Copyright (c) 2015-2021 eBay Software Foundation
+// Copyright (c) 2015-2024 Rasmus Mikkelsen
 // https://github.com/eventflow/EventFlow
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/Source/EventFlow/Configuration/EventNamingStrategy/VoidStrategy.cs b/Source/EventFlow/Configuration/EventNamingStrategy/VoidStrategy.cs
@@ -1,7 +1,6 @@
 // The MIT License (MIT)
 // 
-// Copyright (c) 2015-2022 Rasmus Mikkelsen
-// Copyright (c) 2015-2021 eBay Software Foundation
+// Copyright (c) 2015-2024 Rasmus Mikkelsen
 // https://github.com/eventflow/EventFlow
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/Source/EventFlow/EventFlowOptions.cs b/Source/EventFlow/EventFlowOptions.cs
@@ -28,6 +28,7 @@
 using EventFlow.Commands;
 using EventFlow.Configuration;
 using EventFlow.Configuration.Cancellation;
+using EventFlow.Configuration.EventNamingStrategy;
 using EventFlow.Configuration.Serialization;
 using EventFlow.Core;
 using EventFlow.Core.RetryStrategies;
@@ -227,6 +228,8 @@ private void RegisterDefaults(IServiceCollection serviceCollection)
                 _aggregateEventTypes,
                 _sagaTypes,
                 _snapshotTypes));
+
+            serviceCollection.TryAddTransient<IEventNamingStrategy, VoidStrategy>();
         }
 
         private void RegisterObsoleteDefaults(IServiceCollection serviceCollection)

diff --git a/Source/EventFlow/EventStores/EventDefinitionService.cs b/Source/EventFlow/EventStores/EventDefinitionService.cs
@@ -23,6 +23,7 @@
 using System;
 using EventFlow.Aggregates;
 using EventFlow.Configuration;
+using EventFlow.Configuration.EventNamingStrategy;
 using EventFlow.Core.VersionedTypes;
 using Microsoft.Extensions.Logging;
 
@@ -32,22 +33,22 @@ public class EventDefinitionService :
         VersionedTypeDefinitionService<IAggregateEvent, EventVersionAttribute, EventDefinition>,
         IEventDefinitionService
     {
-        private readonly IEventFlowConfiguration _eventFlowConfiguration;
+        private readonly IEventNamingStrategy _eventNamingStrategy;
 
         public EventDefinitionService(
             ILogger<EventDefinitionService> logger,
             ILoadedVersionedTypes loadedVersionedTypes,
-            IEventFlowConfiguration eventFlowConfiguration)
+            IEventNamingStrategy eventNamingStrategy)
             : base(logger)
         {
-            _eventFlowConfiguration = eventFlowConfiguration;
+            _eventNamingStrategy = eventNamingStrategy;
+
             Load(loadedVersionedTypes.Events);
         }
 
         protected override EventDefinition CreateDefinition(int version, Type type, string name)
         {
-            var strategyAppliedName = _eventFlowConfiguration.EventNamingStrategy
-                .CreateEventName(version, type, name);
+            var strategyAppliedName = _eventNamingStrategy.CreateEventName(version, type, name);
 
             return new EventDefinition(version, type, strategyAppliedName);
         }