Skip to content

Commit d86d453

Browse files
committed
- fixes retry/redirect options customization
1 parent 118dc26 commit d86d453

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@
5858
import okio.BufferedSink;
5959

6060
import static com.microsoft.graph.httpcore.middlewareoption.RedirectOptions.DEFAULT_MAX_REDIRECTS;
61+
import static com.microsoft.graph.httpcore.middlewareoption.RedirectOptions.DEFAULT_SHOULD_REDIRECT;
6162
import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_DELAY;
6263
import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_MAX_RETRIES;
64+
import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_SHOULD_RETRY;
6365

6466
/**
6567
* HTTP provider based off of OkHttp and msgraph-sdk-java-core library
@@ -240,10 +242,14 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
240242
logger.logDebug("Starting to send request, URL " + requestUrl.toString());
241243

242244
// Request level middleware options
243-
final RedirectOptions redirectOptions = request.getMaxRedirects() == DEFAULT_MAX_REDIRECTS ? null
244-
: new RedirectOptions(request.getMaxRedirects(), request.getShouldRedirect());
245-
final RetryOptions retryOptions = (request.getMaxRetries() == DEFAULT_MAX_RETRIES && request.getDelay() == DEFAULT_DELAY) ? null
246-
: new RetryOptions(request.getShouldRetry(), request.getMaxRetries(), request.getDelay());
245+
final RedirectOptions redirectOptions =
246+
request.getMaxRedirects() == DEFAULT_MAX_REDIRECTS && request.getShouldRedirect().equals(DEFAULT_SHOULD_REDIRECT)
247+
? null
248+
: new RedirectOptions(request.getMaxRedirects(), request.getShouldRedirect());
249+
final RetryOptions retryOptions =
250+
request.getMaxRetries() == DEFAULT_MAX_RETRIES && request.getDelay() == DEFAULT_DELAY && request.getShouldRetry().equals(DEFAULT_SHOULD_RETRY)
251+
? null
252+
: new RetryOptions(request.getShouldRetry(), request.getMaxRetries(), request.getDelay());
247253

248254
final Request coreHttpRequest = convertIHttpRequestToOkHttpRequest(request);
249255
Request.Builder corehttpRequestBuilder = coreHttpRequest

0 commit comments

Comments
 (0)