polish

Author: Bilal Al

client/src/main/java/io/split/engine/evaluator/Labels.java

@@ -6,4 +6,5 @@ public class Labels {
     public static final String KILLED = "killed";
     public static final String DEFINITION_NOT_FOUND = "definition not found";
     public static final String EXCEPTION = "exception";
+    public static final String UNSUPPORTED_MATCHER = "unsupported matcher type";
 }

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

@@ -8,6 +8,7 @@
 import io.split.client.dtos.Split;
 import io.split.client.dtos.ConditionType;
 import io.split.client.dtos.MatcherType;
+import io.split.engine.evaluator.Labels;
 import io.split.engine.matchers.AllKeysMatcher;
 import io.split.engine.matchers.AttributeMatcher;
 import io.split.engine.matchers.BetweenMatcher;
@@ -63,6 +64,7 @@ private ParsedSplit parseWithoutExceptionHandling(Split split) {
             List<Partition> partitions = condition.partitions;
             if (checkUnsupportedMatcherExist(condition.matcherGroup.matchers)) {
                 _log.error("Unsupported matcher type found for feature flag: " + split.name + " , will revert to default template matcher.");
+                parsedConditionList.clear();
                 parsedConditionList.add(getTemplateCondition());
                 break;
             }
@@ -99,7 +101,7 @@ private ParsedCondition getTemplateCondition() {
                 ConditionType.ROLLOUT,
                 CombiningMatcher.of(new AllKeysMatcher()),
                 templatePartitions,
-                "unsupported matcher type");
+                Labels.UNSUPPORTED_MATCHER);
     }
 
     private CombiningMatcher toMatcher(MatcherGroup matcherGroup) {

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

@@ -5,6 +5,7 @@
 import io.split.storages.SegmentCache;
 import io.split.storages.memory.SegmentCacheInMemoryImpl;
 import io.split.client.dtos.*;
+import io.split.engine.evaluator.Labels;
 import io.split.engine.ConditionsTestUtil;
 import io.split.engine.SDKReadinessGates;
 import io.split.engine.matchers.AttributeMatcher;
@@ -531,6 +532,7 @@ public void contains_string() {
         set_matcher_test(c, m);
     }
 
+    @Test
     public void unsupportedMatcher() {
         SplitParser parser = new SplitParser();
         String splitWithUndefinedMatcher = "{\"since\":-1,\"till\": 1457726098069,\"splits\": [{ \"changeNumber\": 123, \"trafficTypeName\": \"user\", \"name\": \"some_name\","
@@ -544,6 +546,7 @@ public void unsupportedMatcher() {
             // should not cause exception
             ParsedSplit parsedSplit = parser.parse(split);
             for (ParsedCondition parsedCondition : parsedSplit.parsedConditions()) {
+                assertTrue(parsedCondition.label() == Labels.UNSUPPORTED_MATCHER);
                 for (AttributeMatcher matcher : parsedCondition.matcher().attributeMatchers()) {
                     // Check the matcher is ALL_KEYS
                     assertTrue(matcher.matcher().toString().equals(" in segment all"));