Merge pull request #26 from eplusminus/eb/config-minimum-and-warning

increase minimum polling interval to 30s and add warning to streaming parameter

Author: pkaeding

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

@@ -79,6 +79,7 @@ public LDClient(String sdkKey, LDConfig config) {
       this.updateProcessor = createStreamProcessor(sdkKey, config, requestor);
     } else {
       logger.info("Disabling streaming API");
+      logger.warn("You should only disable the streaming API if instructed to do so by LaunchDarkly support");
       this.updateProcessor = createPollingProcessor(config);
     }
 

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

@@ -34,7 +34,7 @@ public final class LDConfig {
   private static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 2000;
   private static final int DEFAULT_SOCKET_TIMEOUT_MILLIS = 10000;
   private static final int DEFAULT_FLUSH_INTERVAL_SECONDS = 5;
-  private static final long DEFAULT_POLLING_INTERVAL_MILLIS = 1000L;
+  private static final long MIN_POLLING_INTERVAL_MILLIS = 30000L;
   private static final long DEFAULT_START_WAIT_MILLIS = 5000L;
   private static final int DEFAULT_SAMPLING_INTERVAL = 0;
 
@@ -78,8 +78,8 @@ protected LDConfig(Builder builder) {
     this.useLdd = builder.useLdd;
     this.offline = builder.offline;
     this.sendEvents = builder.sendEvents;
-    if (builder.pollingIntervalMillis < DEFAULT_POLLING_INTERVAL_MILLIS) {
-      this.pollingIntervalMillis = DEFAULT_POLLING_INTERVAL_MILLIS;
+    if (builder.pollingIntervalMillis < MIN_POLLING_INTERVAL_MILLIS) {
+      this.pollingIntervalMillis = MIN_POLLING_INTERVAL_MILLIS;
     } else {
       this.pollingIntervalMillis = builder.pollingIntervalMillis;
     }
@@ -152,7 +152,7 @@ public static class Builder {
     private boolean useLdd = false;
     private boolean offline = false;
     private boolean sendEvents = true;
-    private long pollingIntervalMillis = DEFAULT_POLLING_INTERVAL_MILLIS;
+    private long pollingIntervalMillis = MIN_POLLING_INTERVAL_MILLIS;
     private FeatureStore featureStore = new InMemoryFeatureStore();
     private long startWaitMillis = DEFAULT_START_WAIT_MILLIS;
     private int samplingInterval = DEFAULT_SAMPLING_INTERVAL;
@@ -203,7 +203,8 @@ public Builder featureStore(FeatureStore store) {
     }
 
     /**
-     * Set whether streaming mode should be enabled. By default, streaming is enabled.
+     * Set whether streaming mode should be enabled. By default, streaming is enabled. It should only be
+     * disabled on the advice of LaunchDarkly support.
      *
      * @param stream whether streaming mode should be enabled
      * @return the builder
@@ -392,8 +393,8 @@ public Builder sendEvents(boolean sendEvents) {
     }
 
     /**
-     * Set the polling interval (when streaming is disabled). Values less than the default of 1000
-     * will be set to 1000.
+     * Set the polling interval (when streaming is disabled). Values less than the default of
+     * 30000 will be set to the default.
      *
      * @param pollingIntervalMillis rule update polling interval in milliseconds.
      * @return the builder

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

@@ -98,13 +98,13 @@ public void testProxyAuthPartialConfig() {
   @Test
   public void testMinimumPollingIntervalIsEnforcedProperly(){
     LDConfig config = new LDConfig.Builder().pollingIntervalMillis(10L).build();
-    assertEquals(1000L, config.pollingIntervalMillis);
+    assertEquals(30000L, config.pollingIntervalMillis);
   }
 
   @Test
   public void testPollingIntervalIsEnforcedProperly(){
-    LDConfig config = new LDConfig.Builder().pollingIntervalMillis(10001L).build();
-    assertEquals(10001L, config.pollingIntervalMillis);
+    LDConfig config = new LDConfig.Builder().pollingIntervalMillis(30001L).build();
+    assertEquals(30001L, config.pollingIntervalMillis);
   }
 
   @Test