Add org.Json FeatureFlag parsing

Fix org.Json ProjectConfig parsing

Signed-off-by: wangjoshuah <[email protected]>

Author: wangjoshuah

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

@@ -17,35 +17,34 @@
 package com.optimizely.ab.config.parser;
 
 import com.optimizely.ab.config.Attribute;
-import com.optimizely.ab.config.audience.AndCondition;
-import com.optimizely.ab.config.audience.Audience;
-import com.optimizely.ab.config.audience.Condition;
-import com.optimizely.ab.config.audience.NotCondition;
-import com.optimizely.ab.config.audience.OrCondition;
-import com.optimizely.ab.config.audience.UserAttribute;
 import com.optimizely.ab.config.EventType;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.Experiment.ExperimentStatus;
+import com.optimizely.ab.config.FeatureFlag;
 import com.optimizely.ab.config.Group;
 import com.optimizely.ab.config.LiveVariable;
-import com.optimizely.ab.config.LiveVariableUsageInstance;
 import com.optimizely.ab.config.LiveVariable.VariableStatus;
 import com.optimizely.ab.config.LiveVariable.VariableType;
+import com.optimizely.ab.config.LiveVariableUsageInstance;
 import com.optimizely.ab.config.ProjectConfig;
 import com.optimizely.ab.config.TrafficAllocation;
 import com.optimizely.ab.config.Variation;
-
+import com.optimizely.ab.config.audience.AndCondition;
+import com.optimizely.ab.config.audience.Audience;
+import com.optimizely.ab.config.audience.Condition;
+import com.optimizely.ab.config.audience.NotCondition;
+import com.optimizely.ab.config.audience.OrCondition;
+import com.optimizely.ab.config.audience.UserAttribute;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
-
 /**
  * {@code org.json}-based config parser implementation.
  */
@@ -60,6 +59,7 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
             String projectId = rootObject.getString("projectId");
             String revision = rootObject.getString("revision");
             String version = rootObject.getString("version");
+            int datafileVersion = Integer.parseInt(version);
 
             List<Experiment> experiments = parseExperiments(rootObject.getJSONArray("experiments"));
 
@@ -72,14 +72,31 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
 
             boolean anonymizeIP = false;
             List<LiveVariable> liveVariables = null;
-            if (version.equals(ProjectConfig.Version.V3.toString())) {
+            if (datafileVersion >= 3) {
                 liveVariables = parseLiveVariables(rootObject.getJSONArray("variables"));
 
                 anonymizeIP = rootObject.getBoolean("anonymizeIP");
             }
 
-            return new ProjectConfig(accountId, projectId, version, revision, groups, experiments, attributes, events,
-                                     audiences, anonymizeIP, liveVariables);
+            List<FeatureFlag> featureFlags = null;
+            if (datafileVersion >= 4) {
+                featureFlags = parseFeatureFlags(rootObject.getJSONArray("featureFlags"));
+            }
+
+            return new ProjectConfig(
+                    accountId,
+                    anonymizeIP,
+                    projectId,
+                    revision,
+                    version,
+                    attributes,
+                    audiences,
+                    events,
+                    experiments,
+                    featureFlags,
+                    groups,
+                    liveVariables
+            );
         } catch (Exception e) {
             throw new ConfigParseException("Unable to parse datafile: " + json, e);
         }
@@ -123,6 +140,41 @@ private List<Experiment> parseExperiments(JSONArray experimentJson, String group
         return experiments;
     }
 
+    private List<String> parseExperimentIds(JSONArray experimentIdsJson) {
+        ArrayList<String> experimentIds = new ArrayList<String>(experimentIdsJson.length());
+
+        for (Object experimentIdObj : experimentIdsJson) {
+            experimentIds.add((String) experimentIdObj);
+        }
+
+        return experimentIds;
+    }
+
+    private List<FeatureFlag> parseFeatureFlags(JSONArray featureFlagJson) {
+        List<FeatureFlag> featureFlags = new ArrayList<FeatureFlag>(featureFlagJson.length());
+
+        for (Object obj : featureFlagJson) {
+            JSONObject featureFlagObject = (JSONObject) obj;
+            String id = featureFlagObject.getString("id");
+            String key = featureFlagObject.getString("key");
+            String layerId = featureFlagObject.getString("layerId");
+
+            List<String> experimentIds = parseExperimentIds(featureFlagObject.getJSONArray("experimentIds"));
+
+            List<LiveVariable> variables = parseLiveVariables(featureFlagObject.getJSONArray("variables"));
+
+            featureFlags.add(new FeatureFlag(
+                    id,
+                    key,
+                    layerId,
+                    experimentIds,
+                    variables
+            ));
+        }
+
+        return featureFlags;
+    }
+
     private List<Variation> parseVariations(JSONArray variationJson) {
         List<Variation> variations = new ArrayList<Variation>(variationJson.length());
 
@@ -187,12 +239,7 @@ private List<EventType> parseEvents(JSONArray eventJson) {
 
         for (Object obj : eventJson) {
             JSONObject eventObject = (JSONObject)obj;
-            JSONArray experimentIdsJson = eventObject.getJSONArray("experimentIds");
-            List<String> experimentIds = new ArrayList<String>(experimentIdsJson.length());
-
-            for (Object experimentIdObj : experimentIdsJson) {
-                experimentIds.add((String)experimentIdObj);
-            }
+            List<String> experimentIds = parseExperimentIds(eventObject.getJSONArray("experimentIds"));
 
             String id = eventObject.getString("id");
             String key = eventObject.getString("key");