Performed Code Cleanup

sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/ActiveClientLinkManager.cs

@@ -9,146 +9,149 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using System.Threading;
     using System.Threading.Tasks;
 
-    sealed class ActiveClientLinkManager
+    internal sealed class ActiveClientLinkManager
     {
-        static readonly TimeSpan SendTokenTimeout = TimeSpan.FromMinutes(1);
-        static readonly TimeSpan TokenRefreshBuffer = TimeSpan.FromSeconds(10);
-        static readonly TimeSpan MaxTokenRefreshTime = TimeSpan.FromDays(30);
+	    private static readonly TimeSpan SendTokenTimeout = TimeSpan.FromMinutes(1);
+	    private static readonly TimeSpan TokenRefreshBuffer = TimeSpan.FromSeconds(10);
+	    private static readonly TimeSpan MaxTokenRefreshTime = TimeSpan.FromDays(30);
 
-        readonly string clientId;
-        readonly RetryPolicy retryPolicy;
-        readonly ICbsTokenProvider cbsTokenProvider;
-        Timer sendReceiveLinkCbsTokenRenewalTimer;
-        Timer requestResponseLinkCbsTokenRenewalTimer;
+	    private readonly string _clientId;
+	    private readonly RetryPolicy _retryPolicy;
+	    private readonly ICbsTokenProvider _cbsTokenProvider;
+	    private Timer _sendReceiveLinkCbsTokenRenewalTimer;
+	    private Timer _requestResponseLinkCbsTokenRenewalTimer;
 
-        ActiveSendReceiveClientLink activeSendReceiveClientLink;
-        ActiveRequestResponseLink activeRequestResponseClientLink;
+	    private ActiveSendReceiveClientLink _activeSendReceiveClientLink;
+	    private ActiveRequestResponseLink _activeRequestResponseClientLink;
 
         public ActiveClientLinkManager(ClientEntity client, ICbsTokenProvider tokenProvider)
         {
-            this.clientId = client.ClientId;
-            this.retryPolicy = client.RetryPolicy ?? RetryPolicy.Default;
-            this.cbsTokenProvider = tokenProvider;
-            this.sendReceiveLinkCbsTokenRenewalTimer = new Timer(OnRenewSendReceiveCbsToken, this, Timeout.Infinite, Timeout.Infinite);
-            this.requestResponseLinkCbsTokenRenewalTimer = new Timer(OnRenewRequestResponseCbsToken, this, Timeout.Infinite, Timeout.Infinite);
+            _clientId = client.ClientId;
+            _retryPolicy = client.RetryPolicy ?? RetryPolicy.Default;
+            _cbsTokenProvider = tokenProvider;
+            _sendReceiveLinkCbsTokenRenewalTimer = new Timer(OnRenewSendReceiveCbsToken, this, Timeout.Infinite, Timeout.Infinite);
+            _requestResponseLinkCbsTokenRenewalTimer = new Timer(OnRenewRequestResponseCbsToken, this, Timeout.Infinite, Timeout.Infinite);
         }
 
         public void Close()
         {
-            this.sendReceiveLinkCbsTokenRenewalTimer.Dispose();
-            this.sendReceiveLinkCbsTokenRenewalTimer = null;
-            this.requestResponseLinkCbsTokenRenewalTimer.Dispose();
-            this.requestResponseLinkCbsTokenRenewalTimer = null;
+            _sendReceiveLinkCbsTokenRenewalTimer.Dispose();
+            _sendReceiveLinkCbsTokenRenewalTimer = null;
+            _requestResponseLinkCbsTokenRenewalTimer.Dispose();
+            _requestResponseLinkCbsTokenRenewalTimer = null;
         }
 
         public void SetActiveSendReceiveLink(ActiveSendReceiveClientLink sendReceiveClientLink)
         {
-            this.activeSendReceiveClientLink = sendReceiveClientLink;
-            this.activeSendReceiveClientLink.Link.Closed += this.OnSendReceiveLinkClosed;
-            if (this.activeSendReceiveClientLink.Link.State == AmqpObjectState.Opened)
+            _activeSendReceiveClientLink = sendReceiveClientLink;
+            _activeSendReceiveClientLink.Link.Closed += OnSendReceiveLinkClosed;
+            if (_activeSendReceiveClientLink.Link.State == AmqpObjectState.Opened)
             {
-                this.SetRenewCbsTokenTimer(sendReceiveClientLink);
+                SetRenewCbsTokenTimer(sendReceiveClientLink);
             }
         }
 
-        void OnSendReceiveLinkClosed(object sender, EventArgs e)
+        private void OnSendReceiveLinkClosed(object sender, EventArgs e)
         {
-            this.ChangeRenewTimer(this.activeSendReceiveClientLink, Timeout.InfiniteTimeSpan);
+            ChangeRenewTimer(_activeSendReceiveClientLink, Timeout.InfiniteTimeSpan);
         }
 
         public void SetActiveRequestResponseLink(ActiveRequestResponseLink requestResponseLink)
         {
-            this.activeRequestResponseClientLink = requestResponseLink;
-            this.activeRequestResponseClientLink.Link.Closed += this.OnRequestResponseLinkClosed;
-            if (this.activeRequestResponseClientLink.Link.State == AmqpObjectState.Opened)
+            _activeRequestResponseClientLink = requestResponseLink;
+            _activeRequestResponseClientLink.Link.Closed += OnRequestResponseLinkClosed;
+            if (_activeRequestResponseClientLink.Link.State == AmqpObjectState.Opened)
             {
-                this.SetRenewCbsTokenTimer(requestResponseLink);
+                SetRenewCbsTokenTimer(requestResponseLink);
             }
         }
 
-        static async void OnRenewSendReceiveCbsToken(object state)
+        private static async void OnRenewSendReceiveCbsToken(object state)
         {
             var activeClientLinkManager = (ActiveClientLinkManager)state;
-            await activeClientLinkManager.RenewCbsTokenAsync(activeClientLinkManager.activeSendReceiveClientLink).ConfigureAwait(false);
+            await activeClientLinkManager.RenewCbsTokenAsync(activeClientLinkManager._activeSendReceiveClientLink).ConfigureAwait(false);
         }
 
-        static async void OnRenewRequestResponseCbsToken(object state)
+        private static async void OnRenewRequestResponseCbsToken(object state)
         {
             var activeClientLinkManager = (ActiveClientLinkManager)state;
-            await activeClientLinkManager.RenewCbsTokenAsync(activeClientLinkManager.activeRequestResponseClientLink).ConfigureAwait(false);
+            await activeClientLinkManager.RenewCbsTokenAsync(activeClientLinkManager._activeRequestResponseClientLink).ConfigureAwait(false);
         }
 
-        async Task RenewCbsTokenAsync(ActiveClientLinkObject activeClientLinkObject)
+        private async Task RenewCbsTokenAsync(ActiveClientLinkObject activeClientLinkObject)
         {
             try
             {
                 var cbsLink = activeClientLinkObject.Connection.Extensions.Find<AmqpCbsLink>() ?? new AmqpCbsLink(activeClientLinkObject.Connection);
-                DateTime cbsTokenExpiresAtUtc = DateTime.MaxValue;
+                var cbsTokenExpiresAtUtc = DateTime.MaxValue;
 
                 foreach (var resource in activeClientLinkObject.Audience)
                 {
                     MessagingEventSource.Log.AmqpSendAuthenticationTokenStart(activeClientLinkObject.EndpointUri, resource, resource, activeClientLinkObject.RequiredClaims);
 
-                    await this.retryPolicy.RunOperation(
+                    await _retryPolicy.RunOperation(
                         async () =>
                         {
                             cbsTokenExpiresAtUtc = TimeoutHelper.Min(
                                 cbsTokenExpiresAtUtc, 
                                 await cbsLink.SendTokenAsync(
-                                    this.cbsTokenProvider,
+                                    _cbsTokenProvider,
                                     activeClientLinkObject.EndpointUri,
                                     resource,
                                     resource,
                                     activeClientLinkObject.RequiredClaims,
-                                    ActiveClientLinkManager.SendTokenTimeout).ConfigureAwait(false));
-                        }, ActiveClientLinkManager.SendTokenTimeout).ConfigureAwait(false);
+                                    SendTokenTimeout).ConfigureAwait(false));
+                        }, SendTokenTimeout).ConfigureAwait(false);
 
                     MessagingEventSource.Log.AmqpSendAuthenticationTokenStop();
                 }
 
                 activeClientLinkObject.AuthorizationValidUntilUtc = cbsTokenExpiresAtUtc;
-                this.SetRenewCbsTokenTimer(activeClientLinkObject);
+                SetRenewCbsTokenTimer(activeClientLinkObject);
             }
             catch (Exception e)
             {
                 // failed to refresh token, no need to do anything since the server will shut the link itself
-                MessagingEventSource.Log.AmqpSendAuthenticationTokenException(this.clientId, e);
+                MessagingEventSource.Log.AmqpSendAuthenticationTokenException(_clientId, e);
 
-                this.ChangeRenewTimer(activeClientLinkObject, Timeout.InfiniteTimeSpan);
+                ChangeRenewTimer(activeClientLinkObject, Timeout.InfiniteTimeSpan);
             }
         }
 
-        void OnRequestResponseLinkClosed(object sender, EventArgs e)
+        private void OnRequestResponseLinkClosed(object sender, EventArgs e)
         {
-            this.ChangeRenewTimer(this.activeRequestResponseClientLink, Timeout.InfiniteTimeSpan);
+            ChangeRenewTimer(_activeRequestResponseClientLink, Timeout.InfiniteTimeSpan);
         }
 
-        void SetRenewCbsTokenTimer(ActiveClientLinkObject activeClientLinkObject)
+        private void SetRenewCbsTokenTimer(ActiveClientLinkObject activeClientLinkObject)
         {
             var utcNow = DateTime.UtcNow;
             if (activeClientLinkObject.AuthorizationValidUntilUtc < utcNow)
             {
                 return;
             }
 
-            var interval = activeClientLinkObject.AuthorizationValidUntilUtc.Subtract(utcNow) - ActiveClientLinkManager.TokenRefreshBuffer;
-            if (interval < ActiveClientLinkManager.TokenRefreshBuffer)
-                interval = TimeSpan.Zero;
+            var interval = activeClientLinkObject.AuthorizationValidUntilUtc.Subtract(utcNow) - TokenRefreshBuffer;
+
+            if (interval < TokenRefreshBuffer)
+            {
+	            interval = TimeSpan.Zero;
+            }
 
-            interval = TimeoutHelper.Min(interval, ActiveClientLinkManager.MaxTokenRefreshTime);
+            interval = TimeoutHelper.Min(interval, MaxTokenRefreshTime);
 
-            this.ChangeRenewTimer(activeClientLinkObject, interval);
+            ChangeRenewTimer(activeClientLinkObject, interval);
         }
 
-        void ChangeRenewTimer(ActiveClientLinkObject activeClientLinkObject, TimeSpan dueTime)
+        private void ChangeRenewTimer(ActiveClientLinkObject activeClientLinkObject, TimeSpan dueTime)
         {
             if (activeClientLinkObject is ActiveSendReceiveClientLink)
             {
-                this.sendReceiveLinkCbsTokenRenewalTimer?.Change(dueTime, Timeout.InfiniteTimeSpan);
+                _sendReceiveLinkCbsTokenRenewalTimer?.Change(dueTime, Timeout.InfiniteTimeSpan);
             }
             else
             {
-                this.requestResponseLinkCbsTokenRenewalTimer?.Change(dueTime, Timeout.InfiniteTimeSpan);
+                _requestResponseLinkCbsTokenRenewalTimer?.Change(dueTime, Timeout.InfiniteTimeSpan);
             }
         }
     }

sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/ActiveClientLinkObject.cs

@@ -6,17 +6,17 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp;
     using System;
 
-    abstract class ActiveClientLinkObject
+    internal abstract class ActiveClientLinkObject
     {
-        readonly string[] requiredClaims;
+	    private readonly string[] _requiredClaims;
 
         protected ActiveClientLinkObject(AmqpObject amqpLinkObject,  Uri endpointUri, string[] audience, string[] requiredClaims, DateTime authorizationValidUntilUtc)
         {
-            this.LinkObject = amqpLinkObject;
-            this.EndpointUri = endpointUri;
-            this.Audience = audience;
-            this.requiredClaims = requiredClaims;
-            this.AuthorizationValidUntilUtc = authorizationValidUntilUtc;
+            LinkObject = amqpLinkObject;
+            EndpointUri = endpointUri;
+            Audience = audience;
+            _requiredClaims = requiredClaims;
+            AuthorizationValidUntilUtc = authorizationValidUntilUtc;
         }
 
         public AmqpObject LinkObject { get; }
@@ -25,7 +25,7 @@ protected ActiveClientLinkObject(AmqpObject amqpLinkObject,  Uri endpointUri, st
 
         public Uri EndpointUri { get; }
 
-        public string[] RequiredClaims => (string[])this.requiredClaims.Clone();
+        public string[] RequiredClaims => (string[])_requiredClaims.Clone();
 
         public DateTime AuthorizationValidUntilUtc { get; set; }
 

sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/ActiveRequestResponseLink.cs

@@ -6,16 +6,16 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp;
     using System;
 
-    sealed class ActiveRequestResponseLink : ActiveClientLinkObject
+    internal sealed class ActiveRequestResponseLink : ActiveClientLinkObject
     {
         public ActiveRequestResponseLink(RequestResponseAmqpLink link, Uri endpointUri, string[] audience, string[] requiredClaims, DateTime authorizationValidUntilUtc)
             : base(link, endpointUri, audience, requiredClaims, authorizationValidUntilUtc)
         {
-            this.Link = link;
+            Link = link;
         }
 
         public RequestResponseAmqpLink Link { get; }
 
-        public override AmqpConnection Connection => this.Link.Session.Connection;
+        public override AmqpConnection Connection => Link.Session.Connection;
     }
 }

sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/ActiveSendReceiveClientLink.cs

@@ -6,16 +6,16 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp;
     using System;
 
-    sealed class ActiveSendReceiveClientLink : ActiveClientLinkObject
+    internal sealed class ActiveSendReceiveClientLink : ActiveClientLinkObject
     {
         public ActiveSendReceiveClientLink(AmqpLink link, Uri endpointUri, string[] audience, string[] requiredClaims, DateTime authorizationValidUntilUtc)
             : base(link, endpointUri, audience, requiredClaims, authorizationValidUntilUtc)
         {
-            this.Link = link;
+            Link = link;
         }
 
         public AmqpLink Link { get; }
 
-        public override AmqpConnection Connection => this.Link.Session.Connection;
+        public override AmqpConnection Connection => Link.Session.Connection;
     }
 }

sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/AmqpClientConstants.cs

@@ -7,7 +7,7 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp;
     using Microsoft.Azure.Amqp.Encoding;
 
-    class AmqpClientConstants
+    internal class AmqpClientConstants
     {
         // AMQP Management Operation
         public const string ManagementAddress = "$management";

sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/AmqpConnectionHelper.cs

@@ -8,11 +8,11 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp;
     using Microsoft.Azure.Amqp.Sasl;
     using Microsoft.Azure.Amqp.Transport;
-    using Microsoft.Azure.ServiceBus.Primitives;
+    using Primitives;
 
     internal class AmqpConnectionHelper
     {
-        const string CbsSaslMechanismName = "MSSBCBS";
+	    private const string CbsSaslMechanismName = "MSSBCBS";
 
         public static AmqpSettings CreateAmqpSettings(
             Version amqpVersion,
@@ -21,7 +21,7 @@ public static AmqpSettings CreateAmqpSettings(
             string sslHostName = null,
             bool useWebSockets = false,
             bool sslStreamUpgrade = false,
-            System.Net.NetworkCredential networkCredential = null,
+            NetworkCredential networkCredential = null,
             bool forceTokenProvider = true)
         {
             var amqpSettings = new AmqpSettings();

sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/AmqpExceptionHelper.cs

@@ -13,9 +13,9 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp.Encoding;
     using Microsoft.Azure.Amqp.Framing;
 
-    static class AmqpExceptionHelper
+    internal static class AmqpExceptionHelper
     {
-        static readonly Dictionary<string, AmqpResponseStatusCode> ConditionToStatusMap = new Dictionary<string, AmqpResponseStatusCode>
+	    private static readonly Dictionary<string, AmqpResponseStatusCode> ConditionToStatusMap = new Dictionary<string, AmqpResponseStatusCode>
         {
             { AmqpClientConstants.TimeoutError.Value, AmqpResponseStatusCode.RequestTimeout },
             { AmqpErrorCode.NotFound.Value, AmqpResponseStatusCode.NotFound },
@@ -42,7 +42,7 @@ static class AmqpExceptionHelper
 
         public static AmqpSymbol GetResponseErrorCondition(AmqpMessage response, AmqpResponseStatusCode statusCode)
         {
-            object condition = response.ApplicationProperties.Map[ManagementConstants.Response.ErrorCondition];
+            var condition = response.ApplicationProperties.Map[ManagementConstants.Response.ErrorCondition];
             if (condition != null)
             {
                 return (AmqpSymbol)condition;
@@ -63,7 +63,7 @@ public static AmqpSymbol GetResponseErrorCondition(AmqpMessage response, AmqpRes
         public static AmqpResponseStatusCode GetResponseStatusCode(this AmqpMessage responseMessage)
         {
             var amqpResponseStatusCode = AmqpResponseStatusCode.Unused;
-            object statusCodeValue = responseMessage?.ApplicationProperties.Map[ManagementConstants.Response.StatusCode];
+            var statusCodeValue = responseMessage?.ApplicationProperties.Map[ManagementConstants.Response.StatusCode];
             if (statusCodeValue is int && Enum.IsDefined(typeof(AmqpResponseStatusCode), statusCodeValue))
             {
                 amqpResponseStatusCode = (AmqpResponseStatusCode)statusCodeValue;
@@ -74,9 +74,9 @@ public static AmqpResponseStatusCode GetResponseStatusCode(this AmqpMessage resp
 
         public static Exception ToMessagingContractException(this AmqpMessage responseMessage, AmqpResponseStatusCode statusCode)
         {
-            AmqpSymbol errorCondition = AmqpExceptionHelper.GetResponseErrorCondition(responseMessage, statusCode);
+            var errorCondition = GetResponseErrorCondition(responseMessage, statusCode);
             var statusDescription = responseMessage.ApplicationProperties.Map[ManagementConstants.Response.StatusDescription] as string ?? errorCondition.Value;
-            return AmqpExceptionHelper.ToMessagingContractException(errorCondition.Value, statusDescription);
+            return ToMessagingContractException(errorCondition.Value, statusDescription);
         }
 
         public static Exception ToMessagingContractException(this Error error, bool connectionError = false)
@@ -89,7 +89,7 @@ public static Exception ToMessagingContractException(this Error error, bool conn
             return ToMessagingContractException(error.Condition.Value, error.Description, connectionError);
         }
 
-        static Exception ToMessagingContractException(string condition, string message, bool connectionError = false)
+        private static Exception ToMessagingContractException(string condition, string message, bool connectionError = false)
         {
             if (string.Equals(condition, AmqpClientConstants.TimeoutError.Value))
             {