diff --git a/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj b/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj
index f51dbe58e..6336785ab 100644
--- a/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj
+++ b/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj
@@ -22,11 +22,9 @@
-
-
diff --git a/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs b/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs
index 317098b43..11d38754d 100644
--- 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
index 1515286ed..6c6b5f3c8 100644
--- a/samples/KafkaFlow.Sample.BatchOperations/Program.cs
+++ b/samples/KafkaFlow.Sample.BatchOperations/Program.cs
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using KafkaFlow;
-using KafkaFlow.BatchConsume;
+using KafkaFlow.Middlewares.BatchConsume;
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
index 25d305383..8f607780f 100644
--- a/samples/KafkaFlow.Sample.ConsumerThrottling/KafkaFlow.Sample.ConsumerThrottling.csproj
+++ b/samples/KafkaFlow.Sample.ConsumerThrottling/KafkaFlow.Sample.ConsumerThrottling.csproj
@@ -22,7 +22,6 @@
-
diff --git a/samples/KafkaFlow.Sample.FlowControl/KafkaFlow.Sample.FlowControl.csproj b/samples/KafkaFlow.Sample.FlowControl/KafkaFlow.Sample.FlowControl.csproj
index e4a1914e1..20946db23 100644
--- a/samples/KafkaFlow.Sample.FlowControl/KafkaFlow.Sample.FlowControl.csproj
+++ b/samples/KafkaFlow.Sample.FlowControl/KafkaFlow.Sample.FlowControl.csproj
@@ -26,7 +26,6 @@
-
diff --git a/samples/KafkaFlow.Sample.PauseConsumerOnError/KafkaFlow.Sample.PauseConsumerOnError.csproj b/samples/KafkaFlow.Sample.PauseConsumerOnError/KafkaFlow.Sample.PauseConsumerOnError.csproj
index f6f6d1e42..71083617d 100644
--- a/samples/KafkaFlow.Sample.PauseConsumerOnError/KafkaFlow.Sample.PauseConsumerOnError.csproj
+++ b/samples/KafkaFlow.Sample.PauseConsumerOnError/KafkaFlow.Sample.PauseConsumerOnError.csproj
@@ -14,7 +14,6 @@
-
diff --git a/samples/KafkaFlow.Sample.SchemaRegistry/KafkaFlow.Sample.SchemaRegistry.csproj b/samples/KafkaFlow.Sample.SchemaRegistry/KafkaFlow.Sample.SchemaRegistry.csproj
index 220139cdf..fbebfdb41 100644
--- a/samples/KafkaFlow.Sample.SchemaRegistry/KafkaFlow.Sample.SchemaRegistry.csproj
+++ b/samples/KafkaFlow.Sample.SchemaRegistry/KafkaFlow.Sample.SchemaRegistry.csproj
@@ -24,7 +24,6 @@
-
diff --git a/samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj b/samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj
index 1dfe8a114..ee83b36c3 100644
--- a/samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj
+++ b/samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj
@@ -19,12 +19,10 @@
-
-
diff --git a/src/KafkaFlow.Admin/KafkaFlow.Admin.csproj b/src/KafkaFlow.Admin/KafkaFlow.Admin.csproj
index 58d220888..5be79f73e 100644
--- a/src/KafkaFlow.Admin/KafkaFlow.Admin.csproj
+++ b/src/KafkaFlow.Admin/KafkaFlow.Admin.csproj
@@ -9,7 +9,6 @@
-
diff --git a/src/KafkaFlow.BatchConsume/AssemblyInfo.cs b/src/KafkaFlow.BatchConsume/AssemblyInfo.cs
deleted file mode 100644
index f8402e685..000000000
--- a/src/KafkaFlow.BatchConsume/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("KafkaFlow.UnitTests")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
diff --git a/src/KafkaFlow.BatchConsume/KafkaFlow.BatchConsume.csproj b/src/KafkaFlow.BatchConsume/KafkaFlow.BatchConsume.csproj
deleted file mode 100644
index cd42c7410..000000000
--- a/src/KafkaFlow.BatchConsume/KafkaFlow.BatchConsume.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- netstandard2.0
- KafkaFlow.BatchConsume
- A KafkaFlow middleware to consume messages in batches
-
-
-
-
-
-
-
-
diff --git a/src/KafkaFlow.IntegrationTests/KafkaFlow.IntegrationTests.csproj b/src/KafkaFlow.IntegrationTests/KafkaFlow.IntegrationTests.csproj
index 6d3a8f87f..79e8042a0 100644
--- a/src/KafkaFlow.IntegrationTests/KafkaFlow.IntegrationTests.csproj
+++ b/src/KafkaFlow.IntegrationTests/KafkaFlow.IntegrationTests.csproj
@@ -35,14 +35,12 @@
-
-
diff --git a/src/KafkaFlow.SchemaRegistry/KafkaFlow.SchemaRegistry.csproj b/src/KafkaFlow.SchemaRegistry/KafkaFlow.SchemaRegistry.csproj
index b1241a6fb..75ecf75e8 100644
--- a/src/KafkaFlow.SchemaRegistry/KafkaFlow.SchemaRegistry.csproj
+++ b/src/KafkaFlow.SchemaRegistry/KafkaFlow.SchemaRegistry.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/KafkaFlow.SchemaRegistry/SchemaRegistryTypeResolver.cs b/src/KafkaFlow.SchemaRegistry/SchemaRegistryTypeResolver.cs
index 20185edc4..cc9e2cca5 100644
--- a/src/KafkaFlow.SchemaRegistry/SchemaRegistryTypeResolver.cs
+++ b/src/KafkaFlow.SchemaRegistry/SchemaRegistryTypeResolver.cs
@@ -1,3 +1,5 @@
+using KafkaFlow.Serializer;
+
namespace KafkaFlow
{
using System;
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ConsumerConfigurationBuilderExtensions.cs b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ConsumerConfigurationBuilderExtensions.cs
index 81ac47435..9494bad9c 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ConsumerConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ConsumerConfigurationBuilderExtensions.cs
@@ -2,6 +2,7 @@
{
using Confluent.SchemaRegistry;
using KafkaFlow.Configuration;
+ using KafkaFlow.Serializer;
using KafkaFlow.Serializer.SchemaRegistry;
///
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro.csproj b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro.csproj
index 355666973..e65dfa824 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro.csproj
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro.csproj
@@ -10,7 +10,6 @@
-
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ProducerConfigurationBuilderExtensions.cs b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ProducerConfigurationBuilderExtensions.cs
index d60a7a39c..65f570c87 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ProducerConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro/ProducerConfigurationBuilderExtensions.cs
@@ -3,6 +3,7 @@
using Confluent.SchemaRegistry;
using Confluent.SchemaRegistry.Serdes;
using KafkaFlow.Configuration;
+ using KafkaFlow.Serializer;
using KafkaFlow.Serializer.SchemaRegistry;
///
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ConsumerConfigurationBuilderExtensions.cs b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ConsumerConfigurationBuilderExtensions.cs
index 06c8c04b9..0f3405d19 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ConsumerConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ConsumerConfigurationBuilderExtensions.cs
@@ -1,6 +1,7 @@
namespace KafkaFlow
{
using KafkaFlow.Configuration;
+ using KafkaFlow.Serializer;
using KafkaFlow.Serializer.SchemaRegistry;
///
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson.csproj b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson.csproj
index c7e599371..305788443 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson.csproj
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson.csproj
@@ -15,7 +15,6 @@
-
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ProducerConfigurationBuilderExtensions.cs b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ProducerConfigurationBuilderExtensions.cs
index 1708eea73..3dc6a3065 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ProducerConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentJson/ProducerConfigurationBuilderExtensions.cs
@@ -2,6 +2,7 @@
{
using Confluent.SchemaRegistry.Serdes;
using KafkaFlow.Configuration;
+ using KafkaFlow.Serializer;
using KafkaFlow.Serializer.SchemaRegistry;
///
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ConsumerConfigurationBuilderExtensions.cs b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ConsumerConfigurationBuilderExtensions.cs
index ce3b0e4c3..7ae0430ad 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ConsumerConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ConsumerConfigurationBuilderExtensions.cs
@@ -1,4 +1,6 @@
-namespace KafkaFlow
+using KafkaFlow.Serializer;
+
+namespace KafkaFlow
{
using Confluent.SchemaRegistry;
using KafkaFlow.Configuration;
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf.csproj b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf.csproj
index f2eac2e3b..418a3ccd7 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf.csproj
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf.csproj
@@ -16,6 +16,5 @@
-
diff --git a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ProducerConfigurationBuilderExtensions.cs b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ProducerConfigurationBuilderExtensions.cs
index fc59f5e3d..61777a395 100644
--- a/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ProducerConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf/ProducerConfigurationBuilderExtensions.cs
@@ -1,4 +1,6 @@
-namespace KafkaFlow
+using KafkaFlow.Serializer;
+
+namespace KafkaFlow
{
using Confluent.SchemaRegistry;
using Confluent.SchemaRegistry.Serdes;
diff --git a/src/KafkaFlow.UnitTests/BatchConsume/BatchConsumeMiddlewareTests.cs b/src/KafkaFlow.UnitTests/BatchConsume/BatchConsumeMiddlewareTests.cs
index 5e75f3c4d..287aae481 100644
--- a/src/KafkaFlow.UnitTests/BatchConsume/BatchConsumeMiddlewareTests.cs
+++ b/src/KafkaFlow.UnitTests/BatchConsume/BatchConsumeMiddlewareTests.cs
@@ -3,7 +3,7 @@ namespace KafkaFlow.UnitTests.BatchConsume
using System;
using System.Threading.Tasks;
using FluentAssertions;
- using KafkaFlow.BatchConsume;
+ using KafkaFlow.Middlewares.BatchConsume;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/KafkaFlow.UnitTests/KafkaFlow.UnitTests.csproj b/src/KafkaFlow.UnitTests/KafkaFlow.UnitTests.csproj
index f8e053443..a47c494e6 100644
--- a/src/KafkaFlow.UnitTests/KafkaFlow.UnitTests.csproj
+++ b/src/KafkaFlow.UnitTests/KafkaFlow.UnitTests.csproj
@@ -31,11 +31,8 @@
-
-
-
diff --git a/src/KafkaFlow.UnitTests/Serializers/SerializerConsumerMiddlewareTests.cs b/src/KafkaFlow.UnitTests/Serializers/SerializerConsumerMiddlewareTests.cs
index 117cd9f50..85a52aa0c 100644
--- a/src/KafkaFlow.UnitTests/Serializers/SerializerConsumerMiddlewareTests.cs
+++ b/src/KafkaFlow.UnitTests/Serializers/SerializerConsumerMiddlewareTests.cs
@@ -1,3 +1,5 @@
+using KafkaFlow.Serializer;
+
namespace KafkaFlow.UnitTests.Serializers
{
using System;
diff --git a/src/KafkaFlow.UnitTests/Serializers/SerializerProducerMiddlewareTests.cs b/src/KafkaFlow.UnitTests/Serializers/SerializerProducerMiddlewareTests.cs
index 0b45b7a1e..525d1fc11 100644
--- a/src/KafkaFlow.UnitTests/Serializers/SerializerProducerMiddlewareTests.cs
+++ b/src/KafkaFlow.UnitTests/Serializers/SerializerProducerMiddlewareTests.cs
@@ -1,3 +1,5 @@
+using KafkaFlow.Serializer;
+
namespace KafkaFlow.UnitTests.Serializers
{
using System.IO;
diff --git a/src/KafkaFlow.sln b/src/KafkaFlow.sln
index a3012d169..1aea99b99 100644
--- a/src/KafkaFlow.sln
+++ b/src/KafkaFlow.sln
@@ -27,10 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.Abstractions", "K
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.TypedHandler", "KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj", "{E47EF9E0-A1C7-4FF0-AEC5-143F52ED0FBE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.Serializer", "KafkaFlow.Serializer\KafkaFlow.Serializer.csproj", "{B7197114-B1C7-49EC-8740-1E09233B2C40}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.Compressor", "KafkaFlow.Compressor\KafkaFlow.Compressor.csproj", "{D29EC709-33DE-4045-8F3B-EC6619CDB429}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.IntegrationTests", "KafkaFlow.IntegrationTests\KafkaFlow.IntegrationTests.csproj", "{36F459F4-8323-472A-A8C5-8C9D89F92012}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.Serializer.NewtonsoftJson", "KafkaFlow.Serializer.NewtonsoftJson\KafkaFlow.Serializer.NewtonsoftJson.csproj", "{FC622AB0-6481-4249-8D83-27BC39912103}"
@@ -59,8 +55,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.Serializer.Schema
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Middlewares", "Middlewares", "{ED24B548-6F37-4283-A35B-F6015BFB7A34}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.BatchConsume", "KafkaFlow.BatchConsume\KafkaFlow.BatchConsume.csproj", "{C891D0DB-BE19-4D20-9E2F-61D413210F8D}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.Sample.BatchOperations", "..\samples\KafkaFlow.Sample.BatchOperations\KafkaFlow.Sample.BatchOperations.csproj", "{DE8A8871-B19E-489D-8292-386A06A4CDFA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaFlow.Extensions.Hosting", "KafkaFlow.Extensions.Hosting\KafkaFlow.Extensions.Hosting.csproj", "{7913342E-80FD-4094-B892-18DAA2E6948F}"
@@ -125,14 +119,6 @@ Global
{E47EF9E0-A1C7-4FF0-AEC5-143F52ED0FBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E47EF9E0-A1C7-4FF0-AEC5-143F52ED0FBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E47EF9E0-A1C7-4FF0-AEC5-143F52ED0FBE}.Release|Any CPU.Build.0 = Release|Any CPU
- {B7197114-B1C7-49EC-8740-1E09233B2C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B7197114-B1C7-49EC-8740-1E09233B2C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B7197114-B1C7-49EC-8740-1E09233B2C40}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B7197114-B1C7-49EC-8740-1E09233B2C40}.Release|Any CPU.Build.0 = Release|Any CPU
- {D29EC709-33DE-4045-8F3B-EC6619CDB429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D29EC709-33DE-4045-8F3B-EC6619CDB429}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D29EC709-33DE-4045-8F3B-EC6619CDB429}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D29EC709-33DE-4045-8F3B-EC6619CDB429}.Release|Any CPU.Build.0 = Release|Any CPU
{36F459F4-8323-472A-A8C5-8C9D89F92012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36F459F4-8323-472A-A8C5-8C9D89F92012}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36F459F4-8323-472A-A8C5-8C9D89F92012}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -173,10 +159,6 @@ Global
{2E63A019-F8AD-4EC3-A80A-F560DEC7C5B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E63A019-F8AD-4EC3-A80A-F560DEC7C5B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E63A019-F8AD-4EC3-A80A-F560DEC7C5B4}.Release|Any CPU.Build.0 = Release|Any CPU
- {C891D0DB-BE19-4D20-9E2F-61D413210F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C891D0DB-BE19-4D20-9E2F-61D413210F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C891D0DB-BE19-4D20-9E2F-61D413210F8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C891D0DB-BE19-4D20-9E2F-61D413210F8D}.Release|Any CPU.Build.0 = Release|Any CPU
{DE8A8871-B19E-489D-8292-386A06A4CDFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE8A8871-B19E-489D-8292-386A06A4CDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE8A8871-B19E-489D-8292-386A06A4CDFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -238,9 +220,6 @@ Global
{ADAAA63C-E17C-4F1B-A062-3CCA071D75C2} = {ED24B548-6F37-4283-A35B-F6015BFB7A34}
{0A782A83-B66D-4B99-9BE2-2B18AAD2E03C} = {ED24B548-6F37-4283-A35B-F6015BFB7A34}
{88808771-56BE-422B-94DC-7AB070F64E98} = {068CB250-2804-4C7E-9490-17F432B9CE21}
- {E47EF9E0-A1C7-4FF0-AEC5-143F52ED0FBE} = {ED24B548-6F37-4283-A35B-F6015BFB7A34}
- {B7197114-B1C7-49EC-8740-1E09233B2C40} = {ADAAA63C-E17C-4F1B-A062-3CCA071D75C2}
- {D29EC709-33DE-4045-8F3B-EC6619CDB429} = {0A782A83-B66D-4B99-9BE2-2B18AAD2E03C}
{36F459F4-8323-472A-A8C5-8C9D89F92012} = {7A9B997B-DAAC-4004-94F3-32F6B88E0068}
{FC622AB0-6481-4249-8D83-27BC39912103} = {ADAAA63C-E17C-4F1B-A062-3CCA071D75C2}
{B86A51E3-7AC9-4EF8-BD2A-1ACC9EF0F5AE} = {292BCEDD-55B4-49BB-B8B2-24CD834FF2AA}
@@ -251,7 +230,6 @@ Global
{827620D3-2258-410E-A79E-E782ED42284C} = {58483813-0D7C-423E-8E7D-8FBF3E6CDB6D}
{15C12D0C-FE8A-41F9-BBCF-5A963F05D5C7} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
{2E63A019-F8AD-4EC3-A80A-F560DEC7C5B4} = {ADAAA63C-E17C-4F1B-A062-3CCA071D75C2}
- {C891D0DB-BE19-4D20-9E2F-61D413210F8D} = {ED24B548-6F37-4283-A35B-F6015BFB7A34}
{DE8A8871-B19E-489D-8292-386A06A4CDFA} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
{7913342E-80FD-4094-B892-18DAA2E6948F} = {068CB250-2804-4C7E-9490-17F432B9CE21}
{98C9826C-76F6-4C21-8A32-D55C2647905B} = {ADAAA63C-E17C-4F1B-A062-3CCA071D75C2}
@@ -264,6 +242,7 @@ Global
{8EAF0D96-F760-4FEF-9237-92779F66482D} = {EF626895-FDAE-4B28-9110-BA85671CBBF2}
{B4A9E7CE-7A37-411E-967E-D9B5FD1A3992} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
{4A16F519-FAF8-432C-AD0A-CC44F7BD392D} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
+ {E47EF9E0-A1C7-4FF0-AEC5-143F52ED0FBE} = {068CB250-2804-4C7E-9490-17F432B9CE21}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6AE955B5-16B0-41CF-9F12-66D15B3DD1AB}
diff --git a/src/KafkaFlow.Compressor/CompressorConsumerMiddleware.cs b/src/KafkaFlow/Compressor/CompressorConsumerMiddleware.cs
similarity index 100%
rename from src/KafkaFlow.Compressor/CompressorConsumerMiddleware.cs
rename to src/KafkaFlow/Compressor/CompressorConsumerMiddleware.cs
diff --git a/src/KafkaFlow.Compressor/CompressorProducerMiddleware.cs b/src/KafkaFlow/Compressor/CompressorProducerMiddleware.cs
similarity index 100%
rename from src/KafkaFlow.Compressor/CompressorProducerMiddleware.cs
rename to src/KafkaFlow/Compressor/CompressorProducerMiddleware.cs
diff --git a/src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs b/src/KafkaFlow/Compressor/ConfigurationBuilderExtensions.cs
similarity index 100%
rename from src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs
rename to src/KafkaFlow/Compressor/ConfigurationBuilderExtensions.cs
diff --git a/src/KafkaFlow/KafkaFlow.csproj b/src/KafkaFlow/KafkaFlow.csproj
index ddf21310f..4c0091254 100644
--- a/src/KafkaFlow/KafkaFlow.csproj
+++ b/src/KafkaFlow/KafkaFlow.csproj
@@ -9,6 +9,7 @@
+
@@ -20,4 +21,10 @@
<_Parameter1>$(AssemblyName).UnitTests
+
+
+
+ ..\..\..\..\.nuget\packages\microsoft.io.recyclablememorystream\2.1.3\lib\netstandard2.0\Microsoft.IO.RecyclableMemoryStream.dll
+
+
\ No newline at end of file
diff --git a/src/KafkaFlow.BatchConsume/BatchConsumeExtensions.cs b/src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeExtensions.cs
similarity index 97%
rename from src/KafkaFlow.BatchConsume/BatchConsumeExtensions.cs
rename to src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeExtensions.cs
index 1bbe085da..d9c7613cb 100644
--- a/src/KafkaFlow.BatchConsume/BatchConsumeExtensions.cs
+++ b/src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeExtensions.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow.BatchConsume
+namespace KafkaFlow.Middlewares.BatchConsume
{
using System;
using System.Collections.Generic;
diff --git a/src/KafkaFlow.BatchConsume/BatchConsumeMessageContext.cs b/src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeMessageContext.cs
similarity index 95%
rename from src/KafkaFlow.BatchConsume/BatchConsumeMessageContext.cs
rename to src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeMessageContext.cs
index 0087fd6ca..aef603c68 100644
--- a/src/KafkaFlow.BatchConsume/BatchConsumeMessageContext.cs
+++ b/src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeMessageContext.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow.BatchConsume
+namespace KafkaFlow.Middlewares.BatchConsume
{
using System;
using System.Collections.Generic;
diff --git a/src/KafkaFlow.BatchConsume/BatchConsumeMiddleware.cs b/src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeMiddleware.cs
similarity index 98%
rename from src/KafkaFlow.BatchConsume/BatchConsumeMiddleware.cs
rename to src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeMiddleware.cs
index 4f61f6626..02fd02dce 100644
--- a/src/KafkaFlow.BatchConsume/BatchConsumeMiddleware.cs
+++ b/src/KafkaFlow/Middlewares/BatchConsume/BatchConsumeMiddleware.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow.BatchConsume
+namespace KafkaFlow.Middlewares.BatchConsume
{
using System;
using System.Collections.Generic;
diff --git a/src/KafkaFlow.Serializer/AsyncMessageTypeResolverWrapper.cs b/src/KafkaFlow/Serializer/AsyncMessageTypeResolverWrapper.cs
similarity index 94%
rename from src/KafkaFlow.Serializer/AsyncMessageTypeResolverWrapper.cs
rename to src/KafkaFlow/Serializer/AsyncMessageTypeResolverWrapper.cs
index fac02e462..3aef8176c 100644
--- a/src/KafkaFlow.Serializer/AsyncMessageTypeResolverWrapper.cs
+++ b/src/KafkaFlow/Serializer/AsyncMessageTypeResolverWrapper.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow
+namespace KafkaFlow.Serializer
{
using System;
using System.Threading.Tasks;
diff --git a/src/KafkaFlow.Serializer/ConsumerMiddlewareConfigurationBuilderExtensions.cs b/src/KafkaFlow/Serializer/ConsumerMiddlewareConfigurationBuilderExtensions.cs
similarity index 99%
rename from src/KafkaFlow.Serializer/ConsumerMiddlewareConfigurationBuilderExtensions.cs
rename to src/KafkaFlow/Serializer/ConsumerMiddlewareConfigurationBuilderExtensions.cs
index dc80a5ead..cd225de2a 100644
--- a/src/KafkaFlow.Serializer/ConsumerMiddlewareConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow/Serializer/ConsumerMiddlewareConfigurationBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow
+namespace KafkaFlow.Serializer
{
using System;
using KafkaFlow.Configuration;
diff --git a/src/KafkaFlow.Serializer/DefaultTypeResolver.cs b/src/KafkaFlow/Serializer/DefaultTypeResolver.cs
similarity index 94%
rename from src/KafkaFlow.Serializer/DefaultTypeResolver.cs
rename to src/KafkaFlow/Serializer/DefaultTypeResolver.cs
index 31cba1dff..f1fd4ddb9 100644
--- a/src/KafkaFlow.Serializer/DefaultTypeResolver.cs
+++ b/src/KafkaFlow/Serializer/DefaultTypeResolver.cs
@@ -1,7 +1,7 @@
-namespace KafkaFlow
-{
- using System;
+using System;
+namespace KafkaFlow.Serializer
+{
internal class DefaultTypeResolver : IMessageTypeResolver
{
private const string MessageType = "Message-Type";
diff --git a/src/KafkaFlow.Serializer/IAsyncMessageTypeResolver.cs b/src/KafkaFlow/Serializer/IAsyncMessageTypeResolver.cs
similarity index 96%
rename from src/KafkaFlow.Serializer/IAsyncMessageTypeResolver.cs
rename to src/KafkaFlow/Serializer/IAsyncMessageTypeResolver.cs
index ffe4626bd..60c227f65 100644
--- a/src/KafkaFlow.Serializer/IAsyncMessageTypeResolver.cs
+++ b/src/KafkaFlow/Serializer/IAsyncMessageTypeResolver.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow
+namespace KafkaFlow.Serializer
{
using System;
using System.Threading.Tasks;
diff --git a/src/KafkaFlow.Serializer/IMessageTypeResolver.cs b/src/KafkaFlow/Serializer/IMessageTypeResolver.cs
similarity index 94%
rename from src/KafkaFlow.Serializer/IMessageTypeResolver.cs
rename to src/KafkaFlow/Serializer/IMessageTypeResolver.cs
index 5d6d87551..653188c8e 100644
--- a/src/KafkaFlow.Serializer/IMessageTypeResolver.cs
+++ b/src/KafkaFlow/Serializer/IMessageTypeResolver.cs
@@ -1,7 +1,7 @@
-namespace KafkaFlow
-{
- using System;
+using System;
+namespace KafkaFlow.Serializer
+{
///
/// Used by the serializer middleware to resolve the type when consuming and store it when producing
///
diff --git a/src/KafkaFlow.Serializer/ProducerMiddlewareConfigurationBuilder.cs b/src/KafkaFlow/Serializer/ProducerMiddlewareConfigurationBuilder.cs
similarity index 99%
rename from src/KafkaFlow.Serializer/ProducerMiddlewareConfigurationBuilder.cs
rename to src/KafkaFlow/Serializer/ProducerMiddlewareConfigurationBuilder.cs
index 4c05e5ae1..8080ac4cc 100644
--- a/src/KafkaFlow.Serializer/ProducerMiddlewareConfigurationBuilder.cs
+++ b/src/KafkaFlow/Serializer/ProducerMiddlewareConfigurationBuilder.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow
+namespace KafkaFlow.Serializer
{
using System;
using KafkaFlow.Configuration;
diff --git a/src/KafkaFlow.Serializer/SerializerConsumerMiddleware.cs b/src/KafkaFlow/Serializer/SerializerConsumerMiddleware.cs
similarity index 98%
rename from src/KafkaFlow.Serializer/SerializerConsumerMiddleware.cs
rename to src/KafkaFlow/Serializer/SerializerConsumerMiddleware.cs
index e2bc353b1..06e6222c0 100644
--- a/src/KafkaFlow.Serializer/SerializerConsumerMiddleware.cs
+++ b/src/KafkaFlow/Serializer/SerializerConsumerMiddleware.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow
+namespace KafkaFlow.Serializer
{
using System;
using System.IO;
diff --git a/src/KafkaFlow.Serializer/SerializerProducerMiddleware.cs b/src/KafkaFlow/Serializer/SerializerProducerMiddleware.cs
similarity index 97%
rename from src/KafkaFlow.Serializer/SerializerProducerMiddleware.cs
rename to src/KafkaFlow/Serializer/SerializerProducerMiddleware.cs
index b7c0da7c8..1e1253945 100644
--- a/src/KafkaFlow.Serializer/SerializerProducerMiddleware.cs
+++ b/src/KafkaFlow/Serializer/SerializerProducerMiddleware.cs
@@ -1,7 +1,8 @@
-namespace KafkaFlow
+using Microsoft.IO;
+
+namespace KafkaFlow.Serializer
{
using System.Threading.Tasks;
- using Microsoft.IO;
///
/// Middleware to serialize messages when producing
diff --git a/src/KafkaFlow.Serializer/SingleMessageTypeResolver.cs b/src/KafkaFlow/Serializer/SingleMessageTypeResolver.cs
similarity index 96%
rename from src/KafkaFlow.Serializer/SingleMessageTypeResolver.cs
rename to src/KafkaFlow/Serializer/SingleMessageTypeResolver.cs
index b1d22d054..e489dfb99 100644
--- a/src/KafkaFlow.Serializer/SingleMessageTypeResolver.cs
+++ b/src/KafkaFlow/Serializer/SingleMessageTypeResolver.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow
+namespace KafkaFlow.Serializer
{
using System;