Skip to content

fix empty arrays in excluded #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chillaq merged 2 commits into from
Apr 30, 2025
Merged

fix empty arrays in excluded #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ffe622
fix empty arrays in excluded
chillaq Apr 30, 2025
0b2813d
added tests
chillaq Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions client/src/main/java/io/split/client/utils/RuleBasedSegmentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ public static RuleBasedSegmentsToUpdate processRuleBasedSegmentChanges(RuleBased
List<String> toRemove = new ArrayList<>();
Set<String> segments = new HashSet<>();
for (RuleBasedSegment ruleBasedSegment : ruleBasedSegments) {
if (ruleBasedSegment.excluded == null)
{
ruleBasedSegment.excluded = createEmptyExcluded();
}
ruleBasedSegment.excluded = checkExcluded(ruleBasedSegment.excluded);
if (ruleBasedSegment.status != Status.ACTIVE) {
// archive.
toRemove.add(ruleBasedSegment.name);
Expand All @@ -49,4 +46,16 @@ private static Excluded createEmptyExcluded() {
return excluded;
}

private static Excluded checkExcluded(Excluded excluded) {
if (excluded == null) {
excluded = createEmptyExcluded();
}
if (excluded.segments == null) {
excluded.segments = new ArrayList<>();
}
if (excluded.keys == null) {
excluded.keys = new ArrayList<>();
}
return excluded;
}
}
32 changes: 32 additions & 0 deletions client/src/test/java/io/split/engine/experiments/ParsedRuleBasedSegmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,37 @@ public void worksWithoutExcluded() {
RuleBasedSegmentsToUpdate toUpdate = processRuleBasedSegmentChanges(parser, change.ruleBasedSegments.d);
Assert.assertTrue(toUpdate.getToAdd().get(0).excludedKeys().isEmpty());
Assert.assertTrue(toUpdate.getToAdd().get(0).excludedSegments().isEmpty());

load = "{\"ff\":{\"s\":-1,\"t\":-1,\"d\":[]},\"rbs\":{\"s\":-1,\"t\":1457726098069,\"d\":[{ \"changeNumber\": 123, \"trafficTypeName\": \"user\", \"name\": \"some_name\","
+ "\"status\": \"ACTIVE\",\"excluded\":{\"segments\":[\"segment1\"]},\"conditions\": [{\"contitionType\": \"ROLLOUT\","
+ "\"label\": \"some_label\", \"matcherGroup\": { \"matchers\": [{ \"matcherType\": \"ALL_KEYS\", \"negate\": false}],"
+ "\"combiner\": \"AND\"}}]}]}}";
change = Json.fromJson(load, SplitChange.class);
toUpdate = processRuleBasedSegmentChanges(parser, change.ruleBasedSegments.d);
Assert.assertTrue(toUpdate.getToAdd().get(0).excludedKeys().isEmpty());

load = "{\"ff\":{\"s\":-1,\"t\":-1,\"d\":[]},\"rbs\":{\"s\":-1,\"t\":1457726098069,\"d\":[{ \"changeNumber\": 123, \"trafficTypeName\": \"user\", \"name\": \"some_name\","
+ "\"status\": \"ACTIVE\",\"excluded\":{\"segments\":[\"segment1\"], \"keys\":null},\"conditions\": [{\"contitionType\": \"ROLLOUT\","
+ "\"label\": \"some_label\", \"matcherGroup\": { \"matchers\": [{ \"matcherType\": \"ALL_KEYS\", \"negate\": false}],"
+ "\"combiner\": \"AND\"}}]}]}}";
change = Json.fromJson(load, SplitChange.class);
toUpdate = processRuleBasedSegmentChanges(parser, change.ruleBasedSegments.d);
Assert.assertTrue(toUpdate.getToAdd().get(0).excludedKeys().isEmpty());

load = "{\"ff\":{\"s\":-1,\"t\":-1,\"d\":[]},\"rbs\":{\"s\":-1,\"t\":1457726098069,\"d\":[{ \"changeNumber\": 123, \"trafficTypeName\": \"user\", \"name\": \"some_name\","
+ "\"status\": \"ACTIVE\",\"excluded\":{\"keys\":[\"key1\"]},\"conditions\": [{\"contitionType\": \"ROLLOUT\","
+ "\"label\": \"some_label\", \"matcherGroup\": { \"matchers\": [{ \"matcherType\": \"ALL_KEYS\", \"negate\": false}],"
+ "\"combiner\": \"AND\"}}]}]}}";
change = Json.fromJson(load, SplitChange.class);
toUpdate = processRuleBasedSegmentChanges(parser, change.ruleBasedSegments.d);
Assert.assertTrue(toUpdate.getToAdd().get(0).excludedSegments().isEmpty());

load = "{\"ff\":{\"s\":-1,\"t\":-1,\"d\":[]},\"rbs\":{\"s\":-1,\"t\":1457726098069,\"d\":[{ \"changeNumber\": 123, \"trafficTypeName\": \"user\", \"name\": \"some_name\","
+ "\"status\": \"ACTIVE\",\"excluded\":{\"segments\":null, \"keys\":[\"key1\"]},\"conditions\": [{\"contitionType\": \"ROLLOUT\","
+ "\"label\": \"some_label\", \"matcherGroup\": { \"matchers\": [{ \"matcherType\": \"ALL_KEYS\", \"negate\": false}],"
+ "\"combiner\": \"AND\"}}]}]}}";
change = Json.fromJson(load, SplitChange.class);
toUpdate = processRuleBasedSegmentChanges(parser, change.ruleBasedSegments.d);
Assert.assertTrue(toUpdate.getToAdd().get(0).excludedSegments().isEmpty());
}
}