- fixes retry/redirect options customization

Author: Asky-GH

src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java

@@ -357,7 +357,7 @@ public void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect) {
      *
      * @return Callback which is called before redirect
      */
-    @Nullable
+    @Nonnull
     public IShouldRedirect getShouldRedirect() {
     	return baseRequest.getShouldRedirect();
     }
@@ -377,7 +377,7 @@ public void setShouldRetry(@Nonnull IShouldRetry shouldretry) {
      *
      * @return Callback called before retry
      */
-    @Nullable
+    @Nonnull
     public IShouldRetry getShouldRetry() {
     	return baseRequest.getShouldRetry();
     }

src/main/java/com/microsoft/graph/http/BaseRequest.java

@@ -537,7 +537,7 @@ public void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect) {
      *
      * @return Callback which is called before redirect
      */
-    @Nullable
+    @Nonnull
     public IShouldRedirect getShouldRedirect() {
     	return shouldRedirect;
     }
@@ -557,7 +557,7 @@ public void setShouldRetry(@Nonnull IShouldRetry shouldretry) {
      *
      * @return Callback called before retry
      */
-    @Nullable
+    @Nonnull
     public IShouldRetry getShouldRetry() {
     	return shouldRetry;
     }

src/main/java/com/microsoft/graph/http/BaseStreamRequest.java

@@ -224,7 +224,7 @@ public void setShouldRedirect(@Nonnull final IShouldRedirect shouldRedirect) {
      *
      * @return Callback which is called before redirect
      */
-    @Nullable
+    @Nonnull
     public IShouldRedirect getShouldRedirect() {
     	return baseRequest.getShouldRedirect();
     }
@@ -244,7 +244,7 @@ public void setShouldRetry(@Nonnull final IShouldRetry shouldretry) {
      *
      * @return Callback called before retry
      */
-    @Nullable
+    @Nonnull
     public IShouldRetry getShouldRetry() {
     	return baseRequest.getShouldRetry();
     }

src/main/java/com/microsoft/graph/http/CoreHttpProvider.java

@@ -57,6 +57,10 @@
 import okhttp3.ResponseBody;
 import okio.BufferedSink;
 
+import static com.microsoft.graph.httpcore.middlewareoption.RedirectOptions.DEFAULT_MAX_REDIRECTS;
+import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_DELAY;
+import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_MAX_RETRIES;
+
 /**
  * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
  */
@@ -236,8 +240,10 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
 		logger.logDebug("Starting to send request, URL " + requestUrl.toString());
 
 		// Request level middleware options
-		final RedirectOptions redirectOptions = request.getMaxRedirects() <= 0 ? null : new RedirectOptions(request.getMaxRedirects(), request.getShouldRedirect());
-		final RetryOptions retryOptions = request.getShouldRetry() == null ? null : new RetryOptions(request.getShouldRetry(), request.getMaxRetries(), request.getDelay());
+		final RedirectOptions redirectOptions = request.getMaxRedirects() == DEFAULT_MAX_REDIRECTS ? null
+            : new RedirectOptions(request.getMaxRedirects(), request.getShouldRedirect());
+		final RetryOptions retryOptions = (request.getMaxRetries() == DEFAULT_MAX_RETRIES && request.getDelay() == DEFAULT_DELAY) ? null
+            : new RetryOptions(request.getShouldRetry(), request.getMaxRetries(), request.getDelay());
 
 		final Request coreHttpRequest = convertIHttpRequestToOkHttpRequest(request);
 		Request.Builder corehttpRequestBuilder = coreHttpRequest

src/main/java/com/microsoft/graph/http/IHttpRequest.java

@@ -119,7 +119,7 @@ public interface IHttpRequest {
      *
      * @return Callback which is called before redirect
      */
-    @Nullable
+    @Nonnull
     IShouldRedirect getShouldRedirect();
 
     /**
@@ -134,7 +134,7 @@ public interface IHttpRequest {
      *
      * @return Callback called before retry
      */
-    @Nullable
+    @Nonnull
     IShouldRetry getShouldRetry();
 
     /**

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

@@ -68,7 +68,7 @@ public RetryOptions(@Nullable final IShouldRetry shouldRetry, int maxRetries, lo
         if(maxRetries < 0)
             throw new IllegalArgumentException("Max retries cannot be negative");
 
-        this.mShouldretry = shouldRetry != null ? shouldRetry : DEFAULT_SHOULD_RETRY;
+        this.mShouldretry = shouldRetry == null ? DEFAULT_SHOULD_RETRY : shouldRetry;
         this.mMaxRetries = maxRetries;
         this.mDelay = delay;
     }