prepare 4.3.1 release

CHANGELOG.md

@@ -3,6 +3,11 @@
 
 All notable changes to the LaunchDarkly Java SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [4.3.1] - 2018-09-04
+### Fixed:
+- When evaluating a prerequisite feature flag, the analytics event for the evaluation did not include the result value if the prerequisite flag was off.
+- The default Gson serialization for `LDUser` now includes all user properties. Previously, it omitted `privateAttributeNames`.
+
 ## [4.3.0] - 2018-08-27
 ### Added:
 - The new `LDClient` method `allFlagsState()` should be used instead of `allFlags()` if you are passing flag data to the front end for use with the JavaScript SDK. It preserves some flag metadata that the front end requires in order to send analytics events correctly. Versions 2.5.0 and above of the JavaScript SDK are able to use this metadata, but the output of `allFlagsState()` will still work with older versions.

gradle.properties

@@ -1,3 +1,3 @@
-version=4.3.0
+version=4.3.1
 ossrhUsername=
 ossrhPassword=

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

@@ -74,16 +74,16 @@ EvalResult evaluate(LDUser user, FeatureStore featureStore, EventFactory eventFa
       return new EvalResult(EvaluationDetail.<JsonElement>error(EvaluationReason.ErrorKind.USER_NOT_SPECIFIED, null), prereqEvents);
     }
 
-    if (isOn()) {
-      EvaluationDetail<JsonElement> details = evaluate(user, featureStore, prereqEvents, eventFactory);
-      return new EvalResult(details, prereqEvents);
-    }
-
-    return new EvalResult(getOffValue(EvaluationReason.off()), prereqEvents);
+    EvaluationDetail<JsonElement> details = evaluate(user, featureStore, prereqEvents, eventFactory);
+    return new EvalResult(details, prereqEvents);    
   }
 
   private EvaluationDetail<JsonElement> evaluate(LDUser user, FeatureStore featureStore, List<Event.FeatureRequest> events,
       EventFactory eventFactory) {
+    if (!isOn()) {
+      return getOffValue(EvaluationReason.off());
+    }
+
     EvaluationReason prereqFailureReason = checkPrerequisites(user, featureStore, events, eventFactory);
     if (prereqFailureReason != null) {
       return getOffValue(prereqFailureReason);
@@ -123,20 +123,16 @@ private EvaluationReason checkPrerequisites(LDUser user, FeatureStore featureSto
       boolean prereqOk = true;
       Prerequisite prereq = prerequisites.get(i);
       FeatureFlag prereqFeatureFlag = featureStore.get(FEATURES, prereq.getKey());
-      EvaluationDetail<JsonElement> prereqEvalResult = null;
       if (prereqFeatureFlag == null) {
         logger.error("Could not retrieve prerequisite flag \"{}\" when evaluating \"{}\"", prereq.getKey(), key);
         prereqOk = false;
-      } else if (prereqFeatureFlag.isOn()) {
-        prereqEvalResult = prereqFeatureFlag.evaluate(user, featureStore, events, eventFactory);
-        if (prereqEvalResult == null || prereqEvalResult.getVariationIndex() != prereq.getVariation()) {
+      } else {
+        EvaluationDetail<JsonElement> prereqEvalResult = prereqFeatureFlag.evaluate(user, featureStore, events, eventFactory);
+        // Note that if the prerequisite flag is off, we don't consider it a match no matter what its
+        // off variation was. But we still need to evaluate it in order to generate an event.
+        if (!prereqFeatureFlag.isOn() || prereqEvalResult == null || prereqEvalResult.getVariationIndex() != prereq.getVariation()) {
           prereqOk = false;
         }
-      } else {
-        prereqOk = false;
-      }
-      // We continue to evaluate all prerequisites even if one failed.
-      if (prereqFeatureFlag != null) {
         events.add(eventFactory.newPrerequisiteFeatureRequestEvent(prereqFeatureFlag, user, prereqEvalResult, this));
       }
       if (!prereqOk) {

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

@@ -29,7 +29,7 @@
  */
 public final class LDConfig {
   private static final Logger logger = LoggerFactory.getLogger(LDConfig.class);
-  final Gson gson = new GsonBuilder().registerTypeAdapter(LDUser.class, new LDUser.UserAdapter(this)).create();
+  final Gson gson = new GsonBuilder().registerTypeAdapter(LDUser.class, new LDUser.UserAdapterWithPrivateAttributeBehavior(this)).create();
 
   private static final URI DEFAULT_BASE_URI = URI.create("https://app.launchdarkly.com");
   private static final URI DEFAULT_EVENTS_URI = URI.create("https://events.launchdarkly.com");