refactor!: merge batch consume project

Farfetch · Sep 19, 2023 · 45bdb5b · 45bdb5b
1 parent dc06996
commit 45bdb5b
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 33 deletions.
diff --git a/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj b/samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj
@@ -22,7 +22,6 @@
 
     <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" />

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,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/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.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
@@ -29,7 +29,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\KafkaFlow.Admin\KafkaFlow.Admin.csproj" />
-        <ProjectReference Include="..\KafkaFlow.BatchConsume\KafkaFlow.BatchConsume.csproj" />
         <ProjectReference Include="..\KafkaFlow.LogHandler.Microsoft\KafkaFlow.LogHandler.Microsoft.csproj" />
         <ProjectReference Include="..\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
         <ProjectReference Include="..\KafkaFlow.Serializer.NewtonsoftJson\KafkaFlow.Serializer.NewtonsoftJson.csproj" />

diff --git a/src/KafkaFlow.sln b/src/KafkaFlow.sln
@@ -55,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}"
@@ -161,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
@@ -249,7 +243,6 @@ Global
 		{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}
-		{C891D0DB-BE19-4D20-9E2F-61D413210F8D} = {068CB250-2804-4C7E-9490-17F432B9CE21}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6AE955B5-16B0-41CF-9F12-66D15B3DD1AB}

diff --git a/src/KafkaFlow/KafkaFlow.csproj b/src/KafkaFlow/KafkaFlow.csproj
@@ -8,6 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="Confluent.Kafka" Version="2.1.1" />
+        <PackageReference Include="System.Memory" Version="4.5.5" />
         <PackageReference Include="System.Threading.Channels" Version="4.7.1" />
     </ItemGroup>
 

diff --git a/...ow.BatchConsume/BatchConsumeExtensions.cs → ...es/BatchConsume/BatchConsumeExtensions.cs b/...ow.BatchConsume/BatchConsumeExtensions.cs → ...es/BatchConsume/BatchConsumeExtensions.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow.BatchConsume
+namespace KafkaFlow.Middlewares.BatchConsume
 {
     using System;
     using System.Collections.Generic;

diff --git a/...atchConsume/BatchConsumeMessageContext.cs → ...atchConsume/BatchConsumeMessageContext.cs b/...atchConsume/BatchConsumeMessageContext.cs → ...atchConsume/BatchConsumeMessageContext.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow.BatchConsume
+namespace KafkaFlow.Middlewares.BatchConsume
 {
     using System;
     using System.Collections.Generic;

diff --git a/...ow.BatchConsume/BatchConsumeMiddleware.cs → ...es/BatchConsume/BatchConsumeMiddleware.cs b/...ow.BatchConsume/BatchConsumeMiddleware.cs → ...es/BatchConsume/BatchConsumeMiddleware.cs
@@ -1,4 +1,4 @@
-namespace KafkaFlow.BatchConsume
+namespace KafkaFlow.Middlewares.BatchConsume
 {
     using System;
     using System.Collections.Generic;