add support for .net 9

stormaref · Jan 2, 2025 · 0849571 · 0849571
1 parent 9ca5cac
commit 0849571
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 47 deletions.
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '9.0.x'
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/KafkaStorm.Test/KafkaStorm.Test.csproj b/KafkaStorm.Test/KafkaStorm.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -10,13 +10,13 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-        <PackageReference Include="Moq" Version="4.20.70" />
-        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="Moq" Version="4.20.72" />
+        <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.1">
+        <PackageReference Include="coverlet.collector" Version="6.0.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/KafkaStorm.Test/TestBase.cs b/KafkaStorm.Test/TestBase.cs
@@ -32,7 +32,7 @@ private IServiceCollection ConfigureServices()
             {
                 prf.ConfigProducer(new ProducerConfig {BootstrapServers = "localhost:29092",});
 
-                prf.InMemoryQueue();
+                ProducerRegistrationFactory.InMemoryQueue();
 
                 prf.SetQueueLimit(65536);
             });

diff --git a/KafkaStorm/Exceptions/ConsumerNotConfiguredException.cs b/KafkaStorm/Exceptions/ConsumerNotConfiguredException.cs
@@ -2,9 +2,4 @@
 
 namespace KafkaStorm.Exceptions;
 
-public class ConsumerNotConfiguredException : Exception
-{
-    public ConsumerNotConfiguredException() : base("Consumer is not configured")
-    {
-    }
-}
+public class ConsumerNotConfiguredException() : Exception("Consumer is not configured");
diff --git a/KafkaStorm/Exceptions/DuplicateConsumerException.cs b/KafkaStorm/Exceptions/DuplicateConsumerException.cs
@@ -2,9 +2,4 @@
 
 namespace KafkaStorm.Exceptions;
 
-public class DuplicateConsumerException : Exception
-{
-    public DuplicateConsumerException(string name) : base($"Consumer added more than once ({name})")
-    {
-    }
-}
+public class DuplicateConsumerException(string name) : Exception($"Consumer added more than once ({name})");
diff --git a/KafkaStorm/Exceptions/MessageNullException.cs b/KafkaStorm/Exceptions/MessageNullException.cs
@@ -2,9 +2,5 @@
 
 namespace KafkaStorm.Exceptions;
 
-public class MessageNullException<TMessage> : ArgumentNullException
-{
-    public MessageNullException() : base("Message", $"Message of type {typeof(TMessage)} was null")
-    {
-    }
-}
+public class MessageNullException<TMessage>()
+    : ArgumentNullException("Message", $"Message of type {typeof(TMessage)} was null");
diff --git a/KafkaStorm/Exceptions/ProducerConfigNullException.cs b/KafkaStorm/Exceptions/ProducerConfigNullException.cs
@@ -2,9 +2,4 @@
 
 namespace KafkaStorm.Exceptions;
 
-public class ProducerConfigNullException : Exception
-{
-    public ProducerConfigNullException() : base("Producer Config is null")
-    {
-    }
-}
+public class ProducerConfigNullException() : Exception("Producer Config is null");
diff --git a/KafkaStorm/KafkaStorm.csproj b/KafkaStorm/KafkaStorm.csproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <Authors>ArefAzizian</Authors>
-        <Version>8.1.0</Version>
+        <Version>9.0.0</Version>
         <PackageId>KafKaStorm</PackageId>
         <LangVersion>latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -22,9 +22,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-        <PackageReference Include="System.Text.Json" Version="8.0.2" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Confluent.Kafka" Version="2.6.1" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     </ItemGroup>
 </Project>
diff --git a/KafkaStorm/Registration/Extensions.cs b/KafkaStorm/Registration/Extensions.cs
@@ -32,7 +32,7 @@ public static void AddConsumersFromAssembly(this ConsumerRegistrationFactory crf
         var method = typeof(ConsumerRegistrationFactory).GetMethod("AddConsumer");
         var methodInfos = (from messageType in messageTypes
                 let consumerType = GetConsumerType(assembly, messageType)
-                where consumerType != default
+                where consumerType != null
                 select method!.MakeGenericMethod(consumerType, messageType))
             .ToList();
         foreach (var generic in methodInfos)

diff --git a/KafkaStorm/Registration/ProducerRegistrationFactory.cs b/KafkaStorm/Registration/ProducerRegistrationFactory.cs
@@ -38,7 +38,7 @@ public void SetQueueLimit(uint count)
         MaximumQueueMessageCount = count;
     }
 
-    public void InMemoryQueue(bool activate = true)
+    public static void InMemoryQueue(bool activate = true)
     {
         UseInMemoryQueue = activate;
     }

diff --git a/KafkaStorm/Services/ConsumerHostedService.cs b/KafkaStorm/Services/ConsumerHostedService.cs
@@ -21,10 +21,11 @@ public ConsumerHostedService(IConsumer<TMessage> myConsumer)
         _myConsumer = myConsumer;
 
         var fullName = _myConsumer.GetType().FullName;
+        ArgumentException.ThrowIfNullOrEmpty(fullName);
 
         var succeeded =
             ConsumerRegistrationFactory.ConsumerConfigs.TryGetValue(fullName, out var config) &&
-            ConsumerRegistrationFactory.ConsumerTopics.TryGetValue(fullName, out _topicName);
+            ConsumerRegistrationFactory.ConsumerTopics.TryGetValue(fullName, out _topicName!);
 
         _consumer = new ConsumerBuilder<Ignore, string>(succeeded
             ? config
@@ -53,7 +54,7 @@ private void Handle(CancellationToken cancellationToken)
         var result = _consumer.Consume(ConsumerRegistrationFactory.ConsumingPeriod);
         if (result == null)
             return;
-        
+
         var message = JsonSerializer.Deserialize<TMessage>(result.Message.Value) ??
                       throw new MessageNullException<TMessage>();
         _myConsumer.Handle(message, cancellationToken);

diff --git a/KafkaStorm/Services/MessageStore.cs b/KafkaStorm/Services/MessageStore.cs
@@ -18,7 +18,7 @@ public MessageStore()
 
     public (Guid id, StoredMessage? message) GetLastMessage()
     {
-        if (!_dictionary.Any()) return (Guid.Empty, default);
+        if (_dictionary.IsEmpty) return (Guid.Empty, null);
 
         var (key, value) = _dictionary.Last();
         return (key, value);

diff --git a/KafkaStorm/Services/Producer.cs b/KafkaStorm/Services/Producer.cs
@@ -66,12 +66,9 @@ public async Task ProduceNowAsync<TMessage>(TMessage message, string? topicName
 
     public async Task ProduceNowAsync(StoredMessage message)
     {
-        if (message is null)
-        {
-            throw new ArgumentNullException(nameof(message));
-        }
+        ArgumentNullException.ThrowIfNull(message);
 
-        var dr = await _producer.ProduceAsync(message.Topic, new Message<Null, string>
+        await _producer.ProduceAsync(message.Topic, new Message<Null, string>
         {
             Value = JsonSerializer.Serialize(message.Body)
         });

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Simple .net client for Kafka based on **Confluent.Kafka**
 
 ### Using package manager:
 ```
-Install-Package KafkaStorm -Version 8.1.0
+Install-Package KafkaStorm -Version 9.0.0
 ```
 
 # Usage/Examples