Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/src/main/java/io/split/client/dtos/MatcherType.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ public enum MatcherType {
IN_SPLIT_TREATMENT,

/* Semver matchers */
EQUAL_TO_SEMVER
EQUAL_TO_SEMVER,
GREATER_THAN_OR_EQUAL_TO_SEMVER
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import io.split.engine.matchers.strings.RegularExpressionMatcher;
import io.split.engine.matchers.strings.StartsWithAnyOfMatcher;
import io.split.engine.matchers.strings.WhitelistMatcher;
import io.split.engine.matchers.GreaterThanOrEqualToSemverMatcher;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -198,6 +200,10 @@ private AttributeMatcher toMatcher(Matcher matcher) {
checkNotNull(matcher.stringMatcherData);
delegate = new EqualToSemverMatcher(matcher.stringMatcherData);
break;
case GREATER_THAN_OR_EQUAL_TO_SEMVER:
checkNotNull(matcher.stringMatcherData);
delegate = new GreaterThanOrEqualToSemverMatcher(matcher.stringMatcherData);
break;
default:
throw new IllegalArgumentException("Unknown matcher type: " + matcher.matcherType);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package io.split.engine.matchers;

import io.split.engine.evaluator.EvaluationContext;

import java.util.Map;

public class GreaterThanOrEqualToSemverMatcher implements Matcher {

private final Semver _semVer;

public GreaterThanOrEqualToSemverMatcher(String semVer) {
_semVer = Semver.build(semVer);
}

@Override
public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
if (matchValue == null || _semVer == null) {
return false;
}
Semver matchSemver = Semver.build(matchValue.toString());
if (matchSemver == null) {
return false;
}

return 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 GreaterThanOrEqualToSemverMatcher)) return false;

GreaterThanOrEqualToSemverMatcher other = (GreaterThanOrEqualToSemverMatcher) obj;

return _semVer == other._semVer;
}

}
3 changes: 2 additions & 1 deletion client/src/main/java/io/split/engine/matchers/Semver.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.primitives.Ints;

import java.util.Arrays;

public class Semver {
Expand All @@ -17,7 +18,7 @@ public class Semver {
private Long _major;
private Long _minor;
private Long _patch;
private String[] _preRelease;
private String[] _preRelease = new String[] {};
private boolean _isStable;
private String _metadata;
private String _version;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package io.split.engine.matchers;

import org.junit.Test;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

/**
* Tests for EqualToSemverMatcher
*/

public class GreaterThanOrEqualToSemverMatcherTest {

@Test
public void works() {
GreaterThanOrEqualToSemverMatcher greaterThanOrEqualToSemverMatcher = new GreaterThanOrEqualToSemverMatcher("2.1.8");

assertTrue( greaterThanOrEqualToSemverMatcher.match("2.1.8", null, null, null));
assertTrue( greaterThanOrEqualToSemverMatcher.match("2.1.9", null, null, null));
assertFalse( greaterThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null));
assertFalse( greaterThanOrEqualToSemverMatcher.match("2.0.10", null, null, null));
assertTrue( greaterThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null));
}
}