Merge pull request #81 from launchdarkly/dr/allFlagsOffline

allFlags() no longer returns null when client is offline

Author: drichelson

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 
 All notable changes to the LaunchDarkly Java SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
+## [2.0.7] - 2016-12-21
+### Changed
+- allFlags() method on client no longer returns null when client is in offline mode.
+
 ## [2.0.6] - 2016-11-21
 ### Changed
 - RedisFeatureStore: Update Jedis dependency. Improved thread/memory management.

README.md

@@ -11,7 +11,7 @@ Quick setup
         <dependency>
           <groupId>com.launchdarkly</groupId>
           <artifactId>launchdarkly-client</artifactId>
-          <version>2.0.6</version>
+          <version>2.0.7</version>
         </dependency>
 
 1. Import the LaunchDarkly package:

build.gradle

@@ -19,7 +19,7 @@ repositories {
 
 allprojects {
     group = 'com.launchdarkly'
-    version = "2.0.6"
+    version = "2.0.7-SNAPSHOT"
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }

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

@@ -200,8 +200,7 @@ private void sendFlagRequestEvent(String featureKey, LDUser user, JsonElement va
   @Override
   public Map<String, JsonElement> allFlags(LDUser user) {
     if (isOffline()) {
-      logger.warn("allFlags() was called when client is in offline mode! Returning null.");
-      return null;
+      logger.debug("allFlags() was called when client is in offline mode.");
     }
 
     if (!initialized()) {

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

@@ -1,22 +1,22 @@
 package com.launchdarkly.client;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import org.easymock.EasyMockSupport;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class LDClientTest extends EasyMockSupport {
   private FeatureRequestor requestor;
@@ -71,6 +71,23 @@ public void testTestFeatureStoreSetFeatureTrue() throws IOException, Interrupted
     verifyAll();
   }
 
+  @Test
+  public void testTestOfflineModeAllFlags() throws IOException, InterruptedException, ExecutionException, TimeoutException {
+    TestFeatureStore testFeatureStore = new TestFeatureStore();
+    LDConfig config = new LDConfig.Builder()
+        .startWaitMillis(10L)
+        .offline(true)
+        .featureStore(testFeatureStore)
+        .build();
+
+    client = new LDClient("", config);//createMockClient(config);
+    testFeatureStore.setFeatureTrue("key");
+    Map<String, JsonElement> allFlags = client.allFlags(new LDUser("user"));
+    assertNotNull("Expected non-nil response from allFlags() when offline mode is set to true", allFlags);
+    assertEquals("Didn't get expected flag count from allFlags() in offline mode", 1, allFlags.size());
+    assertTrue("Test flag should be true, but was not.", allFlags.get("key").getAsBoolean());
+  }
+
   @Test
   public void testTestFeatureStoreSetFalse() throws IOException, InterruptedException, ExecutionException, TimeoutException {
     TestFeatureStore testFeatureStore = new TestFeatureStore();