Skip to content

Commit 43d25ad

Browse files
committed
Pr suggestions
1 parent cda3711 commit 43d25ad

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public BetweenSemverMatcher(String semverStart, String semverEnd) {
1616

1717
@Override
1818
public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
19-
if (matchValue == null || _semverStart == null || _semverEnd == null) {
19+
if (matchValue == null || _semverStart == null || _semverEnd == null || !(matchValue instanceof String)) {
2020
return false;
2121
}
2222
Semver matchSemver = Semver.build(matchValue.toString());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public GreaterThanOrEqualToSemverMatcher(String semVer) {
1414

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public InListSemverMatcher(Collection<String> whitelist) {
2222

2323
@Override
2424
public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
25-
if (matchValue == null || _semverlist.isEmpty()) {
25+
if (matchValue == null || !(matchValue instanceof String) || _semverlist.isEmpty()) {
2626
return false;
2727
}
2828
Semver matchSemver = Semver.build(matchValue.toString());
@@ -32,7 +32,6 @@ public boolean match(Object matchValue, String bucketingKey, Map<String, Object>
3232

3333
for (Semver semverItem : _semverlist) {
3434
if (semverItem.Version().equals(matchSemver.Version())) return true;
35-
3635
}
3736
return false;
3837
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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 || _semVer == null) {
17+
if (matchValue == null || !(matchValue instanceof String) || _semVer == null) {
1818
return false;
1919
}
2020
Semver matchSemver = Semver.build(matchValue.toString());

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.split.engine.experiments.SplitParser;
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
7-
import com.google.common.primitives.Ints;
87

98
import java.util.Arrays;
109

@@ -96,8 +95,8 @@ public int Compare(Semver toCompare) {
9695
if (_preRelease[i].equals(toCompare.PreRelease()[i])) {
9796
continue;
9897
}
99-
if ( Ints.tryParse(_preRelease[i]) != null && Ints.tryParse(toCompare._preRelease[i]) != null) {
100-
return Integer.compare(Integer.parseInt(_preRelease[i]), Integer.parseInt(toCompare._preRelease[i]));
98+
if ( isNumeric(_preRelease[i]) && isNumeric(toCompare._preRelease[i])) {
99+
return Long.compare(Integer.parseInt(_preRelease[i]), Long.parseLong(toCompare._preRelease[i]));
101100
}
102101
return AdjustNumber(_preRelease[i].compareTo(toCompare._preRelease[i]));
103102
}

0 commit comments

Comments
 (0)