Add logic for new factory Consumer mode

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

@@ -1,7 +1,7 @@
 package io.split.client;
 
 import com.google.common.collect.Lists;
-import io.split.cache.SplitCache;
+import io.split.storages.SplitCache;
 import io.split.client.dtos.ConditionType;
 import io.split.client.dtos.MatcherCombiner;
 import io.split.client.dtos.Partition;

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

@@ -1,7 +1,7 @@
 package io.split.client;
 
-import io.split.cache.InMemoryCacheImp;
-import io.split.cache.SplitCache;
+import io.split.storages.memory.InMemoryCacheImp;
+import io.split.storages.SplitCache;
 import io.split.client.events.NoopEventsStorageImp;
 import io.split.client.impressions.ImpressionsManager;
 import io.split.engine.SDKReadinessGates;

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

@@ -4,6 +4,7 @@
 import io.split.client.impressions.ImpressionListener;
 import io.split.client.impressions.ImpressionsManager;
 import io.split.integrations.IntegrationsConfig;
+import io.split.storages.enums.StorageMode;
 import org.apache.hc.core5.http.HttpHost;
 
 import java.io.IOException;
@@ -57,6 +58,7 @@ public class SplitClientConfig {
     private final int _onDemandFetchMaxRetries;
     private final int _failedAttemptsBeforeLogging;
     private final boolean _cdnDebugLogging;
+    private final StorageMode _storageMode;
 
     // Proxy configs
     private final HttpHost _proxy;
@@ -106,7 +108,8 @@ private SplitClientConfig(String endpoint,
                               int onDemandFetchRetryDelayMs,
                               int onDemandFetchMaxRetries,
                               int failedAttemptsBeforeLogging,
-                              boolean cdnDebugLogging) {
+                              boolean cdnDebugLogging,
+                              StorageMode storageMode) {
         _endpoint = endpoint;
         _eventsEndpoint = eventsEndpoint;
         _featuresRefreshRate = pollForFeatureChangesEveryNSeconds;
@@ -143,6 +146,7 @@ private SplitClientConfig(String endpoint,
         _onDemandFetchMaxRetries = onDemandFetchMaxRetries;
         _failedAttemptsBeforeLogging = failedAttemptsBeforeLogging;
         _cdnDebugLogging = cdnDebugLogging;
+        _storageMode = storageMode;
 
         Properties props = new Properties();
         try {
@@ -286,6 +290,8 @@ public int get_telemetryRefreshRate() {
 
     public boolean cdnDebugLogging() { return _cdnDebugLogging; }
 
+    public StorageMode storageMode() { return _storageMode;}
+
 
     public static final class Builder {
 
@@ -328,6 +334,7 @@ public static final class Builder {
         private final int _onDemandFetchMaxRetries = 10;
         private final int _failedAttemptsBeforeLogging = 10;
         private final boolean _cdnDebugLogging = true;
+        private StorageMode _storageMode = StorageMode.STANDALONE;
 
         public Builder() {
         }
@@ -740,6 +747,17 @@ public Builder telemetryRefreshRate(int telemetryRefreshRate) {
             return this;
         }
 
+        /**
+         * Type of storage
+         *
+         * @param mode
+         * @return this builder
+         */
+        public Builder storageMode(StorageMode mode) {
+            _storageMode = mode;
+            return this;
+        }
+
         public SplitClientConfig build() {
             if (_featuresRefreshRate < 5 ) {
                 throw new IllegalArgumentException("featuresRefreshRate must be >= 5: " + _featuresRefreshRate);
@@ -821,6 +839,10 @@ public SplitClientConfig build() {
                 throw new IllegalStateException("_onDemandFetchMaxRetries must be > 0");
             }
 
+            if(_storageMode == null) {
+                throw new IllegalStateException("storageMode must not be null");
+            }
+
             return new SplitClientConfig(
                     _endpoint,
                     _eventsEndpoint,
@@ -857,7 +879,8 @@ public SplitClientConfig build() {
                     _onDemandFetchRetryDelayMs,
                     _onDemandFetchMaxRetries,
                     _failedAttemptsBeforeLogging,
-                    _cdnDebugLogging);
+                    _cdnDebugLogging,
+                    _storageMode);
         }
     }
 }

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

@@ -1,6 +1,6 @@
 package io.split.client;
 
-import io.split.cache.SplitCache;
+import io.split.storages.SplitCache;
 import io.split.client.api.Key;
 import io.split.client.api.SplitResult;
 import io.split.client.dtos.Event;

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

@@ -2,6 +2,7 @@
 
 import io.split.inputValidation.ApiKeyValidator;
 import io.split.grammar.Treatments;
+import io.split.storages.enums.StorageMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +43,13 @@ public static synchronized SplitFactory build(String apiToken, SplitClientConfig
         if (LocalhostSplitFactory.LOCALHOST.equals(apiToken)) {
             return LocalhostSplitFactory.createLocalhostSplitFactory(config);
         } else {
-            return new SplitFactoryImpl(apiToken, config);
+            if (StorageMode.CONSUMER.equals(config.storageMode())){
+                //TODO Here, once wrapper was implemented I'll add a new constructor with the wrapper as 3rd param for CONSUMER mode .
+                return new SplitFactoryImpl(apiToken, config);
+            }
+            else {
+                return new SplitFactoryImpl(apiToken, config);
+            }
 
         }
     }

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

@@ -1,6 +1,5 @@
 package io.split.client;
 
-import io.split.client.dtos.Event;
 import io.split.client.events.EventsStorage;
 import io.split.client.events.EventsTask;
 import io.split.client.events.InMemoryEventsStorage;
@@ -12,8 +11,9 @@
 import io.split.client.interceptors.GzipDecoderResponseInterceptor;
 import io.split.client.interceptors.GzipEncoderRequestInterceptor;
 import io.split.client.interceptors.SdkMetadataInterceptorFilter;
-import io.split.cache.InMemoryCacheImp;
-import io.split.cache.SplitCache;
+import io.split.storages.enums.StorageMode;
+import io.split.storages.memory.InMemoryCacheImp;
+import io.split.storages.SplitCache;
 import io.split.engine.evaluator.Evaluator;
 import io.split.engine.evaluator.EvaluatorImp;
 import io.split.engine.SDKReadinessGates;
@@ -25,8 +25,8 @@
 import io.split.engine.experiments.SplitParser;
 import io.split.engine.experiments.SplitSynchronizationTask;
 import io.split.engine.segments.SegmentChangeFetcher;
-import io.split.cache.SegmentCache;
-import io.split.cache.SegmentCacheInMemoryImpl;
+import io.split.storages.SegmentCache;
+import io.split.storages.memory.SegmentCacheInMemoryImpl;
 import io.split.engine.segments.SegmentSynchronizationTaskImp;
 import io.split.integrations.IntegrationsConfig;
 import io.split.telemetry.storage.InMemoryTelemetryStorage;

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

@@ -3,7 +3,7 @@
 import com.google.common.base.Preconditions;
 import io.split.client.api.SplitView;
 import io.split.engine.SDKReadinessGates;
-import io.split.cache.SplitCache;
+import io.split.storages.SplitCache;
 import io.split.engine.experiments.ParsedSplit;
 import io.split.inputValidation.SplitNameValidator;
 import io.split.telemetry.storage.TelemetryConfigProducer;

client/src/main/java/io/split/client/jmx/SplitJmxMonitor.java

@@ -1,7 +1,7 @@
 package io.split.client.jmx;
 
-import io.split.cache.SegmentCache;
-import io.split.cache.SplitCache;
+import io.split.storages.SegmentCache;
+import io.split.storages.SplitCache;
 import io.split.client.SplitClient;
 import io.split.engine.common.FetchOptions;
 import io.split.engine.experiments.SplitFetcher;

client/src/main/java/io/split/engine/common/SyncManagerImp.java

@@ -2,8 +2,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import io.split.cache.SegmentCache;
-import io.split.cache.SplitCache;
+import io.split.storages.SegmentCache;
+import io.split.storages.SplitCache;
 import io.split.client.ApiKeyCounter;
 import io.split.client.SplitClientConfig;
 import io.split.engine.SDKReadinessGates;

client/src/main/java/io/split/engine/common/SynchronizerImp.java

@@ -1,10 +1,9 @@
 package io.split.engine.common;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.split.cache.SegmentCache;
-import io.split.cache.SplitCache;
+import io.split.storages.SegmentCache;
+import io.split.storages.SplitCache;
 import io.split.engine.SDKReadinessGates;
 import io.split.engine.experiments.SplitFetcher;
 import io.split.engine.experiments.SplitSynchronizationTask;
@@ -15,7 +14,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.*;
 import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkNotNull;

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

@@ -2,7 +2,7 @@
 
 import io.split.client.dtos.ConditionType;
 import io.split.client.exceptions.ChangeNumberExceptionWrapper;
-import io.split.cache.SplitCache;
+import io.split.storages.SplitCache;
 import io.split.engine.experiments.ParsedCondition;
 import io.split.engine.experiments.ParsedSplit;
 import io.split.engine.splitter.Splitter;

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

@@ -3,9 +3,7 @@
 import io.split.client.dtos.Split;
 import io.split.client.dtos.SplitChange;
 import io.split.client.dtos.Status;
-import io.split.engine.SDKReadinessGates;
-import io.split.cache.SplitCache;
-import io.split.telemetry.domain.enums.HTTPLatenciesEnum;
+import io.split.storages.SplitCache;
 import io.split.telemetry.domain.enums.LastSynchronizationRecordsEnum;
 import io.split.telemetry.storage.TelemetryRuntimeProducer;
 import io.split.engine.common.FetchOptions;

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

@@ -1,7 +1,7 @@
 package io.split.engine.experiments;
 
 import com.google.common.collect.Lists;
-import io.split.cache.SegmentCache;
+import io.split.storages.SegmentCache;
 import io.split.client.dtos.Condition;
 import io.split.client.dtos.Matcher;
 import io.split.client.dtos.MatcherGroup;

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

@@ -1,7 +1,7 @@
 package io.split.engine.experiments;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import io.split.cache.SplitCache;
+import io.split.storages.SplitCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/io/split/engine/matchers/UserDefinedSegmentMatcher.java

@@ -1,6 +1,6 @@
 package io.split.engine.matchers;
 
-import io.split.cache.SegmentCache;
+import io.split.storages.SegmentCache;
 import io.split.engine.evaluator.Evaluator;
 
 import java.util.Map;

client/src/main/java/io/split/engine/segments/SegmentFetcherImp.java

@@ -1,10 +1,9 @@
 package io.split.engine.segments;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.split.cache.SegmentCache;
+import io.split.storages.SegmentCache;
 import io.split.client.dtos.SegmentChange;
 import io.split.engine.SDKReadinessGates;
-import io.split.telemetry.domain.enums.HTTPLatenciesEnum;
 import io.split.telemetry.domain.enums.LastSynchronizationRecordsEnum;
 import io.split.telemetry.storage.TelemetryRuntimeProducer;
 import io.split.engine.common.FetchOptions;

client/src/main/java/io/split/engine/segments/SegmentSynchronizationTaskImp.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import io.split.cache.SegmentCache;
+import io.split.storages.SegmentCache;
 import io.split.engine.SDKReadinessGates;
 import io.split.telemetry.storage.TelemetryRuntimeProducer;
 import org.slf4j.Logger;

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

@@ -1,6 +1,6 @@
 package io.split.inputValidation;
 
-import io.split.cache.SplitCache;
+import io.split.storages.SplitCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/io/split/cache/SegmentCache.java → client/src/main/java/io/split/storages/SegmentCache.java

@@ -1,9 +1,8 @@
-package io.split.cache;
+package io.split.storages;
 
 import io.split.engine.segments.SegmentImp;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * Memory for segments

client/src/main/java/io/split/cache/SplitCache.java → client/src/main/java/io/split/storages/SplitCache.java

@@ -1,4 +1,4 @@
-package io.split.cache;
+package io.split.storages;
 
 import io.split.engine.experiments.ParsedSplit;
 

client/src/main/java/io/split/storages/enums/StorageMode.java

@@ -0,0 +1,6 @@
+package io.split.storages.enums;
+
+public enum StorageMode {
+    STANDALONE,
+    CONSUMER;
+}

client/src/main/java/io/split/cache/InMemoryCacheImp.java → client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java

@@ -1,10 +1,11 @@
-package io.split.cache;
+package io.split.storages.memory;
 
 import com.google.common.collect.ConcurrentHashMultiset;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
 import io.split.engine.experiments.ParsedSplit;
+import io.split.storages.SplitCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/io/split/cache/SegmentCacheInMemoryImpl.java → client/src/main/java/io/split/storages/memory/SegmentCacheInMemoryImpl.java

@@ -1,12 +1,12 @@
-package io.split.cache;
+package io.split.storages.memory;
 
 import com.google.common.collect.Maps;
 import io.split.engine.segments.SegmentImp;
+import io.split.storages.SegmentCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 

client/src/main/java/io/split/telemetry/synchronizer/TelemetrySubmitter.java

@@ -1,8 +1,8 @@
 package io.split.telemetry.synchronizer;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.split.cache.SegmentCache;
-import io.split.cache.SplitCache;
+import io.split.storages.SegmentCache;
+import io.split.storages.SplitCache;
 import io.split.client.SplitClientConfig;
 import io.split.client.impressions.ImpressionListener;
 import io.split.client.impressions.ImpressionsManager;

client/src/test/java/io/split/client/CacheUpdaterServiceTest.java

@@ -1,7 +1,7 @@
 package io.split.client;
 
-import io.split.cache.InMemoryCacheImp;
-import io.split.cache.SplitCache;
+import io.split.storages.memory.InMemoryCacheImp;
+import io.split.storages.SplitCache;
 import org.junit.Assert;
 import org.junit.Test;
 

client/src/test/java/io/split/client/SplitClientImplTest.java

@@ -12,8 +12,8 @@
 import io.split.client.events.NoopEventsStorageImp;
 import io.split.client.impressions.Impression;
 import io.split.client.impressions.ImpressionsManager;
-import io.split.cache.InMemoryCacheImp;
-import io.split.cache.SplitCache;
+import io.split.storages.memory.InMemoryCacheImp;
+import io.split.storages.SplitCache;
 import io.split.engine.evaluator.EvaluatorImp;
 import io.split.engine.SDKReadinessGates;
 import io.split.engine.experiments.ParsedCondition;

client/src/test/java/io/split/client/SplitManagerImplTest.java

@@ -4,7 +4,7 @@
 import io.split.client.api.SplitView;
 import io.split.engine.ConditionsTestUtil;
 import io.split.engine.SDKReadinessGates;
-import io.split.cache.SplitCache;
+import io.split.storages.SplitCache;
 import io.split.engine.experiments.ParsedCondition;
 import io.split.engine.experiments.ParsedSplit;
 import io.split.engine.matchers.AllKeysMatcher;