From b698c90442cd2af627a9f3e44864f6db87c2d1cd Mon Sep 17 00:00:00 2001 From: Mauro Sanz Date: Tue, 15 Dec 2020 16:15:38 -0300 Subject: [PATCH] rename and refactor --- .../{engine => }/cache/InMemoryCacheImp.java | 2 +- .../split/{engine => }/cache/SplitCache.java | 2 +- .../java/io/split/client/SplitClientImpl.java | 2 +- .../io/split/client/SplitFactoryImpl.java | 16 +++++++-------- .../io/split/client/SplitManagerImpl.java | 2 +- .../io/split/client/jmx/SplitJmxMonitor.java | 2 +- .../split/engine/common/SyncManagerImp.java | 12 +++++------ .../split/engine/common/SynchronizerImp.java | 20 +++++++++---------- .../split/engine/evaluator/EvaluatorImp.java | 2 +- ...SplitFetcher.java => SplitFetcherImp.java} | 8 ++++---- ...ask.java => SplitSynchronizationTask.java} | 10 +++++----- .../{engine => }/cache/InMemoryCacheTest.java | 2 +- .../io/split/client/SplitClientImplTest.java | 6 ++---- .../io/split/client/SplitManagerImplTest.java | 4 +--- .../split/engine/common/SynchronizerTest.java | 14 ++++++------- .../split/engine/evaluator/EvaluatorTest.java | 2 +- .../RefreshableSplitFetcherTest.java | 12 +++++------ client/src/test/resources/log4j.properties | 2 +- 18 files changed, 58 insertions(+), 62 deletions(-) rename client/src/main/java/io/split/{engine => }/cache/InMemoryCacheImp.java (99%) rename client/src/main/java/io/split/{engine => }/cache/SplitCache.java (94%) rename client/src/main/java/io/split/engine/experiments/{RefreshableSplitFetcher.java => SplitFetcherImp.java} (94%) rename client/src/main/java/io/split/engine/experiments/{RefreshableSplitFetcherTask.java => SplitSynchronizationTask.java} (88%) rename client/src/test/java/io/split/{engine => }/cache/InMemoryCacheTest.java (99%) diff --git a/client/src/main/java/io/split/engine/cache/InMemoryCacheImp.java b/client/src/main/java/io/split/cache/InMemoryCacheImp.java similarity index 99% rename from client/src/main/java/io/split/engine/cache/InMemoryCacheImp.java rename to client/src/main/java/io/split/cache/InMemoryCacheImp.java index 003a3d1bb..decc31d25 100644 --- a/client/src/main/java/io/split/engine/cache/InMemoryCacheImp.java +++ b/client/src/main/java/io/split/cache/InMemoryCacheImp.java @@ -1,4 +1,4 @@ -package io.split.engine.cache; +package io.split.cache; import com.google.common.collect.ConcurrentHashMultiset; import com.google.common.collect.Maps; diff --git a/client/src/main/java/io/split/engine/cache/SplitCache.java b/client/src/main/java/io/split/cache/SplitCache.java similarity index 94% rename from client/src/main/java/io/split/engine/cache/SplitCache.java rename to client/src/main/java/io/split/cache/SplitCache.java index f79f27878..c9769d176 100644 --- a/client/src/main/java/io/split/engine/cache/SplitCache.java +++ b/client/src/main/java/io/split/cache/SplitCache.java @@ -1,4 +1,4 @@ -package io.split.engine.cache; +package io.split.cache; import io.split.engine.experiments.ParsedSplit; diff --git a/client/src/main/java/io/split/client/SplitClientImpl.java b/client/src/main/java/io/split/client/SplitClientImpl.java index 6807d5fdb..4937123dd 100644 --- a/client/src/main/java/io/split/client/SplitClientImpl.java +++ b/client/src/main/java/io/split/client/SplitClientImpl.java @@ -5,7 +5,7 @@ import io.split.client.dtos.Event; import io.split.client.impressions.Impression; import io.split.client.impressions.ImpressionsManager; -import io.split.engine.cache.SplitCache; +import io.split.cache.SplitCache; import io.split.engine.evaluator.Evaluator; import io.split.engine.SDKReadinessGates; import io.split.engine.evaluator.EvaluatorImp; diff --git a/client/src/main/java/io/split/client/SplitFactoryImpl.java b/client/src/main/java/io/split/client/SplitFactoryImpl.java index 229ae2c7a..3c0692af9 100644 --- a/client/src/main/java/io/split/client/SplitFactoryImpl.java +++ b/client/src/main/java/io/split/client/SplitFactoryImpl.java @@ -11,15 +11,15 @@ import io.split.client.metrics.CachedMetrics; import io.split.client.metrics.FireAndForgetMetrics; import io.split.client.metrics.HttpMetrics; -import io.split.engine.cache.InMemoryCacheImp; -import io.split.engine.cache.SplitCache; +import io.split.cache.InMemoryCacheImp; +import io.split.cache.SplitCache; import io.split.engine.evaluator.Evaluator; import io.split.engine.evaluator.EvaluatorImp; import io.split.engine.SDKReadinessGates; import io.split.engine.common.SyncManager; import io.split.engine.common.SyncManagerImp; -import io.split.engine.experiments.RefreshableSplitFetcher; -import io.split.engine.experiments.RefreshableSplitFetcherTask; +import io.split.engine.experiments.SplitFetcherImp; +import io.split.engine.experiments.SplitSynchronizationTask; import io.split.engine.experiments.SplitChangeFetcher; import io.split.engine.experiments.SplitParser; import io.split.engine.segments.RefreshableSegmentFetcher; @@ -202,8 +202,8 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn SplitChangeFetcher splitChangeFetcher = HttpSplitChangeFetcher.create(httpclient, rootTarget, uncachedFireAndForget); final SplitCache splitCache = new InMemoryCacheImp(); - final RefreshableSplitFetcher splitFetcher = new RefreshableSplitFetcher(splitChangeFetcher, splitParser, gates, splitCache); - final RefreshableSplitFetcherTask splitFetcherTask = new RefreshableSplitFetcherTask(splitFetcher, splitCache, findPollingPeriod(RANDOM, config.featuresRefreshRate())); + final SplitFetcherImp splitFetcher = new SplitFetcherImp(splitChangeFetcher, splitParser, gates, splitCache); + final SplitSynchronizationTask splitSynchronizationTask = new SplitSynchronizationTask(splitFetcher, splitCache, findPollingPeriod(RANDOM, config.featuresRefreshRate())); List impressionListeners = new ArrayList<>(); // Setup integrations @@ -226,7 +226,7 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn final EventClient eventClient = EventClientImpl.create(httpclient, eventsRootTarget, config.eventsQueueSize(), config.eventFlushIntervalInMillis(), config.waitBeforeShutdown()); // SyncManager - final SyncManager syncManager = SyncManagerImp.build(config.streamingEnabled(), splitFetcherTask, splitFetcher, segmentFetcher, splitCache, config.authServiceURL(), httpclient, config.streamingServiceURL(), config.authRetryBackoffBase(), buildSSEdHttpClient(config)); + final SyncManager syncManager = SyncManagerImp.build(config.streamingEnabled(), splitSynchronizationTask, splitFetcher, segmentFetcher, splitCache, config.authServiceURL(), httpclient, config.streamingServiceURL(), config.authRetryBackoffBase(), buildSSEdHttpClient(config)); syncManager.start(); // Evaluator @@ -238,7 +238,7 @@ public void run() { try { segmentFetcher.close(); _log.info("Successful shutdown of segment fetchers"); - splitFetcherTask.close(); + splitSynchronizationTask.close(); _log.info("Successful shutdown of splits"); impressionsManager.close(); _log.info("Successful shutdown of impressions manager"); diff --git a/client/src/main/java/io/split/client/SplitManagerImpl.java b/client/src/main/java/io/split/client/SplitManagerImpl.java index 32128efe8..24f43a926 100644 --- a/client/src/main/java/io/split/client/SplitManagerImpl.java +++ b/client/src/main/java/io/split/client/SplitManagerImpl.java @@ -4,7 +4,7 @@ import io.split.client.api.SplitView; import io.split.client.dtos.Partition; import io.split.engine.SDKReadinessGates; -import io.split.engine.cache.SplitCache; +import io.split.cache.SplitCache; import io.split.engine.experiments.ParsedCondition; import io.split.engine.experiments.ParsedSplit; import org.slf4j.Logger; 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 b5bff41d8..d44a298e7 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.client.SplitClient; -import io.split.engine.cache.SplitCache; +import io.split.cache.SplitCache; import io.split.engine.experiments.SplitFetcher; import io.split.engine.segments.SegmentFetcher; import org.slf4j.Logger; 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 1576cce80..2f261a883 100644 --- a/client/src/main/java/io/split/engine/common/SyncManagerImp.java +++ b/client/src/main/java/io/split/engine/common/SyncManagerImp.java @@ -2,9 +2,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.split.engine.cache.SplitCache; -import io.split.engine.experiments.RefreshableSplitFetcher; -import io.split.engine.experiments.RefreshableSplitFetcherTask; +import io.split.cache.SplitCache; +import io.split.engine.experiments.SplitFetcherImp; +import io.split.engine.experiments.SplitSynchronizationTask; import io.split.engine.segments.RefreshableSegmentFetcher; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.slf4j.Logger; @@ -46,8 +46,8 @@ public class SyncManagerImp implements SyncManager { } public static SyncManagerImp build(boolean streamingEnabledConfig, - RefreshableSplitFetcherTask refreshableSplitFetcherTask, - RefreshableSplitFetcher splitFetcher, + SplitSynchronizationTask splitSynchronizationTask, + SplitFetcherImp splitFetcher, RefreshableSegmentFetcher segmentFetcher, SplitCache splitCache, String authUrl, @@ -56,7 +56,7 @@ public static SyncManagerImp build(boolean streamingEnabledConfig, int authRetryBackOffBase, CloseableHttpClient sseHttpClient) { LinkedBlockingQueue pushMessages = new LinkedBlockingQueue<>(); - Synchronizer synchronizer = new SynchronizerImp(refreshableSplitFetcherTask, splitFetcher, segmentFetcher, splitCache); + Synchronizer synchronizer = new SynchronizerImp(splitSynchronizationTask, splitFetcher, segmentFetcher, splitCache); PushManager pushManager = PushManagerImp.build(synchronizer, streamingServiceUrl, authUrl, httpClient, authRetryBackOffBase, pushMessages, sseHttpClient); return new SyncManagerImp(streamingEnabledConfig, synchronizer, pushManager, pushMessages); } 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 fedcbc4f2..94b0f638b 100644 --- a/client/src/main/java/io/split/engine/common/SynchronizerImp.java +++ b/client/src/main/java/io/split/engine/common/SynchronizerImp.java @@ -2,9 +2,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.split.engine.cache.SplitCache; -import io.split.engine.experiments.RefreshableSplitFetcher; -import io.split.engine.experiments.RefreshableSplitFetcherTask; +import io.split.cache.SplitCache; +import io.split.engine.experiments.SplitFetcherImp; +import io.split.engine.experiments.SplitSynchronizationTask; import io.split.engine.segments.RefreshableSegmentFetcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,17 +19,17 @@ public class SynchronizerImp implements Synchronizer { private static final Logger _log = LoggerFactory.getLogger(Synchronizer.class); - private final RefreshableSplitFetcherTask _refreshableSplitFetcherTask; - private final RefreshableSplitFetcher _splitFetcher; + private final SplitSynchronizationTask _splitSynchronizationTask; + private final SplitFetcherImp _splitFetcher; private final RefreshableSegmentFetcher _segmentFetcher; private final ScheduledExecutorService _syncAllScheduledExecutorService; private final SplitCache _splitCache; - public SynchronizerImp(RefreshableSplitFetcherTask refreshableSplitTask, - RefreshableSplitFetcher splitFetcher, + public SynchronizerImp(SplitSynchronizationTask splitSynchronizationTask, + SplitFetcherImp splitFetcher, RefreshableSegmentFetcher segmentFetcher, SplitCache splitCache) { - _refreshableSplitFetcherTask = checkNotNull(refreshableSplitTask); + _splitSynchronizationTask = checkNotNull(splitSynchronizationTask); _splitFetcher = checkNotNull(splitFetcher); _segmentFetcher = checkNotNull(segmentFetcher); _splitCache = checkNotNull(splitCache); @@ -52,14 +52,14 @@ public void syncAll() { @Override public void startPeriodicFetching() { _log.debug("Starting Periodic Fetching ..."); - _refreshableSplitFetcherTask.startPeriodicFetching(); + _splitSynchronizationTask.startPeriodicFetching(); _segmentFetcher.startPeriodicFetching(); } @Override public void stopPeriodicFetching() { _log.debug("Stop Periodic Fetching ..."); - _refreshableSplitFetcherTask.stop(); + _splitSynchronizationTask.stop(); _segmentFetcher.stop(); } 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 df431acb8..7f974fc94 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.engine.cache.SplitCache; +import io.split.cache.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/RefreshableSplitFetcher.java b/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java similarity index 94% rename from client/src/main/java/io/split/engine/experiments/RefreshableSplitFetcher.java rename to client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java index df696ec47..b62df6b50 100644 --- a/client/src/main/java/io/split/engine/experiments/RefreshableSplitFetcher.java +++ b/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java @@ -4,7 +4,7 @@ import io.split.client.dtos.SplitChange; import io.split.client.dtos.Status; import io.split.engine.SDKReadinessGates; -import io.split.engine.cache.SplitCache; +import io.split.cache.SplitCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,9 +15,9 @@ * * @author adil */ -public class RefreshableSplitFetcher implements SplitFetcher, Runnable { +public class SplitFetcherImp implements SplitFetcher, Runnable { - private static final Logger _log = LoggerFactory.getLogger(RefreshableSplitFetcher.class); + private static final Logger _log = LoggerFactory.getLogger(SplitFetcherImp.class); private final SplitParser _parser; private final SplitChangeFetcher _splitChangeFetcher; @@ -35,7 +35,7 @@ public class RefreshableSplitFetcher implements SplitFetcher, Runnable { * an ARCHIVED split is received, we know if we need to remove a traffic type from the multiset. */ - public RefreshableSplitFetcher(SplitChangeFetcher splitChangeFetcher, SplitParser parser, SDKReadinessGates gates, SplitCache splitCache) { + public SplitFetcherImp(SplitChangeFetcher splitChangeFetcher, SplitParser parser, SDKReadinessGates gates, SplitCache splitCache) { _splitChangeFetcher = checkNotNull(splitChangeFetcher); _parser = checkNotNull(parser); _gates = checkNotNull(gates); diff --git a/client/src/main/java/io/split/engine/experiments/RefreshableSplitFetcherTask.java b/client/src/main/java/io/split/engine/experiments/SplitSynchronizationTask.java similarity index 88% rename from client/src/main/java/io/split/engine/experiments/RefreshableSplitFetcherTask.java rename to client/src/main/java/io/split/engine/experiments/SplitSynchronizationTask.java index 9e60cdd31..3e968c74a 100644 --- a/client/src/main/java/io/split/engine/experiments/RefreshableSplitFetcherTask.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.engine.cache.SplitCache; +import io.split.cache.SplitCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,10 +24,10 @@ * * @author adil */ -public class RefreshableSplitFetcherTask implements Closeable { - private static final Logger _log = LoggerFactory.getLogger(RefreshableSplitFetcherTask.class); +public class SplitSynchronizationTask implements Closeable { + private static final Logger _log = LoggerFactory.getLogger(SplitSynchronizationTask.class); - private final AtomicReference _splitFetcher = new AtomicReference(); + private final AtomicReference _splitFetcher = new AtomicReference(); private final AtomicReference _splitCache = new AtomicReference(); private final AtomicReference _executorService = new AtomicReference<>(); private final AtomicLong _refreshEveryNSeconds; @@ -36,7 +36,7 @@ public class RefreshableSplitFetcherTask implements Closeable { private ScheduledFuture _scheduledFuture; - public RefreshableSplitFetcherTask(RefreshableSplitFetcher splitFetcher, SplitCache splitCache, long refreshEveryNSeconds) { + public SplitSynchronizationTask(SplitFetcherImp splitFetcher, SplitCache splitCache, long refreshEveryNSeconds) { _splitFetcher.set(checkNotNull(splitFetcher)); _splitCache.set(checkNotNull(splitCache)); checkArgument(refreshEveryNSeconds >= 0L); diff --git a/client/src/test/java/io/split/engine/cache/InMemoryCacheTest.java b/client/src/test/java/io/split/cache/InMemoryCacheTest.java similarity index 99% rename from client/src/test/java/io/split/engine/cache/InMemoryCacheTest.java rename to client/src/test/java/io/split/cache/InMemoryCacheTest.java index 1a3b627c0..23ea022f3 100644 --- a/client/src/test/java/io/split/engine/cache/InMemoryCacheTest.java +++ b/client/src/test/java/io/split/cache/InMemoryCacheTest.java @@ -1,4 +1,4 @@ -package io.split.engine.cache; +package io.split.cache; import io.split.engine.experiments.ParsedSplit; import org.junit.Assert; diff --git a/client/src/test/java/io/split/client/SplitClientImplTest.java b/client/src/test/java/io/split/client/SplitClientImplTest.java index 4dffea065..c43f4b33b 100644 --- a/client/src/test/java/io/split/client/SplitClientImplTest.java +++ b/client/src/test/java/io/split/client/SplitClientImplTest.java @@ -10,14 +10,12 @@ import io.split.client.dtos.Partition; import io.split.client.impressions.Impression; import io.split.client.impressions.ImpressionsManager; -import io.split.engine.cache.InMemoryCacheImp; -import io.split.engine.cache.SplitCache; -import io.split.engine.evaluator.Evaluator; +import io.split.cache.InMemoryCacheImp; +import io.split.cache.SplitCache; import io.split.engine.evaluator.EvaluatorImp; import io.split.engine.SDKReadinessGates; import io.split.engine.experiments.ParsedCondition; import io.split.engine.experiments.ParsedSplit; -import io.split.engine.experiments.SplitFetcher; import io.split.engine.matchers.AllKeysMatcher; import io.split.engine.matchers.CombiningMatcher; import io.split.engine.matchers.DependencyMatcher; diff --git a/client/src/test/java/io/split/client/SplitManagerImplTest.java b/client/src/test/java/io/split/client/SplitManagerImplTest.java index 0ff31ebb7..7ef068ac9 100644 --- a/client/src/test/java/io/split/client/SplitManagerImplTest.java +++ b/client/src/test/java/io/split/client/SplitManagerImplTest.java @@ -2,13 +2,11 @@ import com.google.common.collect.Lists; import io.split.client.api.SplitView; -import io.split.client.dtos.Split; import io.split.engine.ConditionsTestUtil; import io.split.engine.SDKReadinessGates; -import io.split.engine.cache.SplitCache; +import io.split.cache.SplitCache; import io.split.engine.experiments.ParsedCondition; import io.split.engine.experiments.ParsedSplit; -import io.split.engine.experiments.SplitFetcher; import io.split.engine.matchers.AllKeysMatcher; import io.split.engine.matchers.CombiningMatcher; import io.split.grammar.Treatments; 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 67ab63f53..9734f9095 100644 --- a/client/src/test/java/io/split/engine/common/SynchronizerTest.java +++ b/client/src/test/java/io/split/engine/common/SynchronizerTest.java @@ -1,25 +1,25 @@ package io.split.engine.common; -import io.split.engine.cache.SplitCache; -import io.split.engine.experiments.RefreshableSplitFetcher; -import io.split.engine.experiments.RefreshableSplitFetcherTask; +import io.split.cache.SplitCache; +import io.split.engine.experiments.SplitFetcherImp; +import io.split.engine.experiments.SplitSynchronizationTask; import io.split.engine.segments.RefreshableSegmentFetcher; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; public class SynchronizerTest { - private RefreshableSplitFetcherTask _refreshableSplitFetcherTask; + private SplitSynchronizationTask _refreshableSplitFetcherTask; private RefreshableSegmentFetcher _segmentFetcher; - private RefreshableSplitFetcher _splitFetcher; + private SplitFetcherImp _splitFetcher; private SplitCache _splitCache; private Synchronizer _synchronizer; @Before public void beforeMethod() { - _refreshableSplitFetcherTask = Mockito.mock(RefreshableSplitFetcherTask.class); + _refreshableSplitFetcherTask = Mockito.mock(SplitSynchronizationTask.class); _segmentFetcher = Mockito.mock(RefreshableSegmentFetcher.class); - _splitFetcher = Mockito.mock(RefreshableSplitFetcher.class); + _splitFetcher = Mockito.mock(SplitFetcherImp.class); _splitCache = Mockito.mock(SplitCache.class); _synchronizer = new SynchronizerImp(_refreshableSplitFetcherTask, _splitFetcher, _segmentFetcher, _splitCache); 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 c8b0b7229..10d4cf038 100644 --- a/client/src/test/java/io/split/engine/evaluator/EvaluatorTest.java +++ b/client/src/test/java/io/split/engine/evaluator/EvaluatorTest.java @@ -3,7 +3,7 @@ import io.split.client.dtos.ConditionType; import io.split.client.dtos.Partition; import io.split.engine.SDKReadinessGates; -import io.split.engine.cache.SplitCache; +import io.split.cache.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/RefreshableSplitFetcherTest.java b/client/src/test/java/io/split/engine/experiments/RefreshableSplitFetcherTest.java index a29f753e2..a1b4c9c6c 100644 --- a/client/src/test/java/io/split/engine/experiments/RefreshableSplitFetcherTest.java +++ b/client/src/test/java/io/split/engine/experiments/RefreshableSplitFetcherTest.java @@ -9,8 +9,8 @@ import io.split.client.dtos.Status; import io.split.engine.ConditionsTestUtil; import io.split.engine.SDKReadinessGates; -import io.split.engine.cache.InMemoryCacheImp; -import io.split.engine.cache.SplitCache; +import io.split.cache.InMemoryCacheImp; +import io.split.cache.SplitCache; import io.split.engine.matchers.AllKeysMatcher; import io.split.engine.matchers.CombiningMatcher; import io.split.engine.segments.NoChangeSegmentChangeFetcher; @@ -61,7 +61,7 @@ private void works(long startingChangeNumber) throws InterruptedException { SDKReadinessGates gates = new SDKReadinessGates(); SplitCache cache = new InMemoryCacheImp(startingChangeNumber); - RefreshableSplitFetcher fetcher = new RefreshableSplitFetcher(splitChangeFetcher, new SplitParser(segmentFetcher), gates, cache); + SplitFetcherImp fetcher = new SplitFetcherImp(splitChangeFetcher, new SplitParser(segmentFetcher), gates, cache); // execute the fetcher for a little bit. executeWaitAndTerminate(fetcher, 1, 3, TimeUnit.SECONDS); @@ -131,7 +131,7 @@ public void when_parser_fails_we_remove_the_experiment() throws InterruptedExcep when(splitChangeFetcher.fetch(1L)).thenReturn(noReturn); SplitCache cache = new InMemoryCacheImp(-1); - RefreshableSplitFetcher fetcher = new RefreshableSplitFetcher(splitChangeFetcher, new SplitParser(segmentFetcher), new SDKReadinessGates(), cache); + SplitFetcherImp fetcher = new SplitFetcherImp(splitChangeFetcher, new SplitParser(segmentFetcher), new SDKReadinessGates(), cache); // execute the fetcher for a little bit. executeWaitAndTerminate(fetcher, 1, 5, TimeUnit.SECONDS); @@ -150,7 +150,7 @@ public void if_there_is_a_problem_talking_to_split_change_count_down_latch_is_no SplitChangeFetcher splitChangeFetcher = mock(SplitChangeFetcher.class); when(splitChangeFetcher.fetch(-1L)).thenThrow(new RuntimeException()); - RefreshableSplitFetcher fetcher = new RefreshableSplitFetcher(splitChangeFetcher, new SplitParser(segmentFetcher), gates, cache); + SplitFetcherImp fetcher = new SplitFetcherImp(splitChangeFetcher, new SplitParser(segmentFetcher), gates, cache); // execute the fetcher for a little bit. executeWaitAndTerminate(fetcher, 1, 5, TimeUnit.SECONDS); @@ -189,7 +189,7 @@ public void works_with_user_defined_segments() throws Exception { SegmentChangeFetcher segmentChangeFetcher = new NoChangeSegmentChangeFetcher(); SegmentFetcher segmentFetcher = new RefreshableSegmentFetcher(segmentChangeFetcher, 1,10, gates); segmentFetcher.startPeriodicFetching(); - RefreshableSplitFetcher fetcher = new RefreshableSplitFetcher(experimentChangeFetcher, new SplitParser(segmentFetcher), gates, cache); + SplitFetcherImp fetcher = new SplitFetcherImp(experimentChangeFetcher, new SplitParser(segmentFetcher), gates, cache); // execute the fetcher for a little bit. executeWaitAndTerminate(fetcher, 1, 5, TimeUnit.SECONDS); diff --git a/client/src/test/resources/log4j.properties b/client/src/test/resources/log4j.properties index 0acac71c6..27f2cc155 100644 --- a/client/src/test/resources/log4j.properties +++ b/client/src/test/resources/log4j.properties @@ -14,4 +14,4 @@ log4j.logger.io.split.engine.SDKReadinessGates=WARN #log4j.logger.split.org.apache.http=info #log4j.logger.org.apache.http=info #log4j.logger.split.org.apache.http.wire=info -#log4j.logger.io.split.engine.experiments.RefreshableSplitFetcher=debug \ No newline at end of file +#log4j.logger.io.split.engine.experiments.SplitFetcherImp=debug \ No newline at end of file