Fixed excluded null issue

Author: chillaq

client/src/main/java/io/split/client/utils/RuleBasedSegmentProcessor.java

@@ -1,5 +1,6 @@
 package io.split.client.utils;
 
+import io.split.client.dtos.Excluded;
 import io.split.client.dtos.RuleBasedSegment;
 import io.split.client.dtos.Status;
 import io.split.engine.experiments.ParsedRuleBasedSegment;
@@ -21,6 +22,10 @@ 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();
+            }
             if (ruleBasedSegment.status != Status.ACTIVE) {
                 // archive.
                 toRemove.add(ruleBasedSegment.name);
@@ -37,4 +42,11 @@ public static RuleBasedSegmentsToUpdate processRuleBasedSegmentChanges(RuleBased
         return new RuleBasedSegmentsToUpdate(toAdd, toRemove, segments);
     }
 
+    private static Excluded createEmptyExcluded() {
+        Excluded excluded = new Excluded();
+        excluded.segments = new ArrayList<>();
+        excluded.keys = new ArrayList<>();
+        return excluded;
+    }
+
 }

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

@@ -2,7 +2,6 @@
 
 import com.google.common.collect.Lists;
 import io.split.client.dtos.Condition;
-import io.split.client.dtos.Partition;
 import io.split.client.dtos.RuleBasedSegment;
 import io.split.engine.matchers.CombiningMatcher;
 import org.slf4j.Logger;

client/src/test/java/io/split/engine/experiments/ParsedRuleBasedSegmentTest.java

@@ -4,13 +4,20 @@
 import com.google.common.collect.Sets;
 import io.split.client.dtos.ConditionType;
 import io.split.client.dtos.MatcherCombiner;
+import io.split.client.dtos.SplitChange;
+import io.split.client.utils.Json;
+import io.split.client.utils.RuleBasedSegmentsToUpdate;
 import io.split.engine.matchers.AttributeMatcher;
 import io.split.engine.matchers.CombiningMatcher;
 import io.split.engine.matchers.UserDefinedSegmentMatcher;
 
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
+
+import static io.split.client.utils.RuleBasedSegmentProcessor.processRuleBasedSegmentChanges;
+
 public class ParsedRuleBasedSegmentTest {
 
     @Test
@@ -27,4 +34,17 @@ public void works() {
                 parsedRuleBasedSegment.parsedConditions());
         Assert.assertEquals(123, parsedRuleBasedSegment.changeNumber());
     }
+
+    @Test
+    public void worksWithoutExcluded() {
+        RuleBasedSegmentParser parser = new RuleBasedSegmentParser();
+        String load = "{\"ff\":{\"s\":-1,\"t\":-1,\"d\":[]},\"rbs\":{\"s\":-1,\"t\":1457726098069,\"d\":[{ \"changeNumber\": 123, \"trafficTypeName\": \"user\", \"name\": \"some_name\","
+                + "\"status\": \"ACTIVE\",\"conditions\": [{\"contitionType\": \"ROLLOUT\","
+                + "\"label\": \"some_label\", \"matcherGroup\": { \"matchers\": [{ \"matcherType\": \"ALL_KEYS\", \"negate\": false}],"
+                + "\"combiner\": \"AND\"}}]}]}}";
+        SplitChange change = Json.fromJson(load, SplitChange.class);
+        RuleBasedSegmentsToUpdate toUpdate = processRuleBasedSegmentChanges(parser, change.ruleBasedSegments.d);
+        Assert.assertEquals(new ArrayList<>(), toUpdate.getToAdd().get(0).excludedKeys());
+        Assert.assertEquals(new ArrayList<>(), toUpdate.getToAdd().get(0).excludedSegments());
+    }
 }