feedback

Author: sanzmauro

client/src/main/java/io/split/client/SplitClientImpl.java

@@ -9,9 +9,15 @@
 import io.split.engine.evaluator.Evaluator;
 import io.split.engine.SDKReadinessGates;
 import io.split.engine.evaluator.EvaluatorImp;
-import io.split.inputValidation.*;
+import io.split.engine.evaluator.Labels;
+
 import io.split.engine.metrics.Metrics;
 import io.split.grammar.Treatments;
+import io.split.inputValidation.EventsValidator;
+import io.split.inputValidation.InputValidationResult;
+import io.split.inputValidation.KeyValidator;
+import io.split.inputValidation.SplitNameValidator;
+import io.split.inputValidation.TrafficTypeValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +37,7 @@ public final class SplitClientImpl implements SplitClient {
     public static final SplitResult SPLIT_RESULT_CONTROL = new SplitResult(Treatments.CONTROL, null);
 
     private static final String GET_TREATMENT_LABEL = "sdk.getTreatment";
-    private static final String DEFINITION_NOT_FOUND = "definition not found";
+    private static final String GET_TREATMENT_WITH_CONFIG_LABEL = "sdk.getTreatmentWithConfig";
 
     private static final Logger _log = LoggerFactory.getLogger(SplitClientImpl.class);
 
@@ -79,17 +85,17 @@ public String getTreatment(Key key, String split, Map<String, Object> attributes
 
     @Override
     public SplitResult getTreatmentWithConfig(String key, String split) {
-        return getTreatmentWithConfigInternal(GET_TREATMENT_LABEL, key, null, split, Collections.<String, Object>emptyMap(), "getTreatmentWithConfig");
+        return getTreatmentWithConfigInternal(GET_TREATMENT_WITH_CONFIG_LABEL, key, null, split, Collections.<String, Object>emptyMap(), "getTreatmentWithConfig");
     }
 
     @Override
     public SplitResult getTreatmentWithConfig(String key, String split, Map<String, Object> attributes) {
-        return getTreatmentWithConfigInternal(GET_TREATMENT_LABEL, key, null, split, attributes, "getTreatmentWithConfig");
+        return getTreatmentWithConfigInternal(GET_TREATMENT_WITH_CONFIG_LABEL, key, null, split, attributes, "getTreatmentWithConfig");
     }
 
     @Override
     public SplitResult getTreatmentWithConfig(Key key, String split, Map<String, Object> attributes) {
-        return getTreatmentWithConfigInternal(GET_TREATMENT_LABEL, key.matchingKey(), key.bucketingKey(), split, attributes, "getTreatmentWithConfig");
+        return getTreatmentWithConfigInternal(GET_TREATMENT_WITH_CONFIG_LABEL, key.matchingKey(), key.bucketingKey(), split, attributes, "getTreatmentWithConfig");
     }
 
     @Override
@@ -197,7 +203,7 @@ private SplitResult getTreatmentWithConfigInternal(String label, String matching
 
             EvaluatorImp.TreatmentLabelAndChangeNumber result = _evaluator.evaluateFeature(matchingKey, bucketingKey, split, attributes);
 
-            if (result.treatment.equals(Treatments.CONTROL) && result.label.equals(DEFINITION_NOT_FOUND) && _gates.isSDKReadyNow()) {
+            if (result.treatment.equals(Treatments.CONTROL) && result.label.equals(Labels.DEFINITION_NOT_FOUND) && _gates.isSDKReadyNow()) {
                 _log.warn(
                         "getTreatment: you passed \"" + split + "\" that does not exist in this environment, " +
                                 "please double check what Splits exist in the web console.");

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

@@ -15,11 +15,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class EvaluatorImp implements Evaluator {
-    private static final String NOT_IN_SPLIT = "not in split";
-    private static final String DEFAULT_RULE = "default rule";
-    private static final String KILLED = "killed";
-    private static final String DEFINITION_NOT_FOUND = "definition not found";
-    private static final String EXCEPTION = "exception";
+
 
     private static final Logger _log = LoggerFactory.getLogger(EvaluatorImp.class);
 
@@ -35,17 +31,17 @@ public TreatmentLabelAndChangeNumber evaluateFeature(String matchingKey, String
             ParsedSplit parsedSplit = _splitCache.get(split);
 
             if (parsedSplit == null) {
-                return new TreatmentLabelAndChangeNumber(Treatments.CONTROL, DEFINITION_NOT_FOUND);
+                return new TreatmentLabelAndChangeNumber(Treatments.CONTROL, Labels.DEFINITION_NOT_FOUND);
             }
 
             return getTreatment(matchingKey, bucketingKey, parsedSplit, attributes);
         }
         catch (ChangeNumberExceptionWrapper e) {
             _log.error("Evaluator Exception", e.wrappedException());
-            return new EvaluatorImp.TreatmentLabelAndChangeNumber(Treatments.CONTROL, EXCEPTION, e.changeNumber());
+            return new EvaluatorImp.TreatmentLabelAndChangeNumber(Treatments.CONTROL, Labels.EXCEPTION, e.changeNumber());
         } catch (Exception e) {
             _log.error("Evaluator Exception", e);
-            return new EvaluatorImp.TreatmentLabelAndChangeNumber(Treatments.CONTROL, EXCEPTION);
+            return new EvaluatorImp.TreatmentLabelAndChangeNumber(Treatments.CONTROL, Labels.EXCEPTION);
         }
     }
 
@@ -61,7 +57,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
         try {
             if (parsedSplit.killed()) {
                 String config = parsedSplit.configurations() != null ? parsedSplit.configurations().get(parsedSplit.defaultTreatment()) : null;
-                return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), KILLED, parsedSplit.changeNumber(), config);
+                return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), Labels.KILLED, parsedSplit.changeNumber(), config);
             }
 
             /*
@@ -85,7 +81,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
                         if (bucket > parsedSplit.trafficAllocation()) {
                             // out of split
                             String config = parsedSplit.configurations() != null ? parsedSplit.configurations().get(parsedSplit.defaultTreatment()) : null;
-                            return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), NOT_IN_SPLIT, parsedSplit.changeNumber(), config);
+                            return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), Labels.NOT_IN_SPLIT, parsedSplit.changeNumber(), config);
                         }
 
                     }
@@ -100,7 +96,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
             }
 
             String config = parsedSplit.configurations() != null ? parsedSplit.configurations().get(parsedSplit.defaultTreatment()) : null;
-            return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), DEFAULT_RULE, parsedSplit.changeNumber(), config);
+            return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), Labels.DEFAULT_RULE, parsedSplit.changeNumber(), config);
         } catch (Exception e) {
             throw new ChangeNumberExceptionWrapper(e, parsedSplit.changeNumber());
         }

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

@@ -0,0 +1,9 @@
+package io.split.engine.evaluator;
+
+public class Labels {
+    public static final String NOT_IN_SPLIT = "not in split";
+    public static final String DEFAULT_RULE = "default rule";
+    public static final String KILLED = "killed";
+    public static final String DEFINITION_NOT_FOUND = "definition not found";
+    public static final String EXCEPTION = "exception";
+}