Expose okhttp3.Call.Factory in all services

mapbox/libjava-services/src/main/java/com/mapbox/services/api/MapboxService.java

@@ -22,6 +22,8 @@
 public abstract class MapboxService<T> {
 
   private boolean enableDebug = false;
+  private OkHttpClient okHttpClient = null;
+  private okhttp3.Call.Factory callFactory = null;
 
   public abstract Response<T> executeCall() throws IOException;
 
@@ -39,22 +41,50 @@ public void setEnableDebug(boolean enableDebug) {
     this.enableDebug = enableDebug;
   }
 
+  /**
+   * Gets the call factory for creating {@link Call} instances.
+   *
+   * @return the call factory, or the default OkHttp client if it's null.
+   * @since 2.0.0
+   */
+  public okhttp3.Call.Factory getCallFactory() {
+    if (callFactory == null) {
+      return getOkHttpClient();
+    }
+
+    return callFactory;
+  }
+
+  /**
+   * Specify a custom call factory for creating {@link Call} instances.
+   *
+   * @param callFactory implementation
+   * @since 2.0.0
+   */
+  public void setCallFactory(okhttp3.Call.Factory callFactory) {
+    this.callFactory = callFactory;
+  }
+
   /**
    * Used Internally.
    *
    * @return OkHttpClient
    * @since 1.0.0
    */
   public OkHttpClient getOkHttpClient() {
-    if (isEnableDebug()) {
-      HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-      logging.setLevel(HttpLoggingInterceptor.Level.BASIC);
-      OkHttpClient.Builder httpClient = new OkHttpClient.Builder();
-      httpClient.addInterceptor(logging);
-      return httpClient.build();
-    } else {
-      return new OkHttpClient();
+    if (okHttpClient == null) {
+      if (isEnableDebug()) {
+        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+        logging.setLevel(HttpLoggingInterceptor.Level.BASIC);
+        OkHttpClient.Builder httpClient = new OkHttpClient.Builder();
+        httpClient.addInterceptor(logging);
+        okHttpClient = httpClient.build();
+      } else {
+        okHttpClient = new OkHttpClient();
+      }
     }
+
+    return okHttpClient;
   }
 
   /**

mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java

@@ -46,6 +46,7 @@ private DirectionsService getService() {
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
       .addConverterFactory(GsonConverterFactory.create())
+      .callFactory(getCallFactory())
       .build();
 
     // Directions service

mapbox/libjava-services/src/main/java/com/mapbox/services/api/distance/v1/MapboxDistance.java

@@ -73,6 +73,7 @@ private DistanceService getService() {
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
       .addConverterFactory(GsonConverterFactory.create(getGson()))
+      .callFactory(getCallFactory())
       .build();
 
     // Distance service

mapbox/libjava-services/src/main/java/com/mapbox/services/api/geocoding/v5/MapboxGeocoding.java

@@ -71,6 +71,7 @@ public GeocodingService getService() {
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
       .addConverterFactory(GsonConverterFactory.create(getGson()))
+      .callFactory(getCallFactory())
       .build();
 
     service = retrofit.create(GeocodingService.class);

mapbox/libjava-services/src/main/java/com/mapbox/services/api/mapmatching/v5/MapboxMapMatching.java

@@ -52,6 +52,7 @@ private MapMatchingService getService() {
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
       .addConverterFactory(GsonConverterFactory.create())
+      .callFactory(getCallFactory())
       .build();
 
     // MapMatching service

mapbox/libjava-services/src/test/java/com/mapbox/services/api/directions/v5/MapboxDirectionsTest.java

@@ -105,6 +105,23 @@ public void requiredAccessToken() throws ServicesException {
     new MapboxDirections.Builder().build();
   }
 
+  @Test
+  public void callFactoryNonNull() throws ServicesException, IOException {
+    MapboxDirections client = new MapboxDirections.Builder()
+            .setAccessToken("pk.XXX")
+            .setCoordinates(positions)
+            .setProfile(DirectionsCriteria.PROFILE_DRIVING)
+            .setBaseUrl(mockUrl.toString())
+            .build();
+
+    // Setting a null call factory doesn't make the request fail
+    // (the default OkHttp client is used)
+    client.setCallFactory(null);
+    Response<DirectionsResponse> response = client.executeCall();
+    assertEquals(response.code(), 200);
+    assertEquals(response.body().getCode(), DirectionsCriteria.RESPONSE_OK);
+  }
+
   @Test
   public void coordinatesOverLimit() throws ServicesException {
     thrown.expect(ServicesException.class);