Added request level middleware options, renamed to CoreHttpProvider

Author: Nakul Sabharwal

src/main/java/com/microsoft/graph/core/DefaultClientConfig.java

@@ -25,8 +25,8 @@
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.concurrency.DefaultExecutors;
 import com.microsoft.graph.concurrency.IExecutors;
+import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.IHttpProvider;
-import com.microsoft.graph.http.OkHttpProvider;
 import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.DefaultSerializer;
@@ -98,7 +98,7 @@ public IAuthenticationProvider getAuthenticationProvider() {
     @Override
     public IHttpProvider getHttpProvider() {
         if (httpProvider == null) {
-            httpProvider = new OkHttpProvider(getSerializer(),
+            httpProvider = new CoreHttpProvider(getSerializer(),
                     getAuthenticationProvider(),
                     getExecutors(),
                     getLogger());

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

@@ -22,16 +22,18 @@
 
 package com.microsoft.graph.http;
 
+import java.net.URL;
+import java.util.List;
+
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
 import com.microsoft.graph.options.FunctionOption;
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
 
-import java.net.URL;
-import java.util.List;
-
 /**
  * A request against a collection
  *
@@ -205,4 +207,94 @@ protected BaseRequest getBaseRequest() {
     public Class<T2> getCollectionPageClass() {
         return collectionPageClass;
     }
+    
+    /**
+     * Sets the max redirects
+     * 
+     * @param maxRedirects Max redirects that a request can take
+     */
+    public void setMaxRedirects(int maxRedirects) {
+    	baseRequest.setMaxRedirects(maxRedirects);
+    }
+    
+    /**
+     * Gets the max redirects
+     * 
+     * @return Max redirects that a request can take
+     */
+    public int getMaxRedirects() {
+    	return baseRequest.getMaxRedirects();
+    }
+    
+    /**
+     * Sets the should redirect callback
+     * 
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    public void setShouldRedirect(IShouldRedirect shouldRedirect) {
+    	baseRequest.setShouldRedirect(shouldRedirect);
+    }
+    
+    /**
+     * Gets the should redirect callback
+     * 
+     * @return Callback which is called before redirect
+     */
+    public IShouldRedirect getShouldRedirect() {
+    	return baseRequest.getShouldRedirect();
+    }
+    
+    /**
+     * Sets the should retry callback
+     * 
+     * @param shouldretry The callback called before retry
+     */
+    public void setShouldRetry(IShouldRetry shouldretry) {
+    	baseRequest.setShouldRetry(shouldretry);
+    }
+    
+    /**
+     * Gets the should retry callback
+     * 
+     * @return Callback called before retry
+     */
+    public IShouldRetry getShouldRetry() {
+    	return baseRequest.getShouldRetry();
+    }
+    
+    /**
+     * Sets the max retries
+     * 
+     * @param maxRetries Max retries for a request
+     */
+    public void setMaxRetries(int maxRetries) {
+    	baseRequest.setMaxRedirects(maxRetries);
+    }
+    
+    /**
+     * Gets max retries 
+     * 
+     * @return Max retries for a request
+     */
+    public int getMaxRetries() {
+    	return baseRequest.getMaxRetries();
+    }
+    
+    /**
+     * Sets the delay in seconds between retires
+     * 
+     * @param delay Delay in seconds between retries
+     */
+    public void setDelay(long delay) {
+    	baseRequest.setDelay(delay);
+    }
+    
+    /**
+     * Gets delay between retries
+     * 
+     * @return Delay between retries in seconds
+     */
+    public long getDelay() {
+    	return baseRequest.getDelay();
+    }
 }

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

@@ -27,6 +27,10 @@
 
 import com.microsoft.graph.concurrency.ICallback;
 import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
+import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
 import com.microsoft.graph.options.FunctionOption;
 import com.microsoft.graph.options.QueryOption;
 import com.microsoft.graph.core.ClientException;
@@ -95,6 +99,31 @@ public abstract class BaseRequest implements IHttpRequest {
      * Value to pass to setUseCaches in connection
      */
     private boolean useCaches;
+    
+    /**
+     * MaxRedirects of every request
+     */
+    private int maxRedirects = RedirectOptions.DEFAULT_MAX_REDIRECTS;
+    
+    /**
+     * ShouldRedirect callback for every request
+     */
+    private IShouldRedirect shouldRedirect = RedirectOptions.DEFAULT_SHOULD_REDIRECT;
+    
+    /**
+     * Max redirects for every request
+     */
+    private int maxRetries = RetryOptions.DEFAULT_MAX_RETRIES;
+    
+    /**
+     * Delay in seconds for every request
+     */
+    private long delay = RetryOptions.DEFAULT_DELAY;
+    
+    /**
+     * Callback before doing a retry
+     */
+    private IShouldRetry shouldRetry = RetryOptions.DEFAULT_SHOULD_RETRY;
 
     /**
      * Creates the request
@@ -351,5 +380,95 @@ public IBaseClient getClient() {
      */
 	public Class<?> getResponseType() {
         return responseClass;
+    }
+	
+	   /**
+     * Sets the max redirects
+     * 
+     * @param maxRedirects Max redirects that a request can take
+     */
+    public void setMaxRedirects(int maxRedirects) {
+    	this.maxRedirects = maxRedirects;
+    }
+    
+    /**
+     * Gets the max redirects
+     * 
+     * @return Max redirects that a request can take
+     */
+    public int getMaxRedirects() {
+    	return maxRedirects;
+    }
+    
+    /**
+     * Sets the should redirect callback
+     * 
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    public void setShouldRedirect(IShouldRedirect shouldRedirect) {
+    	this.shouldRedirect = shouldRedirect;
+    }
+    
+    /**
+     * Gets the should redirect callback
+     * 
+     * @return Callback which is called before redirect
+     */
+    public IShouldRedirect getShouldRedirect() {
+    	return shouldRedirect;
+    }
+    
+    /**
+     * Sets the should retry callback
+     * 
+     * @param shouldretry The callback called before retry
+     */
+    public void setShouldRetry(IShouldRetry shouldretry) {
+    	this.shouldRetry = shouldretry;
+    }
+    
+    /**
+     * Gets the should retry callback
+     * 
+     * @return Callback called before retry
+     */
+    public IShouldRetry getShouldRetry() {
+    	return shouldRetry;
+    }
+    
+    /**
+     * Sets the max retries
+     * 
+     * @param maxRetries Max retries for a request
+     */
+    public void setMaxRetries(int maxRetries) {
+    	this.maxRedirects = maxRedirects;
+    }
+    
+    /**
+     * Gets max retries 
+     * 
+     * @return Max retries for a request
+     */
+    public int getMaxRetries() {
+    	return maxRetries;
+    }
+    
+    /**
+     * Sets the delay in seconds between retires
+     * 
+     * @param delay Delay in seconds between retries
+     */
+    public void setDelay(long delay) {
+    	this.delay = delay;
+    }
+    
+    /**
+     * Gets delay between retries
+     * 
+     * @return Delay between retries in seconds
+     */
+    public long getDelay() {
+    	return delay;
     }
 }

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

@@ -27,6 +27,8 @@
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
+import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 
@@ -178,4 +180,94 @@ public List<Option> getOptions() {
         return baseRequest.getOptions();
     }
 
+    /**
+     * Sets the max redirects
+     * 
+     * @param maxRedirects Max redirects that a request can take
+     */
+    public void setMaxRedirects(int maxRedirects) {
+    	baseRequest.setMaxRedirects(maxRedirects);
+    }
+    
+    /**
+     * Gets the max redirects
+     * 
+     * @return Max redirects that a request can take
+     */
+    public int getMaxRedirects() {
+    	return baseRequest.getMaxRedirects();
+    }
+    
+    /**
+     * Sets the should redirect callback
+     * 
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    public void setShouldRedirect(IShouldRedirect shouldRedirect) {
+    	baseRequest.setShouldRedirect(shouldRedirect);
+    }
+    
+    /**
+     * Gets the should redirect callback
+     * 
+     * @return Callback which is called before redirect
+     */
+    public IShouldRedirect getShouldRedirect() {
+    	return baseRequest.getShouldRedirect();
+    }
+    
+    /**
+     * Sets the should retry callback
+     * 
+     * @param shouldretry The callback called before retry
+     */
+    public void setShouldRetry(IShouldRetry shouldretry) {
+    	baseRequest.setShouldRetry(shouldretry);
+    }
+    
+    /**
+     * Gets the should retry callback
+     * 
+     * @return Callback called before retry
+     */
+    public IShouldRetry getShouldRetry() {
+    	return baseRequest.getShouldRetry();
+    }
+    
+    /**
+     * Sets the max retries
+     * 
+     * @param maxRetries Max retries for a request
+     */
+    public void setMaxRetries(int maxRetries) {
+    	baseRequest.setMaxRetries(maxRetries);
+    }
+    
+    /**
+     * Gets max retries 
+     * 
+     * @return Max retries for a request
+     */
+    public int getMaxRetries() {
+    	return baseRequest.getMaxRetries();
+    }
+    
+    /**
+     * Sets the delay in seconds between retires
+     * 
+     * @param delay Delay in seconds between retries
+     */
+    public void setDelay(long delay) {
+    	baseRequest.setDelay(delay);
+    }
+    
+    /**
+     * Gets delay between retries
+     * 
+     * @return Delay between retries in seconds
+     */
+    public long getDelay() {
+    	return baseRequest.getDelay();
+    }
+    
 }