Merge pull request #501 from splitio/semver-inlist-matcher

Semver inlist matcher

Author: chillaq

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

@@ -34,5 +34,7 @@ public enum MatcherType {
 
     /* Semver matchers */
     EQUAL_TO_SEMVER,
-    GREATER_THAN_OR_EQUAL_TO_SEMVER
+    GREATER_THAN_OR_EQUAL_TO_SEMVER,
+    LESS_THAN_OR_EQUAL_TO_SEMVER,
+    IN_LIST_SEMVER
 }

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

@@ -30,6 +30,8 @@
 import io.split.engine.matchers.strings.StartsWithAnyOfMatcher;
 import io.split.engine.matchers.strings.WhitelistMatcher;
 import io.split.engine.matchers.GreaterThanOrEqualToSemverMatcher;
+import io.split.engine.matchers.LessThanOrEqualToSemverMatcher;
+import io.split.engine.matchers.InListSemverMatcher;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -197,13 +199,21 @@ private AttributeMatcher toMatcher(Matcher matcher) {
                 delegate = new BooleanMatcher(matcher.booleanMatcherData);
                 break;
             case EQUAL_TO_SEMVER:
-                checkNotNull(matcher.stringMatcherData);
+                checkNotNull(matcher.stringMatcherData, "stringMatcherData is required for EQUAL_TO_SEMVER matcher type");
                 delegate = new EqualToSemverMatcher(matcher.stringMatcherData);
                 break;
             case GREATER_THAN_OR_EQUAL_TO_SEMVER:
-                checkNotNull(matcher.stringMatcherData);
+                checkNotNull(matcher.stringMatcherData, "stringMatcherData is required for GREATER_THAN_OR_EQUAL_TO_SEMVER matcher type");
                 delegate = new GreaterThanOrEqualToSemverMatcher(matcher.stringMatcherData);
                 break;
+            case LESS_THAN_OR_EQUAL_TO_SEMVER:
+                checkNotNull(matcher.stringMatcherData, "stringMatcherData is required for LESS_THAN_OR_EQUAL_SEMVER matcher type");
+                delegate = new LessThanOrEqualToSemverMatcher(matcher.stringMatcherData);
+                break;
+            case IN_LIST_SEMVER:
+                checkNotNull(matcher.whitelistMatcherData, "whitelistMatcherData is required for IN_LIST_SEMVER matcher type");
+                delegate = new InListSemverMatcher(matcher.whitelistMatcherData.whitelist);
+                break;
             default:
                 throw new IllegalArgumentException("Unknown matcher type: " + matcher.matcherType);
         }

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

@@ -29,7 +29,7 @@ public boolean match(Object matchValue, String bucketingKey, Map<String, Object>
     public String toString() {
         StringBuilder bldr = new StringBuilder();
         bldr.append("== ");
-        bldr.append(_semVer);
+        bldr.append(_semVer.Version());
         return bldr.toString();
     }
 

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

@@ -29,7 +29,7 @@ public boolean match(Object matchValue, String bucketingKey, Map<String, Object>
     public String toString() {
         StringBuilder bldr = new StringBuilder();
         bldr.append("== ");
-        bldr.append(_semVer);
+        bldr.append(_semVer.Version());
         return bldr.toString();
     }
 

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

@@ -0,0 +1,78 @@
+package io.split.engine.matchers;
+
+import io.split.engine.evaluator.EvaluationContext;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class InListSemverMatcher implements Matcher {
+
+    private final Set<Semver> _semverlist = new HashSet<>();
+
+    public InListSemverMatcher(Collection<String> whitelist) {
+        for (String item : whitelist) {
+            Semver semver = Semver.build(item);
+            if (semver == null) continue;
+
+            _semverlist.add(semver);
+        }
+    }
+
+    @Override
+    public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
+        if (matchValue == null || _semverlist.isEmpty()) {
+            return false;
+        }
+        Semver matchSemver = Semver.build(matchValue.toString());
+        if (matchSemver == null) {
+            return false;
+        }
+
+        for (Semver semverItem : _semverlist) {
+            if (semverItem.Version().equals(matchSemver.Version())) return true;
+
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("in semver list ");
+        boolean first = true;
+
+        for (Semver item : _semverlist) {
+            if (!first) {
+                bldr.append(',');
+            }
+            bldr.append('"');
+            bldr.append(item.Version());
+            bldr.append('"');
+            first = false;
+        }
+
+        bldr.append("]");
+        return bldr.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + _semverlist.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (!(obj instanceof InListSemverMatcher)) return false;
+
+        InListSemverMatcher other = (InListSemverMatcher) obj;
+
+        return _semverlist == other._semverlist;
+    }
+
+}

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

@@ -0,0 +1,54 @@
+package io.split.engine.matchers;
+
+import io.split.engine.evaluator.EvaluationContext;
+
+import java.util.Map;
+
+public class LessThanOrEqualToSemverMatcher implements Matcher {
+
+    private final Semver _semVer;
+
+    public LessThanOrEqualToSemverMatcher(String semVer) {
+        _semVer = Semver.build(semVer);
+    }
+
+    @Override
+    public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
+        if (matchValue == null) {
+            return false;
+        }
+        Semver matchSemver = Semver.build(matchValue.toString());
+        if (matchSemver == null) {
+            return false;
+        }
+
+        return _semVer != null && matchSemver.Compare(_semVer) <= 0;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("== ");
+        bldr.append(_semVer.Version());
+        return bldr.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + _semVer.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (!(obj instanceof LessThanOrEqualToSemverMatcher)) return false;
+
+        LessThanOrEqualToSemverMatcher other = (LessThanOrEqualToSemverMatcher) obj;
+
+        return _semVer == other._semVer;
+    }
+
+}

client/src/test/java/io/split/engine/matchers/InListSemverMatcherTest.java

@@ -0,0 +1,27 @@
+package io.split.engine.matchers;
+
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests for EqualToSemverMatcher
+ */
+
+public class InListSemverMatcherTest {
+
+    @Test
+    public void works() {
+        List<String> whitelist = Lists.newArrayList("2.1.8", "3.4.0");
+        InListSemverMatcher inListSemverMatcher = new InListSemverMatcher(whitelist);
+
+        assertTrue( inListSemverMatcher.match("2.1.8", null, null, null) == true);
+        assertTrue( inListSemverMatcher.match("2.1.9", null, null, null) == false);
+        assertTrue( inListSemverMatcher.match("2.1.8-rc", null, null, null) == false);
+        assertTrue( inListSemverMatcher.match("3.4.0", null, null, null) == true);
+        assertTrue( inListSemverMatcher.match("3.4.0+build", null, null, null) == false);
+    }
+}

client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java

@@ -0,0 +1,23 @@
+package io.split.engine.matchers;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests for EqualToSemverMatcher
+ */
+
+public class LessThanOrEqualToSemverMatcherTest {
+
+    @Test
+    public void works() {
+        LessThanOrEqualToSemverMatcher lessThanOrEqualToSemverMatcher = new LessThanOrEqualToSemverMatcher("2.1.8");
+
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8", null, null, null) == true);
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.9", null, null, null) == false);
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null) == true);
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.0.10", null, null, null) == true);
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null) == true);
+    }
+}