update Akka.NET to 1.5.1

Sharp-Pulsar · Mar 18, 2023 · 229417b · 229417b
1 parent d3386fe
commit 229417b
Show file tree

Hide file tree

Showing 78 changed files with 61 additions and 164 deletions.
diff --git a/Tutorials/Program.cs b/Tutorials/Program.cs
@@ -9,7 +9,6 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using DotNet.Testcontainers.Builders;
 using SharpPulsar;
 using SharpPulsar.Auth.OAuth2;
 using SharpPulsar.Builder;

diff --git a/Tutorials/Tutorials.csproj b/Tutorials/Tutorials.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Spectre.Console" Version="0.46.0" />
-    <PackageReference Include="Testcontainers" Version="2.4.0" />
+    <PackageReference Include="Testcontainers" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/build/Build.cs b/build/Build.cs
@@ -28,7 +28,6 @@
 using System.Threading.Tasks;
 using Nuke.Common.Tools.MSBuild;
 using Nuke.Common.CI.GitHubActions;
-using DotNet.Testcontainers.Builders;
 using Testcontainers.Pulsar;
 //https://github.com/AvaloniaUI/Avalonia/blob/master/nukebuild/Build.cs
 //https://github.com/cfrenzel/Eventfully/blob/master/build/Build.cs
@@ -153,7 +152,7 @@ partial class Build : NukeBuild
                             .EnableNoBuild()
                             .SetBlameCrash(true)
                             .SetBlameHang(true)
-                            .SetBlameHangTimeout("10m")
+                            .SetBlameHangTimeout("30m")
                             .EnableNoRestore()
                             .When(true, _ => _
                                  .SetLoggers("console;verbosity=detailed")

diff --git a/src/SharpPulsar.Admin/SharpPulsar.Admin.csproj b/src/SharpPulsar.Admin/SharpPulsar.Admin.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SharpPulsar.Test/Fixture/PulsarCollection.cs b/src/SharpPulsar.Test/Fixture/PulsarCollection.cs
@@ -2,11 +2,8 @@
 
 namespace SharpPulsar.Test.Fixture
 {
-    using System.Threading.Tasks;
-    using System;
     using SharpPulsar.TestContainer;
     using Xunit;
-    using Xunit.Abstractions;
 
     [CollectionDefinition(nameof(PulsarCollection), DisableParallelization = true)]
     public class PulsarCollection : ICollectionFixture<PulsarFixture>

diff --git a/src/SharpPulsar.Test/MultiTopicsConsumerTest.cs b/src/SharpPulsar.Test/MultiTopicsConsumerTest.cs
@@ -197,7 +197,7 @@ private async Task TestReadMessages(string topic, bool enableBatch)
             await Task.Delay(TimeSpan.FromSeconds(1));
             for (var i = 0; i < numKeys; i++)
             {
-                var message = await reader.ReadNextAsync(TimeSpan.FromMicroseconds(5000)).ConfigureAwait(false);
+                var message = await reader.ReadNextAsync(TimeSpan.FromSeconds(60)).ConfigureAwait(false);
                 if (message != null)
                 {
                     _output.WriteLine($"{message.Key}:{message.MessageId}:{Encoding.UTF8.GetString(message.Data)}");

diff --git a/src/SharpPulsar.Test/OAuthTest.cs b/src/SharpPulsar.Test/OAuthTest.cs
@@ -9,7 +9,6 @@
 using SharpPulsar.Interfaces;
 using SharpPulsar.Schemas;
 using SharpPulsar.Test.Fixture;
-using SharpPulsar.TestContainer;
 using Xunit;
 using Xunit.Abstractions;
 

diff --git a/src/SharpPulsar.Test/PartitionedProducerTest.cs b/src/SharpPulsar.Test/PartitionedProducerTest.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using SharpPulsar.Admin.v2;
 using SharpPulsar.Builder;
-using SharpPulsar.Interfaces;
 using SharpPulsar.Test.Fixture;
 using SharpPulsar.TestContainer;
 using Xunit;

diff --git a/src/SharpPulsar.Test/SharpPulsar.Test.csproj b/src/SharpPulsar.Test/SharpPulsar.Test.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.0" />
-    <Using Include="Akka.Event"/>
+    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.1" />
+    <Using Include="Akka.Event" />
     <PackageReference Include="Castle.Core" Version="5.1.1" />
     <PackageReference Include="FluentAssertions" Version="6.10.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1">

diff --git a/src/SharpPulsar.Test/ZeroQueueSizeTest.cs b/src/SharpPulsar.Test/ZeroQueueSizeTest.cs
@@ -1,6 +1,5 @@
 using Akka.Actor;
 using Akka.Util;
-using App.Metrics.Concurrency;
 using SharpPulsar.Messages.Consumer;
 using System;
 using System.Collections.Generic;
@@ -15,7 +14,6 @@
 using SharpPulsar.Test.Fixture;
 using SharpPulsar.TestContainer;
 using System.Threading.Tasks;
-using System.Text.Json;
 
 /// <summary>
 /// Licensed to the Apache Software Foundation (ASF) under one

diff --git a/src/SharpPulsar.TestContainer/PulsarFixture.cs b/src/SharpPulsar.TestContainer/PulsarFixture.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Configuration;
 using SharpPulsar.Builder;
 using SharpPulsar.Configuration;
-using Xunit;
 
 namespace SharpPulsar.TestContainer
 {

diff --git a/src/SharpPulsar.TestContainer/SharpPulsar.TestContainer.csproj b/src/SharpPulsar.TestContainer/SharpPulsar.TestContainer.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.json" Version="7.0.0" />
     <PackageReference Include="polly" Version="7.2.3" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
-    <PackageReference Include="Testcontainers" Version="2.4.0" />
+    <PackageReference Include="Testcontainers" Version="3.0.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
 

diff --git a/src/SharpPulsar.Trino/SharpPulsar.Trino.csproj b/src/SharpPulsar.Trino/SharpPulsar.Trino.csproj
@@ -14,7 +14,7 @@
     </EmbeddedResource>
   </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Akka" Version="1.5.0" />
+    <PackageReference Include="Akka" Version="1.5.1" />
     <PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" />
     <PackageReference Include="NodaTime" Version="3.1.6" />
     <PackageReference Include="System.Text.Json" Version="7.0.2" />

diff --git a/src/SharpPulsar/Auth/OAuth2/ClientCredentialsFlow.cs b/src/SharpPulsar/Auth/OAuth2/ClientCredentialsFlow.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Text.Json;
 using SharpPulsar.Auth.OAuth2.Protocol;

diff --git a/src/SharpPulsar/Auth/OAuth2/FlowBase.cs b/src/SharpPulsar/Auth/OAuth2/FlowBase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using SharpPulsar.Auth.OAuth2.Protocol;
 using SharpPulsar.Exceptions;
 
@@ -24,14 +23,14 @@
 /// </summary>
 namespace SharpPulsar.Auth.OAuth2
 {
-
 
-	/// <summary>
-	/// An abstract OAuth 2.0 authorization flow.
-	/// </summary>
+
+    /// <summary>
+    /// An abstract OAuth 2.0 authorization flow.
+    /// </summary>
     /// 
 
-	[Serializable]
+    [Serializable]
 	internal abstract class FlowBase : IFlow
 	{
 		public abstract void Close();

diff --git a/src/SharpPulsar/Batch/Api/IBatcherBuilder.cs b/src/SharpPulsar/Batch/Api/IBatcherBuilder.cs
@@ -17,7 +17,6 @@
 /// under the License.
 /// </summary>
 
-using Akka.Event;
 
 namespace SharpPulsar.Batch.Api
 {

diff --git a/src/SharpPulsar/Batch/BatchMessageContainer.cs b/src/SharpPulsar/Batch/BatchMessageContainer.cs
@@ -2,12 +2,10 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.IO;
-using Akka.Event;
 using ProtoBuf;
 using SharpPulsar.Common;
 using SharpPulsar.Exceptions;
 using SharpPulsar.Interfaces;
-using SharpPulsar.Messages;
 using SharpPulsar.Protocol;
 using SharpPulsar.Protocol.Proto;
 using static SharpPulsar.Protocol.Commands;

diff --git a/src/SharpPulsar/Batch/BatchMessageKeyBasedContainer.cs b/src/SharpPulsar/Batch/BatchMessageKeyBasedContainer.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Akka.Event;
 using DotNetty.Common.Utilities;
 using ProtoBuf;
 using SharpPulsar.Common;

diff --git a/src/SharpPulsar/Batch/DefaultBatcherBuilder.cs b/src/SharpPulsar/Batch/DefaultBatcherBuilder.cs
@@ -19,7 +19,6 @@
 /// under the License.
 /// </summary>
 
-using Akka.Event;
 using SharpPulsar.Batch.Api;
 
 namespace SharpPulsar.Batch

diff --git a/src/SharpPulsar/Batch/KeyBasedBatcherBuilder.cs b/src/SharpPulsar/Batch/KeyBasedBatcherBuilder.cs
@@ -1,5 +1,4 @@
 using System;
-using Akka.Event;
 using SharpPulsar.Batch.Api;
 
 /// <summary>

diff --git a/src/SharpPulsar/Batch/ObjectCopier.cs b/src/SharpPulsar/Batch/ObjectCopier.cs
@@ -1,9 +1,4 @@
-using System;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-
-namespace SharpPulsar.Batch
+namespace SharpPulsar.Batch
 {
     /// <summary>
     /// Reference Article http://www.codeproject.com/KB/tips/SerializedObjectCloner.aspx

diff --git a/src/SharpPulsar/BinaryProtoLookupService.cs b/src/SharpPulsar/BinaryProtoLookupService.cs
@@ -1,7 +1,5 @@
 using Akka.Actor;
-using Akka.Event;
 using SharpPulsar.Common.Naming;
-using SharpPulsar.Common.Partition;
 using SharpPulsar.Messages;
 using SharpPulsar.Messages.Requests;
 using SharpPulsar.Model;
@@ -21,7 +19,6 @@
 using SharpPulsar.ServiceName;
 using Mode = SharpPulsar.Protocol.Proto.CommandGetTopicsOfNamespace.Mode;
 using PartitionedTopicMetadata = SharpPulsar.Common.Partition.PartitionedTopicMetadata;
-using ZstdNet;
 
 /// <summary>
 /// Licensed to the Apache Software Foundation (ASF) under one

diff --git a/src/SharpPulsar/Builder/ReaderConfigBuilder.cs b/src/SharpPulsar/Builder/ReaderConfigBuilder.cs
@@ -2,15 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using Akka.Util.Internal;
-using DotNetty.Common.Utilities;
-using Org.BouncyCastle.Utilities;
 using SharpPulsar.Batch;
 using SharpPulsar.Common;
 using SharpPulsar.Common.Compression;
 using SharpPulsar.Configuration;
 using SharpPulsar.Interfaces;
 using SharpPulsar.Precondition;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 using Range = SharpPulsar.Common.Range;
 
 /// <summary>

diff --git a/src/SharpPulsar/ClientCnx.cs b/src/SharpPulsar/ClientCnx.cs
@@ -1,5 +1,4 @@
 using Akka.Actor;
-using Akka.Event;
 using SharpPulsar.Configuration;
 using SharpPulsar.Interfaces;
 using SharpPulsar.Model;
@@ -21,7 +20,6 @@
 using System.Net;
 using SharpPulsar.SocketImpl;
 using System.Threading.Tasks;
-using Org.BouncyCastle.Asn1.Ocsp;
 
 namespace SharpPulsar
 {

diff --git a/src/SharpPulsar/Configuration/ObjectMapper.cs b/src/SharpPulsar/Configuration/ObjectMapper.cs
@@ -1,7 +1,5 @@
 using System;
 using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Text.Json;
 using Newtonsoft.Json.Linq;
 

diff --git a/src/SharpPulsar/Configuration/ReaderConfigurationData.cs b/src/SharpPulsar/Configuration/ReaderConfigurationData.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using SharpPulsar.Common.Compression;
 using SharpPulsar.Interfaces;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 /// <summary>
 /// Licensed to the Apache Software Foundation (ASF) under one

diff --git a/src/SharpPulsar/ConnectionHandler.cs b/src/SharpPulsar/ConnectionHandler.cs
@@ -1,5 +1,4 @@
 using Akka.Actor;
-using Akka.Event;
 using SharpPulsar.Exceptions;
 using System;
 using System.Threading.Tasks;

diff --git a/src/SharpPulsar/ConnectionPool.cs b/src/SharpPulsar/ConnectionPool.cs
@@ -1,5 +1,4 @@
 using Akka.Actor;
-using Akka.Event;
 using Akka.Util.Internal;
 using SharpPulsar.Configuration;
 using SharpPulsar.Extension;
@@ -15,7 +14,7 @@
 
 namespace SharpPulsar
 {
-	public class ConnectionPool : ReceiveActor, IWithUnboundedStash
+    public class ConnectionPool : ReceiveActor, IWithUnboundedStash
 	{
 		private readonly Dictionary<EndPoint, Dictionary<int, ConnectionOpened>> _pool;
 

diff --git a/src/SharpPulsar/ConsumerActor.cs b/src/SharpPulsar/ConsumerActor.cs
@@ -1,6 +1,5 @@
 using Akka.Actor;
 using Akka.Util;
-using OpenTelemetry;
 using ProtoBuf;
 using SharpPulsar.Auth;
 using SharpPulsar.Batch;
@@ -18,7 +17,6 @@
 using SharpPulsar.Messages.Requests;
 using SharpPulsar.Messages.Transaction;
 using SharpPulsar.Precondition;
-using SharpPulsar.Protocol;
 using SharpPulsar.Protocol.Proto;
 using SharpPulsar.Shared;
 using SharpPulsar.Stats.Consumer;

diff --git a/src/SharpPulsar/ConsumerActorBase.cs b/src/SharpPulsar/ConsumerActorBase.cs
@@ -1,11 +1,9 @@
 using Akka.Actor;
 using Akka.Dispatch;
-using Akka.Event;
 using Akka.Util;
 using Akka.Util.Internal;
 using SharpPulsar.Batch.Api;
 using SharpPulsar.Configuration;
-using SharpPulsar.EventSource.Messages;
 using SharpPulsar.Exceptions;
 using SharpPulsar.Extension;
 using SharpPulsar.Interfaces;
@@ -17,8 +15,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
@@ -924,15 +920,15 @@ private void Push(IMessage<T> o)
             {
                 //IncomingMessages.Post(o);
                 Context.Parent.Tell(new ReceivedMessage<T>(o));
-                _log.Info($"Pushed message with sequnceid {o.SequenceId} (topic:{Topic}) to consumer parent");
+                _log.Info($"Pushed message with SequenceId {o.SequenceId} (topic:{Topic}) to consumer parent");
 
             }
             else
             {
                 if (IncomingMessages.Post(o))
-                    _log.Info($"Added message with sequnceid {o.SequenceId} (key:{o.Key}) to IncomingMessages. Message Count: {IncomingMessages.Count}");
+                    _log.Info($"Added message with SequenceId {o.SequenceId} (key:{o.Key}) to IncomingMessages. Message Count: {IncomingMessages.Count}");
                 else
-                    _log.Info($"Failed to add message with sequnceid {o.SequenceId} to IncomingMessages");
+                    _log.Info($"Failed to add message with SequenceId {o.SequenceId} to IncomingMessages");
             }
         }
     }

diff --git a/src/SharpPulsar/ConsumerInterceptors.cs b/src/SharpPulsar/ConsumerInterceptors.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Akka.Actor;
-using Akka.Event;
 
 using SharpPulsar.Interfaces;
 
@@ -25,11 +24,11 @@
 /// </summary>
 namespace SharpPulsar
 {
-	/// <summary>
-	/// A container that hold the list <seealso cref="IConsumerInterceptor{T}"/> and wraps calls to the chain
-	/// of custom interceptors.
-	/// </summary>
-	public class ConsumerInterceptors<T> : IDisposable
+    /// <summary>
+    /// A container that hold the list <seealso cref="IConsumerInterceptor{T}"/> and wraps calls to the chain
+    /// of custom interceptors.
+    /// </summary>
+    public class ConsumerInterceptors<T> : IDisposable
     {
         private readonly ILoggingAdapter _log;
 

diff --git a/src/SharpPulsar/Crypto/MessageCrypto.cs b/src/SharpPulsar/Crypto/MessageCrypto.cs
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
-using Akka.Event;
 using Org.BouncyCastle.Security;
 
 using SharpPulsar.Cache;

diff --git a/src/SharpPulsar/DefaultImplementation.cs b/src/SharpPulsar/DefaultImplementation.cs
@@ -9,7 +9,6 @@
 using NodaTime;
 using SharpPulsar.Shared;
 using SharpPulsar.Schemas.Generic;
-using Akka.Event;
 using SharpPulsar.Interfaces.Schema;
 
 /// <summary>