Skip to content

Commit 28ef210

Browse files
author
Bilal Al
committed
polish
1 parent f68827b commit 28ef210

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ public LessThanOrEqualToSemverMatcher(String semVer) {
1414

1515
@Override
1616
public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
17-
if (matchValue == null) {
17+
if (matchValue == null || _semVer == null) {
1818
return false;
1919
}
2020
Semver matchSemver = Semver.build(matchValue.toString());
2121
if (matchSemver == null) {
2222
return false;
2323
}
2424

25-
return _semVer != null && matchSemver.Compare(_semVer) <= 0;
25+
return matchSemver.Compare(_semVer) <= 0;
2626
}
2727

2828
@Override

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.junit.Test;
44

55
import static org.junit.Assert.assertTrue;
6+
import static org.junit.Assert.assertFalse;
67

78
/**
89
* Tests for EqualToSemverMatcher
@@ -14,10 +15,10 @@ public class LessThanOrEqualToSemverMatcherTest {
1415
public void works() {
1516
LessThanOrEqualToSemverMatcher lessThanOrEqualToSemverMatcher = new LessThanOrEqualToSemverMatcher("2.1.8");
1617

17-
assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8", null, null, null) == true);
18-
assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.9", null, null, null) == false);
19-
assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null) == true);
20-
assertTrue( lessThanOrEqualToSemverMatcher.match("2.0.10", null, null, null) == true);
21-
assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null) == true);
18+
assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8", null, null, null));
19+
assertFalse( lessThanOrEqualToSemverMatcher.match("2.1.9", null, null, null));
20+
assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null));
21+
assertTrue( lessThanOrEqualToSemverMatcher.match("2.0.10", null, null, null));
22+
assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null));
2223
}
2324
}

0 commit comments

Comments
 (0)