refactor!: merge projects into core framework

Farfetch · Sep 19, 2023 · b83954b · b83954b
1 parent 4e37f85
commit b83954b
Show file tree

Hide file tree

Showing 90 changed files with 170 additions and 278 deletions.
diff --git a/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj b/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj
@@ -22,11 +22,9 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\src\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
-      <ProjectReference Include="..\..\src\KafkaFlow.BatchConsume\KafkaFlow.BatchConsume.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
-      <ProjectReference Include="..\..\src\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
     </ItemGroup>
 

diff --git a/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs b/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using KafkaFlow.BatchConsume;
+using KafkaFlow.Middlewares.BatchConsume;
 
 namespace KafkaFlow.Sample.BatchOperations;
 

diff --git a/samples/KafkaFlow.Sample.BatchOperations/Program.cs b/samples/KafkaFlow.Sample.BatchOperations/Program.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Linq;
 using KafkaFlow;
-using KafkaFlow.BatchConsume;
+using KafkaFlow.Middlewares.BatchConsume;
+using KafkaFlow.Middlewares.Serializer.Configuration;
 using KafkaFlow.Producers;
 using KafkaFlow.Sample.BatchOperations;
 using KafkaFlow.Serializer;

diff --git a/samples/KafkaFlow.Sample.ConsumerThrottling/KafkaFlow.Sample.ConsumerThrottling.csproj b/samples/KafkaFlow.Sample.ConsumerThrottling/KafkaFlow.Sample.ConsumerThrottling.csproj
@@ -22,7 +22,6 @@
         <ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
-        <ProjectReference Include="..\..\src\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
     </ItemGroup>

diff --git a/samples/KafkaFlow.Sample.ConsumerThrottling/Program.cs b/samples/KafkaFlow.Sample.ConsumerThrottling/Program.cs
@@ -13,6 +13,8 @@ The ThrottleConsumer mechanism works by checking the lag of "consumerA" every 1
 using System;
 using System.Threading.Tasks;
 using KafkaFlow;
+using KafkaFlow.Middlewares.Serializer;
+using KafkaFlow.Middlewares.Serializer.Configuration;
 using KafkaFlow.Producers;
 using KafkaFlow.Serializer;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/samples/KafkaFlow.Sample.FlowControl/KafkaFlow.Sample.FlowControl.csproj b/samples/KafkaFlow.Sample.FlowControl/KafkaFlow.Sample.FlowControl.csproj
@@ -26,7 +26,6 @@
       <ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Serializer.NewtonsoftJson\KafkaFlow.Serializer.NewtonsoftJson.csproj" />
-      <ProjectReference Include="..\..\src\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
     </ItemGroup>
 

diff --git a/samples/KafkaFlow.Sample.FlowControl/Program.cs b/samples/KafkaFlow.Sample.FlowControl/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using KafkaFlow;
+using KafkaFlow.Middlewares.Serializer.Configuration;
 using KafkaFlow.Sample.FlowControl;
 using KafkaFlow.Serializer;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/samples/KafkaFlow.Sample.PauseConsumerOnError/KafkaFlow.Sample.PauseConsumerOnError.csproj b/samples/KafkaFlow.Sample.PauseConsumerOnError/KafkaFlow.Sample.PauseConsumerOnError.csproj
@@ -14,7 +14,6 @@
       <ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
-      <ProjectReference Include="..\..\src\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
     </ItemGroup>

diff --git a/samples/KafkaFlow.Sample.PauseConsumerOnError/MessageHandler.cs b/samples/KafkaFlow.Sample.PauseConsumerOnError/MessageHandler.cs
@@ -1,4 +1,4 @@
-using KafkaFlow.TypedHandler;
+using KafkaFlow.Middlewares.TypedHandler;
 
 namespace KafkaFlow.Sample.PauseConsumerOnError;
 

diff --git a/samples/KafkaFlow.Sample.PauseConsumerOnError/Program.cs b/samples/KafkaFlow.Sample.PauseConsumerOnError/Program.cs
@@ -1,8 +1,8 @@
 using KafkaFlow;
+using KafkaFlow.Middlewares.Serializer.Configuration;
 using KafkaFlow.Producers;
 using KafkaFlow.Sample.PauseConsumerOnError;
 using KafkaFlow.Serializer;
-using KafkaFlow.TypedHandler;
 using Microsoft.Extensions.DependencyInjection;
 
 var services = new ServiceCollection();

diff --git a/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/AvroMessageHandler.cs b/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/AvroMessageHandler.cs
@@ -1,9 +1,10 @@
-namespace KafkaFlow.Sample.SchemaRegistry.Handlers;
+using KafkaFlow.Middlewares.TypedHandler;
+
+namespace KafkaFlow.Sample.SchemaRegistry.Handlers;
 
 using System;
 using System.Threading.Tasks;
 using global::SchemaRegistry;
-using TypedHandler;
 
 public class AvroMessageHandler : IMessageHandler<AvroLogMessage>
 {

diff --git a/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/AvroMessageHandler2.cs b/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/AvroMessageHandler2.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Threading.Tasks;
 using global::SchemaRegistry;
-using TypedHandler;
+using KafkaFlow.Middlewares.TypedHandler;
 
 public class AvroMessageHandler2 : IMessageHandler<AvroLogMessage2>
 {

diff --git a/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/JsonMessageHandler.cs b/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/JsonMessageHandler.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Threading.Tasks;
 using global::SchemaRegistry;
-using TypedHandler;
+using KafkaFlow.Middlewares.TypedHandler;
 
 public class JsonMessageHandler : IMessageHandler<JsonLogMessage>
 {

diff --git a/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/ProtobufMessageHandler.cs b/samples/KafkaFlow.Sample.SchemaRegistry/Handlers/ProtobufMessageHandler.cs
@@ -1,7 +1,7 @@
 
 using System;
 using System.Threading.Tasks;
-using KafkaFlow.TypedHandler;
+using KafkaFlow.Middlewares.TypedHandler;
 using SchemaRegistry;
 
 namespace KafkaFlow.Sample.SchemaRegistry.Handlers;

diff --git a/samples/KafkaFlow.Sample.SchemaRegistry/KafkaFlow.Sample.SchemaRegistry.csproj b/samples/KafkaFlow.Sample.SchemaRegistry/KafkaFlow.Sample.SchemaRegistry.csproj
@@ -24,7 +24,6 @@
         <ProjectReference Include="..\..\src\KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro\KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow.Serializer.SchemaRegistry.ConfluentJson\KafkaFlow.Serializer.SchemaRegistry.ConfluentJson.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf\KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf.csproj" />
-        <ProjectReference Include="..\..\src\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj" />
         <ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
     </ItemGroup>

diff --git a/samples/KafkaFlow.Sample.SchemaRegistry/Program.cs b/samples/KafkaFlow.Sample.SchemaRegistry/Program.cs
@@ -5,7 +5,6 @@
 using KafkaFlow;
 using KafkaFlow.Producers;
 using KafkaFlow.Sample.SchemaRegistry.Handlers;
-using KafkaFlow.TypedHandler;
 using Microsoft.Extensions.DependencyInjection;
 using SchemaRegistry;
 

diff --git a/samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj b/samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj
@@ -19,12 +19,10 @@
     <ItemGroup>
       <ProjectReference Include="..\..\src\KafkaFlow.Admin\KafkaFlow.Admin.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Compressor.Gzip\KafkaFlow.Compressor.Gzip.csproj" />
-      <ProjectReference Include="..\..\src\KafkaFlow.Compressor\KafkaFlow.Compressor.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.Serializer.ProtobufNet\KafkaFlow.Serializer.ProtobufNet.csproj" />
-      <ProjectReference Include="..\..\src\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj" />
       <ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
     </ItemGroup>

diff --git a/samples/KafkaFlow.Sample/PrintConsoleHandler.cs b/samples/KafkaFlow.Sample/PrintConsoleHandler.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using KafkaFlow.TypedHandler;
+using KafkaFlow.Middlewares.TypedHandler;
 
 namespace KafkaFlow.Sample;
 

diff --git a/samples/KafkaFlow.Sample/Program.cs b/samples/KafkaFlow.Sample/Program.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using KafkaFlow;
+using KafkaFlow.Middlewares.Serializer.Configuration;
 using KafkaFlow.Producers;
 using KafkaFlow.Sample;
 using KafkaFlow.Serializer;
-using KafkaFlow.TypedHandler;
 using Microsoft.Extensions.DependencyInjection;
 
 var services = new ServiceCollection();

diff --git a/src/KafkaFlow.Admin/Extensions/ClusterConfigurationBuilderExtensions.cs b/src/KafkaFlow.Admin/Extensions/ClusterConfigurationBuilderExtensions.cs
@@ -6,7 +6,6 @@
     using KafkaFlow.Admin.Handlers;
     using KafkaFlow.Configuration;
     using KafkaFlow.Serializer;
-    using KafkaFlow.TypedHandler;
 
     /// <summary>
     /// No needed

diff --git a/src/KafkaFlow.Admin/Handlers/ChangeConsumerWorkersCountHandler.cs b/src/KafkaFlow.Admin/Handlers/ChangeConsumerWorkersCountHandler.cs
@@ -3,7 +3,7 @@ namespace KafkaFlow.Admin.Handlers
     using System.Threading.Tasks;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class ChangeConsumerWorkersCountHandler : IMessageHandler<ChangeConsumerWorkersCount>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/ConsumerTelemetryMetricHandler.cs b/src/KafkaFlow.Admin/Handlers/ConsumerTelemetryMetricHandler.cs
@@ -2,7 +2,7 @@ namespace KafkaFlow.Admin.Handlers
 {
     using System.Threading.Tasks;
     using KafkaFlow.Admin.Messages;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class ConsumerTelemetryMetricHandler : IMessageHandler<ConsumerTelemetryMetric>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/PauseConsumerByNameHandler.cs b/src/KafkaFlow.Admin/Handlers/PauseConsumerByNameHandler.cs
@@ -5,7 +5,7 @@ namespace KafkaFlow.Admin.Handlers
     using KafkaFlow.Admin.Extensions;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class PauseConsumerByNameHandler : IMessageHandler<PauseConsumerByName>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/PauseConsumersByGroupHandler.cs b/src/KafkaFlow.Admin/Handlers/PauseConsumersByGroupHandler.cs
@@ -5,7 +5,7 @@ namespace KafkaFlow.Admin.Handlers
     using KafkaFlow.Admin.Extensions;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class PauseConsumersByGroupHandler : IMessageHandler<PauseConsumersByGroup>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/ResetConsumerOffsetHandler.cs b/src/KafkaFlow.Admin/Handlers/ResetConsumerOffsetHandler.cs
@@ -7,7 +7,7 @@ namespace KafkaFlow.Admin.Handlers
     using KafkaFlow.Admin.Extensions;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class ResetConsumerOffsetHandler : IMessageHandler<ResetConsumerOffset>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/RestartConsumerByNameHandler.cs b/src/KafkaFlow.Admin/Handlers/RestartConsumerByNameHandler.cs
@@ -3,7 +3,7 @@ namespace KafkaFlow.Admin.Handlers
     using System.Threading.Tasks;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class RestartConsumerByNameHandler : IMessageHandler<RestartConsumerByName>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/ResumeConsumerByNameHandler.cs b/src/KafkaFlow.Admin/Handlers/ResumeConsumerByNameHandler.cs
@@ -5,7 +5,7 @@ namespace KafkaFlow.Admin.Handlers
     using KafkaFlow.Admin.Extensions;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class ResumeConsumerByNameHandler : IMessageHandler<ResumeConsumerByName>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/ResumeConsumersByGroupHandler.cs b/src/KafkaFlow.Admin/Handlers/ResumeConsumersByGroupHandler.cs
@@ -5,7 +5,7 @@ namespace KafkaFlow.Admin.Handlers
     using KafkaFlow.Admin.Extensions;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class ResumeConsumersByGroupHandler : IMessageHandler<ResumeConsumersByGroup>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/RewindConsumerOffsetToDateTimeHandler.cs b/src/KafkaFlow.Admin/Handlers/RewindConsumerOffsetToDateTimeHandler.cs
@@ -7,7 +7,7 @@ namespace KafkaFlow.Admin.Handlers
     using KafkaFlow.Admin.Extensions;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class RewindConsumerOffsetToDateTimeHandler : IMessageHandler<RewindConsumerOffsetToDateTime>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/StartConsumerByNameHandler.cs b/src/KafkaFlow.Admin/Handlers/StartConsumerByNameHandler.cs
@@ -3,7 +3,7 @@ namespace KafkaFlow.Admin.Handlers
     using System.Threading.Tasks;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class StartConsumerByNameHandler : IMessageHandler<StartConsumerByName>
     {

diff --git a/src/KafkaFlow.Admin/Handlers/StopConsumerByNameHandler.cs b/src/KafkaFlow.Admin/Handlers/StopConsumerByNameHandler.cs
@@ -3,7 +3,7 @@ namespace KafkaFlow.Admin.Handlers
     using System.Threading.Tasks;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
-    using KafkaFlow.TypedHandler;
+    using KafkaFlow.Middlewares.TypedHandler;
 
     internal class StopConsumerByNameHandler : IMessageHandler<StopConsumerByName>
     {

diff --git a/src/KafkaFlow.Admin/KafkaFlow.Admin.csproj b/src/KafkaFlow.Admin/KafkaFlow.Admin.csproj
@@ -9,7 +9,6 @@
     <ItemGroup>
         <ProjectReference Include="..\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
         <ProjectReference Include="..\KafkaFlow.Serializer.ProtobufNet\KafkaFlow.Serializer.ProtobufNet.csproj" />
-        <ProjectReference Include="..\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
         <ProjectReference Include="..\KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj" />
         <ProjectReference Include="..\KafkaFlow\KafkaFlow.csproj" />
     </ItemGroup>

diff --git a/src/KafkaFlow.BatchConsume/AssemblyInfo.cs b/src/KafkaFlow.BatchConsume/AssemblyInfo.cs
diff --git a/src/KafkaFlow.BatchConsume/KafkaFlow.BatchConsume.csproj b/src/KafkaFlow.BatchConsume/KafkaFlow.BatchConsume.csproj
diff --git a/src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs b/src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs
diff --git a/src/KafkaFlow.Compressor/KafkaFlow.Compressor.csproj b/src/KafkaFlow.Compressor/KafkaFlow.Compressor.csproj