fixing excluded segments

Author: sanzmauro

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

@@ -18,8 +18,6 @@ public String toString() {
                 ", status=" + status +
                 ", trafficTypeName='" + trafficTypeName + '\'' +
                 ", changeNumber=" + changeNumber +
-                ", excluded.keys=" + Arrays.toString(excluded.keys.stream().toArray()) +
-                ", excluded.segments=" + Arrays.toString(excluded.segments.stream().toArray()) +
                 '}';
     }
 }

client/src/main/java/io/split/engine/matchers/RuleBasedSegmentMatcher.java

@@ -19,6 +19,7 @@
  */
 public class RuleBasedSegmentMatcher implements Matcher {
     private final String standardType = "standard";
+    private final String ruleBasedType = "rule-based";
 
     private final String _segmentName;
 
@@ -44,8 +45,19 @@ public boolean match(Object matchValue, String bucketingKey, Map<String, Object>
             if (segment.type.equals(standardType) && evaluationContext.getSegmentCache().isInSegment(segment.name, (String) matchValue)) {
                 return false;
             }
+
+            if (segment.type.equals(ruleBasedType)) {
+                List<ParsedCondition> conditions = evaluationContext.getRuleBasedSegmentCache().get(segment.name).parsedConditions();
+                if (matchConditions(conditions, matchValue, bucketingKey, attributes, evaluationContext)) {
+                    return true;
+                }
+            }
         }
-        List<ParsedCondition> conditions = parsedRuleBasedSegment.parsedConditions();
+
+        return matchConditions(parsedRuleBasedSegment.parsedConditions(), matchValue, bucketingKey, attributes, evaluationContext);
+    }
+
+    private boolean matchConditions(List<ParsedCondition> conditions, Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
         for (ParsedCondition parsedCondition : conditions) {
             if (parsedCondition.matcher().match((String) matchValue, bucketingKey, attributes, evaluationContext)) {
                 return true;