diff --git a/client/src/main/java/io/split/client/CacheUpdaterService.java b/client/src/main/java/io/split/client/CacheUpdaterService.java index 6823fdefd..dd31c9ea0 100644 --- a/client/src/main/java/io/split/client/CacheUpdaterService.java +++ b/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; diff --git a/client/src/main/java/io/split/client/LocalhostSplitFactory.java b/client/src/main/java/io/split/client/LocalhostSplitFactory.java index 6c66edf4e..78b43ff79 100644 --- a/client/src/main/java/io/split/client/LocalhostSplitFactory.java +++ b/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; diff --git a/client/src/main/java/io/split/client/SplitClientConfig.java b/client/src/main/java/io/split/client/SplitClientConfig.java index 7b2ae0e5b..9ba7eaf13 100644 --- a/client/src/main/java/io/split/client/SplitClientConfig.java +++ b/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); } } } diff --git a/client/src/main/java/io/split/client/SplitClientImpl.java b/client/src/main/java/io/split/client/SplitClientImpl.java index 46167765c..a4c3d7cd5 100644 --- a/client/src/main/java/io/split/client/SplitClientImpl.java +++ b/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; diff --git a/client/src/main/java/io/split/client/SplitFactoryBuilder.java b/client/src/main/java/io/split/client/SplitFactoryBuilder.java index f7f1fea8b..8508b0988 100644 --- a/client/src/main/java/io/split/client/SplitFactoryBuilder.java +++ b/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); + } } } diff --git a/client/src/main/java/io/split/client/SplitFactoryImpl.java b/client/src/main/java/io/split/client/SplitFactoryImpl.java index eaff85392..0477181b4 100644 --- a/client/src/main/java/io/split/client/SplitFactoryImpl.java +++ b/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; diff --git a/client/src/main/java/io/split/client/SplitManagerImpl.java b/client/src/main/java/io/split/client/SplitManagerImpl.java index 0edd88aaa..73438d6b2 100644 --- a/client/src/main/java/io/split/client/SplitManagerImpl.java +++ b/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; diff --git a/client/src/main/java/io/split/client/jmx/SplitJmxMonitor.java b/client/src/main/java/io/split/client/jmx/SplitJmxMonitor.java index 0fcbea305..26c514768 100644 --- a/client/src/main/java/io/split/client/jmx/SplitJmxMonitor.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/common/SyncManagerImp.java b/client/src/main/java/io/split/engine/common/SyncManagerImp.java index 024ac02d2..38c9a6026 100644 --- a/client/src/main/java/io/split/engine/common/SyncManagerImp.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/common/SynchronizerImp.java b/client/src/main/java/io/split/engine/common/SynchronizerImp.java index 9214d284b..800cc7118 100644 --- a/client/src/main/java/io/split/engine/common/SynchronizerImp.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java b/client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java index c4efe70cb..d837f3b7c 100644 --- a/client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java b/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java index 37ec85c6f..627a015fa 100644 --- a/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/experiments/SplitParser.java b/client/src/main/java/io/split/engine/experiments/SplitParser.java index a5af700ff..182e2e6b8 100644 --- a/client/src/main/java/io/split/engine/experiments/SplitParser.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/experiments/SplitSynchronizationTask.java b/client/src/main/java/io/split/engine/experiments/SplitSynchronizationTask.java index c98b35b37..0634670dd 100644 --- a/client/src/main/java/io/split/engine/experiments/SplitSynchronizationTask.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/matchers/UserDefinedSegmentMatcher.java b/client/src/main/java/io/split/engine/matchers/UserDefinedSegmentMatcher.java index f25e4fec3..2526ca1b8 100644 --- a/client/src/main/java/io/split/engine/matchers/UserDefinedSegmentMatcher.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/segments/SegmentFetcherImp.java b/client/src/main/java/io/split/engine/segments/SegmentFetcherImp.java index 13dfac4bb..3c63a178b 100644 --- a/client/src/main/java/io/split/engine/segments/SegmentFetcherImp.java +++ b/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; diff --git a/client/src/main/java/io/split/engine/segments/SegmentSynchronizationTaskImp.java b/client/src/main/java/io/split/engine/segments/SegmentSynchronizationTaskImp.java index 025ca08ab..99e0e6de2 100644 --- a/client/src/main/java/io/split/engine/segments/SegmentSynchronizationTaskImp.java +++ b/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; diff --git a/client/src/main/java/io/split/inputValidation/TrafficTypeValidator.java b/client/src/main/java/io/split/inputValidation/TrafficTypeValidator.java index 4fc5056a8..6819a721e 100644 --- a/client/src/main/java/io/split/inputValidation/TrafficTypeValidator.java +++ b/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; diff --git a/client/src/main/java/io/split/cache/SegmentCache.java b/client/src/main/java/io/split/storages/SegmentCache.java similarity index 95% rename from client/src/main/java/io/split/cache/SegmentCache.java rename to client/src/main/java/io/split/storages/SegmentCache.java index 81349a5b9..cdb2357d5 100644 --- a/client/src/main/java/io/split/cache/SegmentCache.java +++ b/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 diff --git a/client/src/main/java/io/split/cache/SplitCache.java b/client/src/main/java/io/split/storages/SplitCache.java similarity index 95% rename from client/src/main/java/io/split/cache/SplitCache.java rename to client/src/main/java/io/split/storages/SplitCache.java index c9769d176..6e77b9d8a 100644 --- a/client/src/main/java/io/split/cache/SplitCache.java +++ b/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; diff --git a/client/src/main/java/io/split/storages/enums/StorageMode.java b/client/src/main/java/io/split/storages/enums/StorageMode.java new file mode 100644 index 000000000..2c45f2bdd --- /dev/null +++ b/client/src/main/java/io/split/storages/enums/StorageMode.java @@ -0,0 +1,6 @@ +package io.split.storages.enums; + +public enum StorageMode { + STANDALONE, + CONSUMER; +} diff --git a/client/src/main/java/io/split/cache/InMemoryCacheImp.java b/client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java similarity index 98% rename from client/src/main/java/io/split/cache/InMemoryCacheImp.java rename to client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java index decc31d25..1e82e19f6 100644 --- a/client/src/main/java/io/split/cache/InMemoryCacheImp.java +++ b/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; diff --git a/client/src/main/java/io/split/cache/SegmentCacheInMemoryImpl.java b/client/src/main/java/io/split/storages/memory/SegmentCacheInMemoryImpl.java similarity index 96% rename from client/src/main/java/io/split/cache/SegmentCacheInMemoryImpl.java rename to client/src/main/java/io/split/storages/memory/SegmentCacheInMemoryImpl.java index 774c8d20f..2131393ca 100644 --- a/client/src/main/java/io/split/cache/SegmentCacheInMemoryImpl.java +++ b/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; diff --git a/client/src/main/java/io/split/telemetry/synchronizer/TelemetrySubmitter.java b/client/src/main/java/io/split/telemetry/synchronizer/TelemetrySubmitter.java index 2be82aa9a..688e519d6 100644 --- a/client/src/main/java/io/split/telemetry/synchronizer/TelemetrySubmitter.java +++ b/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; diff --git a/client/src/test/java/io/split/client/CacheUpdaterServiceTest.java b/client/src/test/java/io/split/client/CacheUpdaterServiceTest.java index 9d6d30140..9c15773f7 100644 --- a/client/src/test/java/io/split/client/CacheUpdaterServiceTest.java +++ b/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; diff --git a/client/src/test/java/io/split/client/SplitClientImplTest.java b/client/src/test/java/io/split/client/SplitClientImplTest.java index b729bfb3a..9def44c22 100644 --- a/client/src/test/java/io/split/client/SplitClientImplTest.java +++ b/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; diff --git a/client/src/test/java/io/split/client/SplitManagerImplTest.java b/client/src/test/java/io/split/client/SplitManagerImplTest.java index 201f1fedc..24ce3d4bf 100644 --- a/client/src/test/java/io/split/client/SplitManagerImplTest.java +++ b/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; diff --git a/client/src/test/java/io/split/engine/common/SynchronizerTest.java b/client/src/test/java/io/split/engine/common/SynchronizerTest.java index 88bfdb903..eeccc1c3f 100644 --- a/client/src/test/java/io/split/engine/common/SynchronizerTest.java +++ b/client/src/test/java/io/split/engine/common/SynchronizerTest.java @@ -1,8 +1,8 @@ package io.split.engine.common; -import io.split.cache.InMemoryCacheImp; -import io.split.cache.SegmentCache; -import io.split.cache.SplitCache; +import io.split.storages.memory.InMemoryCacheImp; +import io.split.storages.SegmentCache; +import io.split.storages.SplitCache; import io.split.engine.SDKReadinessGates; import io.split.engine.experiments.SplitFetcherImp; import io.split.engine.experiments.SplitSynchronizationTask; diff --git a/client/src/test/java/io/split/engine/evaluator/EvaluatorIntegrationTest.java b/client/src/test/java/io/split/engine/evaluator/EvaluatorIntegrationTest.java index 14cc7eee8..79eaef401 100644 --- a/client/src/test/java/io/split/engine/evaluator/EvaluatorIntegrationTest.java +++ b/client/src/test/java/io/split/engine/evaluator/EvaluatorIntegrationTest.java @@ -1,8 +1,8 @@ package io.split.engine.evaluator; import com.google.common.collect.Lists; -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.dtos.ConditionType; import io.split.client.dtos.MatcherCombiner; import io.split.client.dtos.Partition; diff --git a/client/src/test/java/io/split/engine/evaluator/EvaluatorTest.java b/client/src/test/java/io/split/engine/evaluator/EvaluatorTest.java index 1a64cb342..8c85a7daa 100644 --- a/client/src/test/java/io/split/engine/evaluator/EvaluatorTest.java +++ b/client/src/test/java/io/split/engine/evaluator/EvaluatorTest.java @@ -2,7 +2,7 @@ import io.split.client.dtos.ConditionType; import io.split.client.dtos.Partition; -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.CombiningMatcher; diff --git a/client/src/test/java/io/split/engine/experiments/SplitFetcherTest.java b/client/src/test/java/io/split/engine/experiments/SplitFetcherTest.java index 9999da832..b6f0a5726 100644 --- a/client/src/test/java/io/split/engine/experiments/SplitFetcherTest.java +++ b/client/src/test/java/io/split/engine/experiments/SplitFetcherTest.java @@ -1,10 +1,10 @@ package io.split.engine.experiments; import com.google.common.collect.Lists; -import io.split.cache.InMemoryCacheImp; -import io.split.cache.SegmentCache; -import io.split.cache.SegmentCacheInMemoryImpl; -import io.split.cache.SplitCache; +import io.split.storages.memory.InMemoryCacheImp; +import io.split.storages.SegmentCache; +import io.split.storages.memory.SegmentCacheInMemoryImpl; +import io.split.storages.SplitCache; import io.split.client.dtos.*; import io.split.engine.ConditionsTestUtil; import io.split.engine.SDKReadinessGates; @@ -21,9 +21,7 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.internal.matchers.Any; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/test/java/io/split/engine/experiments/SplitParserTest.java b/client/src/test/java/io/split/engine/experiments/SplitParserTest.java index 83518da0e..cce9c3200 100644 --- a/client/src/test/java/io/split/engine/experiments/SplitParserTest.java +++ b/client/src/test/java/io/split/engine/experiments/SplitParserTest.java @@ -1,8 +1,8 @@ package io.split.engine.experiments; import com.google.common.collect.Lists; -import io.split.cache.SegmentCache; -import io.split.cache.SegmentCacheInMemoryImpl; +import io.split.storages.SegmentCache; +import io.split.storages.memory.SegmentCacheInMemoryImpl; import io.split.client.dtos.*; import io.split.engine.ConditionsTestUtil; import io.split.engine.SDKReadinessGates; diff --git a/client/src/test/java/io/split/engine/matchers/NegatableMatcherTest.java b/client/src/test/java/io/split/engine/matchers/NegatableMatcherTest.java index d3fe1b144..ac4853f90 100644 --- a/client/src/test/java/io/split/engine/matchers/NegatableMatcherTest.java +++ b/client/src/test/java/io/split/engine/matchers/NegatableMatcherTest.java @@ -1,8 +1,8 @@ package io.split.engine.matchers; import com.google.common.collect.Lists; -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.matchers.strings.WhitelistMatcher; import org.junit.Test; diff --git a/client/src/test/java/io/split/engine/matchers/UserDefinedSegmentMatcherTest.java b/client/src/test/java/io/split/engine/matchers/UserDefinedSegmentMatcherTest.java index 137e815a6..f1f0d5ce2 100644 --- a/client/src/test/java/io/split/engine/matchers/UserDefinedSegmentMatcherTest.java +++ b/client/src/test/java/io/split/engine/matchers/UserDefinedSegmentMatcherTest.java @@ -1,8 +1,8 @@ package io.split.engine.matchers; import com.google.common.collect.Sets; -import io.split.cache.SegmentCache; -import io.split.cache.SegmentCacheInMemoryImpl; +import io.split.storages.SegmentCache; +import io.split.storages.memory.SegmentCacheInMemoryImpl; import org.junit.Test; import java.util.ArrayList; diff --git a/client/src/test/java/io/split/engine/segments/SegmentFetcherImpTest.java b/client/src/test/java/io/split/engine/segments/SegmentFetcherImpTest.java index 0f0c799e0..cb005107e 100644 --- a/client/src/test/java/io/split/engine/segments/SegmentFetcherImpTest.java +++ b/client/src/test/java/io/split/engine/segments/SegmentFetcherImpTest.java @@ -1,20 +1,14 @@ package io.split.engine.segments; import com.google.common.collect.Sets; -import io.split.cache.InMemoryCacheImp; -import io.split.cache.SegmentCache; -import io.split.cache.SegmentCacheInMemoryImpl; -import io.split.cache.SplitCache; +import io.split.storages.SegmentCache; +import io.split.storages.memory.SegmentCacheInMemoryImpl; import io.split.client.dtos.SegmentChange; -import io.split.client.dtos.SplitChange; import io.split.engine.SDKReadinessGates; import io.split.telemetry.storage.InMemoryTelemetryStorage; import io.split.telemetry.storage.TelemetryRuntimeProducer; import io.split.telemetry.storage.TelemetryStorage; import io.split.engine.common.FetchOptions; -import io.split.engine.experiments.SplitChangeFetcher; -import io.split.engine.experiments.SplitFetcherImp; -import io.split.engine.experiments.SplitParser; import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java b/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java index a4e38a129..f4f977916 100644 --- a/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java +++ b/client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java @@ -2,7 +2,7 @@ import com.google.common.collect.Maps; import io.split.engine.SDKReadinessGates; -import io.split.cache.SegmentCache; +import io.split.storages.SegmentCache; import io.split.telemetry.storage.InMemoryTelemetryStorage; import io.split.telemetry.storage.TelemetryStorage; import org.junit.Assert; diff --git a/client/src/test/java/io/split/inputValidation/TrafficTypeValidatorTest.java b/client/src/test/java/io/split/inputValidation/TrafficTypeValidatorTest.java index 765e5666f..69919447f 100644 --- a/client/src/test/java/io/split/inputValidation/TrafficTypeValidatorTest.java +++ b/client/src/test/java/io/split/inputValidation/TrafficTypeValidatorTest.java @@ -1,6 +1,6 @@ package io.split.inputValidation; -import io.split.cache.SplitCache; +import io.split.storages.SplitCache; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; diff --git a/client/src/test/java/io/split/cache/InMemoryCacheTest.java b/client/src/test/java/io/split/storages/memory/InMemoryCacheTest.java similarity index 98% rename from client/src/test/java/io/split/cache/InMemoryCacheTest.java rename to client/src/test/java/io/split/storages/memory/InMemoryCacheTest.java index 23ea022f3..224e80f4d 100644 --- a/client/src/test/java/io/split/cache/InMemoryCacheTest.java +++ b/client/src/test/java/io/split/storages/memory/InMemoryCacheTest.java @@ -1,6 +1,7 @@ -package io.split.cache; +package io.split.storages.memory; import io.split.engine.experiments.ParsedSplit; +import io.split.storages.SplitCache; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/client/src/test/java/io/split/cache/SegmentCacheInMemoryImplTest.java b/client/src/test/java/io/split/storages/memory/SegmentCacheInMemoryImplTest.java similarity index 99% rename from client/src/test/java/io/split/cache/SegmentCacheInMemoryImplTest.java rename to client/src/test/java/io/split/storages/memory/SegmentCacheInMemoryImplTest.java index 1e5fcd4c3..e509a4573 100644 --- a/client/src/test/java/io/split/cache/SegmentCacheInMemoryImplTest.java +++ b/client/src/test/java/io/split/storages/memory/SegmentCacheInMemoryImplTest.java @@ -1,4 +1,4 @@ -package io.split.cache; +package io.split.storages.memory; import junit.framework.TestCase; import org.junit.Assert; diff --git a/client/src/test/java/io/split/telemetry/synchronizer/TelemetrySubmitterTest.java b/client/src/test/java/io/split/telemetry/synchronizer/TelemetrySubmitterTest.java index d4bb42d06..dcb809471 100644 --- a/client/src/test/java/io/split/telemetry/synchronizer/TelemetrySubmitterTest.java +++ b/client/src/test/java/io/split/telemetry/synchronizer/TelemetrySubmitterTest.java @@ -1,9 +1,9 @@ package io.split.telemetry.synchronizer; import io.split.TestHelper; -import io.split.cache.SegmentCache; -import io.split.cache.SegmentCacheInMemoryImpl; -import io.split.cache.SplitCache; +import io.split.storages.SegmentCache; +import io.split.storages.memory.SegmentCacheInMemoryImpl; +import io.split.storages.SplitCache; import io.split.client.ApiKeyCounter; import io.split.client.SplitClientConfig; import io.split.telemetry.domain.Config;