EventStore options builder (#206)

* EventStore options builder * renamed AddExtension * docs Co-authored-by: Radu Popovici <[email protected]>
osstotalsoft · Feb 11, 2022 · f68bc7e · f68bc7e
1 parent c7af16c
commit f68bc7e
Show file tree

Hide file tree

Showing 40 changed files with 431 additions and 251 deletions.
diff --git a/NBB.sln b/NBB.sln
@@ -381,6 +381,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.Noop", "src\M
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.MultiTenancy.Configuration.Tests", "test\UnitTests\MultiTenancy\NBB.MultiTenancy.Configuration.Tests\NBB.MultiTenancy.Configuration.Tests.csproj", "{CEE3FAE5-2E96-4318-9A4D-7FAAC529CB08}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBB.EventStore.AdoNet.Tests", "test\UnitTests\EventStore\NBB.EventStore.AdoNet.Tests\NBB.EventStore.AdoNet.Tests.csproj", "{C3F79479-1011-4ECB-8876-81B81CA2457B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -855,6 +857,10 @@ Global
 		{CEE3FAE5-2E96-4318-9A4D-7FAAC529CB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CEE3FAE5-2E96-4318-9A4D-7FAAC529CB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CEE3FAE5-2E96-4318-9A4D-7FAAC529CB08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3F79479-1011-4ECB-8876-81B81CA2457B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3F79479-1011-4ECB-8876-81B81CA2457B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3F79479-1011-4ECB-8876-81B81CA2457B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3F79479-1011-4ECB-8876-81B81CA2457B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1013,6 +1019,7 @@ Global
 		{2E1525F5-9FF4-47C0-94C1-2BA295A5AD20} = {A4361674-5AB7-442D-8DA7-7187C9BCA38F}
 		{A53CE5F4-841F-40E3-A079-22C583509D6E} = {584C62C0-2AE6-4DD6-9BCF-8FF28B7122CE}
 		{CEE3FAE5-2E96-4318-9A4D-7FAAC529CB08} = {0ECF24A0-BFED-4F7A-8B06-CC40E628E852}
+		{C3F79479-1011-4ECB-8876-81B81CA2457B} = {0407911F-89FC-4138-BD4D-D4CFCFBB5DC1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {23A42379-616A-43EF-99BC-803DF151F54E}

diff --git a/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/Program.cs b/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/Program.cs
@@ -84,9 +84,11 @@ public static async Task Main(string[] args)
                     services.AddContractsReadModelDataAccess();
 
 
-                    services.AddEventStore()
-                        .WithNewtownsoftJsonEventStoreSeserializer(new[] { new SingleValueObjectConverter() })
-                        .WithAdoNetEventRepository();
+                    services.AddEventStore(b =>
+                    {
+                        b.UseNewtownsoftJson(new SingleValueObjectConverter());
+                        b.UseAdoNetEventRepository(o => o.FromConfiguration());
+                    });
 
                     services.Decorate<IMessageBusPublisher, OpenTracingPublisherDecorator>();
                     services.AddMessagingHost(hostingContext.Configuration, hostBuilder => hostBuilder.UseStartup<MessagingHostStartup>());

diff --git a/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/appsettings.json b/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/appsettings.json
@@ -30,8 +30,7 @@
     },
     "EventStore": {
         "NBB": {
-            "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Contracts;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true",
-            "TopicSufix": "NBB.Contracts"
+            "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Contracts;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true"
         },
         "GetEventStore": {
         },

diff --git a/samples/MicroServices/NBB.Invoices/NBB.Invoices.Worker/Program.cs b/samples/MicroServices/NBB.Invoices/NBB.Invoices.Worker/Program.cs
@@ -39,7 +39,7 @@ public static async Task Main(string[] args)
                         .Enrich.FromLogContext()
                         .Enrich.With<CorrelationLogEventEnricher>()
                         .WriteTo.MSSqlServer(connectionString,
-                            new MSSqlServerSinkOptions {TableName = "Logs", AutoCreateSqlTable = true})
+                            new MSSqlServerSinkOptions { TableName = "Logs", AutoCreateSqlTable = true })
                         .CreateLogger();
 
                     loggingBuilder.AddSerilog(dispose: true);
@@ -52,14 +52,16 @@ public static async Task Main(string[] args)
 
                     services.AddMessageBus().AddNatsTransport(hostingContext.Configuration);
                     services.AddInvoicesWriteDataAccess();
-                    services.AddEventStore()
-                        .WithNewtownsoftJsonEventStoreSeserializer(new[] {new SingleValueObjectConverter()})
-                        .WithAdoNetEventRepository();
+                    services.AddEventStore(e =>
+                    {
+                        e.UseNewtownsoftJson(new SingleValueObjectConverter());
+                        e.UseAdoNetEventRepository(o => o.FromConfiguration());
+                    });
 
                     services.AddMessagingHost(
                         hostingContext.Configuration,
                         hostBuilder => hostBuilder
-                        .Configure(configBuilder =>  configBuilder
+                        .Configure(configBuilder => configBuilder
                             .AddSubscriberServices(subscriberBuilder => subscriberBuilder
                                 .FromMediatRHandledCommands().AddAllClasses()
                                 .FromMediatRHandledEvents().AddAllClasses()

diff --git a/samples/MicroServices/NBB.Invoices/NBB.Invoices.Worker/appsettings.json b/samples/MicroServices/NBB.Invoices/NBB.Invoices.Worker/appsettings.json
@@ -20,8 +20,7 @@
   },
   "EventStore": {
     "NBB": {
-      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Invoices;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true",
-      "TopicSufix": "NBB.Invoices"
+      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Invoices;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true"
     },
     "GetEventStore": {
     },

diff --git a/samples/MicroServices/NBB.MicroServicesOrchestration/Program.cs b/samples/MicroServices/NBB.MicroServicesOrchestration/Program.cs
@@ -46,9 +46,11 @@ public static async Task Main(string[] args)
 
                     services.AddMessageBus().AddNatsTransport(hostingContext.Configuration);
 
-                    services.AddEventStore()
-                        .WithNewtownsoftJsonEventStoreSeserializer()
-                        .WithAdoNetEventRepository();
+                    services.AddEventStore(es =>
+                    {
+                        es.UseNewtownsoftJson();
+                        es.UseAdoNetEventRepository(o => o.FromConfiguration());
+                    });
 
                     var integrationMessageAssemblies = new[] {
                         typeof(NBB.Contracts.PublishedLanguage.ContractValidated).Assembly,

diff --git a/samples/MicroServices/NBB.Payments/NBB.Payments.Worker/Program.cs b/samples/MicroServices/NBB.Payments/NBB.Payments.Worker/Program.cs
@@ -54,9 +54,11 @@ public static async Task Main(string[] args)
 
                     services.AddPaymentsWriteDataAccess();
 
-                    services.AddEventStore()
-                        .WithNewtownsoftJsonEventStoreSeserializer(new[] {new SingleValueObjectConverter()})
-                        .WithAdoNetEventRepository();
+                    services.AddEventStore(es =>
+                    {
+                        es.UseNewtownsoftJson(new SingleValueObjectConverter());
+                        es.UseAdoNetEventRepository(opts => opts.FromConfiguration());
+                    });
 
                     services.AddMessagingHost(
                         hostingContext.Configuration,

diff --git a/samples/MicroServices/NBB.Payments/NBB.Payments.Worker/appsettings.json b/samples/MicroServices/NBB.Payments/NBB.Payments.Worker/appsettings.json
@@ -20,8 +20,7 @@
   },
   "EventStore": {
     "NBB": {
-      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Payments;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true",
-      "TopicSufix": "NBB.Payments"
+      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Payments;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true"
     },
     "GetEventStore": {
     },

diff --git a/samples/Monolith/NBB.Mono.Migrations/appsettings.json b/samples/Monolith/NBB.Mono.Migrations/appsettings.json
@@ -5,8 +5,7 @@
   },
   "EventStore": {
     "NBB": {
-      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Mono;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true",
-      "TopicSufix": "NBB.Contracts"
+      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Mono;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true"
     },
     "GetEventStore": {
     },

diff --git a/samples/Monolith/NBB.Mono/Startup.cs b/samples/Monolith/NBB.Mono/Startup.cs
@@ -53,9 +53,11 @@ public void ConfigureServices(IServiceCollection services)
             services.AddInvoicesDataAccess();
             services.AddPaymentsDataAccess();
 
-            services.AddEventStore()
-                .WithNewtownsoftJsonEventStoreSeserializer(new[] { new SingleValueObjectConverter() })
-                .WithAdoNetEventRepository();
+            services.AddEventStore(es =>
+            {
+                es.UseNewtownsoftJson(new SingleValueObjectConverter());
+                es.UseAdoNetEventRepository(opts => opts.FromConfiguration());
+            });
 
             var integrationMessageAssemblies = new[] {
                 typeof(NBB.Contracts.PublishedLanguage.ContractValidated).Assembly,

diff --git a/samples/Monolith/NBB.Mono/appsettings.json b/samples/Monolith/NBB.Mono/appsettings.json
@@ -8,8 +8,7 @@
   },
   "EventStore": {
     "NBB": {
-      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Mono;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true",
-      "TopicSufix": "NBB.Contracts"
+      "ConnectionString": "Server=YOUR_SERVER;Database=NBB_Mono;User Id=YOUR_USER;Password=YOUR_PASSWORD;MultipleActiveResultSets=true"
     },
     "GetEventStore": {
     },

diff --git a/samples/Orchestration/ProcessManagerSample/Startup.cs b/samples/Orchestration/ProcessManagerSample/Startup.cs
@@ -27,9 +27,11 @@ public static void ConfigureServicesDelegate(HostBuilderContext context, IServic
 
             services.AddProcessManager(Assembly.GetEntryAssembly());
 
-            services.AddEventStore()
-                .WithNewtownsoftJsonEventStoreSeserializer()
-                .WithAdoNetEventRepository();
+            services.AddEventStore(es =>
+            {
+                es.UseNewtownsoftJson();
+                es.UseAdoNetEventRepository(opts => opts.FromConfiguration());
+            });
 
             services.AddMessagingHost(
                 context.Configuration,
@@ -41,8 +43,8 @@ public static void ConfigureServicesDelegate(HostBuilderContext context, IServic
                     .WithDefaultOptions()
                     .UsePipeline(builder => builder
                         .UseCorrelationMiddleware()
-                        .UseExceptionHandlingMiddleware()
-                        //.UseMiddleware<OpenTracingMiddleware>()
+                        .UseExceptionHandlingMiddleware()
+                        //.UseMiddleware<OpenTracingMiddleware>()
                         .UseDefaultResiliencyMiddleware()
                         .UseMiddleware<SubscriberLoggingMiddleware>()
                         .UseMediatRMiddleware())

diff --git a/samples/Orchestration/ProcessManagerSample/appsettings.json b/samples/Orchestration/ProcessManagerSample/appsettings.json
@@ -14,7 +14,6 @@
   },
   "EventStore": {
     "NBB": {
-      "TopicSufix": "ProcessMananger"
     }
   }
-}
+}
diff --git a/src/Core/NBB.Core.DependencyInjection/ServiceCollectionExtension.cs b/src/Core/NBB.Core.DependencyInjection/ServiceCollectionExtension.cs
@@ -277,7 +277,7 @@ private static bool HasSameTypeDefinition(Type t1, Type t2)
             return t1.IsGenericType && t2.IsGenericType && t1.GetGenericTypeDefinition() == t2.GetGenericTypeDefinition();
         }
 
-        private static bool TryDecorateOpenGeneric(this IServiceCollection services, Type serviceType, Type decoratorType, [NotNullWhen(false)] out Exception? error, Predicate<Type> serviceTypePredicate = null)
+        private static bool TryDecorateOpenGeneric(this IServiceCollection services, Type serviceType, Type decoratorType, [NotNullWhen(false)] out Exception error, Predicate<Type> serviceTypePredicate = null)
          {
             var closedGenericServiceTypes = services
                 .Where(x => !x.ServiceType.IsGenericTypeDefinition)
@@ -323,7 +323,7 @@ private static IServiceCollection DecorateDescriptors(this IServiceCollection se
             throw error;
         }
 
-        private static bool TryDecorateDescriptors(this IServiceCollection services, Type serviceType, [NotNullWhen(false)] out Exception? error, Func<ServiceDescriptor, ServiceDescriptor> decorator)
+        private static bool TryDecorateDescriptors(this IServiceCollection services, Type serviceType, [NotNullWhen(false)] out Exception error, Func<ServiceDescriptor, ServiceDescriptor> decorator)
         {
             if (!services.TryGetDescriptors(serviceType, out var descriptors))
             {
@@ -363,7 +363,7 @@ private static ServiceDescriptor Decorate(this ServiceDescriptor descriptor, Typ
             return descriptor.WithFactory(provider => provider.CreateInstance(decoratorType, provider.GetInstance(descriptor)));
         }
 
-        private static ServiceDescriptor WithFactory(this ServiceDescriptor descriptor, Func<IServiceProvider, object?> factory)
+        private static ServiceDescriptor WithFactory(this ServiceDescriptor descriptor, Func<IServiceProvider, object> factory)
         {
             return ServiceDescriptor.Describe(descriptor.ServiceType, factory, descriptor.Lifetime);
         }

diff --git a/src/EventStore/NBB.EventStore.Abstractions/EventStoreEnvelope.cs b/src/EventStore/NBB.EventStore.Abstractions/EventStoreEnvelope.cs
diff --git a/src/EventStore/NBB.EventStore.Abstractions/EventStoreOptions.cs b/src/EventStore/NBB.EventStore.Abstractions/EventStoreOptions.cs
diff --git a/src/EventStore/NBB.EventStore.AdoNet.Multitenancy/AdoNetEventRepository.cs b/src/EventStore/NBB.EventStore.AdoNet.Multitenancy/AdoNetEventRepository.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using NBB.EventStore.Abstractions;
 using NBB.EventStore.AdoNet.Internal;
 using NBB.MultiTenancy.Abstractions.Context;
 using System.Collections.Generic;
@@ -16,7 +15,7 @@ public class AdoNetMultiTenantEventRepository : AdoNetEventRepository
     {
         private readonly ITenantContextAccessor _tenantContextAccessor;
 
-        public AdoNetMultiTenantEventRepository(Scripts scripts, ILogger<AdoNetEventRepository> logger, IOptions<EventStoreOptions> eventstoreOptions, ITenantContextAccessor tenantContextAccessor)
+        public AdoNetMultiTenantEventRepository(Scripts scripts, ILogger<AdoNetEventRepository> logger, IOptionsSnapshot<EventStoreAdoNetOptions> eventstoreOptions, ITenantContextAccessor tenantContextAccessor)
                 : base(scripts, logger, eventstoreOptions)
         {
             _tenantContextAccessor = tenantContextAccessor;

diff --git a/src/EventStore/NBB.EventStore.AdoNet.Multitenancy/AdoNetSnapshotRepository.cs b/src/EventStore/NBB.EventStore.AdoNet.Multitenancy/AdoNetSnapshotRepository.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using NBB.EventStore.Abstractions;
 using NBB.EventStore.AdoNet.Internal;
 using NBB.MultiTenancy.Abstractions.Context;
 using System.Collections.Generic;
@@ -17,7 +16,7 @@ public class AdoNetMultitenantSnapshotRepository : AdoNetSnapshotRepository
         private readonly ITenantContextAccessor _tenantContextAccessor;
 
         public AdoNetMultitenantSnapshotRepository(Scripts scripts,
-            ILogger<AdoNetSnapshotRepository> logger, IOptions<EventStoreOptions> eventstoreOptions, ITenantContextAccessor tenantContextAccessor)
+            ILogger<AdoNetSnapshotRepository> logger, IOptionsSnapshot<EventStoreAdoNetOptions> eventstoreOptions, ITenantContextAccessor tenantContextAccessor)
             : base(scripts, logger, eventstoreOptions)
         {
             _tenantContextAccessor = tenantContextAccessor;

diff --git a/src/EventStore/NBB.EventStore.AdoNet.Multitenancy/DependencyInjectionExtensions.cs b/src/EventStore/NBB.EventStore.AdoNet.Multitenancy/DependencyInjectionExtensions.cs
@@ -1,22 +1,33 @@
 // Copyright (c) TotalSoft.
 // This source code is licensed under the MIT license.
 
+using Microsoft.Extensions.Configuration;
 using NBB.EventStore;
+using NBB.EventStore.AdoNet;
 using NBB.EventStore.AdoNet.Multitenancy;
 using NBB.EventStore.AdoNet.Multitenancy.Internal;
+using NBB.MultiTenancy.Abstractions.Configuration;
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class MultiTenantEventStoreAdoNetBuilderExtensions
+{
+    public static EventStoreAdoNetOptionsBuilder FromTenantConfiguration(this EventStoreAdoNetOptionsBuilder b, string name)
+        => b.From<ITenantConfiguration>((c, o) => o.ConnectionString = c.GetConnectionString(name));
+}
 
-// ReSharper disable once CheckNamespace
-namespace Microsoft.Extensions.DependencyInjection
+public static class MultiTenantAdoNetEventStoreOptionsBuilderExtensions
 {
-    public static class DependencyInjectionExtensions
-    {
-        public static IServiceCollection WithMultiTenantAdoNetEventRepository(this IServiceCollection services)
-        {
-            services.AddSingleton<IEventRepository, AdoNetMultiTenantEventRepository>();
-            services.AddSingleton<ISnapshotRepository, AdoNetMultitenantSnapshotRepository>();
-            services.AddSingleton<NBB.EventStore.AdoNet.Internal.Scripts, Scripts>();
+    public static EventStoreOptionsBuilder UseMultiTenantAdoNetEventRepository(this EventStoreOptionsBuilder b, Action<EventStoreAdoNetOptionsBuilder> optionsAction) => ((IEventStoreOptionsBuilder)b).AdExtension(services =>
+    {
+        services.AddScoped<IEventRepository, AdoNetMultiTenantEventRepository>();
+        services.AddScoped<ISnapshotRepository, AdoNetMultitenantSnapshotRepository>();
+        services.AddSingleton<NBB.EventStore.AdoNet.Internal.Scripts, Scripts>();
 
-            return services;
-        }
-    }
+        var b = new EventStoreAdoNetOptionsBuilder();
+        optionsAction?.Invoke(b);
+        services.AddOptions<EventStoreAdoNetOptions>().Configure<IServiceProvider>(((IEventStoreAdoNetOptionsBuilder)b).Configure);
+    });
 }
diff --git a/src/EventStore/NBB.EventStore.AdoNet/AdoNetEventRepository.cs b/src/EventStore/NBB.EventStore.AdoNet/AdoNetEventRepository.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.Options;
 using Microsoft.SqlServer.Server;
 using NBB.Core.Abstractions;
-using NBB.EventStore.Abstractions;
 using NBB.EventStore.AdoNet.Internal;
 using System;
 using System.Collections.Generic;
@@ -22,7 +21,7 @@ public class AdoNetEventRepository : IEventRepository
     {
         private readonly Scripts _scripts;
         private readonly ILogger<AdoNetEventRepository> _logger;
-        private readonly IOptions<EventStoreOptions> _eventstoreOptions;
+        private readonly IOptionsSnapshot<EventStoreAdoNetOptions> _eventstoreOptions;
 
         // TODO: migrate to Microsoft.Data.SqlClient
         private readonly SqlMetaData[] _appendEventsMetadata = new List<SqlMetaData>
@@ -34,7 +33,7 @@ public class AdoNetEventRepository : IEventRepository
             new SqlMetaData("CorrelationId", SqlDbType.UniqueIdentifier),
         }.ToArray();
 
-        public AdoNetEventRepository(Scripts scripts, ILogger<AdoNetEventRepository> logger, IOptions<EventStoreOptions> eventstoreOptions)
+        public AdoNetEventRepository(Scripts scripts, ILogger<AdoNetEventRepository> logger, IOptionsSnapshot<EventStoreAdoNetOptions> eventstoreOptions)
         {
             _scripts = scripts;
             _eventstoreOptions = eventstoreOptions;