Renamed for clarity (+1 squashed commits)

Squashed commits:

[e86f374] Made access private to GetNextWaitInterval (+1 squashed commits)

Squashed commits:

[462983b] Renamed some unit tests

Author: dylan-asos

src/SendGrid/Reliability/RetryDelegatingHandler.cs

@@ -15,6 +15,8 @@ public class RetryDelegatingHandler : DelegatingHandler
 
         private readonly ReliabilitySettings settings;
 
+        private readonly Random random = new Random();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RetryDelegatingHandler"/> class.
         /// </summary>
@@ -38,7 +40,6 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             }
 
             HttpResponseMessage responseMessage = null;
-            var backOffCalculator = new ExponentialBackOffCalculator(settings.RetryInterval);
 
             var waitFor = settings.RetryInterval;
             var numberOfAttempts = 0;
@@ -50,7 +51,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 {
                     responseMessage = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
 
-                    ThrowHttpRequestExceptionIfResponseCodeIsRetriable(responseMessage);
+                    ThrowHttpRequestExceptionIfResponseCodeCanBeRetried(responseMessage);
 
                     sent = true;
                 }
@@ -78,13 +79,13 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                     await Task.Delay(waitFor).ConfigureAwait(false);
                 }
 
-                waitFor = backOffCalculator.GetNextWaitInterval(numberOfAttempts);
+                waitFor = GetNextWaitInterval(numberOfAttempts);
             }
 
             return responseMessage;
         }
 
-        private static void ThrowHttpRequestExceptionIfResponseCodeIsRetriable(HttpResponseMessage responseMessage)
+        private static void ThrowHttpRequestExceptionIfResponseCodeCanBeRetried(HttpResponseMessage responseMessage)
         {
             int statusCode = (int)responseMessage.StatusCode;
 
@@ -94,25 +95,13 @@ private static void ThrowHttpRequestExceptionIfResponseCodeIsRetriable(HttpRespo
             }
         }
 
-        private class ExponentialBackOffCalculator
+        private TimeSpan GetNextWaitInterval(int numberOfAttempts)
         {
-            private TimeSpan baseInterval;
-
-            private readonly Random random = new Random();
-
-            public ExponentialBackOffCalculator(TimeSpan baseInterval)
-            {
-                this.baseInterval = baseInterval;
-            }
-
-            public TimeSpan GetNextWaitInterval(int numberOfAttempts)
-            {
-                var interval = this.baseInterval.TotalMilliseconds + (Math.Pow(2, numberOfAttempts) * 1000);
+            var interval = this.settings.RetryInterval.TotalMilliseconds + (Math.Pow(2, numberOfAttempts) * 1000);
 
-                var randomDelay = this.random.Next(0, 1000);
+            var randomDelay = this.random.Next(0, 1000);
 
-                return TimeSpan.FromMilliseconds(interval + randomDelay);
-            }
+            return TimeSpan.FromMilliseconds(interval + randomDelay);
         }
     }
 }

tests/SendGrid.Tests/Reliability/RetryDelegatingHandlerTests.cs

@@ -27,7 +27,7 @@ public RetryDelegatingHandlerTests()
         }
 
         [Fact]
-        public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenSuccessful()
+        public async Task ShouldReturnHttpResponseAndNotRetryWhenSuccessful()
         {
             innerHandler.AddBehaviour(innerHandler.OK);
 
@@ -38,7 +38,7 @@ public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenSuccessful()
         }
 
         [Fact]
-        public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenUnauthorised()
+        public async Task ShouldReturnHttpResponseAndNotRetryWhenUnauthorised()
         {
             innerHandler.AddBehaviour(innerHandler.AuthenticationError);
 
@@ -49,7 +49,7 @@ public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenUnauthorised()
         }
 
         [Fact]
-        public async Task Invoke_ShouldReturnErrorWithoutRetryWhenErrorIsNotTransient()
+        public async Task ShouldReturnErrorWithoutRetryWhenErrorIsNotTransient()
         {
             innerHandler.AddBehaviour(innerHandler.NonTransientException);
 
@@ -59,7 +59,7 @@ public async Task Invoke_ShouldReturnErrorWithoutRetryWhenErrorIsNotTransient()
         }
 
         [Fact]
-        public async Task Invoke_ShouldReturnErrorWithoutRetryWhen500ErrorStatusIsNotTransient()
+        public async Task ShouldReturnErrorWithoutRetryWhen500ErrorStatusIsNotTransient()
         {
             innerHandler.AddBehaviour(innerHandler.HttpVersionNotSupported);
 
@@ -70,7 +70,7 @@ public async Task Invoke_ShouldReturnErrorWithoutRetryWhen500ErrorStatusIsNotTra
         }
 
         [Fact]
-        public async Task Invoke_ShouldReturnErrorWithoutRetryWhen501ErrorStatus()
+        public async Task ShouldReturnErrorWithoutRetryWhen501ErrorStatus()
         {
             innerHandler.AddBehaviour(innerHandler.NotImplemented);
 
@@ -81,7 +81,7 @@ public async Task Invoke_ShouldReturnErrorWithoutRetryWhen501ErrorStatus()
         }
 
         [Fact]
-        public async Task Invoke_ShouldRetryOnceWhenFailedOnFirstAttemptThenSuccessful()
+        public async Task ShouldRetryOnceWhenFailedOnFirstAttemptThenSuccessful()
         {
             innerHandler.AddBehaviour(innerHandler.TaskCancelled);
             innerHandler.AddBehaviour(innerHandler.OK);
@@ -93,7 +93,7 @@ public async Task Invoke_ShouldRetryOnceWhenFailedOnFirstAttemptThenSuccessful()
         }
 
         [Fact]
-        public async Task Invoke_ShouldRetryTheExpectedAmountOfTimesAndReturnTimeoutExceptionWhenTasksCancelled()
+        public async Task ShouldRetryTheExpectedAmountOfTimesAndReturnTimeoutExceptionWhenTasksCancelled()
         {
             innerHandler.AddBehaviour(innerHandler.TaskCancelled);
             innerHandler.AddBehaviour(innerHandler.TaskCancelled);
@@ -104,7 +104,7 @@ public async Task Invoke_ShouldRetryTheExpectedAmountOfTimesAndReturnTimeoutExce
         }
 
         [Fact]
-        public async Task Invoke_ShouldRetryTheExpectedAmountOfTimesAndReturnExceptionWhenInternalServerErrorsEncountered()
+        public async Task ShouldRetryTheExpectedAmountOfTimesAndReturnExceptionWhenInternalServerErrorsEncountered()
         {
             innerHandler.AddBehaviour(innerHandler.InternalServerError);
             innerHandler.AddBehaviour(innerHandler.ServiceUnavailable);