General code refactoring.

Source/MQTTnet.AspnetCore/Extensions/ApplicationBuilderExtensions.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using MQTTnet.Server;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
     public static class ApplicationBuilderExtensions
     {

Source/MQTTnet.AspnetCore/Extensions/ConnectionBuilderExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Connections;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
     public static class ConnectionBuilderExtensions
     {

Source/MQTTnet.AspnetCore/Extensions/ConnectionRouteBuilderExtensions.cs

@@ -1,8 +1,11 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Connections;
-using System;
 
-namespace MQTTnet.AspNetCore
+#if NETCOREAPP3_1
+using System;
+#endif
+
+namespace MQTTnet.AspNetCore.Extensions
 {
     public static class ConnectionRouteBuilderExtensions
     {

Source/MQTTnet.AspnetCore/Extensions/ReaderExtensions.cs

@@ -5,7 +5,7 @@ using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
     public static class ReaderExtensions
     {

Source/MQTTnet.AspnetCore/Extensions/ServiceCollectionExtensions.cs

@@ -1,12 +1,12 @@
-using Microsoft.Extensions.DependencyInjection;
+using System;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 using MQTTnet.Implementations;
 using MQTTnet.Server;
-using System;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
     public static class ServiceCollectionExtensions
     {

Source/MQTTnet.AspnetCore/MqttConnectionContext.cs

@@ -10,6 +10,7 @@ using System.IO.Pipelines;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.AspNetCore.Extensions;
 
 namespace MQTTnet.AspNetCore
 {

Source/MQTTnet.AspnetCore/SpanBasedMqttPacketBodyReader.cs

@@ -8,9 +8,9 @@ namespace MQTTnet.AspNetCore
 {
     public class SpanBasedMqttPacketBodyReader : IMqttPacketBodyReader
     {
-        private ReadOnlyMemory<byte> _buffer;
+        ReadOnlyMemory<byte> _buffer;
 
-        private int _offset;
+        int _offset;
         
         public void SetBuffer(ReadOnlyMemory<byte> buffer)
         {
@@ -38,16 +38,6 @@ namespace MQTTnet.AspNetCore
         {
             return ReadSegmentWithLengthPrefix().ToArray();
         }
-
-        private ReadOnlySpan<byte> ReadSegmentWithLengthPrefix()
-        {
-            var span = _buffer.Span;
-            var length = BinaryPrimitives.ReadUInt16BigEndian(span.Slice(_offset));
-
-            var result = span.Slice(_offset+2, length);
-            _offset += 2 + length;
-            return result;
-        }
         
         public unsafe string ReadStringWithLengthPrefix()
         {
@@ -121,5 +111,15 @@ namespace MQTTnet.AspNetCore
         {
             _offset = position;
         }
+
+        ReadOnlySpan<byte> ReadSegmentWithLengthPrefix()
+        {
+            var span = _buffer.Span;
+            var length = BinaryPrimitives.ReadUInt16BigEndian(span.Slice(_offset));
+
+            var result = span.Slice(_offset + 2, length);
+            _offset += 2 + length;
+            return result;
+        }
     }
 }

Source/MQTTnet.AspnetCore/SpanBasedMqttPacketWriter.cs

@@ -8,16 +8,10 @@ namespace MQTTnet.AspNetCore
 {
     public class SpanBasedMqttPacketWriter : IMqttPacketWriter
     {
-        private readonly ArrayPool<byte> _pool;
+        readonly ArrayPool<byte> _pool = ArrayPool<byte>.Create();
 
-        public SpanBasedMqttPacketWriter()
-        {
-            _pool = ArrayPool<byte>.Create();
-            
-        }
-
-        private byte[] _buffer;
-        private int _position;
+        byte[] _buffer;
+        int _position;
 
         public int Length { get; set; }
 
@@ -112,7 +106,7 @@ namespace MQTTnet.AspNetCore
             Commit(payload.Length);
         }
 
-        private void Commit(int count)
+        void Commit(int count)
         {
             if (_position == Length)
             {
@@ -122,7 +116,7 @@ namespace MQTTnet.AspNetCore
             _position += count;
         }
 
-        private void GrowIfNeeded(int requiredAdditional) 
+        void GrowIfNeeded(int requiredAdditional) 
         {
             var requiredTotal = _position + requiredAdditional;
             if (_buffer.Length >= requiredTotal)