more style cleanup taken over from other pull request

bollhals · bollhals · commit ab36f9b64217 · 2020-08-15T01:31:26.000+02:00
diff --git a/projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs b/projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs
@@ -222,7 +222,7 @@ public static AmqpTcpEndpoint Parse(string address)
         /// </remarks>
         public static AmqpTcpEndpoint[] ParseMultiple(string addresses)
         {
-            string[] partsArr = addresses.Split(new[] {','});
+            string[] partsArr = addresses.Split(',');
             var results = new List<AmqpTcpEndpoint>();
             foreach (string partRaw in partsArr)
             {
diff --git a/projects/RabbitMQ.Client/client/api/ExternalMechanism.cs b/projects/RabbitMQ.Client/client/api/ExternalMechanism.cs
@@ -29,6 +29,8 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+using System;
+
 namespace RabbitMQ.Client
 {
     public class ExternalMechanism : IAuthMechanism
@@ -38,7 +40,7 @@ public class ExternalMechanism : IAuthMechanism
         /// </summary>
         public byte[] handleChallenge(byte[] challenge, IConnectionFactory factory)
         {
-            return new byte[0];
+            return Array.Empty<byte>();
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/api/IEndpointResolverExtensions.cs b/projects/RabbitMQ.Client/client/api/IEndpointResolverExtensions.cs
@@ -40,12 +40,12 @@ public static T SelectOne<T>(this IEndpointResolver resolver, Func<AmqpTcpEndpoi
         {
             var t = default(T);
             var exceptions = new List<Exception>();
-            foreach(AmqpTcpEndpoint ep in resolver.All())
+            foreach (AmqpTcpEndpoint ep in resolver.All())
             {
                 try
                 {
                     t = selector(ep);
-                    if(t.Equals(default(T)) == false)
+                    if (t.Equals(default(T)) == false)
                     {
                         return t;
                     }
@@ -56,12 +56,12 @@ public static T SelectOne<T>(this IEndpointResolver resolver, Func<AmqpTcpEndpoi
                 }
             }
 
-            if(Object.Equals(t, default(T)) && exceptions.Count > 0)
+            if (Object.Equals(t, default(T)) && exceptions.Count > 0)
             {
                 throw new AggregateException(exceptions);
             }
 
             return t;
         }
     }
-}
+}
diff --git a/projects/RabbitMQ.Client/client/events/AsyncEventHandler.cs b/projects/RabbitMQ.Client/client/events/AsyncEventHandler.cs
@@ -9,9 +9,9 @@ internal static class AsyncEventHandlerExtensions
     {
         public static async Task InvokeAsync<TEvent>(this AsyncEventHandler<TEvent> eventHandler, object sender, TEvent @event) where TEvent : EventArgs
         {
-            if(eventHandler != null)
+            if (eventHandler != null)
             {
-                foreach(AsyncEventHandler<TEvent> handlerInstance in eventHandler.GetInvocationList())
+                foreach (AsyncEventHandler<TEvent> handlerInstance in eventHandler.GetInvocationList())
                 {
                     await handlerInstance(sender, @event).ConfigureAwait(false);
                 }
diff --git a/projects/RabbitMQ.Client/client/impl/AmqpVersion.cs b/projects/RabbitMQ.Client/client/impl/AmqpVersion.cs
@@ -45,7 +45,7 @@ namespace RabbitMQ.Client.Framing.Impl
     /// special-cases 8-0, rewriting it at construction time to be 0-8 instead.
     /// </para>
     /// </remarks>
-    class AmqpVersion
+    internal class AmqpVersion
     {
         /// <summary>
         /// Construct an <see cref="AmqpVersion"/> from major and minor version numbers.
diff --git a/projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs b/projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs
@@ -46,10 +46,10 @@ public Task Stop(IModel model)
             return Task.CompletedTask;
         }
 
-        class WorkPool
+        private class WorkPool
         {
-            readonly Channel<Work> _channel;
-            readonly IModel _model;
+            private readonly Channel<Work> _channel;
+            private readonly IModel _model;
             private Task _worker;
             private readonly int _concurrency;
             private SemaphoreSlim _limiter;
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringModel.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringModel.cs
@@ -1828,7 +1828,7 @@ public IBasicPublishBatch CreateBasicPublishBatch()
                 throw new ObjectDisposedException(GetType().FullName);
             }
 
-            return ((IFullModel)_delegate).CreateBasicPublishBatch();
+            return _delegate.CreateBasicPublishBatch();
         }
 
         public IBasicPublishBatch CreateBasicPublishBatch(int sizeHint)
@@ -1838,7 +1838,7 @@ public IBasicPublishBatch CreateBasicPublishBatch(int sizeHint)
                 throw new ObjectDisposedException(GetType().FullName);
             }
 
-            return ((IFullModel)_delegate).CreateBasicPublishBatch(sizeHint);
+            return _delegate.CreateBasicPublishBatch(sizeHint);
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/impl/BasicProperties.cs b/projects/RabbitMQ.Client/client/impl/BasicProperties.cs
@@ -33,7 +33,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    abstract class BasicProperties : ContentHeaderBase, IBasicProperties
+    internal abstract class BasicProperties : ContentHeaderBase, IBasicProperties
     {
         /// <summary>
         /// Application Id.
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -1043,7 +1043,7 @@ internal OutgoingCommand ChannelCloseWrapper(ushort reasonCode, string reasonTex
             return request;
         }
 
-        void StartAndTune()
+        private void StartAndTune()
         {
             var connectionStartCell = new BlockingCell<ConnectionStartDetails>();
             _model0.m_connectionStartCell = connectionStartCell;
diff --git a/projects/RabbitMQ.Client/client/impl/ConnectionStartDetails.cs b/projects/RabbitMQ.Client/client/impl/ConnectionStartDetails.cs
@@ -33,7 +33,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    class ConnectionStartDetails
+    internal class ConnectionStartDetails
     {
         public byte[] m_locales;
         public byte[] m_mechanisms;
diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerWorkService.cs b/projects/RabbitMQ.Client/client/impl/ConsumerWorkService.cs
@@ -60,12 +60,12 @@ internal Task StopWorkAsync(IModel model)
             return Task.CompletedTask;
         }
 
-        class WorkPool
+        private class WorkPool
         {
             private readonly Channel<Action> _channel;
             private readonly int _concurrency;
             private Task _worker;
-            CancellationTokenSource _tokenSource;
+            private CancellationTokenSource _tokenSource;
             private SemaphoreSlim _limiter;
 
             public WorkPool(int concurrency)
@@ -93,7 +93,7 @@ public void Enqueue(Action action)
                 _channel.Writer.TryWrite(action);
             }
 
-            async Task Loop()
+            private async Task Loop()
             {
                 while (await _channel.Reader.WaitToReadAsync().ConfigureAwait(false))
                 {
@@ -111,7 +111,7 @@ async Task Loop()
                 }
             }
 
-            async Task LoopWithConcurrency(CancellationToken cancellationToken)
+            private async Task LoopWithConcurrency(CancellationToken cancellationToken)
             {
                 try
                 {
@@ -135,7 +135,7 @@ async Task LoopWithConcurrency(CancellationToken cancellationToken)
                 }
             }
 
-            static async Task OffloadToWorkerThreadPool(Action action, SemaphoreSlim limiter)
+            private static async Task OffloadToWorkerThreadPool(Action action, SemaphoreSlim limiter)
             {
                 try
                 {
diff --git a/projects/RabbitMQ.Client/client/impl/IConsumerDispatcher.cs b/projects/RabbitMQ.Client/client/impl/IConsumerDispatcher.cs
@@ -34,7 +34,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    interface IConsumerDispatcher
+    internal interface IConsumerDispatcher
     {
         bool IsShutdown { get; }
 
diff --git a/projects/RabbitMQ.Client/client/impl/IFrameHandler.cs b/projects/RabbitMQ.Client/client/impl/IFrameHandler.cs
@@ -34,7 +34,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    interface IFrameHandler
+    internal interface IFrameHandler
     {
         AmqpTcpEndpoint Endpoint { get; }
 
diff --git a/projects/RabbitMQ.Client/client/impl/IProtocolExtensions.cs b/projects/RabbitMQ.Client/client/impl/IProtocolExtensions.cs
@@ -37,7 +37,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl
 {
-    static class IProtocolExtensions
+    internal static class IProtocolExtensions
     {
         public static IFrameHandler CreateFrameHandler(
             this IProtocol protocol,
diff --git a/projects/RabbitMQ.Client/client/impl/IRpcContinuation.cs b/projects/RabbitMQ.Client/client/impl/IRpcContinuation.cs
@@ -31,7 +31,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    interface IRpcContinuation
+    internal interface IRpcContinuation
     {
         void HandleCommand(in IncomingCommand cmd);
         void HandleModelShutdown(ShutdownEventArgs reason);
diff --git a/projects/RabbitMQ.Client/client/impl/MethodBase.cs b/projects/RabbitMQ.Client/client/impl/MethodBase.cs
@@ -31,7 +31,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    abstract class MethodBase : IMethod
+    internal abstract class MethodBase : IMethod
     {
         public abstract bool HasContent { get; }
 
diff --git a/projects/RabbitMQ.Client/client/impl/ModelBase.cs b/projects/RabbitMQ.Client/client/impl/ModelBase.cs
@@ -45,7 +45,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    abstract class ModelBase : IFullModel, IRecoverable
+    internal abstract class ModelBase : IFullModel, IRecoverable
     {
         ///<summary>Only used to kick-start a connection open
         ///sequence. See <see cref="Connection.Open"/> </summary>
diff --git a/projects/RabbitMQ.Client/client/impl/RpcContinuationQueue.cs b/projects/RabbitMQ.Client/client/impl/RpcContinuationQueue.cs
@@ -43,7 +43,7 @@ namespace RabbitMQ.Client.Impl
     /// under a somewhat generous reading.
     ///</para>
     ///</remarks>
-    class RpcContinuationQueue
+    internal class RpcContinuationQueue
     {
         private class EmptyRpcContinuation : IRpcContinuation
         {
@@ -55,8 +55,9 @@ public void HandleModelShutdown(ShutdownEventArgs reason)
             {
             }
         }
-        static readonly EmptyRpcContinuation s_tmp = new EmptyRpcContinuation();
-        IRpcContinuation _outstandingRpc = s_tmp;
+
+        private static readonly EmptyRpcContinuation s_tmp = new EmptyRpcContinuation();
+        private IRpcContinuation _outstandingRpc = s_tmp;
 
         ///<summary>Enqueue a continuation, marking a pending RPC.</summary>
         ///<remarks>
diff --git a/projects/RabbitMQ.Client/client/impl/SessionManager.cs b/projects/RabbitMQ.Client/client/impl/SessionManager.cs
@@ -36,7 +36,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    class SessionManager
+    internal class SessionManager
     {
         public readonly ushort ChannelMax;
         private readonly IntAllocator _ints;
diff --git a/projects/RabbitMQ.Client/client/impl/ShutdownContinuation.cs b/projects/RabbitMQ.Client/client/impl/ShutdownContinuation.cs
@@ -35,7 +35,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    class ShutdownContinuation
+    internal class ShutdownContinuation
     {
         public readonly BlockingCell<ShutdownEventArgs> m_cell = new BlockingCell<ShutdownEventArgs>();
 
diff --git a/projects/RabbitMQ.Client/client/impl/SimpleBlockingRpcContinuation.cs b/projects/RabbitMQ.Client/client/impl/SimpleBlockingRpcContinuation.cs
@@ -35,7 +35,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    class SimpleBlockingRpcContinuation : IRpcContinuation
+    internal class SimpleBlockingRpcContinuation : IRpcContinuation
     {
         public readonly BlockingCell<Either<IncomingCommand, ShutdownEventArgs>> m_cell = new BlockingCell<Either<IncomingCommand, ShutdownEventArgs>>();
 
diff --git a/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs b/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs
@@ -60,7 +60,7 @@ public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
         }
     }
 
-    class SocketFrameHandler : IFrameHandler
+    internal class SocketFrameHandler : IFrameHandler
     {
         // Socket poll timeout in ms. If the socket does not
         // become writeable in this amount of time, we throw
diff --git a/projects/RabbitMQ.Client/client/impl/SslHelper.cs b/projects/RabbitMQ.Client/client/impl/SslHelper.cs
@@ -41,7 +41,7 @@ namespace RabbitMQ.Client.Impl
     /// Represents an <see cref="SslHelper"/> which does the actual heavy lifting to set up an SSL connection,
     ///  using the config options in an <see cref="SslOption"/> to make things cleaner.
     /// </summary>
-    class SslHelper
+    internal class SslHelper
     {
         private readonly SslOption _sslOption;
 
diff --git a/projects/RabbitMQ.Client/client/impl/StreamProperties.cs b/projects/RabbitMQ.Client/client/impl/StreamProperties.cs
@@ -33,7 +33,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    abstract class StreamProperties : ContentHeaderBase, IStreamProperties
+    internal abstract class StreamProperties : ContentHeaderBase, IStreamProperties
     {
         public abstract string ContentEncoding { get; set; }
         public abstract string ContentType { get; set; }
diff --git a/projects/RabbitMQ.Client/client/impl/TcpClientAdapter.cs b/projects/RabbitMQ.Client/client/impl/TcpClientAdapter.cs
@@ -8,7 +8,7 @@ namespace RabbitMQ.Client.Impl
     /// <summary>
     /// Simple wrapper around TcpClient.
     /// </summary>
-    class TcpClientAdapter : ITcpClient
+    internal class TcpClientAdapter : ITcpClient
     {
         private Socket _sock;
 
@@ -42,10 +42,7 @@ public virtual async Task ConnectAsync(IPAddress ep, int port)
 
         public virtual void Close()
         {
-            if (_sock != null)
-            {
-                _sock.Dispose();
-            }
+            _sock?.Dispose();
             _sock = null;
         }
 
@@ -84,7 +81,10 @@ public virtual bool Connected
         {
             get
             {
-                if(_sock == null) return false;
+                if (_sock is null)
+                {
+                    return false;
+                }
                 return _sock.Connected;
             }
         }
@@ -105,7 +105,7 @@ public virtual TimeSpan ReceiveTimeout
 
         private void AssertSocket()
         {
-            if(_sock == null)
+            if (_sock is null)
             {
                 throw new InvalidOperationException("Cannot perform operation as socket is null");
             }
diff --git a/projects/RabbitMQ.Client/client/impl/TcpClientAdapterHelper.cs b/projects/RabbitMQ.Client/client/impl/TcpClientAdapterHelper.cs
@@ -5,7 +5,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    static class TcpClientAdapterHelper
+    internal static class TcpClientAdapterHelper
     {
         public static IPAddress GetMatchingHost(IReadOnlyCollection<IPAddress> addresses, AddressFamily addressFamily)
         {
diff --git a/projects/RabbitMQ.Client/client/logging/ESLog.cs b/projects/RabbitMQ.Client/client/logging/ESLog.cs
@@ -31,7 +31,7 @@
 
 namespace RabbitMQ.Client.Logging
 {
-    static class ESLog
+    internal static class ESLog
     {
         public static void Info(string message)
         {
diff --git a/projects/RabbitMQ.Client/util/BlockingCell.cs b/projects/RabbitMQ.Client/util/BlockingCell.cs
@@ -44,7 +44,7 @@ namespace RabbitMQ.Util
     ///attempts to set Value result in a thrown
     ///InvalidOperationException.
     ///</remarks>
-    class BlockingCell<T>
+    internal class BlockingCell<T>
     {
         private readonly ManualResetEventSlim _manualResetEventSlim = new ManualResetEventSlim(false);
         private T _value = default;
diff --git a/projects/RabbitMQ.Client/util/DebugUtil.cs b/projects/RabbitMQ.Client/util/DebugUtil.cs
@@ -40,7 +40,7 @@ namespace RabbitMQ.Util
     ///<remarks>
     ///Not part of the public API.
     ///</remarks>
-    static class DebugUtil
+    internal static class DebugUtil
     {
         ///<summary>Print a hex dump of the supplied bytes to stdout.</summary>
         public static void Dump(byte[] bytes)
diff --git a/projects/RabbitMQ.Client/util/Either.cs b/projects/RabbitMQ.Client/util/Either.cs
diff --git a/projects/RabbitMQ.Client/util/IntAllocator.cs b/projects/RabbitMQ.Client/util/IntAllocator.cs
diff --git a/projects/RabbitMQ.Client/util/SetQueue.cs b/projects/RabbitMQ.Client/util/SetQueue.cs
diff --git a/projects/RabbitMQ.Client/util/SharedQueue.cs b/projects/RabbitMQ.Client/util/SharedQueue.cs

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ public static AmqpTcpEndpoint Parse(string address)`
`222`	`222`	`/// </remarks>`
`223`	`223`	`public static AmqpTcpEndpoint[] ParseMultiple(string addresses)`
`224`	`224`	`{`
`225`		`- string[] partsArr = addresses.Split(new[] {','});`
	`225`	`+ string[] partsArr = addresses.Split(',');`
`226`	`226`	`var results = new List<AmqpTcpEndpoint>();`
`227`	`227`	`foreach (string partRaw in partsArr)`
`228`	`228`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.`
`30`	`30`	`//---------------------------------------------------------------------------`
`31`	`31`
	`32`	`+using System;`
	`33`	`+`
`32`	`34`	`namespace RabbitMQ.Client`
`33`	`35`	`{`
`34`	`36`	`public class ExternalMechanism : IAuthMechanism`
`@@ -38,7 +40,7 @@ public class ExternalMechanism : IAuthMechanism`
`38`	`40`	`/// </summary>`
`39`	`41`	`public byte[] handleChallenge(byte[] challenge, IConnectionFactory factory)`
`40`	`42`	`{`
`41`		`- return new byte[0];`
	`43`	`+ return Array.Empty<byte>();`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public static T SelectOne<T>(this IEndpointResolver resolver, Func<AmqpTcpEndpoi`
`40`	`40`	`{`
`41`	`41`	`var t = default(T);`
`42`	`42`	`var exceptions = new List<Exception>();`
`43`		`- foreach(AmqpTcpEndpoint ep in resolver.All())`
	`43`	`+ foreach (AmqpTcpEndpoint ep in resolver.All())`
`44`	`44`	`{`
`45`	`45`	`try`
`46`	`46`	`{`
`47`	`47`	`t = selector(ep);`
`48`		`- if(t.Equals(default(T)) == false)`
	`48`	`+ if (t.Equals(default(T)) == false)`
`49`	`49`	`{`
`50`	`50`	`return t;`
`51`	`51`	`}`
`@@ -56,12 +56,12 @@ public static T SelectOne<T>(this IEndpointResolver resolver, Func<AmqpTcpEndpoi`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- if(Object.Equals(t, default(T)) && exceptions.Count > 0)`
	`59`	`+ if (Object.Equals(t, default(T)) && exceptions.Count > 0)`
`60`	`60`	`{`
`61`	`61`	`throw new AggregateException(exceptions);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`return t;`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`-}`
	`67`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ internal static class AsyncEventHandlerExtensions`
`9`	`9`	`{`
`10`	`10`	`public static async Task InvokeAsync<TEvent>(this AsyncEventHandler<TEvent> eventHandler, object sender, TEvent @event) where TEvent : EventArgs`
`11`	`11`	`{`
`12`		`- if(eventHandler != null)`
	`12`	`+ if (eventHandler != null)`
`13`	`13`	`{`
`14`		`- foreach(AsyncEventHandler<TEvent> handlerInstance in eventHandler.GetInvocationList())`
	`14`	`+ foreach (AsyncEventHandler<TEvent> handlerInstance in eventHandler.GetInvocationList())`
`15`	`15`	`{`
`16`	`16`	`await handlerInstance(sender, @event).ConfigureAwait(false);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ namespace RabbitMQ.Client.Framing.Impl`
`45`	`45`	`/// special-cases 8-0, rewriting it at construction time to be 0-8 instead.`
`46`	`46`	`/// </para>`
`47`	`47`	`/// </remarks>`
`48`		`- class AmqpVersion`
	`48`	`+ internal class AmqpVersion`
`49`	`49`	`{`
`50`	`50`	`/// <summary>`
`51`	`51`	`/// Construct an <see cref="AmqpVersion"/> from major and minor version numbers.`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,10 @@ public Task Stop(IModel model)`
`46`	`46`	`return Task.CompletedTask;`
`47`	`47`	`}`
`48`	`48`
`49`		`- class WorkPool`
	`49`	`+ private class WorkPool`
`50`	`50`	`{`
`51`		`- readonly Channel<Work> _channel;`
`52`		`- readonly IModel _model;`
	`51`	`+ private readonly Channel<Work> _channel;`
	`52`	`+ private readonly IModel _model;`
`53`	`53`	`private Task _worker;`
`54`	`54`	`private readonly int _concurrency;`
`55`	`55`	`private SemaphoreSlim _limiter;`
Original file line number	Diff line number	Diff line change
`@@ -1828,7 +1828,7 @@ public IBasicPublishBatch CreateBasicPublishBatch()`
`1828`	`1828`	`throw new ObjectDisposedException(GetType().FullName);`
`1829`	`1829`	`}`
`1830`	`1830`
`1831`		`- return ((IFullModel)_delegate).CreateBasicPublishBatch();`
	`1831`	`+ return _delegate.CreateBasicPublishBatch();`
`1832`	`1832`	`}`
`1833`	`1833`
`1834`	`1834`	`public IBasicPublishBatch CreateBasicPublishBatch(int sizeHint)`
`@@ -1838,7 +1838,7 @@ public IBasicPublishBatch CreateBasicPublishBatch(int sizeHint)`
`1838`	`1838`	`throw new ObjectDisposedException(GetType().FullName);`
`1839`	`1839`	`}`
`1840`	`1840`
`1841`		`- return ((IFullModel)_delegate).CreateBasicPublishBatch(sizeHint);`
	`1841`	`+ return _delegate.CreateBasicPublishBatch(sizeHint);`
`1842`	`1842`	`}`
`1843`	`1843`	`}`
`1844`	`1844`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`
`34`	`34`	`namespace RabbitMQ.Client.Impl`
`35`	`35`	`{`
`36`		`- abstract class BasicProperties : ContentHeaderBase, IBasicProperties`
	`36`	`+ internal abstract class BasicProperties : ContentHeaderBase, IBasicProperties`
`37`	`37`	`{`
`38`	`38`	`/// <summary>`
`39`	`39`	`/// Application Id.`
Original file line number	Diff line number	Diff line change
`@@ -1043,7 +1043,7 @@ internal OutgoingCommand ChannelCloseWrapper(ushort reasonCode, string reasonTex`
`1043`	`1043`	`return request;`
`1044`	`1044`	`}`
`1045`	`1045`
`1046`		`- void StartAndTune()`
	`1046`	`+ private void StartAndTune()`
`1047`	`1047`	`{`
`1048`	`1048`	`var connectionStartCell = new BlockingCell<ConnectionStartDetails>();`
`1049`	`1049`	`_model0.m_connectionStartCell = connectionStartCell;`
Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,12 @@ internal Task StopWorkAsync(IModel model)`
`60`	`60`	`return Task.CompletedTask;`
`61`	`61`	`}`
`62`	`62`
`63`		`- class WorkPool`
	`63`	`+ private class WorkPool`
`64`	`64`	`{`
`65`	`65`	`private readonly Channel<Action> _channel;`
`66`	`66`	`private readonly int _concurrency;`
`67`	`67`	`private Task _worker;`
`68`		`- CancellationTokenSource _tokenSource;`
	`68`	`+ private CancellationTokenSource _tokenSource;`
`69`	`69`	`private SemaphoreSlim _limiter;`
`70`	`70`
`71`	`71`	`public WorkPool(int concurrency)`
`@@ -93,7 +93,7 @@ public void Enqueue(Action action)`
`93`	`93`	`_channel.Writer.TryWrite(action);`
`94`	`94`	`}`
`95`	`95`
`96`		`- async Task Loop()`
	`96`	`+ private async Task Loop()`
`97`	`97`	`{`
`98`	`98`	`while (await _channel.Reader.WaitToReadAsync().ConfigureAwait(false))`
`99`	`99`	`{`
`@@ -111,7 +111,7 @@ async Task Loop()`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- async Task LoopWithConcurrency(CancellationToken cancellationToken)`
	`114`	`+ private async Task LoopWithConcurrency(CancellationToken cancellationToken)`
`115`	`115`	`{`
`116`	`116`	`try`
`117`	`117`	`{`
`@@ -135,7 +135,7 @@ async Task LoopWithConcurrency(CancellationToken cancellationToken)`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`		`- static async Task OffloadToWorkerThreadPool(Action action, SemaphoreSlim limiter)`
	`138`	`+ private static async Task OffloadToWorkerThreadPool(Action action, SemaphoreSlim limiter)`
`139`	`139`	`{`
`140`	`140`	`try`
`141`	`141`	`{`