polish

Author: chillaq

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

@@ -50,7 +50,8 @@ 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().getPrerequisites(): new ArrayList<>();
+        splitView.prerequisites = parsedSplit.prerequisitesMatcher() != null ?
+                parsedSplit.prerequisitesMatcher().getPrerequisites(): new ArrayList<>();
 
         return splitView;
     }

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

@@ -100,7 +100,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
 
             String bk = (bucketingKey == null) ? matchingKey : bucketingKey;
 
-            if (!parsedSplit.prerequisites().match(matchingKey, bk, attributes, _evaluationContext)) {
+            if (!parsedSplit.prerequisitesMatcher().match(matchingKey, bk, attributes, _evaluationContext)) {
                 return new TreatmentLabelAndChangeNumber(
                         parsedSplit.defaultTreatment(),
                         Labels.PREREQUISITES_NOT_MET,

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

@@ -35,7 +35,7 @@ public class ParsedSplit {
     private final Map<String, String> _configurations;
     private final HashSet<String> _flagSets;
     private final boolean _impressionsDisabled;
-    private PrerequisitesMatcher _prerequisites;
+    private PrerequisitesMatcher _prerequisitesMatcher;
 
     public static ParsedSplit createParsedSplitForTests(
             String feature,
@@ -48,7 +48,7 @@ public static ParsedSplit createParsedSplitForTests(
             int algo,
             HashSet<String> flagSets,
             boolean impressionsDisabled,
-            PrerequisitesMatcher prerequisites
+            PrerequisitesMatcher prerequisitesMatcher
     ) {
         return new ParsedSplit(
                 feature,
@@ -64,7 +64,7 @@ public static ParsedSplit createParsedSplitForTests(
                 null,
                 flagSets,
                 impressionsDisabled,
-                prerequisites
+                prerequisitesMatcher
         );
     }
 
@@ -80,7 +80,7 @@ public static ParsedSplit createParsedSplitForTests(
             Map<String, String> configurations,
             HashSet<String> flagSets,
             boolean impressionsDisabled,
-            PrerequisitesMatcher prerequisites
+            PrerequisitesMatcher prerequisitesMatcher
     ) {
         return new ParsedSplit(
                 feature,
@@ -96,7 +96,7 @@ public static ParsedSplit createParsedSplitForTests(
                 configurations,
                 flagSets,
                 impressionsDisabled,
-                prerequisites
+                prerequisitesMatcher
         );
     }
 
@@ -114,7 +114,7 @@ public ParsedSplit(
             Map<String, String> configurations,
             HashSet<String> flagSets,
             boolean impressionsDisabled,
-            PrerequisitesMatcher prerequisites
+            PrerequisitesMatcher prerequisitesMatcher
     ) {
         _split = feature;
         _seed = seed;
@@ -132,7 +132,7 @@ public ParsedSplit(
         _configurations = configurations;
         _flagSets = flagSets;
         _impressionsDisabled = impressionsDisabled;
-        _prerequisites = prerequisites;
+        _prerequisitesMatcher = prerequisitesMatcher;
     }
 
     public String feature() {
@@ -179,7 +179,7 @@ public Map<String, String> configurations() {
     public boolean impressionsDisabled() {
         return _impressionsDisabled;
     }
-    public PrerequisitesMatcher prerequisites() { return _prerequisites; }
+    public PrerequisitesMatcher prerequisitesMatcher() { return _prerequisitesMatcher; }
 
     @Override
     public int hashCode() {
@@ -215,7 +215,7 @@ public boolean equals(Object obj) {
                 && _algo == other._algo
                 && _configurations == null ? other._configurations == null : _configurations.equals(other._configurations)
                 && _impressionsDisabled == other._impressionsDisabled
-                && _prerequisites == other._prerequisites;
+                && _prerequisitesMatcher == other._prerequisitesMatcher;
     }
 
     @Override
@@ -242,7 +242,7 @@ public String toString() {
         bldr.append(", impressionsDisabled:");
         bldr.append(_impressionsDisabled);
         bldr.append(", prerequisites:");
-        bldr.append(_prerequisites);
+        bldr.append(_prerequisitesMatcher);
 
         return bldr.toString();
 

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

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

client/src/test/java/io/split/engine/experiments/SplitParserTest.java

@@ -153,7 +153,7 @@ public void worksWithConfig() {
         Assert.assertEquals(actual.trafficAllocationSeed(), expected.trafficAllocationSeed());
         Assert.assertEquals(actual.getSegmentsNames(), expected.getSegmentsNames());
         Assert.assertEquals(actual.getRuleBasedSegmentsNames(), expected.getRuleBasedSegmentsNames());
-        Assert.assertEquals(actual.prerequisites().toString(), expected.prerequisites().toString());
+        Assert.assertEquals(actual.prerequisitesMatcher().toString(), expected.prerequisitesMatcher().toString());
 
         Assert.assertEquals(actual.configurations().get("on"), configurations.get("on"));
     }