- adds the ability to configure the http client used by the service client

Author: baywet

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

@@ -32,6 +32,8 @@
 import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
+import okhttp3.OkHttpClient;
+
 /**
  * The default configuration for a service client
  */
@@ -55,7 +57,7 @@ public abstract class DefaultClientConfig implements IClientConfig {
     /**
      * The serializer instance
      */
-    private DefaultSerializer serializer;
+    private ISerializer serializer;
 
     /**
      * Creates an instance of this configuration with an authentication provider
@@ -97,11 +99,22 @@ public IAuthenticationProvider getAuthenticationProvider() {
      */
     @Override
     public IHttpProvider getHttpProvider() {
+        return this.getHttpProvider(null);
+    }
+
+    /**
+     * Gets the HTTP provider
+     *
+     * @param httpClient the http client to pass to the http provider when building it
+     * @param <T1> the http client type
+     * @return the HTTP provider
+     */
+    @Override
+    public <T1> IHttpProvider getHttpProvider(final T1 httpClient) {
         if (httpProvider == null) {
-            httpProvider = new CoreHttpProvider(getSerializer(),
-                    getAuthenticationProvider(),
-                    getExecutors(),
-                    getLogger());
+            httpProvider = (httpClient instanceof OkHttpClient) ? 
+                            new CoreHttpProvider(this, (OkHttpClient) httpClient) :
+                            new CoreHttpProvider(this, null);
             getLogger().logDebug("Created CoreHttpProvider");
         }
         return httpProvider;

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

@@ -53,6 +53,15 @@ public interface IClientConfig {
      */
     IHttpProvider getHttpProvider();
 
+    /**
+     * Gets the HTTP provider
+     * 
+     * @param httpClient the http client to pass to the http provider when building it
+     * @param <T1> the http client type
+     * @return the HTTP provider
+     */
+    <T1> IHttpProvider getHttpProvider(final T1 httpClient);
+
     /**
      * Gets the logger
      * 

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

@@ -46,6 +46,7 @@
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.Constants;
 import com.microsoft.graph.core.DefaultConnectionConfig;
+import com.microsoft.graph.core.IClientConfig;
 import com.microsoft.graph.core.IConnectionConfig;
 import com.microsoft.graph.httpcore.HttpClients;
 import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
@@ -119,6 +120,18 @@ public CoreHttpProvider(final ISerializer serializer,
 		this.logger = logger;
 	}
 
+	/**
+	 * Creates the DefaultHttpProvider
+	 *
+	 * @param clientConfig           the client configuration to use for the provider
+	 * @param httpClient             the http client to execute the requests with
+	 */
+	public CoreHttpProvider(final IClientConfig clientConfig,
+			final OkHttpClient httpClient) {
+		this(clientConfig.getSerializer(), clientConfig.getAuthenticationProvider(), clientConfig.getExecutors(), clientConfig.getLogger());
+		this.corehttpClient = httpClient;
+	}
+
 	/**
 	 * Gets the serializer for this HTTP provider
 	 *
@@ -144,9 +157,9 @@ public <Result, Body> void send(final IHttpRequest request,
 			final ICallback<? super Result> callback,
 			final Class<Result> resultClass,
 			final Body serializable) {
-		final IProgressCallback<Result> progressCallback;
+		final IProgressCallback<? super Result> progressCallback;
 		if (callback instanceof IProgressCallback) {
-			progressCallback = (IProgressCallback<Result>) callback;
+			progressCallback = (IProgressCallback<? super Result>) callback;
 		} else {
 			progressCallback = null;
 		}
@@ -221,7 +234,7 @@ public <Result, Body, DeserializeType> Result send(final IHttpRequest request,
 	public <Result, Body> Request getHttpRequest(final IHttpRequest request,
 			final Class<Result> resultClass,
 			final Body serializable,
-			final IProgressCallback<Result> progress) throws ClientException {
+			final IProgressCallback<? super Result> progress) throws ClientException {
 		final int defaultBufferSize = 4096;
 
 		final URL requestUrl = request.getRequestUrl();
@@ -354,7 +367,7 @@ public MediaType contentType() {
 	private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRequest request,
 			final Class<Result> resultClass,
 			final Body serializable,
-			final IProgressCallback<Result> progress,
+			final IProgressCallback<? super Result> progress,
 			final IStatefulResponseHandler<Result, DeserializeType> handler)
 					throws ClientException {
 
@@ -374,11 +387,11 @@ public Request authenticateRequest(Request request) {
 									.newBuilder()
 									.connectTimeout(connectionConfig.getConnectTimeout(), TimeUnit.MILLISECONDS)
 									.readTimeout(connectionConfig.getReadTimeout(), TimeUnit.MILLISECONDS)
-									.followRedirects(false)
+									.followRedirects(false) //TODO those are duplicated for the time being with core, remove in 3.0
 									.protocols(Arrays.asList(Protocol.HTTP_1_1)) //https://stackoverflow.com/questions/62031298/sockettimeout-on-java-11-but-not-on-java-8
 									.build();
 			}
-			if (authenticationProvider != null) {
+			if (authenticationProvider != null) { //TODO remove the authentication provider as this is done by the interceptor anyway
 				authenticationProvider.authenticateRequest(request);
 			}
 			Request coreHttpRequest = getHttpRequest(request, resultClass, serializable, progress);