Merge pull request #565 from splitio/prereq-dtos

Added and updated DTOs

Author: chillaq

client/src/main/java/io/split/client/CacheUpdaterService.java

@@ -51,7 +51,7 @@ public void updateCache(Map<SplitAndKey, LocalhostSplit> map) {
             String treatment = conditions.size() > 0 ? Treatments.CONTROL : localhostSplit.treatment;
             configurations.put(localhostSplit.treatment, localhostSplit.config);
 
-            split = new ParsedSplit(splitName, 0, false, treatment,conditions, LOCALHOST, 0, 100, 0, 0, configurations, new HashSet<>(), true);
+            split = new ParsedSplit(splitName, 0, false, treatment,conditions, LOCALHOST, 0, 100, 0, 0, configurations, new HashSet<>(), true, null);
             parsedSplits.removeIf(parsedSplit -> parsedSplit.feature().equals(splitName));
             parsedSplits.add(split);
         }

client/src/main/java/io/split/client/api/SplitView.java

@@ -1,6 +1,7 @@
 package io.split.client.api;
 
 import io.split.client.dtos.Partition;
+import io.split.client.dtos.Prerequisites;
 import io.split.engine.experiments.ParsedCondition;
 import io.split.engine.experiments.ParsedSplit;
 
@@ -27,6 +28,7 @@ public class SplitView {
     public List<String> sets;
     public String defaultTreatment;
     public boolean impressionsDisabled;
+    public List<Prerequisites> prerequisites;
 
     public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
         SplitView splitView = new SplitView();
@@ -48,6 +50,7 @@ public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
         splitView.treatments = new ArrayList<String>(treatments);
         splitView.configs = parsedSplit.configurations() == null? Collections.<String, String>emptyMap() : parsedSplit.configurations() ;
         splitView.impressionsDisabled = parsedSplit.impressionsDisabled();
+        splitView.prerequisites = parsedSplit.prerequisites() != null ? parsedSplit.prerequisites(): new ArrayList<>();
 
         return splitView;
     }

client/src/main/java/io/split/client/dtos/Prerequisites.java

@@ -0,0 +1,12 @@
+package io.split.client.dtos;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class Prerequisites {
+    @SerializedName("n")
+    public String featureFlagName;
+    @SerializedName("ts")
+    public List<String> treatments;
+}

client/src/main/java/io/split/client/dtos/Split.java

@@ -19,6 +19,7 @@ public class Split {
     public Map<String, String> configurations;
     public HashSet<String> sets;
     public Boolean impressionsDisabled = null;
+    public List<Prerequisites> prerequisites;
 
     @Override
     public String toString() {

client/src/main/java/io/split/engine/experiments/ParsedSplit.java

@@ -1,6 +1,7 @@
 package io.split.engine.experiments;
 
 import com.google.common.collect.ImmutableList;
+import io.split.client.dtos.Prerequisites;
 import io.split.engine.matchers.AttributeMatcher;
 import io.split.engine.matchers.RuleBasedSegmentMatcher;
 import io.split.engine.matchers.UserDefinedSegmentMatcher;
@@ -34,6 +35,7 @@ public class ParsedSplit {
     private final Map<String, String> _configurations;
     private final HashSet<String> _flagSets;
     private final boolean _impressionsDisabled;
+    private List<Prerequisites> _prerequisites;
 
     public static ParsedSplit createParsedSplitForTests(
             String feature,
@@ -45,7 +47,8 @@ public static ParsedSplit createParsedSplitForTests(
             long changeNumber,
             int algo,
             HashSet<String> flagSets,
-            boolean impressionsDisabled
+            boolean impressionsDisabled,
+            List<Prerequisites> prerequisites
     ) {
         return new ParsedSplit(
                 feature,
@@ -60,7 +63,8 @@ public static ParsedSplit createParsedSplitForTests(
                 algo,
                 null,
                 flagSets,
-                impressionsDisabled
+                impressionsDisabled,
+                prerequisites
         );
     }
 
@@ -75,7 +79,8 @@ public static ParsedSplit createParsedSplitForTests(
             int algo,
             Map<String, String> configurations,
             HashSet<String> flagSets,
-            boolean impressionsDisabled
+            boolean impressionsDisabled,
+            List<Prerequisites> prerequisites
     ) {
         return new ParsedSplit(
                 feature,
@@ -90,7 +95,8 @@ public static ParsedSplit createParsedSplitForTests(
                 algo,
                 configurations,
                 flagSets,
-                impressionsDisabled
+                impressionsDisabled,
+                prerequisites
         );
     }
 
@@ -107,7 +113,8 @@ public ParsedSplit(
             int algo,
             Map<String, String> configurations,
             HashSet<String> flagSets,
-            boolean impressionsDisabled
+            boolean impressionsDisabled,
+            List<Prerequisites> prerequisites
     ) {
         _split = feature;
         _seed = seed;
@@ -125,6 +132,7 @@ public ParsedSplit(
         _configurations = configurations;
         _flagSets = flagSets;
         _impressionsDisabled = impressionsDisabled;
+        _prerequisites = prerequisites;
     }
 
     public String feature() {
@@ -171,6 +179,7 @@ public Map<String, String> configurations() {
     public boolean impressionsDisabled() {
         return _impressionsDisabled;
     }
+    public List<Prerequisites> prerequisites() { return _prerequisites; }
 
     @Override
     public int hashCode() {
@@ -205,7 +214,8 @@ public boolean equals(Object obj) {
                 && _changeNumber == other._changeNumber
                 && _algo == other._algo
                 && _configurations == null ? other._configurations == null : _configurations.equals(other._configurations)
-                && _impressionsDisabled == other._impressionsDisabled;
+                && _impressionsDisabled == other._impressionsDisabled
+                && _prerequisites == other._prerequisites;
     }
 
     @Override
@@ -231,6 +241,9 @@ public String toString() {
         bldr.append(_configurations);
         bldr.append(", impressionsDisabled:");
         bldr.append(_impressionsDisabled);
+        bldr.append(", prerequisites:");
+        bldr.append(_prerequisites);
+
         return bldr.toString();
 
     }

client/src/main/java/io/split/engine/experiments/SplitParser.java

@@ -68,6 +68,7 @@ private ParsedSplit parseWithoutExceptionHandling(Split split) {
                 split.algo,
                 split.configurations,
                 split.sets,
-                split.impressionsDisabled);
+                split.impressionsDisabled,
+                split.prerequisites);
     }
 }

client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java

@@ -131,7 +131,8 @@ public void kill(String splitName, String defaultTreatment, long changeNumber) {
                 parsedSplit.algo(),
                 parsedSplit.configurations(),
                 parsedSplit.flagSets(),
-                parsedSplit.impressionsDisabled()
+                parsedSplit.impressionsDisabled(),
+                parsedSplit.prerequisites()
                 );
 
         _concurrentMap.put(splitName, updatedSplit);