This is an automated email from the ASF dual-hosted git repository.

blankensteiner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-dotpulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new afbd4dc  Cleaned up the entire project using profile "DotPulsar: Full 
Cleanup" (#133)
afbd4dc is described below

commit afbd4dcc4345be2213dc02b977cc6e1b481fdd73
Author: entvex <[email protected]>
AuthorDate: Thu Jan 19 09:54:53 2023 +0100

    Cleaned up the entire project using profile "DotPulsar: Full Cleanup" (#133)
    
    * Cleaned up the entire project using profile "DotPulsar: Full Cleanup"
    
    * Merge lines fixes
    
    Co-authored-by: David Jensen <[email protected]>
---
 src/DotPulsar/ConsumerStateChanged.cs              |  2 +-
 src/DotPulsar/Extensions/ProducerExtensions.cs     |  4 ++--
 src/DotPulsar/Extensions/PulsarClientExtensions.cs |  4 ++--
 src/DotPulsar/Extensions/SendChannelExtensions.cs  |  3 +--
 src/DotPulsar/Extensions/SendExtensions.cs         |  2 +-
 src/DotPulsar/Internal/Abstractions/IConnection.cs |  2 +-
 .../Internal/Abstractions/IConsumerChannel.cs      |  2 +-
 .../Internal/Abstractions/IProducerChannel.cs      |  5 ++---
 src/DotPulsar/Internal/Abstractions/Process.cs     |  2 +-
 src/DotPulsar/Internal/AsyncLock.cs                |  2 +-
 src/DotPulsar/Internal/AsyncQueue.cs               |  4 ++--
 src/DotPulsar/Internal/AsyncQueueWithCursor.cs     |  4 ++--
 src/DotPulsar/Internal/BatchHandler.cs             |  4 ++--
 src/DotPulsar/Internal/Channel.cs                  |  4 ++--
 src/DotPulsar/Internal/ChannelManager.cs           |  6 +++---
 .../Internal/Compression/CompressionFactories.cs   |  8 ++++----
 .../Internal/Compression/CompressionTester.cs      |  1 -
 src/DotPulsar/Internal/Connection.cs               |  8 ++++----
 src/DotPulsar/Internal/ConnectionPool.cs           | 10 +++++-----
 src/DotPulsar/Internal/Consumer.cs                 |  6 +++---
 src/DotPulsar/Internal/ConsumerChannel.cs          |  6 +++---
 src/DotPulsar/Internal/ConsumerChannelFactory.cs   |  4 ++--
 src/DotPulsar/Internal/ConsumerProcess.cs          |  2 +-
 src/DotPulsar/Internal/DefaultExceptionHandler.cs  |  2 +-
 src/DotPulsar/Internal/DotPulsarMeter.cs           |  1 -
 src/DotPulsar/Internal/Events/ChannelActivated.cs  |  2 +-
 .../Internal/Events/ChannelClosedByServer.cs       |  2 +-
 src/DotPulsar/Internal/Events/ChannelConnected.cs  |  2 +-
 .../Internal/Events/ChannelDeactivated.cs          |  2 +-
 .../Internal/Events/ChannelDisconnected.cs         |  2 +-
 .../Internal/Events/ChannelReachedEndOfTopic.cs    |  2 +-
 .../Internal/Events/ChannelUnsubscribed.cs         |  2 +-
 src/DotPulsar/Internal/Events/ConsumerCreated.cs   |  2 +-
 src/DotPulsar/Internal/Events/ConsumerDisposed.cs  |  2 +-
 src/DotPulsar/Internal/Events/ExecutorFaulted.cs   |  2 +-
 src/DotPulsar/Internal/Events/ProducerCreated.cs   |  2 +-
 src/DotPulsar/Internal/Events/ProducerDisposed.cs  |  2 +-
 src/DotPulsar/Internal/Events/ReaderCreated.cs     |  2 +-
 src/DotPulsar/Internal/Events/ReaderDisposed.cs    |  2 +-
 .../ProducerSendReceiptOrderingException.cs        |  2 +-
 src/DotPulsar/Internal/Executor.cs                 |  4 ++--
 .../Internal/Extensions/CommandExtensions.cs       |  4 ++--
 .../Extensions/MessageMetadataExtensions.cs        |  2 +-
 .../Extensions/MessagePackageExtensions.cs         |  2 +-
 src/DotPulsar/Internal/MessageBuilder.cs           |  2 +-
 src/DotPulsar/Internal/MessagePackage.cs           |  2 +-
 src/DotPulsar/Internal/NotReadyChannel.cs          |  7 +++----
 src/DotPulsar/Internal/PingPongHandler.cs          |  4 ++--
 src/DotPulsar/Internal/ProcessManager.cs           |  4 ++--
 src/DotPulsar/Internal/Producer.cs                 | 14 ++++++-------
 src/DotPulsar/Internal/ProducerChannel.cs          |  5 ++---
 src/DotPulsar/Internal/ProducerChannelFactory.cs   |  4 ++--
 src/DotPulsar/Internal/ProducerProcess.cs          |  2 +-
 src/DotPulsar/Internal/PulsarClientBuilder.cs      |  2 +-
 src/DotPulsar/Internal/PulsarClientFactory.cs      |  2 +-
 src/DotPulsar/Internal/PulsarStream.cs             |  6 +++---
 src/DotPulsar/Internal/Reader.cs                   |  4 ++--
 src/DotPulsar/Internal/ReaderProcess.cs            |  2 +-
 src/DotPulsar/Internal/RequestResponseHandler.cs   |  2 +-
 src/DotPulsar/Internal/Requests/ConnectRequest.cs  |  2 +-
 src/DotPulsar/Internal/SendChannel.cs              |  2 +-
 src/DotPulsar/Internal/SendOp.cs                   |  2 +-
 src/DotPulsar/Internal/SendPackage.cs              |  2 +-
 src/DotPulsar/Internal/Serializer.cs               |  2 +-
 src/DotPulsar/Internal/StateManager.cs             |  2 +-
 src/DotPulsar/Internal/SubProducer.cs              | 23 +++++++++++-----------
 src/DotPulsar/MessageId.cs                         |  2 +-
 src/DotPulsar/MessageMetadata.cs                   |  4 ++--
 src/DotPulsar/ProducerStateChanged.cs              |  2 +-
 src/DotPulsar/PulsarClient.cs                      |  8 ++++----
 src/DotPulsar/ReaderStateChanged.cs                |  2 +-
 src/DotPulsar/RoundRobinPartitionRouter.cs         |  2 +-
 src/DotPulsar/Schemas/DoubleSchema.cs              |  1 -
 src/DotPulsar/Schemas/FloatSchema .cs              |  1 -
 src/DotPulsar/Schemas/IntegerSchema.cs             |  1 -
 src/DotPulsar/Schemas/LongSchema.cs                |  1 -
 src/DotPulsar/Schemas/ShortSchema.cs               |  1 -
 src/DotPulsar/Schemas/StringSchema.cs              |  6 +++---
 src/DotPulsar/SinglePartitionRouter.cs             |  2 +-
 tests/DotPulsar.Tests/IntegrationFixture.cs        | 14 ++++++-------
 .../Internal/AsyncQueueWithCursorTests.cs          | 19 +++++++++---------
 .../Internal/ChunkingPipelineTests.cs              |  6 +++---
 .../Internal/Compression/Lz4CompressionTests.cs    |  3 +--
 .../Internal/Compression/SnappyCompressionTests.cs |  3 +--
 .../Internal/Compression/ZlibCompressionTests.cs   |  3 +--
 .../Internal/Compression/ZstdCompressionTests.cs   |  4 +---
 .../Compression/ZstdSharpCompressionTests.cs       |  3 +--
 .../Internal/SequenceBuilderTests.cs               |  1 -
 tests/DotPulsar.Tests/MessageIdTests.cs            |  1 -
 tests/DotPulsar.Tests/ProducerTests.cs             | 18 ++++++++---------
 tests/DotPulsar.Tests/TokenTests.cs                | 22 ++++++++++-----------
 91 files changed, 174 insertions(+), 193 deletions(-)

diff --git a/src/DotPulsar/ConsumerStateChanged.cs 
b/src/DotPulsar/ConsumerStateChanged.cs
index 24f61ee..822b7db 100644
--- a/src/DotPulsar/ConsumerStateChanged.cs
+++ b/src/DotPulsar/ConsumerStateChanged.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 
 /// <summary>
 /// Representation of a consumer state change.
diff --git a/src/DotPulsar/Extensions/ProducerExtensions.cs 
b/src/DotPulsar/Extensions/ProducerExtensions.cs
index 8933a0d..29934c6 100644
--- a/src/DotPulsar/Extensions/ProducerExtensions.cs
+++ b/src/DotPulsar/Extensions/ProducerExtensions.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Extensions;
 
-using Abstractions;
-using Internal;
+using DotPulsar.Abstractions;
+using DotPulsar.Internal;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Extensions/PulsarClientExtensions.cs 
b/src/DotPulsar/Extensions/PulsarClientExtensions.cs
index 9750024..bcedc48 100644
--- a/src/DotPulsar/Extensions/PulsarClientExtensions.cs
+++ b/src/DotPulsar/Extensions/PulsarClientExtensions.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Extensions;
 
-using Abstractions;
-using Internal;
+using DotPulsar.Abstractions;
+using DotPulsar.Internal;
 using System.Buffers;
 
 /// <summary>
diff --git a/src/DotPulsar/Extensions/SendChannelExtensions.cs 
b/src/DotPulsar/Extensions/SendChannelExtensions.cs
index 2149851..13adf87 100644
--- a/src/DotPulsar/Extensions/SendChannelExtensions.cs
+++ b/src/DotPulsar/Extensions/SendChannelExtensions.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Extensions;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 using Microsoft.Extensions.ObjectPool;
 using System;
 using System.Buffers;
@@ -24,7 +24,6 @@ using System.Threading.Tasks;
 /// <summary>
 /// Extensions for ISendChannel.
 /// </summary>
-
 public static class SendChannelExtensions
 {
     private static readonly ObjectPool<MessageMetadata> _messageMetadataPool;
diff --git a/src/DotPulsar/Extensions/SendExtensions.cs 
b/src/DotPulsar/Extensions/SendExtensions.cs
index 0c3a2bf..00eef33 100644
--- a/src/DotPulsar/Extensions/SendExtensions.cs
+++ b/src/DotPulsar/Extensions/SendExtensions.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Extensions;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 using Microsoft.Extensions.ObjectPool;
 using System;
 using System.Buffers;
diff --git a/src/DotPulsar/Internal/Abstractions/IConnection.cs 
b/src/DotPulsar/Internal/Abstractions/IConnection.cs
index a5ba487..14e6d9e 100644
--- a/src/DotPulsar/Internal/Abstractions/IConnection.cs
+++ b/src/DotPulsar/Internal/Abstractions/IConnection.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Abstractions;
 
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/Abstractions/IConsumerChannel.cs 
b/src/DotPulsar/Internal/Abstractions/IConsumerChannel.cs
index b984fe5..4bd3235 100644
--- a/src/DotPulsar/Internal/Abstractions/IConsumerChannel.cs
+++ b/src/DotPulsar/Internal/Abstractions/IConsumerChannel.cs
@@ -15,7 +15,7 @@
 namespace DotPulsar.Internal.Abstractions;
 
 using DotPulsar.Abstractions;
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/Abstractions/IProducerChannel.cs 
b/src/DotPulsar/Internal/Abstractions/IProducerChannel.cs
index e84e480..4bdbdeb 100644
--- a/src/DotPulsar/Internal/Abstractions/IProducerChannel.cs
+++ b/src/DotPulsar/Internal/Abstractions/IProducerChannel.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Abstractions;
 
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Buffers;
 using System.Threading;
@@ -22,7 +22,6 @@ using System.Threading.Tasks;
 
 public interface IProducerChannel : IAsyncDisposable
 {
-    Task Send(MessageMetadata metadata, ReadOnlySequence<byte> payload, 
TaskCompletionSource<BaseCommand> responseTcs, CancellationToken
-    cancellationToken);
+    Task Send(MessageMetadata metadata, ReadOnlySequence<byte> payload, 
TaskCompletionSource<BaseCommand> responseTcs, CancellationToken 
cancellationToken);
     ValueTask ClosedByClient(CancellationToken cancellationToken);
 }
diff --git a/src/DotPulsar/Internal/Abstractions/Process.cs 
b/src/DotPulsar/Internal/Abstractions/Process.cs
index ee1c109..9ef6bd4 100644
--- a/src/DotPulsar/Internal/Abstractions/Process.cs
+++ b/src/DotPulsar/Internal/Abstractions/Process.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Abstractions;
 
-using Events;
+using DotPulsar.Internal.Events;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/AsyncLock.cs 
b/src/DotPulsar/Internal/AsyncLock.cs
index a572dde..56a00e0 100644
--- a/src/DotPulsar/Internal/AsyncLock.cs
+++ b/src/DotPulsar/Internal/AsyncLock.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using Exceptions;
+using DotPulsar.Internal.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/AsyncQueue.cs 
b/src/DotPulsar/Internal/AsyncQueue.cs
index cca67cf..28d1cf1 100644
--- a/src/DotPulsar/Internal/AsyncQueue.cs
+++ b/src/DotPulsar/Internal/AsyncQueue.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using Exceptions;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/AsyncQueueWithCursor.cs 
b/src/DotPulsar/Internal/AsyncQueueWithCursor.cs
index efe0cd5..5651d93 100644
--- a/src/DotPulsar/Internal/AsyncQueueWithCursor.cs
+++ b/src/DotPulsar/Internal/AsyncQueueWithCursor.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using Exceptions;
+using DotPulsar.Internal.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -221,7 +221,7 @@ public sealed class AsyncQueueWithCursor<T> : 
IAsyncDisposable where T : IDispos
 
         _cursorSemaphore.Dispose();
         _cursorNextItemTcs?.TrySetCanceled(CancellationToken.None);
-        ValueTask disposeLock = _pendingLock.DisposeAsync();
+        var disposeLock = _pendingLock.DisposeAsync();
         ReleasePendingLockGrant();
         await disposeLock.ConfigureAwait(false);
         foreach (TaskCompletionSource<object> tcs in _queueEmptyTcs)
diff --git a/src/DotPulsar/Internal/BatchHandler.cs 
b/src/DotPulsar/Internal/BatchHandler.cs
index 7ec382a..fb2e026 100644
--- a/src/DotPulsar/Internal/BatchHandler.cs
+++ b/src/DotPulsar/Internal/BatchHandler.cs
@@ -16,8 +16,8 @@ namespace DotPulsar.Internal;
 
 using DotPulsar.Abstractions;
 using DotPulsar.Internal.Abstractions;
-using Extensions;
-using PulsarApi;
+using DotPulsar.Internal.Extensions;
+using DotPulsar.Internal.PulsarApi;
 using System.Buffers;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/DotPulsar/Internal/Channel.cs 
b/src/DotPulsar/Internal/Channel.cs
index 361b838..9182f93 100644
--- a/src/DotPulsar/Internal/Channel.cs
+++ b/src/DotPulsar/Internal/Channel.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using Events;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Events;
 using System;
 using System.Threading;
 
diff --git a/src/DotPulsar/Internal/ChannelManager.cs 
b/src/DotPulsar/Internal/ChannelManager.cs
index 7c0eed7..0d48f95 100644
--- a/src/DotPulsar/Internal/ChannelManager.cs
+++ b/src/DotPulsar/Internal/ChannelManager.cs
@@ -14,9 +14,9 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using Extensions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Extensions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Buffers;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/Compression/CompressionFactories.cs 
b/src/DotPulsar/Internal/Compression/CompressionFactories.cs
index 566bc65..ca07494 100644
--- a/src/DotPulsar/Internal/Compression/CompressionFactories.cs
+++ b/src/DotPulsar/Internal/Compression/CompressionFactories.cs
@@ -35,25 +35,25 @@ public static class CompressionFactories
 
     private static void LoadSupportForLz4()
     {
-        if (Lz4Compression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory))
+        if (Lz4Compression.TryLoading(out var compressorFactory, out var 
decompressorFactory))
             Add(compressorFactory, decompressorFactory);
     }
 
     private static void LoadSupportForSnappy()
     {
-        if (SnappyCompression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory))
+        if (SnappyCompression.TryLoading(out var compressorFactory, out var 
decompressorFactory))
             Add(compressorFactory, decompressorFactory);
     }
 
     private static void LoadSupportForZlib()
     {
-        if (ZlibCompression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory))
+        if (ZlibCompression.TryLoading(out var compressorFactory, out var 
decompressorFactory))
             Add(compressorFactory, decompressorFactory);
     }
 
     private static void LoadSupportForZstd()
     {
-        if (ZstdSharpCompression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory))
+        if (ZstdSharpCompression.TryLoading(out var compressorFactory, out var 
decompressorFactory))
             Add(compressorFactory, decompressorFactory);
         else if (ZstdCompression.TryLoading(out compressorFactory, out 
decompressorFactory))
             Add(compressorFactory, decompressorFactory);
diff --git a/src/DotPulsar/Internal/Compression/CompressionTester.cs 
b/src/DotPulsar/Internal/Compression/CompressionTester.cs
index 2155924..9c93b50 100644
--- a/src/DotPulsar/Internal/Compression/CompressionTester.cs
+++ b/src/DotPulsar/Internal/Compression/CompressionTester.cs
@@ -15,7 +15,6 @@
 namespace DotPulsar.Internal.Compression;
 
 using DotPulsar.Internal.Abstractions;
-using System;
 using System.Buffers;
 using System.Linq;
 
diff --git a/src/DotPulsar/Internal/Connection.cs 
b/src/DotPulsar/Internal/Connection.cs
index 84bf300..537eb78 100644
--- a/src/DotPulsar/Internal/Connection.cs
+++ b/src/DotPulsar/Internal/Connection.cs
@@ -14,11 +14,11 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
-using Exceptions;
-using Extensions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Exceptions;
+using DotPulsar.Internal.Extensions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Buffers;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/ConnectionPool.cs 
b/src/DotPulsar/Internal/ConnectionPool.cs
index 59647b6..967c62d 100644
--- a/src/DotPulsar/Internal/ConnectionPool.cs
+++ b/src/DotPulsar/Internal/ConnectionPool.cs
@@ -14,11 +14,11 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
-using Extensions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Extensions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Collections.Concurrent;
 using System.Linq;
@@ -149,7 +149,7 @@ public sealed class ConnectionPool : IConnectionPool
     {
         using (await _lock.Lock(cancellationToken).ConfigureAwait(false))
         {
-            if (_connections.TryGetValue(url, out Connection? connection) && 
connection is not null)
+            if (_connections.TryGetValue(url, out var connection) && 
connection is not null)
                 return connection;
 
             return await EstablishNewConnection(url, 
cancellationToken).ConfigureAwait(false);
@@ -175,7 +175,7 @@ public sealed class ConnectionPool : IConnectionPool
 
     private async ValueTask DisposeConnection(PulsarUrl serviceUrl)
     {
-        if (_connections.TryRemove(serviceUrl, out Connection? connection) && 
connection is not null)
+        if (_connections.TryRemove(serviceUrl, out var connection) && 
connection is not null)
         {
             await connection.DisposeAsync().ConfigureAwait(false);
             DotPulsarMeter.ConnectionDisposed();
diff --git a/src/DotPulsar/Internal/Consumer.cs 
b/src/DotPulsar/Internal/Consumer.cs
index 0cc262c..5740ccf 100644
--- a/src/DotPulsar/Internal/Consumer.cs
+++ b/src/DotPulsar/Internal/Consumer.cs
@@ -14,13 +14,13 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Events;
 using DotPulsar.Internal.Extensions;
-using Events;
+using DotPulsar.Internal.PulsarApi;
 using Microsoft.Extensions.ObjectPool;
-using PulsarApi;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/DotPulsar/Internal/ConsumerChannel.cs 
b/src/DotPulsar/Internal/ConsumerChannel.cs
index dadefa1..e24a191 100644
--- a/src/DotPulsar/Internal/ConsumerChannel.cs
+++ b/src/DotPulsar/Internal/ConsumerChannel.cs
@@ -14,11 +14,11 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
-using Extensions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Extensions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/ConsumerChannelFactory.cs 
b/src/DotPulsar/Internal/ConsumerChannelFactory.cs
index 69de5ac..d4dd68e 100644
--- a/src/DotPulsar/Internal/ConsumerChannelFactory.cs
+++ b/src/DotPulsar/Internal/ConsumerChannelFactory.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/ConsumerProcess.cs 
b/src/DotPulsar/Internal/ConsumerProcess.cs
index 2897ab0..9d06d41 100644
--- a/src/DotPulsar/Internal/ConsumerProcess.cs
+++ b/src/DotPulsar/Internal/ConsumerProcess.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 using System.Threading.Tasks;
 
diff --git a/src/DotPulsar/Internal/DefaultExceptionHandler.cs 
b/src/DotPulsar/Internal/DefaultExceptionHandler.cs
index bbaad35..49c8027 100644
--- a/src/DotPulsar/Internal/DefaultExceptionHandler.cs
+++ b/src/DotPulsar/Internal/DefaultExceptionHandler.cs
@@ -16,7 +16,7 @@ namespace DotPulsar.Internal;
 
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
-using Exceptions;
+using DotPulsar.Internal.Exceptions;
 using System;
 using System.IO;
 using System.Net.Sockets;
diff --git a/src/DotPulsar/Internal/DotPulsarMeter.cs 
b/src/DotPulsar/Internal/DotPulsarMeter.cs
index e56d6a2..69348ab 100644
--- a/src/DotPulsar/Internal/DotPulsarMeter.cs
+++ b/src/DotPulsar/Internal/DotPulsarMeter.cs
@@ -68,7 +68,6 @@ public static class DotPulsarMeter
     public static void ProducerDisposed() => Interlocked.Decrement(ref 
_numberOfProducers);
     private static int GetNumberOfProducers() => Volatile.Read(ref 
_numberOfProducers);
 
-
     public static bool MessageSentEnabled => _producerSendDuration.Enabled;
     public static void MessageSent(long startTimestamp, KeyValuePair<string, 
object?>[] tags) =>
         _producerSendDuration.Record(GetMillisecondsTillNow(startTimestamp), 
tags);
diff --git a/src/DotPulsar/Internal/Events/ChannelActivated.cs 
b/src/DotPulsar/Internal/Events/ChannelActivated.cs
index 506ee8a..47b29ef 100644
--- a/src/DotPulsar/Internal/Events/ChannelActivated.cs
+++ b/src/DotPulsar/Internal/Events/ChannelActivated.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ChannelActivated : IEvent
diff --git a/src/DotPulsar/Internal/Events/ChannelClosedByServer.cs 
b/src/DotPulsar/Internal/Events/ChannelClosedByServer.cs
index a5ed6d0..6d6278f 100644
--- a/src/DotPulsar/Internal/Events/ChannelClosedByServer.cs
+++ b/src/DotPulsar/Internal/Events/ChannelClosedByServer.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ChannelClosedByServer : IEvent
diff --git a/src/DotPulsar/Internal/Events/ChannelConnected.cs 
b/src/DotPulsar/Internal/Events/ChannelConnected.cs
index 20ef3d2..ff9bf4c 100644
--- a/src/DotPulsar/Internal/Events/ChannelConnected.cs
+++ b/src/DotPulsar/Internal/Events/ChannelConnected.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ChannelConnected : IEvent
diff --git a/src/DotPulsar/Internal/Events/ChannelDeactivated.cs 
b/src/DotPulsar/Internal/Events/ChannelDeactivated.cs
index 204e240..d9b298d 100644
--- a/src/DotPulsar/Internal/Events/ChannelDeactivated.cs
+++ b/src/DotPulsar/Internal/Events/ChannelDeactivated.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ChannelDeactivated : IEvent
diff --git a/src/DotPulsar/Internal/Events/ChannelDisconnected.cs 
b/src/DotPulsar/Internal/Events/ChannelDisconnected.cs
index e752f90..2aa57e5 100644
--- a/src/DotPulsar/Internal/Events/ChannelDisconnected.cs
+++ b/src/DotPulsar/Internal/Events/ChannelDisconnected.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ChannelDisconnected : IEvent
diff --git a/src/DotPulsar/Internal/Events/ChannelReachedEndOfTopic.cs 
b/src/DotPulsar/Internal/Events/ChannelReachedEndOfTopic.cs
index 65d61ca..dd3cbfc 100644
--- a/src/DotPulsar/Internal/Events/ChannelReachedEndOfTopic.cs
+++ b/src/DotPulsar/Internal/Events/ChannelReachedEndOfTopic.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ChannelReachedEndOfTopic : IEvent
diff --git a/src/DotPulsar/Internal/Events/ChannelUnsubscribed.cs 
b/src/DotPulsar/Internal/Events/ChannelUnsubscribed.cs
index 71be9b2..b5e9566 100644
--- a/src/DotPulsar/Internal/Events/ChannelUnsubscribed.cs
+++ b/src/DotPulsar/Internal/Events/ChannelUnsubscribed.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ChannelUnsubscribed : IEvent
diff --git a/src/DotPulsar/Internal/Events/ConsumerCreated.cs 
b/src/DotPulsar/Internal/Events/ConsumerCreated.cs
index 87d04ff..8975e9e 100644
--- a/src/DotPulsar/Internal/Events/ConsumerCreated.cs
+++ b/src/DotPulsar/Internal/Events/ConsumerCreated.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ConsumerCreated : IEvent
diff --git a/src/DotPulsar/Internal/Events/ConsumerDisposed.cs 
b/src/DotPulsar/Internal/Events/ConsumerDisposed.cs
index a767a66..df832de 100644
--- a/src/DotPulsar/Internal/Events/ConsumerDisposed.cs
+++ b/src/DotPulsar/Internal/Events/ConsumerDisposed.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ConsumerDisposed : IEvent
diff --git a/src/DotPulsar/Internal/Events/ExecutorFaulted.cs 
b/src/DotPulsar/Internal/Events/ExecutorFaulted.cs
index 0ba9dad..ea56b6c 100644
--- a/src/DotPulsar/Internal/Events/ExecutorFaulted.cs
+++ b/src/DotPulsar/Internal/Events/ExecutorFaulted.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ExecutorFaulted : IEvent
diff --git a/src/DotPulsar/Internal/Events/ProducerCreated.cs 
b/src/DotPulsar/Internal/Events/ProducerCreated.cs
index 66e110d..bf8d5bf 100644
--- a/src/DotPulsar/Internal/Events/ProducerCreated.cs
+++ b/src/DotPulsar/Internal/Events/ProducerCreated.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ProducerCreated : IEvent
diff --git a/src/DotPulsar/Internal/Events/ProducerDisposed.cs 
b/src/DotPulsar/Internal/Events/ProducerDisposed.cs
index 5bd1e2e..f9f8d5c 100644
--- a/src/DotPulsar/Internal/Events/ProducerDisposed.cs
+++ b/src/DotPulsar/Internal/Events/ProducerDisposed.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ProducerDisposed : IEvent
diff --git a/src/DotPulsar/Internal/Events/ReaderCreated.cs 
b/src/DotPulsar/Internal/Events/ReaderCreated.cs
index 43d29da..e86adea 100644
--- a/src/DotPulsar/Internal/Events/ReaderCreated.cs
+++ b/src/DotPulsar/Internal/Events/ReaderCreated.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ReaderCreated : IEvent
diff --git a/src/DotPulsar/Internal/Events/ReaderDisposed.cs 
b/src/DotPulsar/Internal/Events/ReaderDisposed.cs
index f852488..ba35812 100644
--- a/src/DotPulsar/Internal/Events/ReaderDisposed.cs
+++ b/src/DotPulsar/Internal/Events/ReaderDisposed.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Events;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class ReaderDisposed : IEvent
diff --git 
a/src/DotPulsar/Internal/Exceptions/ProducerSendReceiptOrderingException.cs 
b/src/DotPulsar/Internal/Exceptions/ProducerSendReceiptOrderingException.cs
index 796ed97..b961753 100644
--- a/src/DotPulsar/Internal/Exceptions/ProducerSendReceiptOrderingException.cs
+++ b/src/DotPulsar/Internal/Exceptions/ProducerSendReceiptOrderingException.cs
@@ -19,7 +19,7 @@ using System;
 
 public sealed class ProducerSendReceiptOrderingException : DotPulsarException
 {
-    public ProducerSendReceiptOrderingException(string message) : 
base(message) {}
+    public ProducerSendReceiptOrderingException(string message) : 
base(message) { }
 
     public ProducerSendReceiptOrderingException(string message, Exception 
innerException) : base(message, innerException) { }
 }
diff --git a/src/DotPulsar/Internal/Executor.cs 
b/src/DotPulsar/Internal/Executor.cs
index 42218f1..27f9faf 100644
--- a/src/DotPulsar/Internal/Executor.cs
+++ b/src/DotPulsar/Internal/Executor.cs
@@ -14,9 +14,9 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
-using Events;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Events;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/Extensions/CommandExtensions.cs 
b/src/DotPulsar/Internal/Extensions/CommandExtensions.cs
index 1853398..f71ecb9 100644
--- a/src/DotPulsar/Internal/Extensions/CommandExtensions.cs
+++ b/src/DotPulsar/Internal/Extensions/CommandExtensions.cs
@@ -15,8 +15,8 @@
 namespace DotPulsar.Internal.Extensions;
 
 using DotPulsar.Exceptions;
-using Exceptions;
-using PulsarApi;
+using DotPulsar.Internal.Exceptions;
+using DotPulsar.Internal.PulsarApi;
 
 public static class CommandExtensions
 {
diff --git a/src/DotPulsar/Internal/Extensions/MessageMetadataExtensions.cs 
b/src/DotPulsar/Internal/Extensions/MessageMetadataExtensions.cs
index 734f53d..9ac4c6d 100644
--- a/src/DotPulsar/Internal/Extensions/MessageMetadataExtensions.cs
+++ b/src/DotPulsar/Internal/Extensions/MessageMetadataExtensions.cs
@@ -16,7 +16,7 @@ namespace DotPulsar.Internal.Extensions;
 
 using System;
 using System.Text;
-using Metadata = PulsarApi.MessageMetadata;
+using Metadata = DotPulsar.Internal.PulsarApi.MessageMetadata;
 
 public static class MessageMetadataExtensions
 {
diff --git a/src/DotPulsar/Internal/Extensions/MessagePackageExtensions.cs 
b/src/DotPulsar/Internal/Extensions/MessagePackageExtensions.cs
index 1c94e21..9d2a7ec 100644
--- a/src/DotPulsar/Internal/Extensions/MessagePackageExtensions.cs
+++ b/src/DotPulsar/Internal/Extensions/MessagePackageExtensions.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal.Extensions;
 
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System.Buffers;
 
 public static class MessagePackageExtensions
diff --git a/src/DotPulsar/Internal/MessageBuilder.cs 
b/src/DotPulsar/Internal/MessageBuilder.cs
index 5013596..a741acb 100644
--- a/src/DotPulsar/Internal/MessageBuilder.cs
+++ b/src/DotPulsar/Internal/MessageBuilder.cs
@@ -15,7 +15,7 @@
 namespace DotPulsar.Internal;
 
 using DotPulsar.Abstractions;
-using Extensions;
+using DotPulsar.Internal.Extensions;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/MessagePackage.cs 
b/src/DotPulsar/Internal/MessagePackage.cs
index 3f2b707..03f41cb 100644
--- a/src/DotPulsar/Internal/MessagePackage.cs
+++ b/src/DotPulsar/Internal/MessagePackage.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System.Buffers;
 
 public readonly struct MessagePackage
diff --git a/src/DotPulsar/Internal/NotReadyChannel.cs 
b/src/DotPulsar/Internal/NotReadyChannel.cs
index eedf493..b1877b7 100644
--- a/src/DotPulsar/Internal/NotReadyChannel.cs
+++ b/src/DotPulsar/Internal/NotReadyChannel.cs
@@ -14,10 +14,10 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Buffers;
 using System.Threading;
@@ -34,8 +34,7 @@ public sealed class NotReadyChannel<TMessage> : 
IConsumerChannel<TMessage>, IPro
     public ValueTask<IMessage<TMessage>> Receive(CancellationToken 
cancellationToken = default)
         => throw GetException();
 
-    public Task Send(MessageMetadata metadata, ReadOnlySequence<byte> payload, 
TaskCompletionSource<BaseCommand> responseTcs, CancellationToken
-    cancellationToken)
+    public Task Send(MessageMetadata metadata, ReadOnlySequence<byte> payload, 
TaskCompletionSource<BaseCommand> responseTcs, CancellationToken 
cancellationToken)
         => throw GetException();
 
     public Task Send(CommandAck command, CancellationToken cancellationToken)
diff --git a/src/DotPulsar/Internal/PingPongHandler.cs 
b/src/DotPulsar/Internal/PingPongHandler.cs
index 4391095..2e5602c 100644
--- a/src/DotPulsar/Internal/PingPongHandler.cs
+++ b/src/DotPulsar/Internal/PingPongHandler.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Diagnostics;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/ProcessManager.cs 
b/src/DotPulsar/Internal/ProcessManager.cs
index 2c9777e..608b02e 100644
--- a/src/DotPulsar/Internal/ProcessManager.cs
+++ b/src/DotPulsar/Internal/ProcessManager.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using Events;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Events;
 using System;
 using System.Collections.Concurrent;
 using System.Linq;
diff --git a/src/DotPulsar/Internal/Producer.cs 
b/src/DotPulsar/Internal/Producer.cs
index 824b523..38fb54b 100644
--- a/src/DotPulsar/Internal/Producer.cs
+++ b/src/DotPulsar/Internal/Producer.cs
@@ -14,9 +14,9 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
+using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Extensions;
 using System;
 using System.Collections.Concurrent;
@@ -64,14 +64,14 @@ public sealed class Producer<TMessage> : 
IProducer<TMessage>, IRegisterEvent
         _operationName = $"{options.Topic} send";
         _activityTags = new KeyValuePair<string, object?>[]
         {
-                new ("messaging.destination", options.Topic),
-                new ("messaging.destination_kind", "topic"),
-                new ("messaging.system", "pulsar"),
-                new ("messaging.url", serviceUrl),
+            new("messaging.destination", options.Topic),
+            new("messaging.destination_kind", "topic"),
+            new("messaging.system", "pulsar"),
+            new("messaging.url", serviceUrl),
         };
         _meterTags = new KeyValuePair<string, object?>[]
         {
-                new ("topic", options.Topic)
+            new("topic", options.Topic)
         };
         _attachTraceInfoToMessages = options.AttachTraceInfoToMessages;
         _sequenceId = new SequenceId(options.InitialSequenceId);
@@ -232,7 +232,7 @@ public sealed class Producer<TMessage> : 
IProducer<TMessage>, IRegisterEvent
         {
             _ = await _state.StateChangedFrom(ProducerState.Disconnected, 
cancellationToken).ConfigureAwait(false);
             if (_throw is not null)
-                ExceptionDispatchInfo.Capture(_throw).Throw();  //Retain 
original stack trace by throwing like this
+                ExceptionDispatchInfo.Capture(_throw).Throw(); //Retain 
original stack trace by throwing like this
         }
 
         if (_producerCount == 1)
diff --git a/src/DotPulsar/Internal/ProducerChannel.cs 
b/src/DotPulsar/Internal/ProducerChannel.cs
index 5016db0..ba2da76 100644
--- a/src/DotPulsar/Internal/ProducerChannel.cs
+++ b/src/DotPulsar/Internal/ProducerChannel.cs
@@ -14,10 +14,9 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using Extensions;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.PulsarApi;
 using Microsoft.Extensions.ObjectPool;
-using PulsarApi;
 using System;
 using System.Buffers;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/ProducerChannelFactory.cs 
b/src/DotPulsar/Internal/ProducerChannelFactory.cs
index 74ab9a0..988e6c7 100644
--- a/src/DotPulsar/Internal/ProducerChannelFactory.cs
+++ b/src/DotPulsar/Internal/ProducerChannelFactory.cs
@@ -14,9 +14,9 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Extensions;
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/ProducerProcess.cs 
b/src/DotPulsar/Internal/ProducerProcess.cs
index 471ca14..9fb9c35 100644
--- a/src/DotPulsar/Internal/ProducerProcess.cs
+++ b/src/DotPulsar/Internal/ProducerProcess.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/PulsarClientBuilder.cs 
b/src/DotPulsar/Internal/PulsarClientBuilder.cs
index 92e3fbb..164e209 100644
--- a/src/DotPulsar/Internal/PulsarClientBuilder.cs
+++ b/src/DotPulsar/Internal/PulsarClientBuilder.cs
@@ -16,7 +16,7 @@ namespace DotPulsar.Internal;
 
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
diff --git a/src/DotPulsar/Internal/PulsarClientFactory.cs 
b/src/DotPulsar/Internal/PulsarClientFactory.cs
index 0bae8c1..6b6e375 100644
--- a/src/DotPulsar/Internal/PulsarClientFactory.cs
+++ b/src/DotPulsar/Internal/PulsarClientFactory.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 
 public sealed class PulsarClientFactory
diff --git a/src/DotPulsar/Internal/PulsarStream.cs 
b/src/DotPulsar/Internal/PulsarStream.cs
index 188cc07..af41066 100644
--- a/src/DotPulsar/Internal/PulsarStream.cs
+++ b/src/DotPulsar/Internal/PulsarStream.cs
@@ -14,9 +14,9 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
-using Exceptions;
-using Extensions;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Exceptions;
+using DotPulsar.Internal.Extensions;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
diff --git a/src/DotPulsar/Internal/Reader.cs b/src/DotPulsar/Internal/Reader.cs
index 671002f..1778791 100644
--- a/src/DotPulsar/Internal/Reader.cs
+++ b/src/DotPulsar/Internal/Reader.cs
@@ -14,11 +14,11 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
 using DotPulsar.Exceptions;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Events;
 using DotPulsar.Internal.PulsarApi;
-using Events;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/ReaderProcess.cs 
b/src/DotPulsar/Internal/ReaderProcess.cs
index f4466a4..8452c64 100644
--- a/src/DotPulsar/Internal/ReaderProcess.cs
+++ b/src/DotPulsar/Internal/ReaderProcess.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System;
 using System.Threading.Tasks;
 
diff --git a/src/DotPulsar/Internal/RequestResponseHandler.cs 
b/src/DotPulsar/Internal/RequestResponseHandler.cs
index f47b160..d228ce6 100644
--- a/src/DotPulsar/Internal/RequestResponseHandler.cs
+++ b/src/DotPulsar/Internal/RequestResponseHandler.cs
@@ -15,8 +15,8 @@
 namespace DotPulsar.Internal;
 
 using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.PulsarApi;
 using DotPulsar.Internal.Requests;
-using PulsarApi;
 using System;
 using System.Threading.Tasks;
 
diff --git a/src/DotPulsar/Internal/Requests/ConnectRequest.cs 
b/src/DotPulsar/Internal/Requests/ConnectRequest.cs
index 091ff6c..3ced785 100644
--- a/src/DotPulsar/Internal/Requests/ConnectRequest.cs
+++ b/src/DotPulsar/Internal/Requests/ConnectRequest.cs
@@ -34,7 +34,7 @@ public struct ConnectRequest : IRequest
 #else
     public bool Equals([AllowNull] IRequest other)
 #endif
-            => other is ConnectRequest;
+        => other is ConnectRequest;
 
     public override int GetHashCode()
         => int.MinValue;
diff --git a/src/DotPulsar/Internal/SendChannel.cs 
b/src/DotPulsar/Internal/SendChannel.cs
index e1f458f..3cee200 100644
--- a/src/DotPulsar/Internal/SendChannel.cs
+++ b/src/DotPulsar/Internal/SendChannel.cs
@@ -15,7 +15,7 @@
 namespace DotPulsar.Internal;
 
 using DotPulsar.Abstractions;
-using Exceptions;
+using DotPulsar.Internal.Exceptions;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/DotPulsar/Internal/SendOp.cs b/src/DotPulsar/Internal/SendOp.cs
index bbf0010..e2a2120 100644
--- a/src/DotPulsar/Internal/SendOp.cs
+++ b/src/DotPulsar/Internal/SendOp.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Buffers;
 using System.Threading;
diff --git a/src/DotPulsar/Internal/SendPackage.cs 
b/src/DotPulsar/Internal/SendPackage.cs
index 3693f34..27b077e 100644
--- a/src/DotPulsar/Internal/SendPackage.cs
+++ b/src/DotPulsar/Internal/SendPackage.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System.Buffers;
 
 public sealed class SendPackage
diff --git a/src/DotPulsar/Internal/Serializer.cs 
b/src/DotPulsar/Internal/Serializer.cs
index 9428043..3a19a2b 100644
--- a/src/DotPulsar/Internal/Serializer.cs
+++ b/src/DotPulsar/Internal/Serializer.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Buffers;
 using System.IO;
diff --git a/src/DotPulsar/Internal/StateManager.cs 
b/src/DotPulsar/Internal/StateManager.cs
index 3942a3a..114a312 100644
--- a/src/DotPulsar/Internal/StateManager.cs
+++ b/src/DotPulsar/Internal/StateManager.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
+using DotPulsar.Internal.Abstractions;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/src/DotPulsar/Internal/SubProducer.cs 
b/src/DotPulsar/Internal/SubProducer.cs
index 58e5f1c..1f9588d 100644
--- a/src/DotPulsar/Internal/SubProducer.cs
+++ b/src/DotPulsar/Internal/SubProducer.cs
@@ -14,12 +14,12 @@
 
 namespace DotPulsar.Internal;
 
-using Abstractions;
 using DotPulsar.Abstractions;
-using Extensions;
-using Events;
-using Exceptions;
-using PulsarApi;
+using DotPulsar.Internal.Abstractions;
+using DotPulsar.Internal.Events;
+using DotPulsar.Internal.Exceptions;
+using DotPulsar.Internal.Extensions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -109,7 +109,7 @@ public sealed class SubProducer : IContainsChannel, 
IState<ProducerState>
 
         while (!cancellationToken.IsCancellationRequested)
         {
-            SendOp sendOp = await 
_sendQueue.NextItem(cancellationToken).ConfigureAwait(false);
+            var sendOp = await 
_sendQueue.NextItem(cancellationToken).ConfigureAwait(false);
 
             if (sendOp.CancellationToken.IsCancellationRequested)
             {
@@ -122,7 +122,7 @@ public sealed class SubProducer : IContainsChannel, 
IState<ProducerState>
                 TaskContinuationOptions.NotOnCanceled | 
TaskContinuationOptions.ExecuteSynchronously);
 
             // Use CancellationToken.None here because otherwise it will throw 
exceptions on all fault actions even retry.
-            bool success = await _executor.TryExecuteOnce(() => 
channel.Send(sendOp.Metadata, sendOp.Data, tcs, cancellationToken), 
CancellationToken.None).ConfigureAwait(false);
+            var success = await _executor.TryExecuteOnce(() => 
channel.Send(sendOp.Metadata, sendOp.Data, tcs, cancellationToken), 
CancellationToken.None).ConfigureAwait(false);
 
             if (success) continue;
             _eventRegister.Register(new ChannelDisconnected(_correlationId));
@@ -138,7 +138,7 @@ public sealed class SubProducer : IContainsChannel, 
IState<ProducerState>
         {
             var responseTask = await 
responseQueue.Dequeue(cancellationToken).ConfigureAwait(false);
 
-            bool success = await _executor.TryExecuteOnce(() =>
+            var success = await _executor.TryExecuteOnce(() =>
             {
                 if (responseTask.IsFaulted) throw responseTask.Exception!;
                 responseTask.Result.Expect(BaseCommand.Type.SendReceipt);
@@ -153,12 +153,12 @@ public sealed class SubProducer : IContainsChannel, 
IState<ProducerState>
 
     private void ProcessReceipt(CommandSendReceipt sendReceipt)
     {
-        ulong receiptSequenceId = sendReceipt.SequenceId;
+        var receiptSequenceId = sendReceipt.SequenceId;
 
-        if (!_sendQueue.TryPeek(out SendOp? sendOp) || sendOp is null)
+        if (!_sendQueue.TryPeek(out var sendOp) || sendOp is null)
             throw new ProducerSendReceiptOrderingException($"Received 
sequenceId {receiptSequenceId} but send queue is empty");
 
-        ulong expectedSequenceId = sendOp.Metadata.SequenceId;
+        var expectedSequenceId = sendOp.Metadata.SequenceId;
 
         if (receiptSequenceId != expectedSequenceId)
             throw new ProducerSendReceiptOrderingException($"Received 
sequenceId {receiptSequenceId}. Expected {expectedSequenceId}");
@@ -202,7 +202,6 @@ public sealed class SubProducer : IContainsChannel, 
IState<ProducerState>
             _sendQueue.ResetCursor();
             _dispatcherTask = MessageDispatcher(_channel, 
_dispatcherCts.Token);
         }, cancellationToken).ConfigureAwait(false);
-
     }
 
     public async ValueTask CloseChannel(CancellationToken cancellationToken)
diff --git a/src/DotPulsar/MessageId.cs b/src/DotPulsar/MessageId.cs
index 0bf801d..f4ef806 100644
--- a/src/DotPulsar/MessageId.cs
+++ b/src/DotPulsar/MessageId.cs
@@ -15,7 +15,7 @@
 namespace DotPulsar;
 
 using DotPulsar.Internal.Extensions;
-using Internal.PulsarApi;
+using DotPulsar.Internal.PulsarApi;
 using System;
 
 /// <summary>
diff --git a/src/DotPulsar/MessageMetadata.cs b/src/DotPulsar/MessageMetadata.cs
index 2ac035d..3a8604e 100644
--- a/src/DotPulsar/MessageMetadata.cs
+++ b/src/DotPulsar/MessageMetadata.cs
@@ -14,8 +14,8 @@
 
 namespace DotPulsar;
 
-using Internal.Extensions;
-using Internal.PulsarApi;
+using DotPulsar.Internal.Extensions;
+using DotPulsar.Internal.PulsarApi;
 using System;
 
 /// <summary>
diff --git a/src/DotPulsar/ProducerStateChanged.cs 
b/src/DotPulsar/ProducerStateChanged.cs
index 0b082a2..d4902c6 100644
--- a/src/DotPulsar/ProducerStateChanged.cs
+++ b/src/DotPulsar/ProducerStateChanged.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 
 /// <summary>
 /// Representation of a producer state change.
diff --git a/src/DotPulsar/PulsarClient.cs b/src/DotPulsar/PulsarClient.cs
index 27135f3..5a0d8e1 100644
--- a/src/DotPulsar/PulsarClient.cs
+++ b/src/DotPulsar/PulsarClient.cs
@@ -14,12 +14,12 @@
 
 namespace DotPulsar;
 
-using Abstractions;
+using DotPulsar.Abstractions;
+using DotPulsar.Exceptions;
+using DotPulsar.Internal;
+using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Compression;
 using DotPulsar.Internal.PulsarApi;
-using Exceptions;
-using Internal;
-using Internal.Abstractions;
 using System;
 using System.Linq;
 using System.Threading;
diff --git a/src/DotPulsar/ReaderStateChanged.cs 
b/src/DotPulsar/ReaderStateChanged.cs
index 6b415d3..34a7102 100644
--- a/src/DotPulsar/ReaderStateChanged.cs
+++ b/src/DotPulsar/ReaderStateChanged.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 
 /// <summary>
 /// Representation of a reader state change.
diff --git a/src/DotPulsar/RoundRobinPartitionRouter.cs 
b/src/DotPulsar/RoundRobinPartitionRouter.cs
index f6c0d48..8edd893 100644
--- a/src/DotPulsar/RoundRobinPartitionRouter.cs
+++ b/src/DotPulsar/RoundRobinPartitionRouter.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 using HashDepot;
 using System.Threading;
 
diff --git a/src/DotPulsar/Schemas/DoubleSchema.cs 
b/src/DotPulsar/Schemas/DoubleSchema.cs
index c827424..601799c 100644
--- a/src/DotPulsar/Schemas/DoubleSchema.cs
+++ b/src/DotPulsar/Schemas/DoubleSchema.cs
@@ -19,7 +19,6 @@ using DotPulsar.Exceptions;
 using System;
 using System.Buffers;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Runtime.InteropServices;
 
 /// <summary>
diff --git a/src/DotPulsar/Schemas/FloatSchema .cs 
b/src/DotPulsar/Schemas/FloatSchema .cs
index d62ecc7..a65d1e8 100644
--- a/src/DotPulsar/Schemas/FloatSchema .cs     
+++ b/src/DotPulsar/Schemas/FloatSchema .cs     
@@ -19,7 +19,6 @@ using DotPulsar.Exceptions;
 using System;
 using System.Buffers;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Runtime.InteropServices;
 
 /// <summary>
diff --git a/src/DotPulsar/Schemas/IntegerSchema.cs 
b/src/DotPulsar/Schemas/IntegerSchema.cs
index 25ebb23..d41da17 100644
--- a/src/DotPulsar/Schemas/IntegerSchema.cs
+++ b/src/DotPulsar/Schemas/IntegerSchema.cs
@@ -19,7 +19,6 @@ using DotPulsar.Exceptions;
 using System;
 using System.Buffers;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Runtime.InteropServices;
 
 /// <summary>
diff --git a/src/DotPulsar/Schemas/LongSchema.cs 
b/src/DotPulsar/Schemas/LongSchema.cs
index 2976f7a..b3c42de 100644
--- a/src/DotPulsar/Schemas/LongSchema.cs
+++ b/src/DotPulsar/Schemas/LongSchema.cs
@@ -19,7 +19,6 @@ using DotPulsar.Exceptions;
 using System;
 using System.Buffers;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Runtime.InteropServices;
 
 /// <summary>
diff --git a/src/DotPulsar/Schemas/ShortSchema.cs 
b/src/DotPulsar/Schemas/ShortSchema.cs
index 21b1978..73f330f 100644
--- a/src/DotPulsar/Schemas/ShortSchema.cs
+++ b/src/DotPulsar/Schemas/ShortSchema.cs
@@ -19,7 +19,6 @@ using DotPulsar.Exceptions;
 using System;
 using System.Buffers;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Runtime.InteropServices;
 
 /// <summary>
diff --git a/src/DotPulsar/Schemas/StringSchema.cs 
b/src/DotPulsar/Schemas/StringSchema.cs
index d80c5cc..7a265d9 100644
--- a/src/DotPulsar/Schemas/StringSchema.cs
+++ b/src/DotPulsar/Schemas/StringSchema.cs
@@ -92,9 +92,9 @@ public sealed class StringSchema : ISchema<string>
         _encoding = encoding;
 
         var properties = new Dictionary<string, string>
-            {
-                { _charSetKey, GetCharSet(encoding.EncodingName) }
-            };
+        {
+            { _charSetKey, GetCharSet(encoding.EncodingName) }
+        };
 
         SchemaInfo = new SchemaInfo("String", Array.Empty<byte>(), 
SchemaType.String, properties);
     }
diff --git a/src/DotPulsar/SinglePartitionRouter.cs 
b/src/DotPulsar/SinglePartitionRouter.cs
index af13c91..c9a06fc 100644
--- a/src/DotPulsar/SinglePartitionRouter.cs
+++ b/src/DotPulsar/SinglePartitionRouter.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 using HashDepot;
 using System;
 
diff --git a/tests/DotPulsar.Tests/IntegrationFixture.cs 
b/tests/DotPulsar.Tests/IntegrationFixture.cs
index d8f786d..ea6ad48 100644
--- a/tests/DotPulsar.Tests/IntegrationFixture.cs
+++ b/tests/DotPulsar.Tests/IntegrationFixture.cs
@@ -52,13 +52,13 @@ public class IntegrationFixture : IAsyncLifetime
         };
 
         var arguments = "\"" +
-            $"bin/pulsar tokens create-secret-key --output {SecretKeyPath} && 
" +
-            $"export brokerClientAuthenticationParameters=token:$(bin/pulsar 
tokens create --secret-key {SecretKeyPath} --subject {UserName}) && " +
-            "export 
CLIENT_PREFIX_authParams=$brokerClientAuthenticationParameters && " +
-            "bin/apply-config-from-env.py conf/standalone.conf && " +
-            "bin/apply-config-from-env-with-prefix.py CLIENT_PREFIX_ 
conf/client.conf && " +
-            "bin/pulsar standalone --no-functions-worker"
-            + "\"";
+                        $"bin/pulsar tokens create-secret-key --output 
{SecretKeyPath} && " +
+                        $"export 
brokerClientAuthenticationParameters=token:$(bin/pulsar tokens create 
--secret-key {SecretKeyPath} --subject {UserName}) && " +
+                        "export 
CLIENT_PREFIX_authParams=$brokerClientAuthenticationParameters && " +
+                        "bin/apply-config-from-env.py conf/standalone.conf && 
" +
+                        "bin/apply-config-from-env-with-prefix.py 
CLIENT_PREFIX_ conf/client.conf && " +
+                        "bin/pulsar standalone --no-functions-worker"
+                        + "\"";
 
         _cluster = new Builder()
             .UseContainer()
diff --git a/tests/DotPulsar.Tests/Internal/AsyncQueueWithCursorTests.cs 
b/tests/DotPulsar.Tests/Internal/AsyncQueueWithCursorTests.cs
index d9c7313..61994d7 100644
--- a/tests/DotPulsar.Tests/Internal/AsyncQueueWithCursorTests.cs
+++ b/tests/DotPulsar.Tests/Internal/AsyncQueueWithCursorTests.cs
@@ -51,7 +51,7 @@ public class AsyncQueueWithCursorTests
         await sut.Enqueue(expected, CancellationToken.None);
 
         //Act
-        var actual = sut.TryPeek(out QueueItem? result);
+        var actual = sut.TryPeek(out var result);
 
         //Assert
         actual.Should().BeTrue();
@@ -87,7 +87,7 @@ public class AsyncQueueWithCursorTests
         var sut = new AsyncQueueWithCursor<IDisposable>(10);
 
         //Act
-        Action act = () => sut.Dequeue();
+        var act = () => sut.Dequeue();
 
         //Assert
         act.Should().Throw<InvalidOperationException>();
@@ -105,7 +105,7 @@ public class AsyncQueueWithCursorTests
 
         //Act
         await sut.Enqueue(expected, CancellationToken.None);
-        var actual = sut.TryPeek(out QueueItem? result);
+        var actual = sut.TryPeek(out var result);
 
         //Assert
         actual.Should().BeTrue();
@@ -194,8 +194,8 @@ public class AsyncQueueWithCursorTests
         await sut.Enqueue(expected2, CancellationToken.None);
 
         //Act
-        QueueItem actual1 = await sut.NextItem(CancellationToken.None);
-        QueueItem actual2 = await sut.NextItem(CancellationToken.None);
+        var actual1 = await sut.NextItem(CancellationToken.None);
+        var actual2 = await sut.NextItem(CancellationToken.None);
 
         //Assert
         actual1.Should().Be(expected1);
@@ -259,9 +259,9 @@ public class AsyncQueueWithCursorTests
         await sut.NextItem(CancellationToken.None);
 
         //Act
-        QueueItem before = await sut.NextItem(CancellationToken.None);
+        var before = await sut.NextItem(CancellationToken.None);
         sut.ResetCursor();
-        QueueItem after = await sut.NextItem(CancellationToken.None);
+        var after = await sut.NextItem(CancellationToken.None);
 
         //Assert
         before.Should().Be(expected2);
@@ -436,7 +436,8 @@ public class AsyncQueueWithCursorTests
             Number = number;
         }
 
-        public void Dispose() {}
+        public void Dispose() { }
+
         public bool Equals(QueueItem? other)
         {
             if (ReferenceEquals(null, other)) return false;
@@ -448,7 +449,7 @@ public class AsyncQueueWithCursorTests
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != this.GetType()) return false;
-            return Equals((QueueItem)obj);
+            return Equals((QueueItem) obj);
         }
         public override int GetHashCode() =>
             Number;
diff --git a/tests/DotPulsar.Tests/Internal/ChunkingPipelineTests.cs 
b/tests/DotPulsar.Tests/Internal/ChunkingPipelineTests.cs
index 62c9ad6..fa330f8 100644
--- a/tests/DotPulsar.Tests/Internal/ChunkingPipelineTests.cs
+++ b/tests/DotPulsar.Tests/Internal/ChunkingPipelineTests.cs
@@ -47,9 +47,9 @@ public class ChunkingPipelineTests
     }
 
     [Theory]
-    [InlineData(4, 6, 3, 4, 6, 3)]     // No segments can be merged
-    [InlineData(1, 6, 4, 7, 4, null)]  // Can merge a and b
-    [InlineData(4, 6, 1, 4, 7, null)]  // Can merge b and c
+    [InlineData(4, 6, 3, 4, 6, 3)]    // No segments can be merged
+    [InlineData(1, 6, 4, 7, 4, null)] // Can merge a and b
+    [InlineData(4, 6, 1, 4, 7, null)] // Can merge b and c
     public async Task 
Send_GivenSequenceIsOverChunkSize_ShouldWriteMultipleArrays(int length1, int 
length2, int length3, int expected1, int expected2, int? expected3)
     {
         //Arrange
diff --git a/tests/DotPulsar.Tests/Internal/Compression/Lz4CompressionTests.cs 
b/tests/DotPulsar.Tests/Internal/Compression/Lz4CompressionTests.cs
index 7866e95..0577d78 100644
--- a/tests/DotPulsar.Tests/Internal/Compression/Lz4CompressionTests.cs
+++ b/tests/DotPulsar.Tests/Internal/Compression/Lz4CompressionTests.cs
@@ -14,7 +14,6 @@
 
 namespace DotPulsar.Tests.Internal.Compression;
 
-using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Compression;
 using FluentAssertions;
 using Xunit;
@@ -26,7 +25,7 @@ public class Lz4CompressionTests
     public void 
Compression_GivenDataToCompressAndDecompress_ShouldReturnOriginalData()
     {
         // Arrange
-        var couldLoad = Lz4Compression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory);
+        var couldLoad = Lz4Compression.TryLoading(out var compressorFactory, 
out var decompressorFactory);
         couldLoad.Should().BeTrue();
         using var compressor = compressorFactory!.Create();
         using var decompressor = decompressorFactory!.Create();
diff --git 
a/tests/DotPulsar.Tests/Internal/Compression/SnappyCompressionTests.cs 
b/tests/DotPulsar.Tests/Internal/Compression/SnappyCompressionTests.cs
index 05b8d33..688e9a6 100644
--- a/tests/DotPulsar.Tests/Internal/Compression/SnappyCompressionTests.cs
+++ b/tests/DotPulsar.Tests/Internal/Compression/SnappyCompressionTests.cs
@@ -14,7 +14,6 @@
 
 namespace DotPulsar.Tests.Internal.Compression;
 
-using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Compression;
 using FluentAssertions;
 using Xunit;
@@ -26,7 +25,7 @@ public class SnappyCompressionTests
     public void 
Compression_GivenDataToCompressAndDecompress_ShouldReturnOriginalData()
     {
         // Arrange
-        var couldLoad = SnappyCompression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory);
+        var couldLoad = SnappyCompression.TryLoading(out var 
compressorFactory, out var decompressorFactory);
         couldLoad.Should().BeTrue();
         using var compressor = compressorFactory!.Create();
         using var decompressor = decompressorFactory!.Create();
diff --git a/tests/DotPulsar.Tests/Internal/Compression/ZlibCompressionTests.cs 
b/tests/DotPulsar.Tests/Internal/Compression/ZlibCompressionTests.cs
index c563844..475a56d 100644
--- a/tests/DotPulsar.Tests/Internal/Compression/ZlibCompressionTests.cs
+++ b/tests/DotPulsar.Tests/Internal/Compression/ZlibCompressionTests.cs
@@ -14,7 +14,6 @@
 
 namespace DotPulsar.Tests.Internal.Compression;
 
-using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Compression;
 using FluentAssertions;
 using Xunit;
@@ -26,7 +25,7 @@ public class ZlibCompressionTests
     public void 
Compression_GivenDataToCompressAndDecompress_ShouldReturnOriginalData()
     {
         // Arrange
-        var couldLoad = ZlibCompression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory);
+        var couldLoad = ZlibCompression.TryLoading(out var compressorFactory, 
out var decompressorFactory);
         couldLoad.Should().BeTrue();
         using var compressor = compressorFactory!.Create();
         using var decompressor = decompressorFactory!.Create();
diff --git a/tests/DotPulsar.Tests/Internal/Compression/ZstdCompressionTests.cs 
b/tests/DotPulsar.Tests/Internal/Compression/ZstdCompressionTests.cs
index 2487d6a..ef7fa0a 100644
--- a/tests/DotPulsar.Tests/Internal/Compression/ZstdCompressionTests.cs
+++ b/tests/DotPulsar.Tests/Internal/Compression/ZstdCompressionTests.cs
@@ -14,10 +14,8 @@
 
 namespace DotPulsar.Tests.Internal.Compression;
 
-using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Compression;
 using FluentAssertions;
-using System.Runtime.InteropServices;
 using Xunit;
 
 [Trait("Category", "Unit")]
@@ -27,7 +25,7 @@ public class ZstdCompressionTests
     public void 
Compression_GivenDataToCompressAndDecompress_ShouldReturnOriginalData()
     {
         // Arrange
-        var couldLoad = ZstdCompression.TryLoading(out ICompressorFactory? 
compressorFactory, out IDecompressorFactory? decompressorFactory);
+        var couldLoad = ZstdCompression.TryLoading(out var compressorFactory, 
out var decompressorFactory);
         couldLoad.Should().BeTrue();
 
         using var compressor = compressorFactory!.Create();
diff --git 
a/tests/DotPulsar.Tests/Internal/Compression/ZstdSharpCompressionTests.cs 
b/tests/DotPulsar.Tests/Internal/Compression/ZstdSharpCompressionTests.cs
index ca34f83..91a15e4 100644
--- a/tests/DotPulsar.Tests/Internal/Compression/ZstdSharpCompressionTests.cs
+++ b/tests/DotPulsar.Tests/Internal/Compression/ZstdSharpCompressionTests.cs
@@ -14,7 +14,6 @@
 
 namespace DotPulsar.Tests.Internal.Compression;
 
-using DotPulsar.Internal.Abstractions;
 using DotPulsar.Internal.Compression;
 using FluentAssertions;
 using Xunit;
@@ -26,7 +25,7 @@ public class ZstdSharpCompressionTests
     public void 
Compression_GivenDataToCompressAndDecompress_ShouldReturnOriginalData()
     {
         // Arrange
-        var couldLoad = ZstdSharpCompression.TryLoading(out 
ICompressorFactory? compressorFactory, out IDecompressorFactory? 
decompressorFactory);
+        var couldLoad = ZstdSharpCompression.TryLoading(out var 
compressorFactory, out var decompressorFactory);
         couldLoad.Should().BeTrue();
         using var compressor = compressorFactory!.Create();
         using var decompressor = decompressorFactory!.Create();
diff --git a/tests/DotPulsar.Tests/Internal/SequenceBuilderTests.cs 
b/tests/DotPulsar.Tests/Internal/SequenceBuilderTests.cs
index fc7d5c7..dd92cd4 100644
--- a/tests/DotPulsar.Tests/Internal/SequenceBuilderTests.cs
+++ b/tests/DotPulsar.Tests/Internal/SequenceBuilderTests.cs
@@ -17,7 +17,6 @@ namespace DotPulsar.Tests.Internal;
 using DotPulsar.Internal;
 using FluentAssertions;
 using System.Buffers;
-using System.Linq;
 using Xunit;
 
 [Trait("Category", "Unit")]
diff --git a/tests/DotPulsar.Tests/MessageIdTests.cs 
b/tests/DotPulsar.Tests/MessageIdTests.cs
index e416e90..4a4c50e 100644
--- a/tests/DotPulsar.Tests/MessageIdTests.cs
+++ b/tests/DotPulsar.Tests/MessageIdTests.cs
@@ -16,7 +16,6 @@
 
 namespace DotPulsar.Tests;
 
-using DotPulsar;
 using FluentAssertions;
 using Xunit;
 
diff --git a/tests/DotPulsar.Tests/ProducerTests.cs 
b/tests/DotPulsar.Tests/ProducerTests.cs
index 8db8726..5509dd2 100644
--- a/tests/DotPulsar.Tests/ProducerTests.cs
+++ b/tests/DotPulsar.Tests/ProducerTests.cs
@@ -14,7 +14,7 @@
 
 namespace DotPulsar.Tests;
 
-using Abstractions;
+using DotPulsar.Abstractions;
 using DotPulsar.Extensions;
 using FluentAssertions;
 using System;
@@ -41,7 +41,7 @@ public class ProducerTests
     {
         //Arrange
         await using var client = CreateClient();
-        string topicName = $"simple-produce-consume{Guid.NewGuid():N}";
+        var topicName = $"simple-produce-consume{Guid.NewGuid():N}";
         const string content = "test-message";
 
         //Act
@@ -67,7 +67,7 @@ public class ProducerTests
     {
         //Arrange
         await using var client = CreateClient();
-        string topicName = $"simple-produce-consume{Guid.NewGuid():N}";
+        var topicName = $"simple-produce-consume{Guid.NewGuid():N}";
         const string content = "test-message";
         const int msgCount = 3;
 
@@ -156,7 +156,7 @@ public class ProducerTests
         //Arrange
         await using var client = CreateClient();
 
-        string topicName = $"round-robin-partitioned-{Guid.NewGuid():N}";
+        var topicName = $"round-robin-partitioned-{Guid.NewGuid():N}";
         const string content = "test-message";
         const int partitions = 3;
         var consumers = new List<IConsumer<string>>();
@@ -188,9 +188,9 @@ public class ProducerTests
 
     private IPulsarClient CreateClient()
         => PulsarClient
-        .Builder()
-        .Authentication(AuthenticationFactory.Token(ct => 
ValueTask.FromResult(_fixture.CreateToken(Timeout.InfiniteTimeSpan))))
-        .ExceptionHandler(ec => _testOutputHelper.WriteLine($"Exception: 
{ec.Exception}"))
-        .ServiceUrl(_fixture.ServiceUrl)
-        .Build();
+            .Builder()
+            .Authentication(AuthenticationFactory.Token(ct => 
ValueTask.FromResult(_fixture.CreateToken(Timeout.InfiniteTimeSpan))))
+            .ExceptionHandler(ec => _testOutputHelper.WriteLine($"Exception: 
{ec.Exception}"))
+            .ServiceUrl(_fixture.ServiceUrl)
+            .Build();
 }
diff --git a/tests/DotPulsar.Tests/TokenTests.cs 
b/tests/DotPulsar.Tests/TokenTests.cs
index 9834a63..9734fd9 100644
--- a/tests/DotPulsar.Tests/TokenTests.cs
+++ b/tests/DotPulsar.Tests/TokenTests.cs
@@ -71,7 +71,7 @@ public class TokenTests
         await using var producer = CreateProducer(client);
 
         // Act
-        _ = await producer.Send("Test");  // Make sure we have a working 
connection
+        _ = await producer.Send("Test"); // Make sure we have a working 
connection
         throwException = true;
         var state = await producer.OnStateChangeTo(ProducerState.Faulted);
 
@@ -121,7 +121,7 @@ public class TokenTests
         await using var producer = CreateProducer(client);
 
         // Act
-        _ = await producer.Send("Test");  // Make sure we have a working 
connection
+        _ = await producer.Send("Test"); // Make sure we have a working 
connection
         await tcs.Task;
         var state = await producer.OnStateChangeTo(ProducerState.Connected);
 
@@ -131,18 +131,18 @@ public class TokenTests
 
     private IPulsarClient CreateClient(Func<CancellationToken, 
ValueTask<string>> tokenSupplier)
         => PulsarClient
-        .Builder()
-        .Authentication(AuthenticationFactory.Token(tokenSupplier))
-        .ExceptionHandler(ec => _testOutputHelper.WriteLine($"Exception: 
{ec.Exception}"))
-        .ServiceUrl(_fixture.ServiceUrl)
-        .Build();
+            .Builder()
+            .Authentication(AuthenticationFactory.Token(tokenSupplier))
+            .ExceptionHandler(ec => _testOutputHelper.WriteLine($"Exception: 
{ec.Exception}"))
+            .ServiceUrl(_fixture.ServiceUrl)
+            .Build();
 
     private IProducer<string> CreateProducer(IPulsarClient client)
         => client
-        .NewProducer(Schema.String)
-        .Topic(MyTopic)
-        .StateChangedHandler(Monitor)
-        .Create();
+            .NewProducer(Schema.String)
+            .Topic(MyTopic)
+            .StateChangedHandler(Monitor)
+            .Create();
 
     private void Monitor(ProducerStateChanged stateChanged, CancellationToken 
_)
     {

Reply via email to