polish

Author: chillaq

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

@@ -5,7 +5,7 @@
 public class FallbackTreatmentCalculatorImp implements FallbackTreatmentCalculator
 {
     private final FallbackTreatmentsConfiguration _fallbackTreatmentsConfiguration;
-    private final String labelPrefix = "fallback - ";
+    private final static String labelPrefix = "fallback - ";
 
     public FallbackTreatmentCalculatorImp(FallbackTreatmentsConfiguration fallbackTreatmentsConfiguration) {
         _fallbackTreatmentsConfiguration = fallbackTreatmentsConfiguration;

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

@@ -28,6 +28,7 @@ public class EvaluatorImp implements Evaluator {
     private final EvaluationContext _evaluationContext;
     private final SplitCacheConsumer _splitCacheConsumer;
     private final FallbackTreatmentCalculator _fallbackTreatmentCalculator;
+    private final String _evaluatorException = "Evaluator Exception";
 
     public EvaluatorImp(SplitCacheConsumer splitCacheConsumer, SegmentCacheConsumer segmentCache,
                         RuleBasedSegmentCacheConsumer ruleBasedSegmentCacheConsumer,
@@ -64,7 +65,7 @@ public Map<String, EvaluatorImp.TreatmentLabelAndChangeNumber> evaluateFeaturesB
         try {
             return evaluateFeatures(key, bucketingKey, flagSetsWithNames, attributes);
         } catch (Exception e) {
-            _log.error("Evaluator Exception", e);
+            _log.error(_evaluatorException, e);
             return createMapControl(flagSetsWithNames, io.split.engine.evaluator.Labels.EXCEPTION);
         }
     }
@@ -216,11 +217,11 @@ private TreatmentLabelAndChangeNumber evaluateParsedSplit(String matchingKey, St
             }
             return getTreatment(matchingKey, bucketingKey, parsedSplit, attributes);
         } catch (ChangeNumberExceptionWrapper e) {
-            _log.error("Evaluator Exception", e.wrappedException());
+            _log.error(_evaluatorException, e.wrappedException());
             FallbackTreatment fallbackTreatment = _fallbackTreatmentCalculator.resolve(featureName, Labels.EXCEPTION);
             return new TreatmentLabelAndChangeNumber(fallbackTreatment.getTreatment(), fallbackTreatment.getLabel(), e.changeNumber());
         } catch (Exception e) {
-            _log.error("Evaluator Exception", e);
+            _log.error(_evaluatorException, e);
             FallbackTreatment fallbackTreatment = _fallbackTreatmentCalculator.resolve(featureName, Labels.EXCEPTION);
             return new TreatmentLabelAndChangeNumber(fallbackTreatment.getTreatment(), fallbackTreatment.getLabel());
         }

client/src/main/java/io/split/inputValidation/FallbackTreatmentValidator.java

@@ -50,18 +50,16 @@ public static String isValidTreatment(String name, String method) {
     public static Map<String, FallbackTreatment> isValidByFlagTreatment(Map<String, FallbackTreatment> byFlagTreatment, String method) {
         Map<String, FallbackTreatment> result = new HashMap<>();
         for (Map.Entry<String, FallbackTreatment> entry : byFlagTreatment.entrySet()) {
-            Optional<String> feature_name = isValid(entry.getKey(), "Validator");
-            if (feature_name.equals(Optional.empty())) {
+            Optional<String> featureName = isValid(entry.getKey(), method);
+            if (featureName.equals(Optional.empty())) {
                 continue;
             }
 
             FallbackTreatment fallbackTreatment = entry.getValue();
-            String treatment = isValidTreatment(fallbackTreatment.getTreatment(), "Validator");
-            if (treatment == null) {
-                continue;
+            String treatment = isValidTreatment(fallbackTreatment.getTreatment(), method);
+            if (treatment != null) {
+                result.put(featureName.get(), new FallbackTreatment(treatment, fallbackTreatment.getConfig()));
             }
-
-            result.put(feature_name.get(), new FallbackTreatment(treatment, fallbackTreatment.getConfig()));
         }
 
         return result;