|
58 | 58 | import okio.BufferedSink; |
59 | 59 |
|
60 | 60 | import static com.microsoft.graph.httpcore.middlewareoption.RedirectOptions.DEFAULT_MAX_REDIRECTS; |
| 61 | +import static com.microsoft.graph.httpcore.middlewareoption.RedirectOptions.DEFAULT_SHOULD_REDIRECT; |
61 | 62 | import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_DELAY; |
62 | 63 | import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_MAX_RETRIES; |
| 64 | +import static com.microsoft.graph.httpcore.middlewareoption.RetryOptions.DEFAULT_SHOULD_RETRY; |
63 | 65 |
|
64 | 66 | /** |
65 | 67 | * 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 |
240 | 242 | logger.logDebug("Starting to send request, URL " + requestUrl.toString()); |
241 | 243 |
|
242 | 244 | // 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()); |
247 | 253 |
|
248 | 254 | final Request coreHttpRequest = convertIHttpRequestToOkHttpRequest(request); |
249 | 255 | Request.Builder corehttpRequestBuilder = coreHttpRequest |
|
0 commit comments