Reordered should retry parameters

Author: Nakul Sabharwal

src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java

@@ -14,11 +14,7 @@ public MSBatchRequestStep(String requestId, Request request, List<String> arrayO
 			throw new IllegalArgumentException("Request Id cannot be null.");
 		if(request == null)
 			new IllegalArgumentException("Request cannot be null.");
-		if(request.url() == null)
-			throw new IllegalArgumentException("Request url cannot be null.");
-		if(request.method() == null)
-			throw new IllegalArgumentException("Request method cannot be null.");
-		
+				
 		this.requestId = requestId;
 		this.request = request;
 		this.arrayOfDependsOnIds = arrayOfDependsOnIds;

src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java

@@ -27,7 +27,7 @@ public class RedirectHandler implements Interceptor{
 	 * Initialize using default redirect options, default IShouldRedirect and max redirect value
 	 */
 	public RedirectHandler() {
-		this.mRedirectOptions = new RedirectOptions();
+		this(null);
 	}
 
 	/*
@@ -109,8 +109,8 @@ public Response intercept(Chain chain) throws IOException {
 
 		while(true) {
 			response = chain.proceed(request);
-			boolean shouldRedirect = redirectOptions.shouldRedirect().shouldRedirect(response)
-					&& isRedirected(request, response, requestsCount, redirectOptions);
+			boolean shouldRedirect = isRedirected(request, response, requestsCount, redirectOptions)
+					&& redirectOptions.shouldRedirect().shouldRedirect(response);
 			if(!shouldRedirect) break;
 
 			Request followup = getRedirect(request, response);

src/main/java/com/microsoft/graph/httpcore/RetryHandler.java

@@ -56,18 +56,18 @@ boolean retryRequest(Response response, int executionCount, Request request, Ret
 		if(retryOptions != null) {
 			shouldRetryCallback = retryOptions.shouldRetry();
 		}
-		// Call should retry callback
-		if(shouldRetryCallback != null && !shouldRetryCallback.shouldRetry(response, executionCount, request, retryOptions.delay())) {
-				return false;
-		}
 
 		boolean shouldRetry = false;
 		// Status codes 429 503 504
 		int statusCode = response.code();
 		// Only requests with payloads that are buffered/rewindable are supported. 
 		// Payloads with forward only streams will be have the responses returned 
 		// without any retry attempt.
-		shouldRetry = (executionCount <= retryOptions.maxRetries()) && checkStatus(statusCode) && isBuffered(response, request);
+		shouldRetry = 
+				(executionCount <= retryOptions.maxRetries()) 
+				&& checkStatus(statusCode) && isBuffered(response, request)
+				&& shouldRetryCallback != null 
+				&& shouldRetryCallback.shouldRetry(retryOptions.delay(), executionCount, request, response);
 
 		if(shouldRetry) {
 			long retryInterval = getRetryAfter(response, retryOptions.delay(), executionCount);
@@ -86,8 +86,9 @@ long getRetryAfter(Response response, long delay, int executionCount) {
 		if(retryAfterHeader != null) {
 			retryDelay = Long.parseLong(retryAfterHeader);
 		} else {
-			retryDelay = (long)Math.pow(2.0, (double)executionCount) * DELAY_MILLISECONDS;
+			retryDelay = (long)((Math.pow(2.0, (double)executionCount)-1)*0.5);
 			retryDelay = executionCount < 2 ? retryDelay : retryDelay + delay + (long)Math.random(); 
+			retryDelay *= DELAY_MILLISECONDS;
 		}
 		return Math.min(retryDelay, RetryOptions.MAX_DELAY);
 	}
@@ -99,7 +100,7 @@ boolean checkStatus(int statusCode) {
 
 	boolean isBuffered(Response response, Request request) {
 		String methodName = request.method();
-		if(methodName.equalsIgnoreCase("GET") || methodName.equalsIgnoreCase("DELETE")) 
+		if(methodName.equalsIgnoreCase("GET") || methodName.equalsIgnoreCase("DELETE") || methodName.equalsIgnoreCase("HEAD") || methodName.equalsIgnoreCase("OPTIONS")) 
 			return true;
 
 		boolean isHTTPMethodPutPatchOrPost = methodName.equalsIgnoreCase("POST") ||

src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java

@@ -4,5 +4,5 @@
 import okhttp3.Response;
 
 public interface IShouldRetry {
-	boolean shouldRetry(Response response, int executionCount, Request request, long delay);
+	boolean shouldRetry(long delay, int executionCount, Request request,Response response);
 }

src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java

@@ -7,7 +7,7 @@ public class RetryOptions implements IMiddlewareControl {
 	private IShouldRetry mShouldretry;
 	public static final IShouldRetry DEFAULT_SHOULD_RETRY = new IShouldRetry() {
 		@Override
-		public boolean shouldRetry(Response response, int executionCount, Request request, long delay) {
+		public boolean shouldRetry(long delay, int executionCount, Request request, Response response) {
 			return true;
 		}
 	};

src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java

@@ -47,7 +47,7 @@ public void testRetryHandlerWithRetryOptions() {
 	@Test
 	public void testRetryHandlerWithCustomRetryOptions() {
 		IShouldRetry shouldRetry = new IShouldRetry() {
-			public boolean shouldRetry(Response response, int executionCount, Request request, long delay){
+			public boolean shouldRetry(long delay, int executionCount, Request request,Response response){
 				return false;
 			}
 		};