added less than or equal semver matcher

Author: Bilal Al

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

@@ -34,5 +34,6 @@ 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
 }

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

@@ -19,7 +19,7 @@
 import io.split.engine.matchers.GreaterThanOrEqualToMatcher;
 import io.split.engine.matchers.LessThanOrEqualToMatcher;
 import io.split.engine.matchers.UserDefinedSegmentMatcher;
-import io.split.engine.matchers.EqualToMatcherSemver;
+import io.split.engine.matchers.EqualToSemverMatcher;
 import io.split.engine.matchers.collections.ContainsAllOfSetMatcher;
 import io.split.engine.matchers.collections.ContainsAnyOfSetMatcher;
 import io.split.engine.matchers.collections.EqualToSetMatcher;
@@ -30,6 +30,7 @@
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -198,12 +199,16 @@ private AttributeMatcher toMatcher(Matcher matcher) {
                 break;
             case EQUAL_TO_SEMVER:
                 checkNotNull(matcher.stringMatcherData);
-                delegate = new EqualToMatcherSemver(matcher.stringMatcherData);
+                delegate = new EqualToSemverMatcher(matcher.stringMatcherData);
                 break;
             case GREATER_THAN_OR_EQUAL_TO_SEMVER:
                 checkNotNull(matcher.stringMatcherData);
                 delegate = new GreaterThanOrEqualToSemverMatcher(matcher.stringMatcherData);
                 break;
+            case LESS_THAN_OR_EQUAL_TO_SEMVER:
+                checkNotNull(matcher.stringMatcherData);
+                delegate = new LessThanOrEqualToSemverMatcher(matcher.stringMatcherData);
+                break;
             default:
                 throw new IllegalArgumentException("Unknown matcher type: " + matcher.matcherType);
         }

…ngine/matchers/EqualToMatcherSemver.java …ngine/matchers/EqualToSemverMatcher.javaclient/src/main/java/io/split/engine/matchers/EqualToMatcherSemver.java renamed to client/src/main/java/io/split/engine/matchers/EqualToSemverMatcher.java client/src/main/java/io/split/engine/matchers/EqualToMatcherSemver.java renamed to client/src/main/java/io/split/engine/matchers/EqualToSemverMatcher.java

@@ -4,11 +4,11 @@
 
 import java.util.Map;
 
-public class EqualToMatcherSemver implements Matcher {
+public class EqualToSemverMatcher implements Matcher {
 
     private final Semver _semVer;
 
-    public EqualToMatcherSemver(String semVer) {
+    public EqualToSemverMatcher(String semVer) {
         _semVer = Semver.build(semVer);
     }
 
@@ -44,9 +44,9 @@ public int hashCode() {
     public boolean equals(Object obj) {
         if (obj == null) return false;
         if (this == obj) return true;
-        if (!(obj instanceof EqualToMatcherSemver)) return false;
+        if (!(obj instanceof EqualToSemverMatcher)) return false;
 
-        EqualToMatcherSemver other = (EqualToMatcherSemver) obj;
+        EqualToSemverMatcher other = (EqualToSemverMatcher) obj;
 
         return _semVer == other._semVer;
     }

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);
+        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/EqualToSemverMatcherTest.java

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

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

@@ -8,7 +8,7 @@
  * Tests for EqualToSemverMatcher
  */
 
-public class GreaterThanOrEqualToSemverTest {
+public class GreaterThanOrEqualToSemverMatcherTest {
 
     @Test
     public void works() {

…hers/GreaterThanOrEqualToSemverTest.java …eaterThanOrEqualToSemverMatcherTest.javaclient/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverTest.java renamed to client/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcherTest.java client/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverTest.java renamed to client/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcherTest.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);
+    }
+}