Merge pull request #62 from neuroglia-io/feat-replace-plugins

Replaced plugin-based services by explicit implementations
neuroglia-io · Aug 26, 2024 · 07a1ee8 · 07a1ee8
2 parents 0946f97 + 183714c
commit 07a1ee8
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 23 deletions.
diff --git a/src/broker/CloudStreams.Broker.Api/CloudStreams.Broker.Api.csproj b/src/broker/CloudStreams.Broker.Api/CloudStreams.Broker.Api.csproj
@@ -27,9 +27,8 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.14.1" />
-    <PackageReference Include="Neuroglia.Plugins" Version="4.14.1" />
-    <PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.14.1" />
+    <PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.0" />
+    <PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.0" />
 	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.3" />
   </ItemGroup>

diff --git a/src/broker/CloudStreams.Broker.Application/CloudStreams.Broker.Application.csproj b/src/broker/CloudStreams.Broker.Application/CloudStreams.Broker.Application.csproj
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.9.2" />
     <PackageReference Include="Grpc.Core.Api" Version="2.65.0" />
-	<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.14.1" />
+	<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.15.0" />
     <PackageReference Include="Polly" Version="8.4.1" />
   </ItemGroup>
 

diff --git a/src/core/CloudStreams.Core.Api/CloudStreams.Core.Api.csproj b/src/core/CloudStreams.Core.Api/CloudStreams.Core.Api.csproj
@@ -28,10 +28,11 @@
 	<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
 	<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
 	<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-	<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.14.1" />
-	<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.14.1" />
-	<PackageReference Include="Neuroglia.Plugins" Version="4.14.1" />
-	<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.14.1" />
+	<PackageReference Include="Neuroglia.Data.Infrastructure.EventSourcing.EventStore" Version="4.15.0" />
+	<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.15.0" />
+	<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.15.0" />
+	<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.0" />
+	<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.0" />
 	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
 	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.3" />
 	<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />

diff --git a/src/core/CloudStreams.Core.Api/Services/CloudStreamsApplicationBuilder.cs b/src/core/CloudStreams.Core.Api/Services/CloudStreamsApplicationBuilder.cs
@@ -19,10 +19,10 @@
 using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.OpenApi.Models;
 using Neuroglia.Data.Expressions.JQ;
-using Neuroglia.Data.Infrastructure.EventSourcing.Services;
+using Neuroglia.Data.Infrastructure.EventSourcing;
+using Neuroglia.Data.Infrastructure.ResourceOriented.Redis;
 using Neuroglia.Data.PatchModel.Services;
 using Neuroglia.Mediation.Services;
-using Neuroglia.Plugins;
 using Neuroglia.Security.Services;
 using Neuroglia.Serialization.Json;
 using Neuroglia.Serialization.Yaml;
@@ -50,6 +50,8 @@ public class CloudStreamsApplicationBuilder
     /// <param name="logging">The service used to configure and build logging</param>
     public CloudStreamsApplicationBuilder(ConfigurationManager configuration, IHostEnvironment environment, IServiceCollection services, ILoggingBuilder logging)
     {
+        var esdbConnectionString = configuration.GetConnectionString("eventstore")!;
+        var redisConnectionString = configuration.GetConnectionString("redis")!;
         this.Configuration = configuration;
         this.Environment = environment;
         this.Services = services;
@@ -71,10 +73,16 @@ public CloudStreamsApplicationBuilder(ConfigurationManager configuration, IHostE
         this.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
         this.Services.AddSingleton<IUserAccessor, HttpContextUserAccessor>();
         this.Services.AddSingleton<IUserInfoProvider, UserInfoProvider>();
-        this.Services.AddPluginProvider(this.Configuration);
-        this.Services.AddPlugin<IEventStore>();
-        this.Services.AddPlugin<IProjectionManager>();
-        this.Services.AddPlugin<IDatabase>();
+        //this.Services.AddPluginProvider(this.Configuration);
+        //this.Services.AddPlugin<IEventStore>();
+        //this.Services.AddPlugin<IProjectionManager>();
+        //this.Services.AddPlugin<IDatabase>();
+        this.Services.AddEventStoreClient(esdbConnectionString);
+        this.Services.AddEventStorePersistentSubscriptionsClient(esdbConnectionString);
+        this.Services.AddEventStoreProjectionManagementClient(esdbConnectionString);
+        this.Services.AddEsdbEventStore();
+        this.Services.AddEsdbProjectionManager();
+        this.Services.AddRedisDatabase(redisConnectionString);
         this.Services.AddSingleton<CloudEventStore>();
         this.Services.AddSingleton<ICloudEventStore>(provider => provider.GetRequiredService<CloudEventStore>());
         this.Services.AddSingleton<IHostedService>(provider => provider.GetRequiredService<CloudEventStore>());

diff --git a/src/core/CloudStreams.Core.Application/CloudStreams.Core.Application.csproj b/src/core/CloudStreams.Core.Application/CloudStreams.Core.Application.csproj
@@ -20,8 +20,8 @@
 
   <ItemGroup>
 	<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
-	<PackageReference Include="Neuroglia.Data.Infrastructure.EventSourcing" Version="4.14.1" />
-	<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Abstractions" Version="4.14.1" />
+	<PackageReference Include="Neuroglia.Data.Infrastructure.EventSourcing" Version="4.15.0" />
+	<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Abstractions" Version="4.15.0" />
 	<PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

diff --git a/src/core/CloudStreams.Core/CloudStreams.Core.csproj b/src/core/CloudStreams.Core/CloudStreams.Core.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neuroglia.Data.Infrastructure.EventSourcing.Abstractions" Version="4.14.1" />
-    <PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.14.1" />
-    <PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.14.1" />
+    <PackageReference Include="Neuroglia.Data.Infrastructure.EventSourcing.Abstractions" Version="4.15.0" />
+    <PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.15.0" />
+    <PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.15.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/gateway/CloudStreams.Gateway.Api/CloudStreams.Gateway.Api.csproj b/src/gateway/CloudStreams.Gateway.Api/CloudStreams.Gateway.Api.csproj
@@ -26,9 +26,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.14.1" />
-    <PackageReference Include="Neuroglia.Plugins" Version="4.14.1" />
-    <PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.14.1" />
+    <PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.0" />
+    <PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.0" />
 	<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.3" />
   </ItemGroup>

diff --git a/src/gateway/CloudStreams.Gateway.Application/CloudStreams.Gateway.Application.csproj b/src/gateway/CloudStreams.Gateway.Application/CloudStreams.Gateway.Application.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
 	<PackageReference Include="FluentValidation" Version="11.9.2" />
-    <PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.14.1" />
+    <PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.15.0" />
   </ItemGroup>
 
   <ItemGroup>