Initial commit of custom CloseableHttpClient for OptimizelyFactory.

Author: The-inside-man

core-httpclient-impl/src/main/java/com/optimizely/ab/OptimizelyFactory.java

@@ -23,6 +23,7 @@
 import com.optimizely.ab.event.EventHandler;
 import com.optimizely.ab.internal.PropertyUtils;
 import com.optimizely.ab.notification.NotificationCenter;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,6 +49,7 @@
  */
 public final class OptimizelyFactory {
     private static final Logger logger = LoggerFactory.getLogger(OptimizelyFactory.class);
+    private static CloseableHttpClient customHttpClient;
 
     /**
      * Convenience method for setting the maximum number of events contained within a batch.
@@ -221,7 +223,16 @@ public static Optimizely newDefaultInstance(String sdkKey) {
             return newDefaultInstance(() -> null);
         }
 
-        return newDefaultInstance(sdkKey, null);
+        return newDefaultInstance(sdkKey, "");
+    }
+
+    public static Optimizely newDefaultInstance(String sdkKey, CloseableHttpClient httpClient) {
+        if (sdkKey == null || httpClient == null) {
+            logger.error("Must provide an sdkKey and httpClient, returning non-op Optimizely client");
+            return newDefaultInstance(() -> null);
+        }
+        customHttpClient = httpClient;
+        return newDefaultInstance(sdkKey);
     }
 
     /**
@@ -234,6 +245,7 @@ public static Optimizely newDefaultInstance(String sdkKey) {
      * @return A new Optimizely instance
      */
     public static Optimizely newDefaultInstance(String sdkKey, String fallback) {
+        if (fallback.equals("")) { fallback = null; }
         String datafileAccessToken = PropertyUtils.get(HttpProjectConfigManager.CONFIG_DATAFILE_AUTH_TOKEN);
         return newDefaultInstance(sdkKey, fallback, datafileAccessToken);
     }
@@ -248,12 +260,21 @@ public static Optimizely newDefaultInstance(String sdkKey, String fallback) {
      */
     public static Optimizely newDefaultInstance(String sdkKey, String fallback, String datafileAccessToken) {
         NotificationCenter notificationCenter = new NotificationCenter();
-
-        HttpProjectConfigManager.Builder builder = HttpProjectConfigManager.builder()
-            .withDatafile(fallback)
-            .withNotificationCenter(notificationCenter)
-            .withSdkKey(sdkKey);
-
+        HttpProjectConfigManager.Builder builder;
+        if (customHttpClient != null) {
+            OptimizelyHttpClient optimizelyHttpClient = new OptimizelyHttpClient(customHttpClient);
+
+            builder = HttpProjectConfigManager.builder()
+                .withDatafile(fallback)
+                .withNotificationCenter(notificationCenter)
+                .withOptimizelyHttpClient(optimizelyHttpClient)
+                .withSdkKey(sdkKey);
+        } else {
+            builder = HttpProjectConfigManager.builder()
+                .withDatafile(fallback)
+                .withNotificationCenter(notificationCenter)
+                .withSdkKey(sdkKey);
+        }
         if (datafileAccessToken != null) {
             builder.withDatafileAccessToken(datafileAccessToken);
         }

core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyFactoryTest.java

@@ -23,6 +23,12 @@
 import com.optimizely.ab.event.BatchEventProcessor;
 import com.optimizely.ab.internal.PropertyUtils;
 import com.optimizely.ab.notification.NotificationCenter;
+import org.apache.http.HttpHost;
+import org.apache.http.conn.routing.HttpRoutePlanner;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -223,6 +229,27 @@ public void newDefaultInstanceWithSdkKey() throws Exception {
         assertFalse(optimizely.isValid());
     }
 
+    @Test
+    public void newDefaultInstanceWithSdkKeyAndCustomHttpClient() throws Exception {
+        // Set a blocking timeout so we don't block for too long.
+        OptimizelyFactory.setBlockingTimeout(5, TimeUnit.MICROSECONDS);
+
+        // Add custom Proxy and Port here
+        int port = 443;
+        String proxyHostName = "localhost";
+        HttpHost proxyHost = new HttpHost(proxyHostName, port);
+
+        HttpRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxyHost);
+
+        HttpClientBuilder clientBuilder = HttpClients.custom();
+        clientBuilder = clientBuilder.setRoutePlanner(routePlanner);
+
+        CloseableHttpClient httpClient = clientBuilder.build();
+
+        optimizely = OptimizelyFactory.newDefaultInstance("sdk-key", httpClient);
+        assertFalse(optimizely.isValid());
+    }
+
     @Test
     public void newDefaultInstanceWithFallback() throws Exception {
         String datafileString = Resources.toString(Resources.getResource("valid-project-config-v4.json"), Charsets.UTF_8);