Holdouts parsing from data file

Author: muzahidul-opti

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

@@ -51,6 +51,8 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
         }.getType();
         Type experimentsType = new TypeToken<List<Experiment>>() {
         }.getType();
+        Type holdoutsType = new TypeToken<List<Holdout>>() {
+        }.getType();
         Type attributesType = new TypeToken<List<Attribute>>() {
         }.getType();
         Type eventsType = new TypeToken<List<EventType>>() {
@@ -64,6 +66,13 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
         List<Experiment> experiments =
             context.deserialize(jsonObject.get("experiments").getAsJsonArray(), experimentsType);
 
+        List<Holdout> holdouts;
+        if (jsonObject.has("holdouts")) {
+            holdouts = context.deserialize(jsonObject.get("holdouts").getAsJsonArray(), holdoutsType);
+        } else {
+            holdouts = Collections.emptyList();
+        }
+
         List<Attribute> attributes;
         attributes = context.deserialize(jsonObject.get("attributes"), attributesType);
 
@@ -127,6 +136,7 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
             typedAudiences,
             events,
             experiments,
+            holdouts,
             featureFlags,
             groups,
             rollouts,

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

@@ -46,6 +46,13 @@ public DatafileProjectConfig deserialize(JsonParser parser, DeserializationConte
         List<Attribute> attributes = JacksonHelpers.arrayNodeToList(node.get("attributes"), Attribute.class, codec);
         List<EventType> events = JacksonHelpers.arrayNodeToList(node.get("events"), EventType.class, codec);
 
+        List<Holdout> holdouts;
+        if (node.has("holdouts")) {
+             holdouts = JacksonHelpers.arrayNodeToList(node.get("holdouts"), Holdout.class, codec);
+        } else {
+            holdouts = Collections.emptyList();
+        }
+
         List<Audience> audiences = Collections.emptyList();
         if (node.has("audiences")) {
             audiences = JacksonHelpers.arrayNodeToList(node.get("audiences"), Audience.class, codec);
@@ -103,6 +110,7 @@ public DatafileProjectConfig deserialize(JsonParser parser, DeserializationConte
             (List<Audience>) (List<? extends Audience>) typedAudiences,
             events,
             experiments,
+            holdouts,
             featureFlags,
             groups,
             rollouts,

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

@@ -25,7 +25,9 @@
 import com.google.gson.reflect.TypeToken;
 import com.optimizely.ab.bucketing.DecisionService;
 import com.optimizely.ab.config.Experiment;
+import com.optimizely.ab.config.Holdout;
 import com.optimizely.ab.config.Experiment.ExperimentStatus;
+import com.optimizely.ab.config.Holdout.HoldoutStatus;
 import com.optimizely.ab.config.FeatureFlag;
 import com.optimizely.ab.config.FeatureVariable;
 import com.optimizely.ab.config.FeatureVariableUsageInstance;
@@ -151,6 +153,51 @@ static Experiment parseExperiment(JsonObject experimentJson, JsonDeserialization
         return parseExperiment(experimentJson, "", context);
     }
 
+    static Holdout parseHoldout(JsonObject holdoutJson, String groupId, JsonDeserializationContext context) {
+        String id = holdoutJson.get("id").getAsString();
+        String key = holdoutJson.get("key").getAsString();
+        JsonElement holdoutStatusJson = holdoutJson.get("status");
+        String status = holdoutJson.get("status").getAsString();
+
+        JsonArray audienceIdsJson = holdoutJson.getAsJsonArray("audienceIds");
+        List<String> audienceIds = new ArrayList<>(audienceIdsJson.size());
+        for (JsonElement audienceIdObj : audienceIdsJson) {
+            audienceIds.add(audienceIdObj.getAsString());
+        }
+
+        Condition conditions = parseAudienceConditions(holdoutJson);
+
+        // parse the child objects
+        List<Variation> variations = parseVariations(holdoutJson.getAsJsonArray("variations"), context);
+        Map<String, String> userIdToVariationKeyMap =
+            parseForcedVariations(holdoutJson.getAsJsonObject("forcedVariations"));
+        List<TrafficAllocation> trafficAllocations =
+            parseTrafficAllocation(holdoutJson.getAsJsonArray("trafficAllocation"));
+
+        List<String> includedFlags = new ArrayList<>();
+        if (holdoutJson.has("includedFlags")) {
+            JsonArray includedIdsJson = holdoutJson.getAsJsonArray("includedFlags");
+            for (JsonElement hoIdObj : includedIdsJson) {
+                includedFlags.add(hoIdObj.getAsString());
+            }
+        }
+
+        List<String> excludedFlags = new ArrayList<>();
+        if (holdoutJson.has("excludedFlags")) {
+            JsonArray excludedIdsJson = holdoutJson.getAsJsonArray("excludedFlags");
+            for (JsonElement hoIdObj : excludedIdsJson) {
+                excludedFlags.add(hoIdObj.getAsString());
+            }
+        }
+
+        return new Holdout(id, key, status, audienceIds, conditions, variations, userIdToVariationKeyMap,
+            trafficAllocations, includedFlags, excludedFlags, groupId);
+    }
+
+    static Holdout parseHoldout(JsonObject holdoutJson, JsonDeserializationContext context) {
+        return parseHoldout(holdoutJson, "", context);
+    }
+
     static FeatureFlag parseFeatureFlag(JsonObject featureFlagJson, JsonDeserializationContext context) {
         String id = featureFlagJson.get("id").getAsString();
         String key = featureFlagJson.get("key").getAsString();

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

@@ -48,6 +48,13 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
 
             List<Experiment> experiments = parseExperiments(rootObject.getJSONArray("experiments"));
 
+            List<Holdout> holdouts;
+            if (rootObject.has("holdouts")) {
+                holdouts = parseHoldouts(rootObject.getJSONArray("holdouts"));
+            } else {
+                holdouts = Collections.emptyList();
+            }
+
             List<Attribute> attributes;
             attributes = parseAttributes(rootObject.getJSONArray("attributes"));
 
@@ -108,6 +115,7 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
                 typedAudiences,
                 events,
                 experiments,
+                holdouts,
                 featureFlags,
                 groups,
                 rollouts,
@@ -166,6 +174,74 @@ private List<Experiment> parseExperiments(JSONArray experimentJson, String group
         return experiments;
     }
 
+    private List<Holdout> parseHoldouts(JSONArray holdoutJson) {
+        return parseHoldouts(holdoutJson, "");
+    }
+
+    private List<Holdout> parseHoldouts(JSONArray holdoutJson, String groupId) {
+        List<Holdout> holdouts = new ArrayList<Holdout>(holdoutJson.length());
+
+        for (int i = 0; i < holdoutJson.length(); i++) {
+            Object obj = holdoutJson.get(i);
+            JSONObject holdoutObject = (JSONObject) obj;
+            String id = holdoutObject.getString("id");
+            String key = holdoutObject.getString("key");
+            String status = holdoutObject.getString("status");
+
+            JSONArray audienceIdsJson = holdoutObject.getJSONArray("audienceIds");
+            List<String> audienceIds = new ArrayList<String>(audienceIdsJson.length());
+
+            for (int j = 0; j < audienceIdsJson.length(); j++) {
+                Object audienceIdObj = audienceIdsJson.get(j);
+                audienceIds.add((String) audienceIdObj);
+            }
+
+            Condition conditions = null;
+            if (holdoutObject.has("audienceConditions")) {
+                Object jsonCondition = holdoutObject.get("audienceConditions");
+                conditions = ConditionUtils.<AudienceIdCondition>parseConditions(AudienceIdCondition.class, jsonCondition);
+            }
+
+            // parse the child objects
+            List<Variation> variations = parseVariations(holdoutObject.getJSONArray("variations"));
+            Map<String, String> userIdToVariationKeyMap =
+                parseForcedVariations(holdoutObject.getJSONObject("forcedVariations"));
+            List<TrafficAllocation> trafficAllocations =
+                parseTrafficAllocation(holdoutObject.getJSONArray("trafficAllocation"));
+
+            List<String> includedFlags;
+            if (holdoutObject.has("includedFlags")) {
+                JSONArray includedIdsJson = holdoutObject.getJSONArray("includedFlags");
+                includedFlags = new ArrayList<>(includedIdsJson.length());
+
+                for (int j = 0; j < includedIdsJson.length(); j++) {
+                    Object idObj = includedIdsJson.get(j);
+                    includedFlags.add((String) idObj);
+                }
+            } else {
+                includedFlags = Collections.emptyList();
+            }
+
+            List<String> excludedFlags;
+            if (holdoutObject.has("excludedFlags")) {
+                JSONArray excludedIdsJson = holdoutObject.getJSONArray("excludedFlags");
+                excludedFlags = new ArrayList<>(excludedIdsJson.length());
+
+                for (int j = 0; j < excludedIdsJson.length(); j++) {
+                    Object idObj = excludedIdsJson.get(j);
+                    excludedFlags.add((String) idObj);
+                }
+            } else {
+                excludedFlags = Collections.emptyList();
+            }
+
+            holdouts.add(new Holdout(id, key, status, audienceIds, conditions, variations, userIdToVariationKeyMap,
+                trafficAllocations, includedFlags, excludedFlags, groupId));
+        }
+
+        return holdouts;
+    }
+
     private List<String> parseExperimentIds(JSONArray experimentIdsJson) {
         ArrayList<String> experimentIds = new ArrayList<String>(experimentIdsJson.length());
 

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

@@ -57,6 +57,13 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
 
             List<Experiment> experiments = parseExperiments((JSONArray) rootObject.get("experiments"));
 
+            List<Holdout> holdouts;
+            if (rootObject.containsKey("holdouts")) {
+                holdouts = parseHoldouts((JSONArray) rootObject.get("holdouts"));
+            } else {
+                holdouts = Collections.emptyList();
+            }
+
             List<Attribute> attributes;
             attributes = parseAttributes((JSONArray) rootObject.get("attributes"));
 
@@ -111,6 +118,7 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
                 typedAudiences,
                 events,
                 experiments,
+                holdouts,
                 featureFlags,
                 groups,
                 rollouts,
@@ -173,6 +181,65 @@ private List<Experiment> parseExperiments(JSONArray experimentJson, String group
         return experiments;
     }
 
+
+    private List<Holdout> parseHoldouts(JSONArray holdoutJson) {
+        return parseHoldouts(holdoutJson, "");
+    }
+
+    private List<Holdout> parseHoldouts(JSONArray holdoutJson, String groupId) {
+        List<Holdout> holdouts = new ArrayList<Holdout>(holdoutJson.size());
+
+        for (Object obj : holdoutJson) {
+            JSONObject hoObject = (JSONObject) obj;
+            String id = (String) hoObject.get("id");
+            String key = (String) hoObject.get("key");
+            String status = (String) hoObject.get("status");
+
+            JSONArray audienceIdsJson = (JSONArray) hoObject.get("audienceIds");
+            List<String> audienceIds = new ArrayList<String>(audienceIdsJson.size());
+
+            for (Object audienceIdObj : audienceIdsJson) {
+                audienceIds.add((String) audienceIdObj);
+            }
+
+            Condition conditions = null;
+            if (hoObject.containsKey("audienceConditions")) {
+                Object jsonCondition = hoObject.get("audienceConditions");
+                try {
+                    conditions = ConditionUtils.<AudienceIdCondition>parseConditions(AudienceIdCondition.class, jsonCondition);
+                } catch (Exception e) {
+                    // unable to parse conditions.
+                    Logger.getAnonymousLogger().log(Level.ALL, "problem parsing audience conditions", e);
+                }
+            }
+            // parse the child objects
+            List<Variation> variations = parseVariations((JSONArray) hoObject.get("variations"));
+            Map<String, String> userIdToVariationKeyMap =
+                parseForcedVariations((JSONObject) hoObject.get("forcedVariations"));
+            List<TrafficAllocation> trafficAllocations =
+                parseTrafficAllocation((JSONArray) hoObject.get("trafficAllocation"));
+
+            List<String> includedFlags;
+            if (hoObject.containsKey("includedFlags")) {
+                includedFlags = new ArrayList<String>((JSONArray) hoObject.get("includedFlags"));
+            } else {
+                includedFlags = Collections.emptyList();
+            }
+
+            List<String> excludedFlags;
+            if (hoObject.containsKey("excludedFlags")) {
+                excludedFlags = new ArrayList<String>((JSONArray) hoObject.get("excludedFlags"));
+            } else {
+                excludedFlags = Collections.emptyList();
+            }
+
+            holdouts.add(new Holdout(id, key, status, audienceIds, conditions, variations, userIdToVariationKeyMap,
+                trafficAllocations, includedFlags, excludedFlags, groupId));
+        }
+
+        return holdouts;
+    }
+
     private List<String> parseExperimentIds(JSONArray experimentIdsJsonArray) {
         List<String> experimentIds = new ArrayList<String>(experimentIdsJsonArray.size());