Merge pull request #504 from splitio/Feature/Semver

Merge semver to dev

Author: mmelograno

CHANGES.txt

@@ -1,5 +1,9 @@
-4.12.0 (XXX XX, 2024)
-- Added support for injecting user-defined custom headers for all outgoing HTTP calls, typically useful for proxy authentication purposes.
+4.12.0 (May 15, 2024)
+- Added support for targeting rules based on semantic versions (https://semver.org/).
+- Added the logic to handle correctly when the SDK receives an unsupported Matcher type.
+- Enhanced SDK Headers for Authorization Frameworks
+- Cleaned unused imports and renaming some methods
+- Fixed empty token handler thanks to @hpark-miovision
 
 4.11.1 (Feb 29, 2024)
 - Fixed deadlock in UniqueKeysTracker when sending Unique Keys.

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.12.0-rc3</version>
+        <version>4.12.0</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>

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";
+}
+

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);
 

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;
+}

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;

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

@@ -30,5 +30,12 @@ public enum MatcherType {
     EQUAL_TO_BOOLEAN,
 
     /* Dependency Matcher */
-    IN_SPLIT_TREATMENT
+    IN_SPLIT_TREATMENT,
+
+    /* Semver matchers */
+    EQUAL_TO_SEMVER,
+    GREATER_THAN_OR_EQUAL_TO_SEMVER,
+    LESS_THAN_OR_EQUAL_TO_SEMVER,
+    IN_LIST_SEMVER,
+    BETWEEN_SEMVER
 }

client/src/main/java/io/split/client/exceptions/SemverParseException.java

@@ -0,0 +1,7 @@
+package io.split.client.exceptions;
+
+public class SemverParseException extends Exception {
+    public SemverParseException(String message) {
+        super(message);
+    }
+}

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";
 }

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

@@ -19,6 +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.EqualToSemverMatcher;
 import io.split.engine.matchers.collections.ContainsAllOfSetMatcher;
 import io.split.engine.matchers.collections.ContainsAnyOfSetMatcher;
 import io.split.engine.matchers.collections.EqualToSetMatcher;
@@ -28,6 +29,11 @@
 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 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;
 
@@ -193,6 +199,26 @@ private AttributeMatcher toMatcher(Matcher matcher) {
                                 + ". matcher.booleanMatcherData() MUST NOT BE null");
                 delegate = new BooleanMatcher(matcher.booleanMatcherData);
                 break;
+            case EQUAL_TO_SEMVER:
+                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, "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, "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);
         }