diff --git a/client/src/main/java/io/split/Spec.java b/client/src/main/java/io/split/Spec.java index 79f9a4bc..05d73aba 100644 --- a/client/src/main/java/io/split/Spec.java +++ b/client/src/main/java/io/split/Spec.java @@ -9,6 +9,5 @@ private Spec() { // TODO: Change the schema to 1.3 when updating splitclient public static final String SPEC_1_3 = "1.3"; public static final String SPEC_1_1 = "1.1"; - public static String SPEC_VERSION = SPEC_1_3; } diff --git a/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java b/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java index 466ffb67..88b5fe5d 100644 --- a/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java +++ b/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java @@ -22,7 +22,7 @@ import java.net.URISyntaxException; import static com.google.common.base.Preconditions.checkNotNull; -import static io.split.Spec.SPEC_VERSION; +import static io.split.Spec.SPEC_1_3; /** * Created by adilaijaz on 5/30/15. @@ -35,6 +35,7 @@ public final class HttpSplitChangeFetcher implements SplitChangeFetcher { private static final String TILL = "till"; private static final String SETS = "sets"; private static final String SPEC = "s"; + private String specVersion = SPEC_1_3; private final SplitHttpClient _client; private final URI _target; private final TelemetryRuntimeProducer _telemetryRuntimeProducer; @@ -83,7 +84,7 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) { } private URI buildURL(FetchOptions options, long since, long sinceRBS) throws URISyntaxException { - URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION); + URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + specVersion); uriBuilder.addParameter(SINCE, "" + since); uriBuilder.addParameter(RB_SINCE, "" + sinceRBS); if (!options.flagSetsFilter().isEmpty()) { diff --git a/client/src/main/java/io/split/client/JsonLocalhostSplitChangeFetcher.java b/client/src/main/java/io/split/client/JsonLocalhostSplitChangeFetcher.java index 8ff3a5a3..f4f2b86d 100644 --- a/client/src/main/java/io/split/client/JsonLocalhostSplitChangeFetcher.java +++ b/client/src/main/java/io/split/client/JsonLocalhostSplitChangeFetcher.java @@ -1,7 +1,6 @@ package io.split.client; import com.google.gson.stream.JsonReader; -import io.split.client.dtos.ChangeDto; import io.split.client.dtos.SplitChange; import io.split.client.utils.InputStreamProvider; import io.split.client.utils.Json; @@ -17,18 +16,21 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; import java.util.Arrays; +import static io.split.client.utils.Utils.checkExitConditions; + public class JsonLocalhostSplitChangeFetcher implements SplitChangeFetcher { private static final Logger _log = LoggerFactory.getLogger(JsonLocalhostSplitChangeFetcher.class); private final InputStreamProvider _inputStreamProvider; - private byte [] lastHash; + private byte [] lastHashFeatureFlags; + private byte [] lastHashRuleBasedSegments; public JsonLocalhostSplitChangeFetcher(InputStreamProvider inputStreamProvider) { _inputStreamProvider = inputStreamProvider; - lastHash = new byte[0]; + lastHashFeatureFlags = new byte[0]; + lastHashRuleBasedSegments = new byte[0]; } @Override @@ -36,37 +38,43 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) { try { JsonReader jsonReader = new JsonReader(new BufferedReader(new InputStreamReader(_inputStreamProvider.get(), StandardCharsets.UTF_8))); SplitChange splitChange = Json.fromJson(jsonReader, SplitChange.class); - splitChange.ruleBasedSegments = new ChangeDto<>(); - - // TODO: Remove when updating the class to support RBS - splitChange.ruleBasedSegments.d = new ArrayList<>(); - splitChange.ruleBasedSegments.t = -1; - splitChange.ruleBasedSegments.s = -1; - return processSplitChange(splitChange, since); + return processSplitChange(splitChange, since, sinceRBS); } catch (Exception e) { throw new IllegalStateException("Problem fetching splitChanges: " + e.getMessage(), e); } } - private SplitChange processSplitChange(SplitChange splitChange, long changeNumber) throws NoSuchAlgorithmException { + private SplitChange processSplitChange(SplitChange splitChange, long changeNumber, long changeNumberRBS) throws NoSuchAlgorithmException { SplitChange splitChangeToProcess = LocalhostSanitizer.sanitization(splitChange); // if the till is less than storage CN and different from the default till ignore the change - if (splitChangeToProcess.featureFlags.t < changeNumber && splitChangeToProcess.featureFlags.t != -1) { + if (checkExitConditions(splitChangeToProcess.featureFlags, changeNumber) || + checkExitConditions(splitChangeToProcess.ruleBasedSegments, changeNumberRBS)) { _log.warn("The till is lower than the change number or different to -1"); return null; } - String splitJson = splitChange.featureFlags.d.toString(); - MessageDigest digest = MessageDigest.getInstance("SHA-1"); - digest.reset(); - digest.update(splitJson.getBytes()); - // calculate the json sha - byte [] currHash = digest.digest(); + byte [] currHashFeatureFlags = getStringDigest(splitChange.featureFlags.d.toString()); + byte [] currHashRuleBasedSegments = getStringDigest(splitChange.ruleBasedSegments.d.toString()); //if sha exist and is equal to before sha, or if till is equal to default till returns the same segmentChange with till equals to storage CN - if (Arrays.equals(lastHash, currHash) || splitChangeToProcess.featureFlags.t == -1) { + if (Arrays.equals(lastHashFeatureFlags, currHashFeatureFlags) || splitChangeToProcess.featureFlags.t == -1) { splitChangeToProcess.featureFlags.t = changeNumber; } - lastHash = currHash; + if (Arrays.equals(lastHashRuleBasedSegments, currHashRuleBasedSegments) || splitChangeToProcess.ruleBasedSegments.t == -1) { + splitChangeToProcess.ruleBasedSegments.t = changeNumberRBS; + } + + lastHashFeatureFlags = currHashFeatureFlags; + lastHashRuleBasedSegments = currHashRuleBasedSegments; splitChangeToProcess.featureFlags.s = changeNumber; + splitChangeToProcess.ruleBasedSegments.s = changeNumberRBS; + return splitChangeToProcess; } + + private byte[] getStringDigest(String Json) throws NoSuchAlgorithmException { + MessageDigest digest = MessageDigest.getInstance("SHA-1"); + digest.reset(); + digest.update(Json.getBytes()); + // calculate the json sha + return digest.digest(); + } } \ No newline at end of file diff --git a/client/src/main/java/io/split/client/dtos/RuleBasedSegment.java b/client/src/main/java/io/split/client/dtos/RuleBasedSegment.java index ec1cc68a..75fc92bc 100644 --- a/client/src/main/java/io/split/client/dtos/RuleBasedSegment.java +++ b/client/src/main/java/io/split/client/dtos/RuleBasedSegment.java @@ -1,5 +1,6 @@ package io.split.client.dtos; +import java.util.Arrays; import java.util.List; public class RuleBasedSegment { @@ -9,4 +10,16 @@ public class RuleBasedSegment { public long changeNumber; public List conditions; public Excluded excluded; + + @Override + public String toString() { + return "RuleBasedSegment{" + + "name='" + name + '\'' + + ", status=" + status + + ", trafficTypeName='" + trafficTypeName + '\'' + + ", changeNumber=" + changeNumber + + ", excluded.keys=" + Arrays.toString(excluded.keys.stream().toArray()) + + ", excluded.segments=" + Arrays.toString(excluded.segments.stream().toArray()) + + '}'; + } } diff --git a/client/src/main/java/io/split/client/utils/LocalhostSanitizer.java b/client/src/main/java/io/split/client/utils/LocalhostSanitizer.java index b3add619..3b7695c8 100644 --- a/client/src/main/java/io/split/client/utils/LocalhostSanitizer.java +++ b/client/src/main/java/io/split/client/utils/LocalhostSanitizer.java @@ -14,6 +14,8 @@ import io.split.client.dtos.SplitChange; import io.split.client.dtos.Status; import io.split.client.dtos.WhitelistMatcherData; +import io.split.client.dtos.RuleBasedSegment; +import io.split.client.dtos.ChangeDto; import java.security.SecureRandom; import java.util.ArrayList; @@ -30,66 +32,136 @@ private LocalhostSanitizer() { public static SplitChange sanitization(SplitChange splitChange) { SecureRandom random = new SecureRandom(); List splitsToRemove = new ArrayList<>(); - if (splitChange.featureFlags.t < LocalhostConstants.DEFAULT_TS || splitChange.featureFlags.t == 0) { - splitChange.featureFlags.t = LocalhostConstants.DEFAULT_TS; - } - if (splitChange.featureFlags.s < LocalhostConstants.DEFAULT_TS || splitChange.featureFlags.s > splitChange.featureFlags.t) { - splitChange.featureFlags.s = splitChange.featureFlags.t; - } + List ruleBasedSegmentsToRemove = new ArrayList<>(); + splitChange = sanitizeTillAndSince(splitChange); + if (splitChange.featureFlags.d != null) { - for (Split split: splitChange.featureFlags.d) { - if (split.name == null){ + for (Split split : splitChange.featureFlags.d) { + if (split.name == null) { splitsToRemove.add(split); continue; } - if (split.trafficTypeName == null || split.trafficTypeName.isEmpty()) { - split.trafficTypeName = LocalhostConstants.USER; - } + split.trafficTypeName = sanitizeIfNullOrEmpty(split.trafficTypeName, LocalhostConstants.USER); + split.status = sanitizeStatus(split.status); + split.defaultTreatment = sanitizeIfNullOrEmpty(split.defaultTreatment, LocalhostConstants.CONTROL); + split.changeNumber = sanitizeChangeNumber(split.changeNumber, 0); + if (split.trafficAllocation == null || split.trafficAllocation < 0 || split.trafficAllocation > LocalhostConstants.SIZE_100) { split.trafficAllocation = LocalhostConstants.SIZE_100; } if (split.trafficAllocationSeed == null || split.trafficAllocationSeed == 0) { - split.trafficAllocationSeed = - random.nextInt(10) * LocalhostConstants.MILLI_SECONDS; + split.trafficAllocationSeed = -random.nextInt(10) * LocalhostConstants.MILLI_SECONDS; } if (split.seed == 0) { - split.seed = - random.nextInt(10) * LocalhostConstants.MILLI_SECONDS; - } - if (split.status == null || split.status != Status.ACTIVE && split.status != Status.ARCHIVED) { - split.status = Status.ACTIVE; - } - if (split.defaultTreatment == null || split.defaultTreatment.isEmpty()) { - split.defaultTreatment = LocalhostConstants.CONTROL; + split.seed = -random.nextInt(10) * LocalhostConstants.MILLI_SECONDS; } - if (split.changeNumber < 0) { - split.changeNumber = 0; - } - if (split.algo != LocalhostConstants.ALGO){ + if (split.algo != LocalhostConstants.ALGO) { split.algo = LocalhostConstants.ALGO; } - if (split.conditions == null) { - split.conditions = new ArrayList<>(); - } - - Condition condition = new Condition(); - if (!split.conditions.isEmpty()){ - condition = split.conditions.get(split.conditions.size() - 1); - } + split.conditions = sanitizeConditions((ArrayList) split.conditions, false, split.trafficTypeName); + } + splitChange.featureFlags.d.removeAll(splitsToRemove); + } else { + splitChange.featureFlags.d = new ArrayList<>(); + } - if (split.conditions.isEmpty() || !condition.conditionType.equals(ConditionType.ROLLOUT) || - condition.matcherGroup.matchers == null || - condition.matcherGroup.matchers.isEmpty() || - !condition.matcherGroup.matchers.get(0).matcherType.equals(MatcherType.ALL_KEYS)) { - Condition rolloutCondition = new Condition(); - split.conditions.add(createRolloutCondition(rolloutCondition, split.trafficTypeName, null)); + if (splitChange.ruleBasedSegments.d != null) { + for (RuleBasedSegment ruleBasedSegment : splitChange.ruleBasedSegments.d) { + if (ruleBasedSegment.name == null) { + ruleBasedSegmentsToRemove.add(ruleBasedSegment); + continue; } + ruleBasedSegment.trafficTypeName = sanitizeIfNullOrEmpty(ruleBasedSegment.trafficTypeName, LocalhostConstants.USER); + ruleBasedSegment.status = sanitizeStatus(ruleBasedSegment.status); + ruleBasedSegment.changeNumber = sanitizeChangeNumber(ruleBasedSegment.changeNumber, 0); + ruleBasedSegment.conditions = sanitizeConditions((ArrayList) ruleBasedSegment.conditions, false, + ruleBasedSegment.trafficTypeName); + ruleBasedSegment.excluded.segments = sanitizeExcluded((ArrayList) ruleBasedSegment.excluded.segments); + ruleBasedSegment.excluded.keys = sanitizeExcluded((ArrayList) ruleBasedSegment.excluded.keys); } - splitChange.featureFlags.d.removeAll(splitsToRemove); - return splitChange; + splitChange.ruleBasedSegments.d.removeAll(ruleBasedSegmentsToRemove); + } else { + splitChange.ruleBasedSegments.d = new ArrayList<>(); + } + + return splitChange; + } + + private static ArrayList sanitizeConditions(ArrayList conditions, boolean createPartition, String trafficTypeName) { + if (conditions == null) { + conditions = new ArrayList<>(); + } + + Condition condition = new Condition(); + if (!conditions.isEmpty()){ + condition = conditions.get(conditions.size() - 1); + } + + if (conditions.isEmpty() || !condition.conditionType.equals(ConditionType.ROLLOUT) || + condition.matcherGroup.matchers == null || + condition.matcherGroup.matchers.isEmpty() || + !condition.matcherGroup.matchers.get(0).matcherType.equals(MatcherType.ALL_KEYS)) { + Condition rolloutCondition = new Condition(); + conditions.add(createRolloutCondition(rolloutCondition, trafficTypeName, null, createPartition)); + } + return conditions; + } + private static String sanitizeIfNullOrEmpty(String toBeSantitized, String defaultValue) { + if (toBeSantitized == null || toBeSantitized.isEmpty()) { + return defaultValue; + } + return toBeSantitized; + } + + private static long sanitizeChangeNumber(long toBeSantitized, long defaultValue) { + if (toBeSantitized < 0) { + return defaultValue; + } + return toBeSantitized; + } + + private static Status sanitizeStatus(Status toBeSanitized) { + if (toBeSanitized == null || toBeSanitized != Status.ACTIVE && toBeSanitized != Status.ARCHIVED) { + return Status.ACTIVE; + } + return toBeSanitized; + + } + + private static ArrayList sanitizeExcluded(ArrayList excluded) + { + if (excluded == null) { + return new ArrayList<>(); + } + return excluded; + } + + private static SplitChange sanitizeTillAndSince(SplitChange splitChange) { + if (checkTillConditions(splitChange.featureFlags)) { + splitChange.featureFlags.t = LocalhostConstants.DEFAULT_TS; + } + if (checkSinceConditions(splitChange.featureFlags)) { + splitChange.featureFlags.s = splitChange.featureFlags.t; + } + + if (checkTillConditions(splitChange.ruleBasedSegments)) { + splitChange.ruleBasedSegments.t = LocalhostConstants.DEFAULT_TS; + } + if (checkSinceConditions(splitChange.ruleBasedSegments)) { + splitChange.ruleBasedSegments.s = splitChange.ruleBasedSegments.t; } - splitChange.featureFlags.d = new ArrayList<>(); return splitChange; } - public static SegmentChange sanitization(SegmentChange segmentChange) { + + private static boolean checkTillConditions(ChangeDto change) { + return change.t < LocalhostConstants.DEFAULT_TS || change.t == 0; + } + + private static boolean checkSinceConditions(ChangeDto change) { + return change.s < LocalhostConstants.DEFAULT_TS || change.s > change.t; + } + + public static SegmentChange sanitization(SegmentChange segmentChange) { if (segmentChange.name == null || segmentChange.name.isEmpty()) { return null; } @@ -111,7 +183,7 @@ public static SegmentChange sanitization(SegmentChange segmentChange) { return segmentChange; } - public static Condition createRolloutCondition(Condition condition, String trafficType, String treatment) { + public static Condition createRolloutCondition(Condition condition, String trafficType, String treatment, boolean createPartition) { condition.conditionType = ConditionType.ROLLOUT; condition.matcherGroup = new MatcherGroup(); condition.matcherGroup.combiner = MatcherCombiner.AND; @@ -126,19 +198,21 @@ public static Condition createRolloutCondition(Condition condition, String traff condition.matcherGroup.matchers = new ArrayList<>(); condition.matcherGroup.matchers.add(matcher); - condition.partitions = new ArrayList<>(); - Partition partition1 = new Partition(); - Partition partition2 = new Partition(); - partition1.size = LocalhostConstants.SIZE_100; - partition2.size = LocalhostConstants.SIZE_0; - if (treatment != null) { - partition1.treatment = treatment; - } else { - partition1.treatment = LocalhostConstants.TREATMENT_OFF; - partition2.treatment = LocalhostConstants.TREATMENT_ON; + if (createPartition) { + condition.partitions = new ArrayList<>(); + Partition partition1 = new Partition(); + Partition partition2 = new Partition(); + partition1.size = LocalhostConstants.SIZE_100; + partition2.size = LocalhostConstants.SIZE_0; + if (treatment != null) { + partition1.treatment = treatment; + } else { + partition1.treatment = LocalhostConstants.TREATMENT_OFF; + partition2.treatment = LocalhostConstants.TREATMENT_ON; + } + condition.partitions.add(partition1); + condition.partitions.add(partition2); } - condition.partitions.add(partition1); - condition.partitions.add(partition2); condition.label = DEFAULT_RULE; return condition; @@ -147,7 +221,7 @@ public static Condition createRolloutCondition(Condition condition, String traff public static Condition createCondition(Object keyOrKeys, String treatment) { Condition condition = new Condition(); if (keyOrKeys == null) { - return LocalhostSanitizer.createRolloutCondition(condition, "user", treatment); + return LocalhostSanitizer.createRolloutCondition(condition, "user", treatment, true); } else { if (keyOrKeys instanceof String) { List keys = new ArrayList<>(); diff --git a/client/src/main/java/io/split/client/utils/Utils.java b/client/src/main/java/io/split/client/utils/Utils.java index 43de59f9..9a386db5 100644 --- a/client/src/main/java/io/split/client/utils/Utils.java +++ b/client/src/main/java/io/split/client/utils/Utils.java @@ -1,5 +1,6 @@ package io.split.client.utils; +import io.split.client.dtos.ChangeDto; import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpEntity; @@ -40,4 +41,8 @@ public static URI appendPath(URI root, String pathToAppend) throws URISyntaxExce String path = String.format("%s%s%s", root.getPath(), root.getPath().endsWith("/") ? "" : "/", pathToAppend); return new URIBuilder(root).setPath(path).build(); } + + public static boolean checkExitConditions(ChangeDto change, long cn) { + return change.t < cn && change.t != -1; + } } \ No newline at end of file diff --git a/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java b/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java index b1f2207c..358bd08b 100644 --- a/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java +++ b/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java @@ -1,8 +1,5 @@ package io.split.engine.experiments; -import io.split.client.dtos.ChangeDto; -import io.split.client.dtos.RuleBasedSegment; -import io.split.client.dtos.Split; import io.split.client.dtos.SplitChange; import io.split.client.exceptions.UriTooLongException; import io.split.client.interceptors.FlagSetsFilter; @@ -22,6 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static io.split.client.utils.FeatureFlagProcessor.processFeatureFlagChanges; import static io.split.client.utils.RuleBasedSegmentProcessor.processRuleBasedSegmentChanges; +import static io.split.client.utils.Utils.checkExitConditions; /** * An ExperimentFetcher that refreshes experiment definitions periodically. @@ -163,8 +161,4 @@ private Set runWithoutExceptionHandling(FetchOptions options) throws Int return segments; } - - private boolean checkExitConditions(ChangeDto change, long cn) { - return change.s != cn || change.t < cn; - } } \ No newline at end of file diff --git a/client/src/main/java/io/split/engine/sse/AuthApiClientImp.java b/client/src/main/java/io/split/engine/sse/AuthApiClientImp.java index 28464ebd..5c45e1b7 100644 --- a/client/src/main/java/io/split/engine/sse/AuthApiClientImp.java +++ b/client/src/main/java/io/split/engine/sse/AuthApiClientImp.java @@ -1,6 +1,7 @@ package io.split.engine.sse; import com.google.gson.JsonObject; +import io.split.Spec; import io.split.client.dtos.SplitHttpResponse; import io.split.client.utils.Json; import io.split.engine.common.FetchOptions; @@ -18,7 +19,6 @@ 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); @@ -38,7 +38,7 @@ public AuthApiClientImp(String url, SplitHttpClient httpClient, TelemetryRuntime public AuthenticationResponse Authenticate() { try { long initTime = System.currentTimeMillis(); - URI uri = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION).build(); + URI uri = new URIBuilder(_target).addParameter(SPEC, "" + Spec.SPEC_1_3).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/HttpSplitChangeFetcherTest.java b/client/src/test/java/io/split/client/HttpSplitChangeFetcherTest.java index d503a4b2..479504ed 100644 --- a/client/src/test/java/io/split/client/HttpSplitChangeFetcherTest.java +++ b/client/src/test/java/io/split/client/HttpSplitChangeFetcherTest.java @@ -199,7 +199,6 @@ public void testURLTooLong() throws IOException, URISyntaxException, IllegalAcce @Test public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTargetException, NoSuchMethodException, IllegalAccessException, IOException { - Spec.SPEC_VERSION = Spec.SPEC_1_3; URI rootTarget = URI.create("https://api.split.io"); CloseableHttpClient httpClientMock = Mockito.mock(CloseableHttpClient.class); HttpEntity entityMock = Mockito.mock(HttpEntity.class); @@ -225,7 +224,6 @@ public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTarget SplitChange change = fetcher.fetch(-1, -1, new FetchOptions.Builder().cacheControlHeaders(true).build()); - Assert.assertEquals(Spec.SPEC_1_1, Spec.SPEC_VERSION); List captured = requestCaptor.getAllValues(); Assert.assertEquals(captured.size(), 2); Assert.assertTrue(captured.get(0).getUri().toString().contains("s=1.3")); diff --git a/client/src/test/java/io/split/client/JsonLocalhostSplitChangeFetcherTest.java b/client/src/test/java/io/split/client/JsonLocalhostSplitChangeFetcherTest.java index c6cbce52..512f6d8e 100644 --- a/client/src/test/java/io/split/client/JsonLocalhostSplitChangeFetcherTest.java +++ b/client/src/test/java/io/split/client/JsonLocalhostSplitChangeFetcherTest.java @@ -1,9 +1,6 @@ package io.split.client; -import io.split.client.dtos.ConditionType; -import io.split.client.dtos.Split; -import io.split.client.dtos.SplitChange; -import io.split.client.dtos.Status; +import io.split.client.dtos.*; import io.split.client.utils.FileInputStreamProvider; import io.split.client.utils.InputStreamProvider; import io.split.client.utils.StaticContentInputStreamProvider; @@ -20,6 +17,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -27,15 +25,13 @@ public class JsonLocalhostSplitChangeFetcherTest { @Rule public TemporaryFolder folder = new TemporaryFolder(); - private String TEST_0 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":-1},\"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"; - private String TEST_1 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_2\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":-1},\"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"; - private String TEST_2 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_2\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":2323},\"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"; - private String TEST_3 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":2323},\"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"; - private String TEST_4 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":445345},\"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"; - private String TEST_5 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_2\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":-1},\"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"; + private String TEST_0 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":-1},\"rbs\":{\"d\":[{\"changeNumber\":5,\"name\":\"sample_rule_based_segment\",\"status\":\"ACTIVE\",\"trafficTypeName\":\"user\",\"excluded\":{\"keys\":[\"mauro@split.io\"],\"segments\":[]},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":\"email\"},\"matcherType\":\"ENDS_WITH\",\"negate\":false,\"whitelistMatcherData\":{\"whitelist\":[\"@split.io\"]}}]}}]}],\"s\":-1,\"t\":-1}}"; + private String TEST_1 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_2\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":-1},\"rbs\":{\"d\":[{\"changeNumber\":5,\"name\":\"sample_rule_based_segment\",\"status\":\"ACTIVE\",\"trafficTypeName\":\"user\",\"excluded\":{\"keys\":[\"mauro@split.io\"],\"segments\":[]},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":\"email\"},\"matcherType\":\"ENDS_WITH\",\"negate\":false,\"whitelistMatcherData\":{\"whitelist\":[\"@split.io\"]}}]}}]}],\"s\":-1,\"t\":-1}}"; + private String TEST_2 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_2\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":2323},\"rbs\":{\"d\":[{\"changeNumber\":5,\"name\":\"sample_rule_based_segment\",\"status\":\"ACTIVE\",\"trafficTypeName\":\"user\",\"excluded\":{\"keys\":[\"mauro@split.io\"],\"segments\":[]},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":\"email\"},\"matcherType\":\"ENDS_WITH\",\"negate\":false,\"whitelistMatcherData\":{\"whitelist\":[\"@split.io\"]}}]}}]}],\"s\":-1,\"t\":-1}}"; + private String TEST_3 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":2323},\"rbs\":{\"d\":[{\"changeNumber\":5,\"name\":\"sample_rule_based_segment\",\"status\":\"ACTIVE\",\"trafficTypeName\":\"user\",\"excluded\":{\"keys\":[\"mauro@split.io\",\"gaston@split.io\"],\"segments\":[]},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":\"email\"},\"matcherType\":\"ENDS_WITH\",\"negate\":false,\"whitelistMatcherData\":{\"whitelist\":[\"@split.io\"]}}]}}]}],\"s\":-1,\"t\":1122}}"; + private String TEST_4 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":445345},\"rbs\":{\"d\":[{\"changeNumber\":5,\"name\":\"sample_rule_based_segment\",\"status\":\"ACTIVE\",\"trafficTypeName\":\"user\",\"excluded\":{\"keys\":[\"mauro@split.io\",\"gaston@split.io\"],\"segments\":[]},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":\"email\"},\"matcherType\":\"ENDS_WITH\",\"negate\":false,\"whitelistMatcherData\":{\"whitelist\":[\"@split.io\"]}}]}}]}],\"s\":-1,\"t\":5566}}"; + private String TEST_5 = "{\"ff\":{\"d\":[{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_1\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"user\",\"name\":\"SPLIT_2\",\"trafficAllocation\":100,\"trafficAllocationSeed\":-1780071202,\"seed\":-1442762199,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"off\",\"changeNumber\":1675443537882,\"algo\":2,\"configurations\":{},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":100}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":-1},\"rbs\":{\"d\":[{\"changeNumber\":5,\"name\":\"sample_rule_based_segment\",\"status\":\"ACTIVE\",\"trafficTypeName\":\"user\",\"excluded\":{\"keys\":[\"mauro@split.io\"],\"segments\":[]},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":\"email\"},\"matcherType\":\"ENDS_WITH\",\"negate\":false,\"whitelistMatcherData\":{\"whitelist\":[\"@split.io\"]}}]}}]}],\"s\":-1,\"t\":-1}}"; - // TODO: Enable all tests once JSONLocalhost support spec 1.3 - @Ignore @Test public void testParseSplitChange() throws FileNotFoundException { InputStream inputStream = new FileInputStream("src/test/resources/split_init.json"); @@ -62,9 +58,12 @@ public void testSinceAndTillSanitization() throws FileNotFoundException { Assert.assertEquals(-1L, splitChange.featureFlags.t); Assert.assertEquals(-1L, splitChange.featureFlags.s); + + Assert.assertEquals(-1L, splitChange.ruleBasedSegments.t); + Assert.assertEquals(-1L, splitChange.ruleBasedSegments.s); + } - @Ignore @Test public void testSplitChangeWithoutSplits() throws FileNotFoundException { InputStream inputStream = new FileInputStream("src/test/resources/sanitizer/splitChangeWithoutSplits.json"); @@ -75,9 +74,9 @@ public void testSplitChangeWithoutSplits() throws FileNotFoundException { SplitChange splitChange = localhostSplitChangeFetcher.fetch(-1L, -1, fetchOptions); Assert.assertEquals(0, splitChange.featureFlags.d.size()); + Assert.assertEquals(0, splitChange.ruleBasedSegments.d.size()); } - @Ignore @Test public void testSplitChangeSplitsToSanitize() throws FileNotFoundException { InputStream inputStream = new FileInputStream("src/test/resources/sanitizer/splitChangeSplitsToSanitize.json"); @@ -93,9 +92,14 @@ public void testSplitChangeSplitsToSanitize() throws FileNotFoundException { Assert.assertEquals(Status.ACTIVE, split.status); Assert.assertEquals("control", split.defaultTreatment); Assert.assertEquals(ConditionType.ROLLOUT, split.conditions.get(split.conditions.size() - 1).conditionType); + + Assert.assertEquals(1, splitChange.ruleBasedSegments.d.size()); + RuleBasedSegment ruleBasedSegment = splitChange.ruleBasedSegments.d.get(0); + Assert.assertEquals(Status.ACTIVE, split.status); + Assert.assertEquals(ConditionType.ROLLOUT, ruleBasedSegment.conditions.get(ruleBasedSegment.conditions.size() - 1).conditionType); + Assert.assertEquals(new ArrayList<>(), ruleBasedSegment.excluded.segments); } - @Ignore @Test public void testSplitChangeSplitsToSanitizeMatchersNull() throws FileNotFoundException { InputStream inputStream = new FileInputStream("src/test/resources/sanitizer/splitChangerMatchersNull.json"); @@ -130,6 +134,9 @@ public void testSplitChangeSplitsDifferentScenarios() throws IOException { Assert.assertEquals(1, splitChange.featureFlags.d.size()); Assert.assertEquals(-1, splitChange.featureFlags.t); Assert.assertEquals(-1, splitChange.featureFlags.s); + Assert.assertEquals(1, splitChange.ruleBasedSegments.d.size()); + Assert.assertEquals(-1, splitChange.ruleBasedSegments.t); + Assert.assertEquals(-1, splitChange.ruleBasedSegments.s); test = TEST_1.getBytes(); com.google.common.io.Files.write(test, file); @@ -153,28 +160,37 @@ public void testSplitChangeSplitsDifferentScenarios() throws IOException { com.google.common.io.Files.write(test, file); // 3) The CN from storage is -1, till is 2323, and since is -1, sha is different than before. It's going to return a split change with updates. - splitChange = localhostSplitChangeFetcher.fetch(-1L, -1, fetchOptions); + splitChange = localhostSplitChangeFetcher.fetch(-1L, -1L, fetchOptions); Assert.assertEquals(1, splitChange.featureFlags.d.size()); Assert.assertEquals(2323, splitChange.featureFlags.t); Assert.assertEquals(-1, splitChange.featureFlags.s); + Assert.assertEquals(1, splitChange.ruleBasedSegments.d.size()); + Assert.assertEquals(1122, splitChange.ruleBasedSegments.t); + Assert.assertEquals(-1, splitChange.ruleBasedSegments.s); test = TEST_4.getBytes(); com.google.common.io.Files.write(test, file); // 4) The CN from storage is 2323, till is 445345, and since is -1, and sha is the same as before. It's going to return a split change with same data. - splitChange = localhostSplitChangeFetcher.fetch(2323, -1, fetchOptions); + splitChange = localhostSplitChangeFetcher.fetch(2323, 1122, fetchOptions); Assert.assertEquals(1, splitChange.featureFlags.d.size()); Assert.assertEquals(2323, splitChange.featureFlags.t); Assert.assertEquals(2323, splitChange.featureFlags.s); + Assert.assertEquals(1, splitChange.ruleBasedSegments.d.size()); + Assert.assertEquals(1122, splitChange.ruleBasedSegments.t); + Assert.assertEquals(1122, splitChange.ruleBasedSegments.s); test = TEST_5.getBytes(); com.google.common.io.Files.write(test, file); // 5) The CN from storage is 2323, till and since are -1, and sha is different than before. It's going to return a split change with updates. - splitChange = localhostSplitChangeFetcher.fetch(2323, -1, fetchOptions); + splitChange = localhostSplitChangeFetcher.fetch(2323, 1122, fetchOptions); Assert.assertEquals(2, splitChange.featureFlags.d.size()); Assert.assertEquals(2323, splitChange.featureFlags.t); Assert.assertEquals(2323, splitChange.featureFlags.s); + Assert.assertEquals(1, splitChange.ruleBasedSegments.d.size()); + Assert.assertEquals(1122, splitChange.ruleBasedSegments.t); + Assert.assertEquals(1122, splitChange.ruleBasedSegments.s); } @Test(expected = IllegalStateException.class) diff --git a/client/src/test/java/io/split/client/JsonLocalhostSplitFactoryTest.java b/client/src/test/java/io/split/client/JsonLocalhostSplitFactoryTest.java new file mode 100644 index 00000000..b0ebf960 --- /dev/null +++ b/client/src/test/java/io/split/client/JsonLocalhostSplitFactoryTest.java @@ -0,0 +1,35 @@ +package io.split.client; + +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.concurrent.TimeoutException; + +public class JsonLocalhostSplitFactoryTest { + + @Test + public void works() throws IOException, URISyntaxException, InterruptedException, TimeoutException { + SplitClientConfig config = SplitClientConfig.builder() + .splitFile("src/test/resources/splits_localhost.json") + .segmentDirectory("src/test/resources") + .setBlockUntilReadyTimeout(10000) + .build(); + SplitFactory splitFactory = SplitFactoryBuilder.build("localhost", config); + SplitClient client = splitFactory.client(); + client.blockUntilReady(); + + Assert.assertEquals("on", client.getTreatment("bilal@@split.io", "rbs_flag", new HashMap() {{ + put("email", "bilal@@split.io"); + }})); + Assert.assertEquals("off", client.getTreatment("mauro@split.io", "rbs_flag", new HashMap() {{ + put("email", "mauro@split.io"); + }})); + Assert.assertEquals("off", client.getTreatment("bilal", "test_split")); + Assert.assertEquals("on", client.getTreatment("bilal", "push_test")); + Assert.assertEquals("on_whitelist", client.getTreatment("admin", "push_test")); + client.destroy(); + } +} \ No newline at end of file diff --git a/client/src/test/java/io/split/client/SplitClientIntegrationTest.java b/client/src/test/java/io/split/client/SplitClientIntegrationTest.java index adf8efd7..ecc97496 100644 --- a/client/src/test/java/io/split/client/SplitClientIntegrationTest.java +++ b/client/src/test/java/io/split/client/SplitClientIntegrationTest.java @@ -1,11 +1,13 @@ package io.split.client; import io.split.SSEMockServer; +import io.split.Spec; import io.split.SplitMockServer; import io.split.client.api.SplitView; import io.split.client.dtos.EvaluationOptions; import io.split.client.impressions.ImpressionsManager; import io.split.client.utils.CustomDispatcher; +import io.split.engine.experiments.SplitFetcherImp; import io.split.storages.enums.OperationMode; import io.split.storages.enums.StorageMode; import io.split.storages.pluggable.CustomStorageWrapperImp; @@ -24,6 +26,7 @@ import javax.ws.rs.sse.OutboundSseEvent; import java.io.IOException; +import java.lang.reflect.Field; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -44,9 +47,9 @@ public class SplitClientIntegrationTest { @Test public void getTreatmentWithStreamingEnabled() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); - MockResponse response2 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850110, \"t\":1585948850110}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); - MockResponse response3 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850111, \"t\":1585948850111}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); + MockResponse response2 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850110, \"t\":1585948850110}, \"rbs\":{\"d\":[],\"s\":1585948850110,\"t\":1585948850110}}"); + MockResponse response3 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850111, \"t\":1585948850111}, \"rbs\":{\"d\":[],\"s\":1585948850111,\"t\":1585948850111}}"); Queue responses = new LinkedList<>(); responses.add(response); Queue responses2 = new LinkedList<>(); @@ -144,7 +147,7 @@ public void getTreatmentWithStreamingEnabled() throws Exception { @Test public void getTreatmentWithStreamingEnabledAndAuthDisabled() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"s\":-1,\"t\":-1,\"d\":[]}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"s\":1585948850109,\"t\":1585948850109,\"d\":[]}}"); Queue responses = new LinkedList<>(); responses.add(response); SplitMockServer splitServer = new SplitMockServer(CustomDispatcher.builder() @@ -165,14 +168,19 @@ public void getTreatmentWithStreamingEnabledAndAuthDisabled() throws Exception { String result = client.getTreatment("admin", "push_test"); Assert.assertEquals("on_whitelist", result); - + Assert.assertEquals("on", client.getTreatment("bilal@@split.io", "rbs_flag", new HashMap() {{ + put("email", "bilal@@split.io"); + }})); + Assert.assertEquals("off", client.getTreatment("mauro@split.io", "rbs_flag", new HashMap() {{ + put("email", "mauro@split.io"); + }})); client.destroy(); splitServer.stop(); } @Test public void getTreatmentWithStreamingDisabled() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); Queue responses = new LinkedList<>(); responses.add(response); SplitMockServer splitServer = new SplitMockServer(CustomDispatcher.builder() @@ -224,8 +232,8 @@ public void managerSplitsWithStreamingEnabled() throws Exception { manager.blockUntilReady(); List results = manager.splits(); - Assert.assertEquals(4, results.size()); - Assert.assertEquals(3, results.stream().filter(r -> !r.killed).toArray().length); + Assert.assertEquals(5, results.size()); + Assert.assertEquals(4, results.stream().filter(r -> !r.killed).toArray().length); // SPLIT_KILL should fetch. OutboundSseEvent sseEventSplitKill = new OutboundEvent @@ -237,17 +245,18 @@ public void managerSplitsWithStreamingEnabled() throws Exception { Awaitility.await() .atMost(2L, TimeUnit.MINUTES) - .until(() -> 2 == manager.splits().stream().filter(r -> !r.killed).toArray().length); + .until(() -> 3 == manager.splits().stream().filter(r -> !r.killed).toArray().length); splitServer.stop(); sseServer.stop(); + factory.destroy(); } @Test public void splitClientOccupancyNotifications() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); - MockResponse response2 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850110, \"t\":1585948850110}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); - MockResponse response3 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850111, \"t\":1585948850111}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); + MockResponse response2 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850110, \"t\":1585948850110}, \"rbs\":{\"d\":[],\"s\":1585948850110,\"t\":1585948850110}}"); + MockResponse response3 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850111, \"t\":1585948850111}, \"rbs\":{\"d\":[],\"s\":1585948850111,\"t\":1585948850111}}"); Queue responses = new LinkedList<>(); responses.add(response); Queue responses2 = new LinkedList<>(); @@ -320,9 +329,9 @@ public void splitClientOccupancyNotifications() throws Exception { @Test public void splitClientControlNotifications() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); - MockResponse response2 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850110, \"t\":1585948850110}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); - MockResponse response3 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850111, \"t\":1585948850111}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); + MockResponse response2 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850110, \"t\":1585948850110}, \"rbs\":{\"d\":[],\"s\":1585948850110,\"t\":1585948850110}}"); + MockResponse response3 = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850111, \"t\":1585948850111}, \"rbs\":{\"d\":[],\"s\":1585948850111,\"t\":1585948850111}}"); Queue responses = new LinkedList<>(); responses.add(response); Queue responses2 = new LinkedList<>(); @@ -415,7 +424,7 @@ public void splitClientControlNotifications() throws Exception { @Test public void splitClientMultiFactory() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\":[],\"s\":1585948850109, \"t\":1585948850109},\"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); Queue responses = new LinkedList<>(); responses.add(response); responses.add(response); @@ -564,13 +573,14 @@ public void splitClientMultiFactory() throws Exception { @Test public void keepAlive() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); Queue responses = new LinkedList<>(); responses.add(response); - SplitMockServer splitServer = new SplitMockServer(CustomDispatcher.builder() + CustomDispatcher dispatcher = CustomDispatcher.builder() .path(CustomDispatcher.SINCE_1585948850109, responses) - .build()); + .build(); + SplitMockServer splitServer = new SplitMockServer(dispatcher); //plitMockServer splitServer = new SplitMockServer(CustomDispatcher.builder().build()); SSEMockServer.SseEventQueue eventQueue = new SSEMockServer.SseEventQueue(); @@ -589,7 +599,6 @@ public void keepAlive() throws Exception { // wait to check keep alive notification. Thread.sleep(50000); - // must reconnect and after the second syncAll the result must be different Awaitility.await() .atMost(1L, TimeUnit.MINUTES) @@ -602,7 +611,7 @@ public void keepAlive() throws Exception { @Test public void testConnectionClosedByRemoteHostIsProperlyHandled() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); Queue responses = new LinkedList<>(); responses.add(response); SplitMockServer splitServer = new SplitMockServer(CustomDispatcher.builder() @@ -636,11 +645,12 @@ public void testConnectionClosedByRemoteHostIsProperlyHandled() throws Exception Thread.sleep(1000); result = client.getTreatment("admin", "push_test"); Assert.assertNotEquals("on_whitelist", result); + client.destroy(); } @Test public void testConnectionClosedIsProperlyHandled() throws Exception { - MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850109}, \"rbs\":{\"d\":[],\"s\":1585948850109,\"t\":1585948850109}}"); Queue responses = new LinkedList<>(); responses.add(response); SplitMockServer splitServer = new SplitMockServer(CustomDispatcher.builder() @@ -672,6 +682,7 @@ public void testConnectionClosedIsProperlyHandled() throws Exception { Thread.sleep(1000); result = client.getTreatment("admin", "push_test"); Assert.assertNotEquals("on_whitelist", result); + client.destroy(); } @Test @@ -706,15 +717,21 @@ public void testPluggableMode() throws IOException, URISyntaxException { Assert.assertTrue(events.stream().anyMatch(e -> "keyValue".equals(e.getEventDto().key) && e.getEventDto().value == 12L)); Assert.assertTrue(events.stream().anyMatch(e -> "keyProperties".equals(e.getEventDto().key) && e.getEventDto().properties != null)); - Assert.assertEquals(2, splits.size()); + Assert.assertEquals(3, splits.size()); Assert.assertTrue(splits.stream().anyMatch(sw -> "first.name".equals(sw.name))); Assert.assertTrue(splits.stream().anyMatch(sw -> "second.name".equals(sw.name))); Assert.assertEquals("on", client.getTreatment("key", "first.name")); Assert.assertEquals("off", client.getTreatmentWithConfig("FakeKey", "second.name").treatment()); Assert.assertEquals("control", client.getTreatment("FakeKey", "noSplit")); + Assert.assertEquals("on", client.getTreatment("bilal@@split.io", "rbs_flag", new HashMap() {{ + put("email", "bilal@@split.io"); + }})); + Assert.assertEquals("off", client.getTreatment("mauro@split.io", "rbs_flag", new HashMap() {{ + put("email", "mauro@split.io"); + }})); List impressions = customStorageWrapper.getImps(); - Assert.assertEquals(2, impressions.size()); + Assert.assertEquals(4, impressions.size()); Assert.assertTrue(impressions.stream().anyMatch(imp -> "first.name".equals(imp.getKeyImpression().feature) && "on".equals(imp.getKeyImpression().treatment))); Assert.assertTrue(impressions.stream().anyMatch(imp -> "second.name".equals(imp.getKeyImpression().feature) && "off".equals(imp.getKeyImpression().treatment))); @@ -727,22 +744,22 @@ public void testPluggableMode() throws IOException, URISyntaxException { String key3 = keys.stream().filter(key -> key.contains("getTreatmentWithConfig/")).collect(Collectors.toList()).get(0); Assert.assertEquals(Optional.of(3L), Optional.ofNullable(latencies.get(key1))); - Assert.assertEquals(Optional.of(1L), Optional.of(latencies.get(key2))); + Assert.assertEquals(Optional.of(3L), Optional.of(latencies.get(key2))); Assert.assertEquals(Optional.of(1L), Optional.of(latencies.get(key3))); Thread.sleep(500); Assert.assertNotNull(customStorageWrapper.getConfig()); String key = customStorageWrapper.getConfig().keySet().stream().collect(Collectors.toList()).get(0); Assert.assertTrue(customStorageWrapper.getConfig().get(key).contains(StorageMode.PLUGGABLE.name())); - + client.destroy(); } catch (TimeoutException | InterruptedException e) { } } @Test public void getTreatmentFlagSetWithPolling() throws Exception { - MockResponse response = new MockResponse().setBody("{\"splits\":[{\"trafficTypeName\":\"client\",\"name\":\"workm\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set1\",\"set2\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"client\",\"name\":\"workm_set_3\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set3\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]}],\"since\":-1,\"till\":1602796638344}"); - MockResponse responseFlag = new MockResponse().setBody("{\"splits\": [], \"since\":1602796638344, \"till\":1602796638344}"); + MockResponse response = new MockResponse().setBody("{\"ff\":{\"d\":[{\"trafficTypeName\":\"client\",\"name\":\"workm\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set1\",\"set2\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"client\",\"name\":\"workm_set_3\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set3\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":1602796638344},\"rbs\":{\"d\":[],\"t\":-1,\"s\":-1}}"); + MockResponse responseFlag = new MockResponse().setBody("{\"ff\":{\"d\":[],\"s\":1602796638344,\"t\":1602796638344},\"rbs\":{\"d\":[],\"t\":-1,\"s\":-1}}"); MockResponse segmentResponse = new MockResponse().setBody("{\"name\":\"new_segment\",\"added\":[\"user-1\"],\"removed\":[\"user-2\",\"user-3\"],\"since\":-1,\"till\":-1}"); Queue responses = new LinkedList<>(); responses.add(response); diff --git a/client/src/test/java/io/split/client/utils/CustomDispatcher.java b/client/src/test/java/io/split/client/utils/CustomDispatcher.java index f4ba566a..ea2a2235 100644 --- a/client/src/test/java/io/split/client/utils/CustomDispatcher.java +++ b/client/src/test/java/io/split/client/utils/CustomDispatcher.java @@ -14,11 +14,11 @@ public class CustomDispatcher extends Dispatcher { public static final String SINCE_1602796638344 = "/api/splitChanges?s=1.3&since=1602796638344&rbSince=-1&sets=set1%2Cset2"; public static final String AUTH_ENABLED = "/api/auth/enabled?s=1.3"; public static final String AUTH_DISABLED = "/api/auth/disabled?s=1.3"; - public static final String SINCE_1585948850109 = "/api/splitChanges?s=1.3&since=1585948850109&rbSince=-1"; + public static final String SINCE_1585948850109 = "/api/splitChanges?s=1.3&since=1585948850109&rbSince=1585948850109"; public static final String SINCE_1585948850109_FLAG_SET = "/api/splitChanges?s=1.3&since=-1&rbSince=-1&sets=set_1%2Cset_2"; - public static final String SINCE_1585948850110 = "/api/splitChanges?s=1.3&since=1585948850110&rbSince=-1"; - public static final String SINCE_1585948850111 = "/api/splitChanges?s=1.3&since=1585948850111&rbSince=-1"; - public static final String SINCE_1585948850112 = "/api/splitChanges?s=1.3&since=1585948850112&rbSince=-1"; + public static final String SINCE_1585948850110 = "/api/splitChanges?s=1.3&since=1585948850110&rbSince=1585948850110"; + public static final String SINCE_1585948850111 = "/api/splitChanges?s=1.3&since=1585948850111&rbSince=1585948850111"; + public static final String SINCE_1585948850112 = "/api/splitChanges?s=1.3&since=1585948850112&rbSince=1585948850112"; public static final String SEGMENT_TEST_INITIAL = "/api/segmentChanges/segment-test?since=-1"; public static final String SEGMENT3_INITIAL = "/api/segmentChanges/segment3?since=-1"; public static final String SEGMENT3_SINCE_1585948850110 = "/api/segmentChanges/segment3?since=1585948850110"; @@ -44,23 +44,23 @@ public MockResponse dispatch(@NotNull RecordedRequest request) { case CustomDispatcher.INITIAL_SPLIT_CHANGES: return getResponse(CustomDispatcher.INITIAL_SPLIT_CHANGES, new MockResponse().setBody(inputStreamToString("splits.json"))); case CustomDispatcher.INITIAL_FLAGS_BY_SETS: - return getResponse(CustomDispatcher.INITIAL_FLAGS_BY_SETS, new MockResponse().setBody("{\"ff\":{\"d\":[{\"trafficTypeName\":\"client\",\"name\":\"workm\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set1\",\"set2\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"client\",\"name\":\"workm_set_3\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set_3\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":1602796638344}, \"rbs\":{\"s\":-1,\"t\":-1,\"d\":[]}}")); + return getResponse(CustomDispatcher.INITIAL_FLAGS_BY_SETS, new MockResponse().setBody("{\"ff\":{\"d\":[{\"trafficTypeName\":\"client\",\"name\":\"workm\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set1\",\"set2\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]},{\"trafficTypeName\":\"client\",\"name\":\"workm_set_3\",\"trafficAllocation\":100,\"trafficAllocationSeed\":147392224,\"seed\":524417105,\"status\":\"ACTIVE\",\"killed\":false,\"defaultTreatment\":\"on\",\"changeNumber\":1602796638344,\"algo\":2,\"configurations\":{},\"sets\":[\"set_3\"],\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"IN_SEGMENT\",\"negate\":false,\"userDefinedSegmentMatcherData\":{\"segmentName\":\"new_segment\"},\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":0},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":100},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"in segment new_segment\"},{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"client\",\"attribute\":null},\"matcherType\":\"ALL_KEYS\",\"negate\":false,\"userDefinedSegmentMatcherData\":null,\"whitelistMatcherData\":null,\"unaryNumericMatcherData\":null,\"betweenMatcherData\":null,\"booleanMatcherData\":null,\"dependencyMatcherData\":null,\"stringMatcherData\":null}]},\"partitions\":[{\"treatment\":\"on\",\"size\":100},{\"treatment\":\"off\",\"size\":0},{\"treatment\":\"free\",\"size\":0},{\"treatment\":\"conta\",\"size\":0}],\"label\":\"default rule\"}]}],\"s\":-1,\"t\":1602796638344},\"rbs\":{\"s\":-1,\"t\":-1,\"d\":[]}}")); case CustomDispatcher.AUTH_ENABLED: return getResponse(CustomDispatcher.AUTH_ENABLED,new MockResponse().setBody(inputStreamToString("streaming-auth-push-enabled.json"))); case CustomDispatcher.AUTH_DISABLED: return getResponse(CustomDispatcher.AUTH_DISABLED,new MockResponse().setBody(inputStreamToString("streaming-auth-push-disabled.json"))); case CustomDispatcher.SINCE_1585948850109: - return getResponse(CustomDispatcher.SINCE_1585948850109, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850110}, \"rbs\":{\"s\":-1,\"t\":-1,\"d\":[]}}")); + return getResponse(CustomDispatcher.SINCE_1585948850109, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850110}, \"rbs\":{\"s\":1585948850109,\"t\":1585948850110,\"d\":[]}}")); case SINCE_1585948850109_FLAG_SET: - return getResponse(SINCE_1585948850109_FLAG_SET, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850110}")); + return getResponse(SINCE_1585948850109_FLAG_SET, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850109, \"t\":1585948850110}, \"rbs\":{\"s\":1585948850109,\"t\":1585948850110,\"d\":[]}}")); case CustomDispatcher.SINCE_1585948850110: return getResponse(CustomDispatcher.SINCE_1585948850110, new MockResponse().setBody(inputStreamToString("splits2.json"))); case CustomDispatcher.SINCE_1585948850111: return getResponse(CustomDispatcher.SINCE_1585948850111, new MockResponse().setBody(inputStreamToString("splits_killed.json"))); case CustomDispatcher.SINCE_1585948850112: - return getResponse(CustomDispatcher.SINCE_1585948850112, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850112, \"t\":1585948850112}, \"rbs\":{\"s\":-1,\"t\":-1,\"d\":[]}}")); + return getResponse(CustomDispatcher.SINCE_1585948850112, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1585948850112, \"t\":1585948850112}, \"rbs\":{\"s\":1585948850112,\"t\":1585948850112,\"d\":[]}}")); case CustomDispatcher.SINCE_1602796638344: - return getResponse(CustomDispatcher.SINCE_1602796638344, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1602796638344, \"t\":1602796638344}, \"rbs\":{\"s\":-1,\"t\":-1,\"d\":[]}}")); + return getResponse(CustomDispatcher.SINCE_1602796638344, new MockResponse().setBody("{\"ff\":{\"d\": [], \"s\":1602796638344, \"t\":1602796638344}, \"rbs\":{\"s\":1602796638344,\"t\":1602796638344,\"d\":[]}}")); case CustomDispatcher.SEGMENT_TEST_INITIAL: return getResponse(CustomDispatcher.SEGMENT_TEST_INITIAL, new MockResponse().setBody("{\"name\": \"segment3\",\"added\": [],\"removed\": [],\"since\": -1,\"till\": -1}")); case CustomDispatcher.SEGMENT3_INITIAL: diff --git a/client/src/test/java/io/split/engine/experiments/SplitFetcherImpTest.java b/client/src/test/java/io/split/engine/experiments/SplitFetcherImpTest.java index f708c359..d2680413 100644 --- a/client/src/test/java/io/split/engine/experiments/SplitFetcherImpTest.java +++ b/client/src/test/java/io/split/engine/experiments/SplitFetcherImpTest.java @@ -174,8 +174,6 @@ public void testFetchingSplitsAndRuleBasedSegments() throws Exception { Assert.assertEquals("sample_rule_based_segment", ruleBasedSegmentCache.get("sample_rule_based_segment").ruleBasedSegment()); } - // TODO: enable tests when JSONLocalhost support spec 1.3 - @Ignore @Test public void testLocalHost() { FlagSetsFilter flagSetsFilter = new FlagSetsFilterImpl(new HashSet<>()); @@ -195,7 +193,6 @@ public void testLocalHost() { Assert.assertEquals(1, fetchResult.getSegments().size()); } - @Ignore @Test public void testLocalHostFlagSets() throws IOException { File file = folder.newFile("test_0.json"); @@ -220,7 +217,6 @@ public void testLocalHostFlagSets() throws IOException { Assert.assertEquals(1, fetchResult.getSegments().size()); } - @Ignore @Test public void testLocalHostFlagSetsNotIntersect() throws IOException { File file = folder.newFile("test_0.json"); diff --git a/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java b/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java index 5270c65a..ae33691e 100644 --- a/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java +++ b/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java @@ -171,7 +171,6 @@ public void testLocalhostSegmentChangeFetcher() throws InterruptedException, Fil ruleBasedSegmentParser, ruleBasedSegmentCacheProducer); SplitSynchronizationTask splitSynchronizationTask = new SplitSynchronizationTask(splitFetcher, splitCacheProducer, 1000, null); - Spec.SPEC_VERSION = Spec.SPEC_1_1; // check old spec splitSynchronizationTask.start(); diff --git a/client/src/test/java/io/split/storages/pluggable/CustomStorageWrapperImp.java b/client/src/test/java/io/split/storages/pluggable/CustomStorageWrapperImp.java index 65ca18b0..728ffec7 100644 --- a/client/src/test/java/io/split/storages/pluggable/CustomStorageWrapperImp.java +++ b/client/src/test/java/io/split/storages/pluggable/CustomStorageWrapperImp.java @@ -10,6 +10,7 @@ import io.split.client.dtos.ConditionType; import io.split.client.dtos.Split; import io.split.client.dtos.Status; +import io.split.client.dtos.RuleBasedSegment; import io.split.client.utils.Json; import io.split.engine.ConditionsTestUtil; import io.split.engine.segments.SegmentImp; @@ -41,6 +42,8 @@ public class CustomStorageWrapperImp implements CustomStorageWrapper { private static final String TELEMETRY_INIT = "SPLITIO.telemetry.init"; private static final String LATENCIES = "SPLITIO.telemetry.latencies"; private static final String SPLIT = "SPLITIO.split."; + private static final String RULE_BASED_SEGMENT = "SPLITIO.rbsegment"; + private static final String RULE_BASED_SEGMENTS = "SPLITIO.rbsegments"; private static final String SPLITS = "SPLITIO.splits.*"; private static final String SEGMENT = "SPLITIO.segment."; private static final String IMPRESSIONS = "SPLITIO.impressions"; @@ -48,6 +51,7 @@ public class CustomStorageWrapperImp implements CustomStorageWrapper { private static final String COUNTS = "SPLITIO.impressions.counts"; private static final String FLAG_SET = "SPLITIO.flagSet"; private Map splitsStorage = new HashMap<>(); + private Map ruleBasedSegmentStorage = new HashMap<>(); private Map segmentStorage = new HashMap<>(); private final ConcurrentMap _methodLatencies = Maps.newConcurrentMap(); private final ConcurrentMap _latencies = Maps.newConcurrentMap(); @@ -81,6 +85,9 @@ public String get(String key) throws Exception { if(value.equals(SPLIT)){ return _json.toJson(splitsStorage.get(key)); } + if(value.equals(RULE_BASED_SEGMENT)){ + return _json.toJson(ruleBasedSegmentStorage.get(key)); + } return ""; } @@ -238,6 +245,10 @@ private String getStorage(String key) { return SPLITS; else if(key.startsWith(SPLIT)) return SPLIT; + else if(key.startsWith(RULE_BASED_SEGMENT)) + return RULE_BASED_SEGMENT; + else if(key.startsWith(RULE_BASED_SEGMENTS)) + return RULE_BASED_SEGMENTS; else if (key.startsWith(LATENCIES)) return LATENCIES; else if (key.startsWith(TELEMETRY_INIT)) @@ -262,6 +273,8 @@ private void updateCache(){ segmentStorage.put(PrefixAdapter.buildSegment("segmentName"), new SegmentImp(9874654L, "segmentName", Lists.newArrayList("key", "key2"))); splitsStorage.put(PrefixAdapter.buildSplitKey("first.name"), makeSplit("first.name", 123, Lists.newArrayList(condition), 456478976L)); splitsStorage.put(PrefixAdapter.buildSplitKey("second.name"), makeSplit("second.name", 321, Lists.newArrayList(), 568613L)); + splitsStorage.put(PrefixAdapter.buildSplitKey("rbs_flag"), Json.fromJson("{\"changeNumber\": 10, \"trafficTypeName\": \"user\", \"name\": \"rbs_flag\", \"trafficAllocation\": 100, \"trafficAllocationSeed\": 1828377380, \"seed\": -286617921, \"status\": \"ACTIVE\", \"killed\": false, \"defaultTreatment\": \"off\", \"algo\": 2, \"conditions\": [{\"conditionType\": \"ROLLOUT\", \"matcherGroup\": {\"combiner\": \"AND\", \"matchers\": [{\"keySelector\": {\"trafficType\": \"user\"},\"matcherType\": \"IN_RULE_BASED_SEGMENT\", \"negate\": false, \"userDefinedSegmentMatcherData\": {\"segmentName\": \"sample_rule_based_segment\"}}]},\"partitions\": [{\"treatment\": \"on\", \"size\": 100},{\"treatment\": \"off\", \"size\": 0}],\"label\": \"in rule based segment sample_rule_based_segment\"},{\"conditionType\": \"ROLLOUT\", \"matcherGroup\": {\"combiner\": \"AND\", \"matchers\": [{\"keySelector\": {\"trafficType\": \"user\"},\"matcherType\": \"ALL_KEYS\", \"negate\": false}]},\"partitions\": [{\"treatment\": \"on\", \"size\": 0},{\"treatment\": \"off\", \"size\": 100}],\"label\": \"default rule\"}],\"configurations\": {},\"sets\": [],\"impressionsDisabled\": false}", Split.class)); + ruleBasedSegmentStorage.put(PrefixAdapter.buildRuleBasedSegmentKey("sample_rule_based_segment"), Json.fromJson( "{\"changeNumber\":5,\"name\":\"sample_rule_based_segment\",\"status\":\"ACTIVE\",\"trafficTypeName\":\"user\",\"excluded\":{\"keys\":[\"mauro@split.io\"],\"segments\":[]},\"conditions\":[{\"conditionType\":\"ROLLOUT\",\"matcherGroup\":{\"combiner\":\"AND\",\"matchers\":[{\"keySelector\":{\"trafficType\":\"user\",\"attribute\":\"email\"},\"matcherType\":\"ENDS_WITH\",\"negate\":false,\"whitelistMatcherData\":{\"whitelist\":[\"@split.io\"]}}]}}]}", RuleBasedSegment.class)); _flagSets.put("SPLITIO.flagSet.set1", new HashSet<>(new ArrayList<>(Arrays.asList("flag1", "flag2")))); } diff --git a/client/src/test/resources/sanitizer/splitChangeSplitsToSanitize.json b/client/src/test/resources/sanitizer/splitChangeSplitsToSanitize.json index bbd2ad17..de35084e 100644 --- a/client/src/test/resources/sanitizer/splitChangeSplitsToSanitize.json +++ b/client/src/test/resources/sanitizer/splitChangeSplitsToSanitize.json @@ -1,5 +1,5 @@ {"ff": { - "dd": [ + "d": [ { "name": "test1", "trafficAllocation": 101, @@ -98,4 +98,35 @@ ], "s": -1, "t": 1660326991072 -}, "rbs":{"d": [], "s": -1, "t": -1}} \ No newline at end of file + }, +"rbs":{ + "d": [ + {"changeNumber":5, + "name":"sample_rule_based_segment", + "status":"ACTIVE", + "trafficTypeName":"user", + "excluded":{"keys":["mauro@split.io"]} + }, + {"changeNumber":5, + "status":"ACTIVE", + "trafficTypeName":"user", + "excluded":{"keys":["mauro@split.io"],"segments":[]}, + "conditions":[ + {"conditionType":"ROLLOUT", + "matcherGroup":{"combiner":"AND", + "matchers":[ + {"keySelector":{"trafficType":"user","attribute":"email"}, + "matcherType":"ENDS_WITH", + "negate":false, + "whitelistMatcherData":{"whitelist":["@split.io"]} + } + ] + } + } + ] + } + + ], + "s": -1, + "t": -1} +} \ No newline at end of file diff --git a/client/src/test/resources/sanitizer/splitChangeTillSanitization.json b/client/src/test/resources/sanitizer/splitChangeTillSanitization.json index 32ec409e..5a1f806f 100644 --- a/client/src/test/resources/sanitizer/splitChangeTillSanitization.json +++ b/client/src/test/resources/sanitizer/splitChangeTillSanitization.json @@ -52,4 +52,4 @@ ], "s": 398, "t": 0 -}, "rbs":{"d": [], "s": -1, "t": -1}} \ No newline at end of file +}, "rbs":{"d": [], "s": -1, "t": 0}} \ No newline at end of file diff --git a/client/src/test/resources/sanitizer/splitChangeWithoutSplits.json b/client/src/test/resources/sanitizer/splitChangeWithoutSplits.json index 1152bfd6..29463bff 100644 --- a/client/src/test/resources/sanitizer/splitChangeWithoutSplits.json +++ b/client/src/test/resources/sanitizer/splitChangeWithoutSplits.json @@ -1,4 +1,4 @@ {"ff": { "s": -1, "t": 2434234234 -}, "rbs":{"d": [], "s": -1, "t": -1}} \ No newline at end of file +}, "rbs":{"s": -1, "t": -1}} \ No newline at end of file diff --git a/client/src/test/resources/segment_test.json b/client/src/test/resources/segment_test.json new file mode 100644 index 00000000..a1458fc4 --- /dev/null +++ b/client/src/test/resources/segment_test.json @@ -0,0 +1,12 @@ +{ + "name": "segment_test", + "added": [ + "user1", + "user2", + "user3", + "user4" + ], + "removed": [], + "since": -1, + "till": 1585948850110 +} \ No newline at end of file diff --git a/client/src/test/resources/splits.json b/client/src/test/resources/splits.json index 04c89d05..da2654f1 100644 --- a/client/src/test/resources/splits.json +++ b/client/src/test/resources/splits.json @@ -224,8 +224,113 @@ "label": "default label" } ] + }, + { + "changeNumber": 10, + "trafficTypeName": "user", + "name": "rbs_flag", + "trafficAllocation": 100, + "trafficAllocationSeed": 1828377380, + "seed": -286617921, + "status": "ACTIVE", + "killed": false, + "defaultTreatment": "off", + "algo": 2, + "conditions": [ + { + "conditionType": "ROLLOUT", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user" + }, + "matcherType": "IN_RULE_BASED_SEGMENT", + "negate": false, + "userDefinedSegmentMatcherData": { + "segmentName": "sample_rule_based_segment" + } + } + ] + }, + "partitions": [ + { + "treatment": "on", + "size": 100 + }, + { + "treatment": "off", + "size": 0 + } + ], + "label": "in rule based segment sample_rule_based_segment" + }, + { + "conditionType": "ROLLOUT", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user" + }, + "matcherType": "ALL_KEYS", + "negate": false + } + ] + }, + "partitions": [ + { + "treatment": "on", + "size": 0 + }, + { + "treatment": "off", + "size": 100 + } + ], + "label": "default rule" + } + ], + "configurations": {}, + "sets": [], + "impressionsDisabled": false } ], "s": -1, "t": 1585948850109 -}, "rbs":{"d": [], "s": -1, "t": -1}} +}, "rbs":{"d": [ + { + "changeNumber": 5, + "name": "sample_rule_based_segment", + "status": "ACTIVE", + "trafficTypeName": "user", + "excluded":{ + "keys":["mauro@split.io","gaston@split.io"], + "segments":[] + }, + "conditions": [ + { + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user", + "attribute": "email" + }, + "matcherType": "ENDS_WITH", + "negate": false, + "whitelistMatcherData": { + "whitelist": [ + "@split.io" + ] + } + } + ] + } + } + ] + }], "s": -1, "t": 1585948850109} +} diff --git a/client/src/test/resources/splits2.json b/client/src/test/resources/splits2.json index 956457af..afbc9299 100644 --- a/client/src/test/resources/splits2.json +++ b/client/src/test/resources/splits2.json @@ -117,4 +117,4 @@ ], "s": 1585948850110, "t": 1585948850111 -}, "rbs":{"d": [], "s": -1, "t": -1}} \ No newline at end of file +}, "rbs":{"d": [], "s": 1585948850110, "t": 1585948850111}} \ No newline at end of file diff --git a/client/src/test/resources/splits_killed.json b/client/src/test/resources/splits_killed.json index ee77577e..6924afc6 100644 --- a/client/src/test/resources/splits_killed.json +++ b/client/src/test/resources/splits_killed.json @@ -88,4 +88,4 @@ ], "s": 1585948850111, "t": 1585948850112 -}, "rbs":{"d": [], "s": -1, "t": -1}} \ No newline at end of file +}, "rbs":{"d": [], "s": 1585948850111, "t": 1585948850112}} \ No newline at end of file diff --git a/client/src/test/resources/splits_localhost.json b/client/src/test/resources/splits_localhost.json new file mode 100644 index 00000000..6f4abdb2 --- /dev/null +++ b/client/src/test/resources/splits_localhost.json @@ -0,0 +1,295 @@ +{"ff": { + "d": [ + { + "trafficTypeName": "user", + "name": "push_test", + "trafficAllocation": 100, + "trafficAllocationSeed": -2092979940, + "seed": 105482719, + "status": "ACTIVE", + "killed": false, + "defaultTreatment": "on_default", + "changeNumber": 1585948850109, + "algo": 2, + "configurations": {}, + "conditions": [ + { + "conditionType": "WHITELIST", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": null, + "matcherType": "WHITELIST", + "negate": false, + "userDefinedSegmentMatcherData": null, + "whitelistMatcherData": { + "whitelist": [ + "admin", + "mauro" + ] + }, + "unaryNumericMatcherData": null, + "betweenMatcherData": null, + "booleanMatcherData": null, + "dependencyMatcherData": null, + "stringMatcherData": null + } + ] + }, + "partitions": [ + { + "treatment": "on_whitelist", + "size": 100 + } + ], + "label": "whitelisted" + }, + { + "conditionType": "ROLLOUT", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user", + "attribute": null + }, + "matcherType": "ALL_KEYS", + "negate": false, + "userDefinedSegmentMatcherData": null, + "whitelistMatcherData": null, + "unaryNumericMatcherData": null, + "betweenMatcherData": null, + "booleanMatcherData": null, + "dependencyMatcherData": null, + "stringMatcherData": null + } + ] + }, + "partitions": [ + { + "treatment": "on", + "size": 100 + }, + { + "treatment": "off", + "size": 0 + }, + { + "treatment": "V1", + "size": 0 + } + ], + "label": "default rule" + } + ] + }, + { + "trafficTypeName": "user", + "name": "tinchotest", + "trafficAllocation": 24, + "trafficAllocationSeed": -172559061, + "seed": -906334215, + "status": "ACTIVE", + "killed": true, + "defaultTreatment": "off", + "changeNumber": 1585948717645, + "algo": 2, + "configurations": {}, + "conditions": [ + { + "conditionType": "ROLLOUT", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user", + "attribute": null + }, + "matcherType": "ALL_KEYS", + "negate": false, + "userDefinedSegmentMatcherData": null, + "whitelistMatcherData": null, + "unaryNumericMatcherData": null, + "betweenMatcherData": null, + "booleanMatcherData": null, + "dependencyMatcherData": null, + "stringMatcherData": null + } + ] + }, + "partitions": [ + { + "treatment": "on", + "size": 100 + }, + { + "treatment": "off", + "size": 0 + } + ], + "label": "default rule" + } + ] + }, + { + "trafficTypeName": "user", + "name": "test_split", + "trafficAllocation": 100, + "trafficAllocationSeed": 1582960494, + "seed": 1842944006, + "status": "ACTIVE", + "killed": false, + "defaultTreatment": "off", + "changeNumber": 1582741588594, + "algo": 2, + "configurations": {}, + "conditions": [ + { + "conditionType": "ROLLOUT", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user", + "attribute": null + }, + "matcherType": "ALL_KEYS", + "negate": false, + "userDefinedSegmentMatcherData": null, + "whitelistMatcherData": null, + "unaryNumericMatcherData": null, + "betweenMatcherData": null, + "booleanMatcherData": null, + "dependencyMatcherData": null, + "stringMatcherData": null + } + ] + }, + "partitions": [ + { + "treatment": "on", + "size": 0 + }, + { + "treatment": "off", + "size": 100 + } + ], + "label": "default rule" + } + ] + }, + { + "changeNumber": 10, + "trafficTypeName": "user", + "name": "rbs_flag", + "trafficAllocation": 100, + "trafficAllocationSeed": 1828377380, + "seed": -286617921, + "status": "ACTIVE", + "killed": false, + "defaultTreatment": "off", + "algo": 2, + "conditions": [ + { + "conditionType": "ROLLOUT", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user" + }, + "matcherType": "IN_RULE_BASED_SEGMENT", + "negate": false, + "userDefinedSegmentMatcherData": { + "segmentName": "sample_rule_based_segment" + } + } + ] + }, + "partitions": [ + { + "treatment": "on", + "size": 100 + }, + { + "treatment": "off", + "size": 0 + } + ], + "label": "in rule based segment sample_rule_based_segment" + }, + { + "conditionType": "ROLLOUT", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user" + }, + "matcherType": "ALL_KEYS", + "negate": false + } + ] + }, + "partitions": [ + { + "treatment": "on", + "size": 0 + }, + { + "treatment": "off", + "size": 100 + } + ], + "label": "default rule" + } + ], + "configurations": {}, + "sets": [], + "impressionsDisabled": false + } + ], + "s": -1, + "t": -1 +}, "rbs":{"d": [ + { + "changeNumber": 5, + "name": "sample_rule_based_segment", + "status": "ACTIVE", + "trafficTypeName": "user", + "excluded":{ + "keys":["mauro@split.io","gaston@split.io"], + "segments":[] + }, + "conditions": [ + { + "conditionType": "WHITELIST", + "matcherGroup": { + "combiner": "AND", + "matchers": [ + { + "keySelector": { + "trafficType": "user", + "attribute": "email" + }, + "matcherType": "ENDS_WITH", + "negate": false, + "whitelistMatcherData": { + "whitelist": [ + "@split.io" + ] + } + } + ] + } + } + ] + }], "s": -1, "t": -1} +}