Move start wait param into builder. Restore original constructor signatures.

Author: Dan Richelson

src/main/java/com/launchdarkly/client/LDClient.java

@@ -34,11 +34,9 @@ public class LDClient implements Closeable {
    * cases, you should use this constructor.
    *
    * @param apiKey        the API key for your account
-   * @param waitForMillis when set to greater than zero allows callers to block until the client
-   *                      has connected to LaunchDarkly and is properly initialized
    */
-  public LDClient(String apiKey, long waitForMillis) {
-    this(apiKey, LDConfig.DEFAULT, waitForMillis);
+  public LDClient(String apiKey) {
+    this(apiKey, LDConfig.DEFAULT);
   }
 
   /**
@@ -47,10 +45,8 @@ public LDClient(String apiKey, long waitForMillis) {
    *
    * @param apiKey        the API key for your account
    * @param config        a client configuration object
-   * @param waitForMillis when set to greater than zero allows callers to block until the client
-   *                      has connected to LaunchDarkly and is properly initialized
    */
-  public LDClient(String apiKey, LDConfig config, long waitForMillis) {
+  public LDClient(String apiKey, LDConfig config) {
     this.config = config;
     this.requestor = createFeatureRequestor(apiKey, config);
     this.eventProcessor = createEventProcessor(apiKey, config);
@@ -75,10 +71,10 @@ public LDClient(String apiKey, LDConfig config, long waitForMillis) {
 
     Future<Void> startFuture = updateProcessor.start();
 
-    if (waitForMillis > 0L) {
-      logger.info("Waiting up to " + waitForMillis + " milliseconds for LaunchDarkly client to start...");
+    if (config.startWaitMillis > 0L) {
+      logger.info("Waiting up to " + config.startWaitMillis + " milliseconds for LaunchDarkly client to start...");
       try {
-        startFuture.get(waitForMillis, TimeUnit.MILLISECONDS);
+        startFuture.get(config.startWaitMillis, TimeUnit.MILLISECONDS);
       } catch (TimeoutException e) {
         logger.error("Timeout encountered waiting for LaunchDarkly client initialization");
       } catch (Exception e) {

src/main/java/com/launchdarkly/client/LDConfig.java

@@ -22,6 +22,7 @@ public final class LDConfig {
   private static final int DEFAULT_SOCKET_TIMEOUT = 10000;
   private static final int DEFAULT_FLUSH_INTERVAL = 5;
   private static final long DEFAULT_POLLING_INTERVAL_MILLIS = 1000L;
+  private static final long DEFAULT_START_WAIT_MILLIS = 0L;
   private static final Logger logger = LoggerFactory.getLogger(LDConfig.class);
 
   protected static final LDConfig DEFAULT = new Builder().build();
@@ -40,6 +41,7 @@ public final class LDConfig {
   final boolean useLdd;
   final boolean offline;
   final long pollingIntervalMillis;
+  final long startWaitMillis;
 
   protected LDConfig(Builder builder) {
     this.baseURI = builder.baseURI;
@@ -60,6 +62,7 @@ protected LDConfig(Builder builder) {
     } else {
       this.pollingIntervalMillis = builder.pollingIntervalMillis;
     }
+    this.startWaitMillis = builder.startWaitMillis;
   }
 
   /**
@@ -90,6 +93,7 @@ public static class Builder {
     private boolean offline = false;
     private long pollingIntervalMillis = DEFAULT_POLLING_INTERVAL_MILLIS;
     private FeatureStore featureStore = new InMemoryFeatureStore();
+    public long startWaitMillis = DEFAULT_START_WAIT_MILLIS;
 
     /**
      * Creates a builder with all configuration parameters set to the default
@@ -319,6 +323,18 @@ public Builder pollingIntervalMillis(long pollingIntervalMillis) {
       return this;
     }
 
+    /**
+     * Set how long the constructor will block awaiting a successful connection to LaunchDarkly.
+     * Default value of 0 will not block and cause the constructor to return immediately.
+     *
+     * @param startWaitMillis
+     * @return the builder
+     */
+    public Builder startWaitMillis(long startWaitMillis) {
+      this.startWaitMillis = startWaitMillis;
+      return this;
+    }
+
     HttpHost proxyHost() {
       if (this.proxyHost == null && this.proxyPort == -1 && this.proxyScheme == null) {
         return null;

src/test/java/com/launchdarkly/client/LDClientTest.java

@@ -37,7 +37,7 @@ public void testOffline() throws IOException {
         .offline(true)
         .build();
 
-    client = createMockClient(config, 0L);
+    client = createMockClient(config);
     replayAll();
 
     assertDefaultValueIsReturned();
@@ -51,7 +51,7 @@ public void testUseLdd() throws IOException {
         .useLdd(true)
         .build();
 
-    client = createMockClient(config, 0L);
+    client = createMockClient(config);
     // Asserting 2 things here: no pollingProcessor or streamingProcessor activity
     // and sending of event:
     expect(eventProcessor.sendEvent(anyObject(Event.class))).andReturn(true);
@@ -73,7 +73,7 @@ public void testStreamingNoWait() throws IOException {
     expect(eventProcessor.sendEvent(anyObject(Event.class))).andReturn(true);
     replayAll();
 
-    client = createMockClient(config, 0L);
+    client = createMockClient(config);
     assertDefaultValueIsReturned();
 
     verifyAll();
@@ -82,14 +82,15 @@ public void testStreamingNoWait() throws IOException {
   @Test
   public void testStreamingWait() throws Exception {
     LDConfig config = new LDConfig.Builder()
+        .startWaitMillis(10L)
         .stream(true)
         .build();
 
     expect(streamProcessor.start()).andReturn(initFuture);
     expect(initFuture.get(10L, TimeUnit.MILLISECONDS)).andThrow(new TimeoutException());
     replayAll();
 
-    client = createMockClient(config, 10L);
+    client = createMockClient(config);
     verifyAll();
   }
 
@@ -104,7 +105,7 @@ public void testPollingNoWait() throws IOException {
     expect(eventProcessor.sendEvent(anyObject(Event.class))).andReturn(true);
     replayAll();
 
-    client = createMockClient(config, 0L);
+    client = createMockClient(config);
     assertDefaultValueIsReturned();
 
     verifyAll();
@@ -113,6 +114,7 @@ public void testPollingNoWait() throws IOException {
   @Test
   public void testPollingWait() throws Exception {
     LDConfig config = new LDConfig.Builder()
+        .startWaitMillis(10L)
         .stream(false)
         .build();
 
@@ -122,7 +124,7 @@ public void testPollingWait() throws Exception {
     expect(pollingProcessor.initialized()).andReturn(false);
     replayAll();
 
-    client = createMockClient(config, 10L);
+    client = createMockClient(config);
     assertDefaultValueIsReturned();
     verifyAll();
   }
@@ -132,11 +134,8 @@ private void assertDefaultValueIsReturned() {
     assertEquals(true, result);
   }
 
-  private LDClient createMockClient(
-      LDConfig config,
-      Long waitForMillis
-  ) {
-    return new LDClient("API_KEY", config, waitForMillis) {
+  private LDClient createMockClient(LDConfig config) {
+    return new LDClient("API_KEY", config) {
       @Override
       protected FeatureRequestor createFeatureRequestor(String apiKey, LDConfig config) {
         return requestor;