Merge branch 'Feature/Semver' into semver-less-equalto-matcher

chillaq · web-flow · commit 11a247a77889 · 2024-05-03T12:13:12.000-07:00
diff --git a/client/src/main/java/io/split/Spec.java b/client/src/main/java/io/split/Spec.java
@@ -0,0 +1,11 @@
+package io.split;
+
+public final class Spec {
+
+    private Spec() {
+        // restrict instantiation
+    }
+
+    public static final String SPEC_VERSION = "1.1";
+}
+
diff --git a/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java b/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java
@@ -1,6 +1,7 @@
 package io.split.client;
 
 import com.google.common.annotations.VisibleForTesting;
+
 import io.split.client.dtos.SplitChange;
 import io.split.client.dtos.SplitHttpResponse;
 import io.split.client.exceptions.UriTooLongException;
@@ -21,6 +22,7 @@
 import java.net.URISyntaxException;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static io.split.Spec.SPEC_VERSION;
 
 /**
  * Created by adilaijaz on 5/30/15.
@@ -31,6 +33,7 @@ public final class HttpSplitChangeFetcher implements SplitChangeFetcher {
     private static final String SINCE = "since";
     private static final String TILL = "till";
     private static final String SETS = "sets";
+    private static final String SPEC = "s";
     private final SplitHttpClient _client;
     private final URI _target;
     private final TelemetryRuntimeProducer _telemetryRuntimeProducer;
@@ -58,13 +61,14 @@ public SplitChange fetch(long since, FetchOptions options) {
         long start = System.currentTimeMillis();
 
         try {
-            URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SINCE, "" + since);
-            if (options.hasCustomCN()) {
-                uriBuilder.addParameter(TILL, "" + options.targetCN());
-            }
+            URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION);
+            uriBuilder.addParameter(SINCE, "" + since);
             if (!options.flagSetsFilter().isEmpty()) {
                 uriBuilder.addParameter(SETS, "" + options.flagSetsFilter());
             }
+            if (options.hasCustomCN()) {
+                uriBuilder.addParameter(TILL, "" + options.targetCN());
+            }
             URI uri = uriBuilder.build();
             SplitHttpResponse response = _client.get(uri, options, null);
 
diff --git a/client/src/main/java/io/split/client/dtos/BetweenStringMatcherData.java b/client/src/main/java/io/split/client/dtos/BetweenStringMatcherData.java
@@ -0,0 +1,11 @@
+package io.split.client.dtos;
+
+/**
+ * Metadata to support the between matcher.
+ *
+ * @author adil
+ */
+public class BetweenStringMatcherData {
+    public String start;
+    public String end;
+}
diff --git a/client/src/main/java/io/split/client/dtos/Matcher.java b/client/src/main/java/io/split/client/dtos/Matcher.java
@@ -13,6 +13,7 @@ public class Matcher {
     public WhitelistMatcherData whitelistMatcherData;
     public UnaryNumericMatcherData unaryNumericMatcherData;
     public BetweenMatcherData betweenMatcherData;
+    public BetweenStringMatcherData betweenStringMatcherData;
     public DependencyMatcherData dependencyMatcherData;
     public Boolean booleanMatcherData;
     public String stringMatcherData;
diff --git a/client/src/main/java/io/split/client/dtos/MatcherType.java b/client/src/main/java/io/split/client/dtos/MatcherType.java
@@ -35,5 +35,7 @@ public enum MatcherType {
     /* Semver matchers */
     EQUAL_TO_SEMVER,
     GREATER_THAN_OR_EQUAL_TO_SEMVER,
-    LESS_THAN_OR_EQUAL_TO_SEMVER
+    LESS_THAN_OR_EQUAL_TO_SEMVER,
+    IN_LIST_SEMVER,
+    BETWEEN_SEMVER
 }
diff --git a/client/src/main/java/io/split/engine/evaluator/Labels.java b/client/src/main/java/io/split/engine/evaluator/Labels.java
@@ -6,5 +6,5 @@ public class Labels {
     public static final String KILLED = "killed";
     public static final String DEFINITION_NOT_FOUND = "definition not found";
     public static final String EXCEPTION = "exception";
-    public static final String UNSUPPORTED_MATCHER = "unsupported matcher type";
+    public static final String UNSUPPORTED_MATCHER = "targeting rule type unsupported by sdk";
 }
diff --git a/client/src/main/java/io/split/engine/experiments/SplitParser.java b/client/src/main/java/io/split/engine/experiments/SplitParser.java
@@ -31,6 +31,8 @@
 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 io.split.engine.matchers.BetweenSemverMatcher;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -198,17 +200,25 @@ 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);
+                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;
+            case BETWEEN_SEMVER:
+                checkNotNull(matcher.betweenStringMatcherData, "betweenStringMatcherData is required for BETWEEN_SEMVER matcher type");
+                delegate = new BetweenSemverMatcher(matcher.betweenStringMatcherData.start, matcher.betweenStringMatcherData.end);
+                break;
             default:
                 throw new IllegalArgumentException("Unknown matcher type: " + matcher.matcherType);
         }
diff --git a/client/src/main/java/io/split/engine/matchers/BetweenSemverMatcher.java b/client/src/main/java/io/split/engine/matchers/BetweenSemverMatcher.java
@@ -0,0 +1,58 @@
+package io.split.engine.matchers;
+
+import io.split.engine.evaluator.EvaluationContext;
+
+import java.util.Map;
+
+public class BetweenSemverMatcher implements Matcher {
+
+    private final Semver _semverStart;
+    private final Semver _semverEnd;
+
+    public BetweenSemverMatcher(String semverStart, String semverEnd) {
+        _semverStart = Semver.build(semverStart);
+        _semverEnd = Semver.build(semverEnd);
+    }
+
+    @Override
+    public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
+        if (matchValue == null || _semverStart == null || _semverEnd == null) {
+            return false;
+        }
+        Semver matchSemver = Semver.build(matchValue.toString());
+        if (matchSemver == null) {
+            return false;
+        }
+
+        return matchSemver.Compare(_semverStart) >= 0 && matchSemver.Compare(_semverEnd) <= 0;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("between semver ");
+        bldr.append(_semverStart.Version());
+        bldr.append(" and ");
+        bldr.append(_semverEnd.Version());
+        return bldr.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + _semverStart.hashCode() + _semverEnd.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (!(obj instanceof BetweenSemverMatcher)) return false;
+
+        BetweenSemverMatcher other = (BetweenSemverMatcher) obj;
+
+        return _semverStart == other._semverStart && _semverEnd == other._semverEnd;
+    }
+
+}
diff --git a/client/src/main/java/io/split/engine/matchers/EqualToSemverMatcher.java b/client/src/main/java/io/split/engine/matchers/EqualToSemverMatcher.java
@@ -14,22 +14,22 @@ public EqualToSemverMatcher(String semVer) {
 
     @Override
     public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
-        if (matchValue == null) {
+        if (matchValue == null || _semVer == null) {
             return false;
         }
         Semver matchSemver = Semver.build(matchValue.toString());
         if (matchSemver == null) {
             return false;
         }
 
-        return _semVer != null && matchSemver.Version().equals(_semVer.Version());
+        return matchSemver.Version().equals(_semVer.Version());
     }
 
     @Override
     public String toString() {
         StringBuilder bldr = new StringBuilder();
-        bldr.append("== ");
-        bldr.append(_semVer);
+        bldr.append("== semver ");
+        bldr.append(_semVer.Version());
         return bldr.toString();
     }
 
diff --git a/client/src/main/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcher.java b/client/src/main/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcher.java
@@ -14,22 +14,22 @@ public GreaterThanOrEqualToSemverMatcher(String semVer) {
 
     @Override
     public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
-        if (matchValue == null) {
+        if (matchValue == null || _semVer == null) {
             return false;
         }
         Semver matchSemver = Semver.build(matchValue.toString());
         if (matchSemver == null) {
             return false;
         }
 
-        return _semVer != null && matchSemver.Compare(_semVer) >= 0;
+        return matchSemver.Compare(_semVer) >= 0;
     }
 
     @Override
     public String toString() {
         StringBuilder bldr = new StringBuilder();
-        bldr.append("== ");
-        bldr.append(_semVer);
+        bldr.append(">= semver ");
+        bldr.append(_semVer.Version());
         return bldr.toString();
     }
 
diff --git a/client/src/main/java/io/split/engine/matchers/InListSemverMatcher.java b/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;
+    }
+
+}
diff --git a/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java b/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java
@@ -28,8 +28,8 @@ public boolean match(Object matchValue, String bucketingKey, Map<String, Object>
     @Override
     public String toString() {
         StringBuilder bldr = new StringBuilder();
-        bldr.append("== ");
-        bldr.append(_semVer);
+        bldr.append("<= semver ");
+        bldr.append(_semVer.Version());
         return bldr.toString();
     }
 
diff --git a/client/src/main/java/io/split/engine/matchers/Semver.java b/client/src/main/java/io/split/engine/matchers/Semver.java
@@ -144,19 +144,36 @@ private void setMajorMinorAndPatch(String version) throws SemverParseException {
         String[] vParts = version.split(ValueDelimiter);
         if (vParts.length != 3)
             throw new SemverParseException("Unable to convert to Semver, incorrect format: " + version);
-        _major = Long.parseUnsignedLong(vParts[0]);
-        _minor = Long.parseUnsignedLong(vParts[1]);
-        _patch = Long.parseUnsignedLong(vParts[2]);
+        _major = Long.parseLong(vParts[0]);
+        _minor = Long.parseLong(vParts[1]);
+        _patch = Long.parseLong(vParts[2]);
     }
 
     private String setVersion() {
         String toReturn = _major + ValueDelimiter + _minor + ValueDelimiter + _patch;
-        if (_preRelease != null && _preRelease.length != 0) {
+        if (_preRelease != null && _preRelease.length != 0)
+        {
+            for (int i = 0; i < _preRelease.length; i++)
+            {
+                if (isNumeric(_preRelease[i]))
+                {
+                    _preRelease[i] = Long.toString(Long.parseLong(_preRelease[i]));
+                }
+            }
             toReturn = toReturn + PreReleaseDelimiter + String.join(ValueDelimiter, _preRelease);
         }
         if (_metadata != null && !_metadata.isEmpty()) {
             toReturn = toReturn + MetadataDelimiter + _metadata;
         }
         return toReturn;
     }
+
+    private static boolean isNumeric(String str) {
+        try {
+            Double.parseDouble(str);
+            return true;
+        } catch(NumberFormatException e){
+            return false;
+        }
+    }
 }
diff --git a/client/src/main/java/io/split/engine/sse/AuthApiClientImp.java b/client/src/main/java/io/split/engine/sse/AuthApiClientImp.java
@@ -18,10 +18,12 @@
 import java.net.URI;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static io.split.Spec.SPEC_VERSION;
 
 public class AuthApiClientImp implements AuthApiClient {
     private static final Logger _log = LoggerFactory.getLogger(AuthApiClientImp.class);
 
+    private static final String SPEC = "s";
     private final SplitHttpClient _httpClient;
     private final String _target;
     private final TelemetryRuntimeProducer _telemetryRuntimeProducer;
@@ -36,7 +38,7 @@ public AuthApiClientImp(String url, SplitHttpClient httpClient, TelemetryRuntime
     public AuthenticationResponse Authenticate() {
         try {
             long initTime = System.currentTimeMillis();
-            URI uri = new URIBuilder(_target).build();
+            URI uri = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION).build();
             SplitHttpResponse response = _httpClient.get(uri, new FetchOptions.Builder().cacheControlHeaders(false).build(), null);
             Integer statusCode = response.statusCode();
 
diff --git a/client/src/test/java/io/split/client/utils/CustomDispatcher.java b/client/src/test/java/io/split/client/utils/CustomDispatcher.java
diff --git a/client/src/test/java/io/split/engine/experiments/SplitParserTest.java b/client/src/test/java/io/split/engine/experiments/SplitParserTest.java
diff --git a/client/src/test/java/io/split/engine/matchers/BetweenSemverMatcherTest.java b/client/src/test/java/io/split/engine/matchers/BetweenSemverMatcherTest.java
diff --git a/client/src/test/java/io/split/engine/matchers/EqualToSemverMatcherTest.java b/client/src/test/java/io/split/engine/matchers/EqualToSemverMatcherTest.java
diff --git a/client/src/test/java/io/split/engine/matchers/InListSemverMatcherTest.java b/client/src/test/java/io/split/engine/matchers/InListSemverMatcherTest.java
diff --git a/client/src/test/java/io/split/engine/matchers/SemverTest.java b/client/src/test/java/io/split/engine/matchers/SemverTest.java
diff --git a/client/src/test/resources/semver/semver-splits.json b/client/src/test/resources/semver/semver-splits.json

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,7 @@ public enum MatcherType {`
`35`	`35`	`/* Semver matchers */`
`36`	`36`	`EQUAL_TO_SEMVER,`
`37`	`37`	`GREATER_THAN_OR_EQUAL_TO_SEMVER,`
`38`		`- LESS_THAN_OR_EQUAL_TO_SEMVER`
	`38`	`+ LESS_THAN_OR_EQUAL_TO_SEMVER,`
	`39`	`+ IN_LIST_SEMVER,`
	`40`	`+ BETWEEN_SEMVER`
`39`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ public class Labels {`
`6`	`6`	`public static final String KILLED = "killed";`
`7`	`7`	`public static final String DEFINITION_NOT_FOUND = "definition not found";`
`8`	`8`	`public static final String EXCEPTION = "exception";`
`9`		`- public static final String UNSUPPORTED_MATCHER = "unsupported matcher type";`
	`9`	`+ public static final String UNSUPPORTED_MATCHER = "targeting rule type unsupported by sdk";`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,22 +14,22 @@ public EqualToSemverMatcher(String semVer) {`
`14`	`14`
`15`	`15`	`@Override`
`16`	`16`	`public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {`
`17`		`- if (matchValue == null) {`
	`17`	`+ if (matchValue == null \|\| _semVer == null) {`
`18`	`18`	`return false;`
`19`	`19`	`}`
`20`	`20`	`Semver matchSemver = Semver.build(matchValue.toString());`
`21`	`21`	`if (matchSemver == null) {`
`22`	`22`	`return false;`
`23`	`23`	`}`
`24`	`24`
`25`		`- return _semVer != null && matchSemver.Version().equals(_semVer.Version());`
	`25`	`+ return matchSemver.Version().equals(_semVer.Version());`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public String toString() {`
`30`	`30`	`StringBuilder bldr = new StringBuilder();`
`31`		`- bldr.append("== ");`
`32`		`- bldr.append(_semVer);`
	`31`	`+ bldr.append("== semver ");`
	`32`	`+ bldr.append(_semVer.Version());`
`33`	`33`	`return bldr.toString();`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -14,22 +14,22 @@ public GreaterThanOrEqualToSemverMatcher(String semVer) {`
`14`	`14`
`15`	`15`	`@Override`
`16`	`16`	`public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {`
`17`		`- if (matchValue == null) {`
	`17`	`+ if (matchValue == null \|\| _semVer == null) {`
`18`	`18`	`return false;`
`19`	`19`	`}`
`20`	`20`	`Semver matchSemver = Semver.build(matchValue.toString());`
`21`	`21`	`if (matchSemver == null) {`
`22`	`22`	`return false;`
`23`	`23`	`}`
`24`	`24`
`25`		`- return _semVer != null && matchSemver.Compare(_semVer) >= 0;`
	`25`	`+ return matchSemver.Compare(_semVer) >= 0;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public String toString() {`
`30`	`30`	`StringBuilder bldr = new StringBuilder();`
`31`		`- bldr.append("== ");`
`32`		`- bldr.append(_semVer);`
	`31`	`+ bldr.append(">= semver ");`
	`32`	`+ bldr.append(_semVer.Version());`
`33`	`33`	`return bldr.toString();`
`34`	`34`	`}`
`35`	`35`