Skip to content

Commit

Permalink
build(deps): bump kafkaflow version to "3.0.0" (#144)
Browse files Browse the repository at this point in the history
* build(deps): bump kafkaflow version to "3.0.0"

* docs: update quickstart

* refactor: use try register instead of doing it manually

* chore: replace system.data.sqlclient by microsoft.data.sqlclient
  • Loading branch information
Gui Ferreira committed Dec 15, 2023
1 parent 42096fa commit 9ee2ed2
Show file tree
Hide file tree
Showing 34 changed files with 95 additions and 124 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
# User-specific stuff
.idea


# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
Expand Down Expand Up @@ -429,4 +430,7 @@ healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/

# macOS
.DS_Store

# End of https://www.gitignore.io/api/rider,linux,windows,visualstudio
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace KafkaFlow.Retry.Common.Sample.Helpers
{
using System.Collections.Generic;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Reflection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
using KafkaFlow;
using KafkaFlow.Retry.Sample.Exceptions;
using KafkaFlow.Retry.Sample.Messages;
using KafkaFlow.TypedHandler;


internal class RetryDurableTestHandler : IMessageHandler<RetryDurableTestMessage>
{
public Task Handle(IMessageContext context, RetryDurableTestMessage message)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using KafkaFlow;
using KafkaFlow.Retry.Sample.Exceptions;
using KafkaFlow.Retry.Sample.Messages;
using KafkaFlow.TypedHandler;


internal class RetryForeverTestHandler : IMessageHandler<RetryForeverTestMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using KafkaFlow;
using KafkaFlow.Retry.Sample.Exceptions;
using KafkaFlow.Retry.Sample.Messages;
using KafkaFlow.TypedHandler;


internal class RetrySimpleTestHandler : IMessageHandler<RetrySimpleTestMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
using KafkaFlow.Retry.Sample.Messages;
using KafkaFlow.Retry.SqlServer;
using KafkaFlow.Serializer;
using KafkaFlow.TypedHandler;

internal static class KafkaClusterConfigurationBuilderHelper
{
internal static IClusterConfigurationBuilder SetupRetryDurableMongoDb(
Expand Down Expand Up @@ -41,7 +39,7 @@ internal static class KafkaClusterConfigurationBuilderHelper
.WithAutoOffsetReset(AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSerializer<ProtobufNetSerializer>()
.AddDeserializer<ProtobufNetDeserializer>()
.RetryDurable(
configure => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -129,7 +127,7 @@ internal static class KafkaClusterConfigurationBuilderHelper
.WithAutoOffsetReset(AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSerializer<ProtobufNetSerializer>()
.AddDeserializer<ProtobufNetDeserializer>()
.RetryDurable(
configure => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -209,7 +207,7 @@ internal static IClusterConfigurationBuilder SetupRetryForever(this IClusterConf
.WithAutoOffsetReset(AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSerializer<ProtobufNetSerializer>()
.AddDeserializer<ProtobufNetDeserializer>()
.RetryForever(
(configure) => configure
.Handle<RetryForeverTestException>()
Expand Down Expand Up @@ -251,7 +249,7 @@ internal static IClusterConfigurationBuilder SetupRetrySimple(this IClusterConfi
.WithAutoOffsetReset(AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSerializer<ProtobufNetSerializer>()
.AddDeserializer<ProtobufNetDeserializer>()
.RetrySimple(
(configure) => configure
.Handle<RetrySimpleTestException>()
Expand Down
15 changes: 6 additions & 9 deletions samples/KafkaFlow.Retry.Sample/KafkaFlow.Retry.Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="KafkaFlow" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Admin" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Compressor" Version="2.2.15" />
<PackageReference Include="KafkaFlow.LogHandler.Console" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Serializer" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="2.2.15" />
<PackageReference Include="KafkaFlow.TypedHandler" Version="2.2.15" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
<PackageReference Include="KafkaFlow" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Admin" Version="3.0.0" />
<PackageReference Include="KafkaFlow.LogHandler.Console" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Threading.Tasks;
using global::SchemaRegistry;
using KafkaFlow.Retry.SchemaRegistry.Sample.Exceptions;
using TypedHandler;

public class AvroMessageTestHandler : IMessageHandler<AvroLogMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using KafkaFlow.Retry.SchemaRegistry.Sample.ContractResolvers;
using KafkaFlow.Retry.SchemaRegistry.Sample.Exceptions;
using KafkaFlow.Retry.SchemaRegistry.Sample.Handlers;
using KafkaFlow.TypedHandler;
using Newtonsoft.Json;

internal static class KafkaClusterConfigurationBuilderHelper
Expand Down Expand Up @@ -47,7 +46,7 @@ internal static class KafkaClusterConfigurationBuilderHelper
.WithAutoOffsetReset(AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSchemaRegistryAvroSerializer()
.AddSchemaRegistryAvroDeserializer()
.RetryDurable(
configure => configure
.Handle<RetryDurableTestException>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="KafkaFlow" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Admin" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Compressor" Version="2.2.15" />
<PackageReference Include="KafkaFlow.LogHandler.Console" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Serializer" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro" Version="2.2.15" />
<PackageReference Include="KafkaFlow.TypedHandler" Version="2.2.15" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
<PackageReference Include="KafkaFlow" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Admin" Version="3.0.0" />
<PackageReference Include="KafkaFlow.LogHandler.Console" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Serializer.ProtobufNet" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Serializer.SchemaRegistry.ConfluentAvro" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaFlow.Retry.API/KafkaFlow.Retry.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using KafkaFlow.Retry.Postgres;
using KafkaFlow.Retry.SqlServer;
using KafkaFlow.Serializer;
using KafkaFlow.TypedHandler;
using Newtonsoft.Json;

internal static class BootstrapperKafka
Expand Down Expand Up @@ -71,7 +70,7 @@ internal static IClusterConfigurationBuilder CreatAllTestTopicsIfNotExist(this I
.WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
.AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
.RetryDurable(
(configure) => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -147,7 +146,7 @@ internal static IClusterConfigurationBuilder CreatAllTestTopicsIfNotExist(this I
.WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
.AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
.RetryDurable(
(configure) => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -221,7 +220,7 @@ internal static IClusterConfigurationBuilder CreatAllTestTopicsIfNotExist(this I
.WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
.AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
.RetryDurable(
(configure) => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -297,7 +296,7 @@ internal static IClusterConfigurationBuilder CreatAllTestTopicsIfNotExist(this I
.WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
.AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
.RetryDurable(
(configure) => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -373,7 +372,7 @@ internal static IClusterConfigurationBuilder CreatAllTestTopicsIfNotExist(this I
.WithAutoOffsetReset((KafkaFlow.AutoOffsetReset)AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
.AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
.RetryDurable(
(configure) => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -448,7 +447,7 @@ internal static IClusterConfigurationBuilder CreatAllTestTopicsIfNotExist(this I
.WithAutoOffsetReset((KafkaFlow.AutoOffsetReset)AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetryDurableTestMessage))
.AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetryDurableTestMessage))
.RetryDurable(
(configure) => configure
.Handle<RetryDurableTestException>()
Expand Down Expand Up @@ -519,7 +518,7 @@ internal static IClusterConfigurationBuilder SetupRetryForeverCluster(this IClus
.WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<ProtobufNetSerializer>(typeof(RetryForeverTestMessage))
.AddSingleTypeDeserializer<ProtobufNetDeserializer>(typeof(RetryForeverTestMessage))
.RetryForever(
(configure) => configure
.Handle<RetryForeverTestException>()
Expand Down Expand Up @@ -551,7 +550,7 @@ internal static IClusterConfigurationBuilder SetupRetrySimpleCluster(this IClust
.WithAutoOffsetReset(KafkaFlow.AutoOffsetReset.Latest)
.AddMiddlewares(
middlewares => middlewares
.AddSingleTypeSerializer<NewtonsoftJsonSerializer>(typeof(RetrySimpleTestMessage))
.AddSingleTypeDeserializer<NewtonsoftJsonDeserializer>(typeof(RetrySimpleTestMessage))
.RetrySimple(
(configure) => configure
.Handle<RetrySimpleTestException>()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace KafkaFlow.Retry.IntegrationTests.Core.Bootstrappers
{
using System.Collections.Generic;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Reflection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using System.Threading.Tasks;
using Dawn;
using global::Microsoft.Extensions.Configuration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using KafkaFlow.Retry.IntegrationTests.Core.Exceptions;
using KafkaFlow.Retry.IntegrationTests.Core.Messages;
using KafkaFlow.Retry.IntegrationTests.Core.Storages;
using KafkaFlow.TypedHandler;

internal class RetryDurableTestMessageHandler : IMessageHandler<RetryDurableTestMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using KafkaFlow.Retry.IntegrationTests.Core.Exceptions;
using KafkaFlow.Retry.IntegrationTests.Core.Messages;
using KafkaFlow.Retry.IntegrationTests.Core.Storages;
using KafkaFlow.TypedHandler;

internal class RetryForeverTestMessageHandler : IMessageHandler<RetryForeverTestMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using KafkaFlow.Retry.IntegrationTests.Core.Exceptions;
using KafkaFlow.Retry.IntegrationTests.Core.Messages;
using KafkaFlow.Retry.IntegrationTests.Core.Storages;
using KafkaFlow.TypedHandler;

internal class RetrySimpleTestMessageHandler : IMessageHandler<RetrySimpleTestMessage>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,28 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoFixture" Version="4.17.0" />
<PackageReference Include="FluentAssertions" Version="6.9.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="AutoFixture" Version="4.18.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="OpenCover" Version="4.7.1221" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="KafkaFlow" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Admin" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Compressor" Version="2.2.15" />
<PackageReference Include="KafkaFlow.LogHandler.Console" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Serializer" Version="2.2.15" />
<PackageReference Include="KafkaFlow.Serializer.NewtonsoftJson" Version="2.2.15" />
<PackageReference Include="KafkaFlow.TypedHandler" Version="2.2.15" />
<PackageReference Include="KafkaFlow" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Admin" Version="3.0.0" />
<PackageReference Include="KafkaFlow.LogHandler.Console" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Microsoft.DependencyInjection" Version="3.0.0" />
<PackageReference Include="KafkaFlow.Serializer.NewtonsoftJson" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaFlow.Retry.IntegrationTests/conf/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"RetryQueueItemCollectionName": "RetryQueueItems"
},
"SqlServerRepository": {
"ConnectionString": "Server=localhost; User ID=SA; Password=SqlSever123123; Pooling=true; Trusted_Connection=true; Integrated Security=true; Min Pool Size=1; Max Pool Size=100; MultipleActiveResultSets=true; Application Name=KafkaFlow Retry Tests;",
"ConnectionString": "Server=localhost; User ID=SA; Password=SqlSever123123; Pooling=true; Trusted_Connection=true; Integrated Security=true; Min Pool Size=1; Max Pool Size=100; MultipleActiveResultSets=true; Application Name=KafkaFlow Retry Tests; Encrypt=false;",
"DatabaseName": "kafka_flow_retry_durable_test",
"Schema": "dbo"
},
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaFlow.Retry.MongoDb/KafkaFlow.Retry.MongoDb.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.12.4" />
<PackageReference Include="MongoDB.Driver" Version="2.22.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 9ee2ed2

Please sign in to comment.