Add GsonParser for FeatureFlags

Fix GsonParsing of FeatureFlags

Author: wangjoshuah

core-api/src/main/java/com/optimizely/ab/config/FeatureFlag.java

@@ -75,6 +75,7 @@ public String toString() {
                 ", layerId='" + layerId + '\'' +
                 ", experimentIds=" + experimentIds +
                 ", variables=" + variables +
+                ", variableKeyToLiveVariableMap=" + variableKeyToLiveVariableMap +
                 '}';
     }
 

core-api/src/main/java/com/optimizely/ab/config/parser/FeatureFlagGsonDeserializer.java

@@ -0,0 +1,36 @@
+/**
+ *
+ *    Copyright 2017, Optimizely and contributors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.optimizely.ab.config.parser;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.optimizely.ab.config.FeatureFlag;
+
+import java.lang.reflect.Type;
+
+public class FeatureFlagGsonDeserializer implements JsonDeserializer<FeatureFlag> {
+    @Override
+    public FeatureFlag deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+            throws JsonParseException {
+
+        JsonObject jsonObject = json.getAsJsonObject();
+        return GsonHelpers.parseFeatureFlag(jsonObject, context);
+    }
+}

core-api/src/main/java/com/optimizely/ab/config/parser/GsonConfigParser.java

@@ -18,11 +18,11 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 import com.optimizely.ab.config.Experiment;
+import com.optimizely.ab.config.FeatureFlag;
 import com.optimizely.ab.config.Group;
-import com.optimizely.ab.config.audience.Audience;
 import com.optimizely.ab.config.ProjectConfig;
+import com.optimizely.ab.config.audience.Audience;
 
 import javax.annotation.Nonnull;
 
@@ -40,11 +40,12 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
             throw new ConfigParseException("Unable to parse empty json.");
         }
         Gson gson = new GsonBuilder()
-            .registerTypeAdapter(ProjectConfig.class, new ProjectConfigGsonDeserializer())
-            .registerTypeAdapter(Audience.class, new AudienceGsonDeserializer())
-            .registerTypeAdapter(Group.class, new GroupGsonDeserializer())
-            .registerTypeAdapter(Experiment.class, new ExperimentGsonDeserializer())
-            .create();
+                .registerTypeAdapter(Audience.class, new AudienceGsonDeserializer())
+                .registerTypeAdapter(Experiment.class, new ExperimentGsonDeserializer())
+                .registerTypeAdapter(FeatureFlag.class, new FeatureFlagGsonDeserializer())
+                .registerTypeAdapter(Group.class, new GroupGsonDeserializer())
+                .registerTypeAdapter(ProjectConfig.class, new ProjectConfigGsonDeserializer())
+                .create();
 
         try {
             return gson.fromJson(json, ProjectConfig.class);

core-api/src/main/java/com/optimizely/ab/config/parser/GsonHelpers.java

@@ -21,17 +21,18 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
-
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.Experiment.ExperimentStatus;
+import com.optimizely.ab.config.FeatureFlag;
+import com.optimizely.ab.config.LiveVariable;
 import com.optimizely.ab.config.LiveVariableUsageInstance;
 import com.optimizely.ab.config.TrafficAllocation;
 import com.optimizely.ab.config.Variation;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -114,4 +115,28 @@ static Experiment parseExperiment(JsonObject experimentJson, String groupId, Jso
     static Experiment parseExperiment(JsonObject experimentJson, JsonDeserializationContext context) {
         return parseExperiment(experimentJson, "", context);
     }
+
+    static FeatureFlag parseFeatureFlag(JsonObject featureFlagJson, JsonDeserializationContext context) {
+        String id = featureFlagJson.get("id").getAsString();
+        String key = featureFlagJson.get("key").getAsString();
+        String layerId = featureFlagJson.get("layerId").getAsString();
+
+        JsonArray experimentIdsJson = featureFlagJson.getAsJsonArray("experimentIds");
+        List<String> experimentIds = new ArrayList<String>();
+        for (JsonElement experimentIdObj : experimentIdsJson) {
+            experimentIds.add(experimentIdObj.getAsString());
+        }
+
+        Type liveVariableType = new TypeToken<List<LiveVariable>>() {}.getType();
+        List<LiveVariable> liveVariables = context.deserialize(featureFlagJson.getAsJsonArray("variables"),
+                liveVariableType);
+
+        return new FeatureFlag(
+                id,
+                key,
+                layerId,
+                experimentIds,
+                liveVariables
+        );
+    }
 }

core-api/src/main/java/com/optimizely/ab/config/parser/ProjectConfigGsonDeserializer.java

@@ -25,6 +25,7 @@
 import com.optimizely.ab.config.Attribute;
 import com.optimizely.ab.config.EventType;
 import com.optimizely.ab.config.Experiment;
+import com.optimizely.ab.config.FeatureFlag;
 import com.optimizely.ab.config.Group;
 import com.optimizely.ab.config.LiveVariable;
 import com.optimizely.ab.config.ProjectConfig;
@@ -47,6 +48,7 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
         String projectId = jsonObject.get("projectId").getAsString();
         String revision = jsonObject.get("revision").getAsString();
         String version = jsonObject.get("version").getAsString();
+        int datafileVersion = Integer.parseInt(version);
 
         // generic list type tokens
         Type groupsType = new TypeToken<List<Group>>() {}.getType();
@@ -70,14 +72,32 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
         boolean anonymizeIP = false;
         // live variables should be null if using V2
         List<LiveVariable> liveVariables = null;
-        if (version.equals(ProjectConfig.Version.V3.toString())) {
+        if (datafileVersion >= 3) {
             Type liveVariablesType = new TypeToken<List<LiveVariable>>() {}.getType();
             liveVariables = context.deserialize(jsonObject.getAsJsonArray("variables"), liveVariablesType);
 
             anonymizeIP = jsonObject.get("anonymizeIP").getAsBoolean();
         }
 
-        return new ProjectConfig(accountId, projectId, version, revision, groups, experiments, attributes, events,
-                                 audiences, anonymizeIP, liveVariables);
+        List<FeatureFlag> featureFlags = null;
+        if (datafileVersion >= 4) {
+            Type featureFlagsType = new TypeToken<List<FeatureFlag>>() {}.getType();
+            featureFlags = context.deserialize(jsonObject.getAsJsonArray("featureFlags"), featureFlagsType);
+        }
+
+        return new ProjectConfig(
+                accountId,
+                anonymizeIP,
+                projectId,
+                revision,
+                version,
+                attributes,
+                audiences,
+                events,
+                experiments,
+                featureFlags,
+                groups,
+                liveVariables
+        );
     }
 }

core-api/src/test/java/com/optimizely/ab/config/parser/GsonConfigParserTest.java

@@ -57,7 +57,7 @@ public void parseProjectConfigV3() throws Exception {
     }
 
     @Test
-    public void parseProjectCOnfigV4() throws Exception {
+    public void parseProjectConfigV4() throws Exception {
         GsonConfigParser parser = new GsonConfigParser();
         ProjectConfig actual = parser.parseProjectConfig(validConfigJsonV4());
         ProjectConfig expected = validProjectConfigV4();