Use parent Call.Factory of OkHttpClient to be able to use OpenTelemetry

Author: cbos

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

@@ -41,6 +41,7 @@
 import javax.annotation.Nonnull;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
@@ -137,7 +138,7 @@ public static Builder<OkHttpClient, Request> builder() {
      * @return builder to start configuring the client
      */
     @Nonnull
-    public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(@Nonnull final Class<nativeClient> nativeClientClass, @Nonnull final Class<nativeRequest> nativeRequestClass) {
+    public static <nativeClient extends Call.Factory, nativeRequest> Builder<nativeClient, nativeRequest> builder(@Nonnull final Class<nativeClient> nativeClientClass, @Nonnull final Class<nativeRequest> nativeRequestClass) {
         return new Builder<>();
     }
 
@@ -146,7 +147,7 @@ public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest>
      * @param <httpClientType> type of the native http library client
      * @param <nativeRequestType> type of a request for the native http client
      */
-    public static class Builder<httpClientType, nativeRequestType> {
+    public static class Builder<httpClientType extends Call.Factory, nativeRequestType> {
         private ISerializer serializer;
         private IHttpProvider<nativeRequestType> httpProvider;
         private ILogger logger;
@@ -174,18 +175,17 @@ private ISerializer getSerializer() {
                 return serializer;
             }
         }
-        @SuppressWarnings("unchecked")
-        private httpClientType getHttpClient() {
+        private Call.Factory getHttpClient() {
             if(httpClient == null) {
-                return (httpClientType)HttpClients.createDefault(getAuthenticationProvider());
+                return HttpClients.createDefault(getAuthenticationProvider());
             } else {
                 return httpClient;
             }
         }
         @SuppressWarnings("unchecked")
         private IHttpProvider<nativeRequestType> getHttpProvider() {
             if(httpProvider == null) {
-                return (IHttpProvider<nativeRequestType>)new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
+                return (IHttpProvider<nativeRequestType>)new CoreHttpProvider(getSerializer(), getLogger(), getHttpClient());
             } else {
                 return httpProvider;
             }

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

@@ -98,9 +98,9 @@ public class CoreHttpProvider implements IHttpProvider<Request> {
     private final ILogger logger;
 
     /**
-     * The OkHttpClient that handles all requests
+     * The OkHttpClient(Call.Factory) that handles all requests
      */
-    private OkHttpClient corehttpClient;
+    private Call.Factory corehttpClient;
 
     /**
      * Creates the CoreHttpProvider
@@ -112,7 +112,7 @@ public class CoreHttpProvider implements IHttpProvider<Request> {
     @SuppressFBWarnings
     public CoreHttpProvider(@Nonnull final ISerializer serializer,
             @Nonnull final ILogger logger,
-            @Nonnull final OkHttpClient httpClient) {
+            @Nonnull final Call.Factory httpClient) {
         Objects.requireNonNull(logger, "parameter logger cannot be null");
         Objects.requireNonNull(serializer, "parameter serializer cannot be null");
         Objects.requireNonNull(httpClient, "parameter httpClient cannot be null");