Merge pull request #188 from splitio/localhost-client-refactor

LocalhostSplitClient Refactor

Author: ldecheverz-split

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

@@ -0,0 +1,90 @@
+package io.split.client;
+
+import com.google.common.collect.Lists;
+import io.split.cache.SplitCache;
+import io.split.client.dtos.ConditionType;
+import io.split.client.dtos.MatcherCombiner;
+import io.split.client.dtos.Partition;
+import io.split.engine.experiments.ParsedCondition;
+import io.split.engine.experiments.ParsedSplit;
+import io.split.engine.matchers.AllKeysMatcher;
+import io.split.engine.matchers.AttributeMatcher;
+import io.split.engine.matchers.CombiningMatcher;
+import io.split.engine.matchers.strings.WhitelistMatcher;
+import io.split.grammar.Treatments;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Comparator;
+import java.util.stream.Collectors;
+
+public final  class CacheUpdaterService {
+
+    private static String LOCALHOST = "localhost";
+    private SplitCache _splitCache;
+
+    public CacheUpdaterService(SplitCache splitCache) {
+        _splitCache = splitCache;
+    }
+
+    public void updateCache(Map<SplitAndKey, LocalhostSplit> map) {
+        _splitCache.clear();
+        for (Map.Entry<SplitAndKey,LocalhostSplit> entrySplit : map.entrySet()) {
+            SplitAndKey splitAndKey = entrySplit.getKey();
+            String splitName = splitAndKey.split();
+            String splitKey = splitAndKey.key();
+            LocalhostSplit localhostSplit = entrySplit.getValue();
+            ParsedSplit split = _splitCache.get(splitName);
+            List<ParsedCondition> conditions = getConditions(splitKey, split, localhostSplit.treatment);
+            String treatment = conditions.size() > 0 ? Treatments.CONTROL : localhostSplit.treatment;
+            Map<String, String> configurations = new HashMap<>();
+            if(split != null && split.configurations().size() > 0) {
+                configurations = split.configurations();
+            }
+            configurations.put(localhostSplit.treatment, localhostSplit.config);
+
+            split = new ParsedSplit(splitName, 0, false, treatment,conditions, LOCALHOST, 0, 100, 0, 0, configurations);
+            _splitCache.put(split);
+        }
+    }
+
+    private List<ParsedCondition> getConditions(String splitKey, ParsedSplit split, String treatment){
+        List<ParsedCondition> conditions = split == null ? new ArrayList<>() : split.parsedConditions().stream().collect(Collectors.toList());
+        Partition partition = new Partition();
+        partition.treatment = treatment;
+        partition.size = 100;
+
+        if(splitKey != null) {
+            conditions.add(createWhitelistCondition(splitKey, partition));
+        }
+        else {
+            conditions = conditions.stream().filter(pc -> ConditionType.WHITELIST.equals(pc.conditionType())).collect(Collectors.toList());
+            conditions.add(createRolloutCondition(partition));
+        }
+        conditions.sort(Comparator.comparing(ParsedCondition::conditionType));
+        return conditions;
+    }
+
+    private ParsedCondition createWhitelistCondition(String splitKey, Partition partition) {
+        ParsedCondition parsedCondition = new ParsedCondition(ConditionType.WHITELIST,
+                new CombiningMatcher(MatcherCombiner.AND,
+                        Lists.newArrayList(new AttributeMatcher(null, new WhitelistMatcher(Lists.newArrayList(splitKey)), false))),
+                Lists.newArrayList(partition), splitKey);
+        return parsedCondition;
+    }
+
+    private ParsedCondition createRolloutCondition(Partition partition) {
+        Partition rolloutPartition = new Partition();
+        rolloutPartition.treatment = "-";
+        rolloutPartition.size = 0;
+        ParsedCondition parsedCondition = new ParsedCondition(ConditionType.ROLLOUT,
+                new CombiningMatcher(MatcherCombiner.AND,
+                        Lists.newArrayList(new AttributeMatcher(null,  new AllKeysMatcher(), false))),
+                Lists.newArrayList(partition, rolloutPartition), "LOCAL");
+
+        return parsedCondition;
+    }
+
+}

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

@@ -1,5 +1,11 @@
 package io.split.client;
 
+import io.split.cache.InMemoryCacheImp;
+import io.split.cache.SplitCache;
+import io.split.client.impressions.ImpressionsManager;
+import io.split.engine.SDKReadinessGates;
+import io.split.engine.evaluator.EvaluatorImp;
+import io.split.engine.metrics.Metrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,9 +29,10 @@ public final class LocalhostSplitFactory implements SplitFactory {
     static final String FILENAME = ".split";
     static final String LOCALHOST = "localhost";
 
-    private final LocalhostSplitClientAndFactory _client;
+    private final SplitClient _client;
     private final LocalhostSplitManager _manager;
     private final AbstractLocalhostSplitFile _splitFile;
+    private final CacheUpdaterService _cacheUpdaterService;
 
     public static LocalhostSplitFactory createLocalhostSplitFactory(SplitClientConfig config) throws IOException {
         String directory = System.getProperty("user.home");
@@ -44,7 +51,15 @@ public LocalhostSplitFactory(String directory, String file) throws IOException {
         }
 
         Map<SplitAndKey, LocalhostSplit> splitAndKeyToTreatment = _splitFile.readOnSplits();
-        _client = new LocalhostSplitClientAndFactory(this, new LocalhostSplitClient(splitAndKeyToTreatment));
+        SplitCache splitCache = new InMemoryCacheImp();
+        SDKReadinessGates sdkReadinessGates = new SDKReadinessGates();
+
+        sdkReadinessGates.splitsAreReady();
+        _cacheUpdaterService = new CacheUpdaterService(splitCache);
+        _cacheUpdaterService.updateCache(splitAndKeyToTreatment);
+        _client = new SplitClientImpl(this, splitCache,
+                new ImpressionsManager.NoOpImpressionsManager(),  new Metrics.NoopMetrics(), new NoopEventClient(),
+                SplitClientConfig.builder().setBlockUntilReadyTimeout(1).build(), sdkReadinessGates, new EvaluatorImp(splitCache));
         _manager = LocalhostSplitManager.of(splitAndKeyToTreatment);
 
         _splitFile.registerWatcher();
@@ -73,7 +88,7 @@ public boolean isDestroyed() {
     }
 
     public void updateFeatureToTreatmentMap(Map<SplitAndKey, LocalhostSplit> featureToTreatmentMap) {
-        _client.updateFeatureToTreatmentMap(featureToTreatmentMap);
+        _cacheUpdaterService.updateCache(featureToTreatmentMap);
         _manager.updateFeatureToTreatmentMap(featureToTreatmentMap);
     }
 }

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

@@ -77,7 +77,7 @@ public void blockUntilReady() throws TimeoutException, InterruptedException {
 
     @Override
     public SplitView split(String featureName) {
-        if (!_splitAndKeyToTreatmentMap.containsKey(featureName)) {
+        if (!_splitToTreatmentsMap.containsKey(featureName)) {
             return null;
         }