Adjusting against current version.

Author: aliabbasrizvi

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

@@ -32,13 +32,9 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * HttpProjectConfigManager is an implementation of a ProjectConfigManager
+ * HttpProjectConfigManager is an implementation of a {@link PollingProjectConfigManager}
  * backed by a datafile. Currently this is loosely tied to Apache HttpClient
  * implementation which is the client of choice in this package.
- *
- * Note that this implementation is blocking and stateless. This is best used in
- * conjunction with the {@link PollingProjectConfigManager} to provide caching
- * and asynchronous fetching.
  */
 public class HttpProjectConfigManager extends PollingProjectConfigManager {
 
@@ -48,8 +44,8 @@ public class HttpProjectConfigManager extends PollingProjectConfigManager {
     private final URI uri;
     private String datafileLastModified;
 
-    private HttpProjectConfigManager(long period, TimeUnit timeUnit, OptimizelyHttpClient httpClient, String url) {
-        super(period, timeUnit);
+    private HttpProjectConfigManager(long period, TimeUnit timeUnit, OptimizelyHttpClient httpClient, String url, long blockingTimeoutPeriod, TimeUnit blockingTimeoutUnit) {
+        super(period, timeUnit, blockingTimeoutPeriod, blockingTimeoutUnit);
         this.httpClient = httpClient;
         this.uri = URI.create(url);
     }
@@ -128,9 +124,13 @@ public static class Builder {
         private String url;
         private String format = "https://cdn.optimizely.com/datafiles/%s.json";
         private OptimizelyHttpClient httpClient;
+
         private long period = 5;
         private TimeUnit timeUnit = TimeUnit.MINUTES;
 
+        private long blockingTimeoutPeriod = 10;
+        private TimeUnit blockingTimeoutUnit = TimeUnit.SECONDS;
+
         public Builder withDatafile(String datafile) {
             this.datafile = datafile;
             return this;
@@ -156,6 +156,23 @@ public Builder withOptimizelyHttpClient(OptimizelyHttpClient httpClient) {
             return this;
         }
 
+        /**
+         * Configure time to block before Completing the future. This timeout is used on the first call
+         * to {@link PollingProjectConfigManager#getConfig()}. If the timeout is exceeded then the
+         * PollingProjectConfigManager will begin returning null immediately until the call to Poll
+         * succeeds.
+         */
+        public Builder withBlockingTimeout(long period, TimeUnit timeUnit) {
+            if (timeUnit == null) {
+                throw new NullPointerException("Must provide valid timeUnit");
+            }
+
+            this.blockingTimeoutPeriod = period;
+            this.blockingTimeoutUnit = timeUnit;
+
+            return this;
+        }
+
         public Builder withPollingInterval(long period, TimeUnit timeUnit) {
             if (timeUnit == null) {
                 throw new NullPointerException("Must provide valid timeUnit");
@@ -186,17 +203,15 @@ public HttpProjectConfigManager build(boolean defer) {
                 httpClient = HttpClientUtils.getDefaultHttpClient();
             }
 
-            if (url != null) {
-                return new HttpProjectConfigManager(period, timeUnit, httpClient, url);
-            }
+            if (url == null) {
+                if (sdkKey == null) {
+                    throw new NullPointerException("sdkKey cannot be null");
+                }
 
-            if (sdkKey == null) {
-                throw new NullPointerException("sdkKey cannot be null");
+                url = String.format(format, sdkKey);
             }
 
-            url = String.format(format, sdkKey);
-
-            HttpProjectConfigManager httpProjectManager = new HttpProjectConfigManager(period, timeUnit, httpClient, url);
+            HttpProjectConfigManager httpProjectManager = new HttpProjectConfigManager(period, timeUnit, httpClient, url, blockingTimeoutPeriod, blockingTimeoutUnit);
 
             if (datafile != null) {
                 try {

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

@@ -37,11 +37,13 @@
 import org.mockito.runners.MockitoJUnitRunner;
 
 import java.net.URI;
+import java.util.concurrent.TimeUnit;
 
 import static com.optimizely.ab.config.HttpProjectConfigManager.*;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -187,6 +189,27 @@ public void testGetDatafileHttpResponse5XX() throws Exception {
         projectConfigManager.getDatafileFromResponse(getResponse);
     }
 
+    public void testInvalidPayload() throws Exception {
+        reset(mockHttpClient);
+        CloseableHttpResponse invalidPayloadResponse = mock(CloseableHttpResponse.class);
+        StatusLine statusLine = mock(StatusLine.class);
+
+        when(statusLine.getStatusCode()).thenReturn(200);
+        when(invalidPayloadResponse.getStatusLine()).thenReturn(statusLine);
+        when(invalidPayloadResponse.getEntity()).thenReturn(new StringEntity("I am an invalid response!"));
+
+        when(mockHttpClient.execute(any(HttpGet.class)))
+            .thenReturn(invalidPayloadResponse);
+
+        projectConfigManager = builder()
+            .withOptimizelyHttpClient(mockHttpClient)
+            .withSdkKey("sdk-key")
+            .withBlockingTimeout(10, TimeUnit.MILLISECONDS)
+            .build();
+
+        assertNull(projectConfigManager.getConfig());
+    }
+
     @Test
     @Ignore
     public void testBasicFetch() throws Exception {