polish

Author: chillaq

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

@@ -28,7 +28,7 @@ public class SplitView {
     public List<String> sets;
     public String defaultTreatment;
     public boolean impressionsDisabled;
-    public List<Prerequisites> prerequisites;
+    public String prerequisites;
 
     public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
         SplitView splitView = new SplitView();
@@ -50,7 +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<>();
+        splitView.prerequisites = parsedSplit.prerequisites() != null ? parsedSplit.prerequisites().toString(): "";
 
         return splitView;
     }

client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java

@@ -4,7 +4,6 @@
 import io.split.client.exceptions.ChangeNumberExceptionWrapper;
 import io.split.engine.experiments.ParsedCondition;
 import io.split.engine.experiments.ParsedSplit;
-import io.split.engine.matchers.PrerequisitesMatcher;
 import io.split.engine.splitter.Splitter;
 import io.split.grammar.Treatments;
 import io.split.storages.RuleBasedSegmentCacheConsumer;
@@ -28,7 +27,6 @@ public class EvaluatorImp implements Evaluator {
     private final RuleBasedSegmentCacheConsumer _ruleBasedSegmentCacheConsumer;
     private final EvaluationContext _evaluationContext;
     private final SplitCacheConsumer _splitCacheConsumer;
-    private PrerequisitesMatcher _prerequisitesMatcher;
 
     public EvaluatorImp(SplitCacheConsumer splitCacheConsumer, SegmentCacheConsumer segmentCache,
                         RuleBasedSegmentCacheConsumer ruleBasedSegmentCacheConsumer) {
@@ -102,7 +100,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
 
             String bk = (bucketingKey == null) ? matchingKey : bucketingKey;
 
-            if (!_prerequisitesMatcher.match(matchingKey, bk, attributes, _evaluationContext)) {
+            if (!parsedSplit.prerequisites().match(matchingKey, bk, attributes, _evaluationContext)) {
                 return new TreatmentLabelAndChangeNumber(
                         parsedSplit.defaultTreatment(),
                         Labels.PREREQUISITES_NOT_MET,
@@ -169,7 +167,6 @@ private TreatmentLabelAndChangeNumber evaluateParsedSplit(String matchingKey, St
             if (parsedSplit == null) {
                 return new TreatmentLabelAndChangeNumber(Treatments.CONTROL, Labels.DEFINITION_NOT_FOUND);
             }
-            _prerequisitesMatcher = new PrerequisitesMatcher(parsedSplit.prerequisites());
             return getTreatment(matchingKey, bucketingKey, parsedSplit, attributes);
         } catch (ChangeNumberExceptionWrapper e) {
             _log.error("Evaluator Exception", e.wrappedException());

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

@@ -1,8 +1,8 @@
 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.PrerequisitesMatcher;
 import io.split.engine.matchers.RuleBasedSegmentMatcher;
 import io.split.engine.matchers.UserDefinedSegmentMatcher;
 
@@ -35,7 +35,7 @@ public class ParsedSplit {
     private final Map<String, String> _configurations;
     private final HashSet<String> _flagSets;
     private final boolean _impressionsDisabled;
-    private List<Prerequisites> _prerequisites;
+    private PrerequisitesMatcher _prerequisites;
 
     public static ParsedSplit createParsedSplitForTests(
             String feature,
@@ -48,7 +48,7 @@ public static ParsedSplit createParsedSplitForTests(
             int algo,
             HashSet<String> flagSets,
             boolean impressionsDisabled,
-            List<Prerequisites> prerequisites
+            PrerequisitesMatcher prerequisites
     ) {
         return new ParsedSplit(
                 feature,
@@ -80,7 +80,7 @@ public static ParsedSplit createParsedSplitForTests(
             Map<String, String> configurations,
             HashSet<String> flagSets,
             boolean impressionsDisabled,
-            List<Prerequisites> prerequisites
+            PrerequisitesMatcher prerequisites
     ) {
         return new ParsedSplit(
                 feature,
@@ -114,7 +114,7 @@ public ParsedSplit(
             Map<String, String> configurations,
             HashSet<String> flagSets,
             boolean impressionsDisabled,
-            List<Prerequisites> prerequisites
+            PrerequisitesMatcher prerequisites
     ) {
         _split = feature;
         _seed = seed;
@@ -179,7 +179,7 @@ public Map<String, String> configurations() {
     public boolean impressionsDisabled() {
         return _impressionsDisabled;
     }
-    public List<Prerequisites> prerequisites() { return _prerequisites; }
+    public PrerequisitesMatcher prerequisites() { return _prerequisites; }
 
     @Override
     public int hashCode() {

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

@@ -6,6 +6,7 @@
 import io.split.client.dtos.Partition;
 import io.split.client.dtos.Split;
 import io.split.engine.matchers.CombiningMatcher;
+import io.split.engine.matchers.PrerequisitesMatcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,6 +70,6 @@ private ParsedSplit parseWithoutExceptionHandling(Split split) {
                 split.configurations,
                 split.sets,
                 split.impressionsDisabled,
-                split.prerequisites);
+                new PrerequisitesMatcher(split.prerequisites));
     }
 }

client/src/main/java/io/split/engine/matchers/PrerequisitesMatcher.java

@@ -43,8 +43,10 @@ public boolean match(Object matchValue, String bucketingKey, Map<String, Object>
     public String toString() {
         StringBuilder bldr = new StringBuilder();
         bldr.append("prerequisites: ");
-        bldr.append(this._prerequisites.stream().map(pr -> pr.featureFlagName + " " +
-                pr.treatments.toString()).map(Object::toString).collect(Collectors.joining(", ")));
+        if (this._prerequisites != null) {
+            bldr.append(this._prerequisites.stream().map(pr -> pr.featureFlagName + " " +
+                    pr.treatments.toString()).map(Object::toString).collect(Collectors.joining(", ")));
+        }
         return bldr.toString();
     }