polishing

Author: chillaq

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

@@ -19,7 +19,6 @@
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Optional;
 
 public class LegacyLocalhostSplitChangeFetcher implements SplitChangeFetcher {

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

@@ -30,7 +30,7 @@ private LocalhostSanitizer() {
     }
 
     public static SplitChange sanitization(SplitChange splitChange) {
-        splitChange = sanitizeTillAndSince(splitChange);
+        sanitizeTillAndSince(splitChange);
         splitChange.featureFlags.d = sanitizeFeatureFlags(splitChange.featureFlags.d);
         splitChange.ruleBasedSegments.d = sanitizeRuleBasedSegments(splitChange.ruleBasedSegments.d);
 
@@ -62,7 +62,6 @@ private static List<RuleBasedSegment> sanitizeRuleBasedSegments(List<RuleBasedSe
 
     private static List<Split> sanitizeFeatureFlags(List<Split> featureFlags) {
         List<Split> splitsToRemove = new ArrayList<>();
-        SecureRandom random = new SecureRandom();
         if (featureFlags != null) {
             for (Split split : featureFlags) {
                 if (split.name == null) {
@@ -73,19 +72,10 @@ private static List<Split> sanitizeFeatureFlags(List<Split> featureFlags) {
                 split.status = sanitizeStatus(split.status);
                 split.defaultTreatment = sanitizeIfNullOrEmpty(split.defaultTreatment, LocalhostConstants.CONTROL);
                 split.changeNumber = sanitizeChangeNumber(split.changeNumber, 0);
-
-                if (split.trafficAllocation == null || split.trafficAllocation < 0 || split.trafficAllocation > LocalhostConstants.SIZE_100) {
-                    split.trafficAllocation = LocalhostConstants.SIZE_100;
-                }
-                if (split.trafficAllocationSeed == null || split.trafficAllocationSeed == 0) {
-                    split.trafficAllocationSeed = -random.nextInt(10) * LocalhostConstants.MILLI_SECONDS;
-                }
-                if (split.seed == 0) {
-                    split.seed = -random.nextInt(10) * LocalhostConstants.MILLI_SECONDS;
-                }
-                if (split.algo != LocalhostConstants.ALGO) {
-                    split.algo = LocalhostConstants.ALGO;
-                }
+                split.trafficAllocation = sanitizeTrafficAllocation(split.trafficAllocation);
+                split.trafficAllocationSeed = sanitizeSeed(split.trafficAllocationSeed);
+                split.seed = sanitizeSeed(split.seed);
+                split.algo = sanitizeAlgo(split.algo);
                 split.conditions = sanitizeConditions((ArrayList<Condition>) split.conditions, false, split.trafficTypeName);
             }
             featureFlags.removeAll(splitsToRemove);
@@ -95,6 +85,28 @@ private static List<Split> sanitizeFeatureFlags(List<Split> featureFlags) {
         return featureFlags;
     }
 
+    private static int sanitizeSeed(Integer seed) {
+        SecureRandom random = new SecureRandom();
+        if (seed == null || seed == 0) {
+            seed = -random.nextInt(10) * LocalhostConstants.MILLI_SECONDS;
+        }
+        return seed;
+    }
+
+    private static int sanitizeAlgo(int algo) {
+        if (algo != LocalhostConstants.ALGO) {
+            algo = LocalhostConstants.ALGO;
+        }
+        return algo;
+    }
+
+    private static int sanitizeTrafficAllocation(Integer trafficAllocation) {
+        if (trafficAllocation == null || trafficAllocation < 0 || trafficAllocation > LocalhostConstants.SIZE_100) {
+            trafficAllocation = LocalhostConstants.SIZE_100;
+        }
+        return trafficAllocation;
+    }
+
     private static ArrayList<Condition> sanitizeConditions(ArrayList<Condition> conditions, boolean createPartition, String trafficTypeName) {
         if (conditions == null) {
             conditions = new ArrayList<>();
@@ -114,18 +126,18 @@ private static ArrayList<Condition> sanitizeConditions(ArrayList<Condition> cond
         }
         return conditions;
     }
-    private static String sanitizeIfNullOrEmpty(String toBeSantitized, String defaultValue) {
-        if (toBeSantitized == null || toBeSantitized.isEmpty()) {
+    private static String sanitizeIfNullOrEmpty(String toBeSanitized, String defaultValue) {
+        if (toBeSanitized == null || toBeSanitized.isEmpty()) {
             return defaultValue;
         }
-        return toBeSantitized;
+        return toBeSanitized;
     }
 
-    private static long sanitizeChangeNumber(long toBeSantitized, long defaultValue) {
-        if (toBeSantitized < 0) {
+    private static long sanitizeChangeNumber(long toBeSanitized, long defaultValue) {
+        if (toBeSanitized < 0) {
             return defaultValue;
         }
-        return toBeSantitized;
+        return toBeSanitized;
     }
 
     private static Status sanitizeStatus(Status toBeSanitized) {

client/src/main/java/io/split/engine/sse/dtos/CommonChangeNotification.java

@@ -82,7 +82,7 @@ public String toString() {
         return String.format("Type: %s; Channel: %s; ChangeNumber: %s", getType(), getChannel(), getChangeNumber());
     }
 
-    private void updateDefinition(byte[] decodedBytes) throws UnsupportedEncodingException {
+    private void updateDefinition(byte[] decodedBytes) {
         definition = (Y) Json.fromJson(new String(decodedBytes, StandardCharsets.UTF_8), _definitionClass);
     }
 }