Skip to content

Commit

Permalink
refactor!: merge projects into core framework
Browse files Browse the repository at this point in the history
  • Loading branch information
jose-sousa-8 committed Sep 19, 2023
1 parent 4e37f85 commit 598b1d8
Show file tree
Hide file tree
Showing 86 changed files with 87 additions and 199 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using KafkaFlow.BatchConsume;
using KafkaFlow.Middlewares.BatchConsume;

namespace KafkaFlow.Sample.BatchOperations;

Expand Down
2 changes: 1 addition & 1 deletion samples/KafkaFlow.Sample.BatchOperations/Program.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

namespace KafkaFlow.Sample.PauseConsumerOnError;

Expand Down
1 change: 0 additions & 1 deletion samples/KafkaFlow.Sample.PauseConsumerOnError/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using KafkaFlow.Producers;
using KafkaFlow.Sample.PauseConsumerOnError;
using KafkaFlow.Serializer;
using KafkaFlow.TypedHandler;
using Microsoft.Extensions.DependencyInjection;

var services = new ServiceCollection();
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System;
using System.Threading.Tasks;
using global::SchemaRegistry;
using TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

public class AvroMessageHandler2 : IMessageHandler<AvroLogMessage2>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System;
using System.Threading.Tasks;
using global::SchemaRegistry;
using TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

public class JsonMessageHandler : IMessageHandler<JsonLogMessage>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

using System;
using System.Threading.Tasks;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;
using SchemaRegistry;

namespace KafkaFlow.Sample.SchemaRegistry.Handlers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion samples/KafkaFlow.Sample.SchemaRegistry/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using KafkaFlow;
using KafkaFlow.Producers;
using KafkaFlow.Sample.SchemaRegistry.Handlers;
using KafkaFlow.TypedHandler;
using Microsoft.Extensions.DependencyInjection;
using SchemaRegistry;

Expand Down
2 changes: 0 additions & 2 deletions samples/KafkaFlow.Sample/KafkaFlow.Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/KafkaFlow.Sample/PrintConsoleHandler.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Threading.Tasks;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

namespace KafkaFlow.Sample;

Expand Down
1 change: 0 additions & 1 deletion samples/KafkaFlow.Sample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using KafkaFlow.Producers;
using KafkaFlow.Sample;
using KafkaFlow.Serializer;
using KafkaFlow.TypedHandler;
using Microsoft.Extensions.DependencyInjection;

var services = new ServiceCollection();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using KafkaFlow.Admin.Handlers;
using KafkaFlow.Configuration;
using KafkaFlow.Serializer;
using KafkaFlow.TypedHandler;

/// <summary>
/// No needed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaFlow.Admin/Handlers/PauseConsumerByNameHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaFlow.Admin/Handlers/ResetConsumerOffsetHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaFlow.Admin/Handlers/StartConsumerByNameHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaFlow.Admin/Handlers/StopConsumerByNameHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
1 change: 0 additions & 1 deletion src/KafkaFlow.Admin/KafkaFlow.Admin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions src/KafkaFlow.BatchConsume/AssemblyInfo.cs

This file was deleted.

14 changes: 0 additions & 14 deletions src/KafkaFlow.BatchConsume/KafkaFlow.BatchConsume.csproj

This file was deleted.

13 changes: 0 additions & 13 deletions src/KafkaFlow.Compressor/KafkaFlow.Compressor.csproj

This file was deleted.

1 change: 0 additions & 1 deletion src/KafkaFlow.IntegrationTests/Core/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ namespace KafkaFlow.IntegrationTests.Core
using KafkaFlow.IntegrationTests.Core.Producers;
using KafkaFlow.Serializer;
using KafkaFlow.Serializer.SchemaRegistry;
using KafkaFlow.TypedHandler;
using AutoOffsetReset = KafkaFlow.AutoOffsetReset;

internal static class Bootstrapper
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace KafkaFlow.IntegrationTests.Core.Handlers
{
using System.Threading.Tasks;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;
using MessageTypes;

internal class AvroMessageHandler : IMessageHandler<LogMessages2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace KafkaFlow.IntegrationTests.Core.Handlers
{
using System.Threading.Tasks;
using KafkaFlow.IntegrationTests.Core.Messages;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

internal class ConfluentJsonMessageHandler : IMessageHandler<TestMessage3>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace KafkaFlow.IntegrationTests.Core.Handlers
{
using System.Threading.Tasks;
using KafkaFlow.IntegrationTests.Core.Messages;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

internal class ConfluentProtobufMessageHandler : IMessageHandler<TestProtoMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace KafkaFlow.IntegrationTests.Core.Handlers
{
using System.Threading.Tasks;
using KafkaFlow.IntegrationTests.Core.Messages;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

internal class MessageHandler : IMessageHandler<TestMessage1>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace KafkaFlow.IntegrationTests.Core.Handlers
{
using System.Threading.Tasks;
using KafkaFlow.IntegrationTests.Core.Messages;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

internal class MessageHandler1 : IMessageHandler<TestMessage1>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace KafkaFlow.IntegrationTests.Core.Handlers
using System;
using System.Threading.Tasks;
using KafkaFlow.IntegrationTests.Core.Messages;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

internal class MessageHandler2 : IMessageHandler<TestMessage2>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace KafkaFlow.IntegrationTests.Core.Handlers
{
using System.Threading.Tasks;
using KafkaFlow.IntegrationTests.Core.Messages;
using KafkaFlow.TypedHandler;
using KafkaFlow.Middlewares.TypedHandler;

internal class PauseResumeHandler : IMessageHandler<PauseResumeMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@
<ItemGroup>
<ProjectReference Include="..\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
<ProjectReference Include="..\KafkaFlow.Compressor.Gzip\KafkaFlow.Compressor.Gzip.csproj" />
<ProjectReference Include="..\KafkaFlow.Compressor\KafkaFlow.Compressor.csproj" />
<ProjectReference Include="..\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
<ProjectReference Include="..\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
<ProjectReference Include="..\KafkaFlow.Serializer.ProtobufNet\KafkaFlow.Serializer.ProtobufNet.csproj" />
<ProjectReference Include="..\KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro\KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro.csproj" />
<ProjectReference Include="..\KafkaFlow.Serializer.SchemaRegistry.ConfluentJson\KafkaFlow.Serializer.SchemaRegistry.ConfluentJson.csproj" />
<ProjectReference Include="..\KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf\KafkaFlow.Serializer.SchemaRegistry.ConfluentProtobuf.csproj" />
<ProjectReference Include="..\KafkaFlow.Serializer\KafkaFlow.Serializer.csproj" />
<ProjectReference Include="..\KafkaFlow.TypedHandler\KafkaFlow.TypedHandler.csproj" />
<ProjectReference Include="..\KafkaFlow\KafkaFlow.csproj" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 598b1d8

Please sign in to comment.