Skip to content

Commit 789f219

Browse files
sanzmaurosanzmauro
committed
rename and refactor
1 parent 9eb18e5 commit 789f219

File tree

18 files changed

+58
-63
lines changed

18 files changed

+58
-63
lines changed

‎client/src/main/java/io/split/engine/cache/InMemoryCacheImp.java‎ renamed to ‎client/src/main/java/io/split/cache/InMemoryCacheImp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.split.engine.cache;
1+
package io.split.cache;
22

33
import com.google.common.collect.ConcurrentHashMultiset;
44
import com.google.common.collect.Maps;

‎client/src/main/java/io/split/engine/cache/SplitCache.java‎ renamed to ‎client/src/main/java/io/split/cache/SplitCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.split.engine.cache;
1+
package io.split.cache;
22

33
import io.split.engine.experiments.ParsedSplit;
44

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.split.client.dtos.Event;
66
import io.split.client.impressions.Impression;
77
import io.split.client.impressions.ImpressionsManager;
8-
import io.split.engine.cache.SplitCache;
8+
import io.split.cache.SplitCache;
99
import io.split.engine.evaluator.Evaluator;
1010
import io.split.engine.SDKReadinessGates;
1111
import io.split.engine.evaluator.EvaluatorImp;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
import io.split.client.metrics.CachedMetrics;
1212
import io.split.client.metrics.FireAndForgetMetrics;
1313
import io.split.client.metrics.HttpMetrics;
14-
import io.split.engine.cache.InMemoryCacheImp;
15-
import io.split.engine.cache.SplitCache;
14+
import io.split.cache.InMemoryCacheImp;
15+
import io.split.cache.SplitCache;
1616
import io.split.engine.evaluator.Evaluator;
1717
import io.split.engine.evaluator.EvaluatorImp;
1818
import io.split.engine.SDKReadinessGates;
1919
import io.split.engine.common.SyncManager;
2020
import io.split.engine.common.SyncManagerImp;
21-
import io.split.engine.experiments.RefreshableSplitFetcher;
22-
import io.split.engine.experiments.RefreshableSplitFetcherTask;
21+
import io.split.engine.experiments.SplitFetcherImp;
22+
import io.split.engine.experiments.SplitSynchronizationTask;
2323
import io.split.engine.experiments.SplitChangeFetcher;
2424
import io.split.engine.experiments.SplitParser;
2525
import io.split.engine.segments.RefreshableSegmentFetcher;
@@ -202,8 +202,8 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
202202
SplitChangeFetcher splitChangeFetcher = HttpSplitChangeFetcher.create(httpclient, rootTarget, uncachedFireAndForget);
203203

204204
final SplitCache splitCache = new InMemoryCacheImp();
205-
final RefreshableSplitFetcher splitFetcher = new RefreshableSplitFetcher(splitChangeFetcher, splitParser, gates, splitCache);
206-
final RefreshableSplitFetcherTask splitFetcherTask = new RefreshableSplitFetcherTask(splitFetcher, splitCache, findPollingPeriod(RANDOM, config.featuresRefreshRate()));
205+
final SplitFetcherImp splitFetcher = new SplitFetcherImp(splitChangeFetcher, splitParser, gates, splitCache);
206+
final SplitSynchronizationTask splitSynchronizationTask = new SplitSynchronizationTask(splitFetcher, splitCache, findPollingPeriod(RANDOM, config.featuresRefreshRate()));
207207

208208
List<ImpressionListener> impressionListeners = new ArrayList<>();
209209
// Setup integrations
@@ -226,7 +226,7 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
226226
final EventClient eventClient = EventClientImpl.create(httpclient, eventsRootTarget, config.eventsQueueSize(), config.eventFlushIntervalInMillis(), config.waitBeforeShutdown());
227227

228228
// SyncManager
229-
final SyncManager syncManager = SyncManagerImp.build(config.streamingEnabled(), splitFetcherTask, splitFetcher, segmentFetcher, splitCache, config.authServiceURL(), httpclient, config.streamingServiceURL(), config.authRetryBackoffBase(), buildSSEdHttpClient(config));
229+
final SyncManager syncManager = SyncManagerImp.build(config.streamingEnabled(), splitSynchronizationTask, splitFetcher, segmentFetcher, splitCache, config.authServiceURL(), httpclient, config.streamingServiceURL(), config.authRetryBackoffBase(), buildSSEdHttpClient(config));
230230
syncManager.start();
231231

232232
// Evaluator
@@ -238,7 +238,7 @@ public void run() {
238238
try {
239239
segmentFetcher.close();
240240
_log.info("Successful shutdown of segment fetchers");
241-
splitFetcherTask.close();
241+
splitSynchronizationTask.close();
242242
_log.info("Successful shutdown of splits");
243243
impressionsManager.close();
244244
_log.info("Successful shutdown of impressions manager");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import io.split.client.api.SplitView;
55
import io.split.client.dtos.Partition;
66
import io.split.engine.SDKReadinessGates;
7-
import io.split.engine.cache.SplitCache;
7+
import io.split.cache.SplitCache;
88
import io.split.engine.experiments.ParsedCondition;
99
import io.split.engine.experiments.ParsedSplit;
1010
import org.slf4j.Logger;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.split.client.jmx;
22

33
import io.split.client.SplitClient;
4-
import io.split.engine.cache.SplitCache;
4+
import io.split.cache.SplitCache;
55
import io.split.engine.experiments.SplitFetcher;
66
import io.split.engine.segments.SegmentFetcher;
77
import org.slf4j.Logger;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.google.common.annotations.VisibleForTesting;
44
import com.google.common.util.concurrent.ThreadFactoryBuilder;
5-
import io.split.engine.cache.SplitCache;
6-
import io.split.engine.experiments.RefreshableSplitFetcher;
7-
import io.split.engine.experiments.RefreshableSplitFetcherTask;
5+
import io.split.cache.SplitCache;
6+
import io.split.engine.experiments.SplitFetcherImp;
7+
import io.split.engine.experiments.SplitSynchronizationTask;
88
import io.split.engine.segments.RefreshableSegmentFetcher;
99
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
1010
import org.slf4j.Logger;
@@ -46,8 +46,8 @@ public class SyncManagerImp implements SyncManager {
4646
}
4747

4848
public static SyncManagerImp build(boolean streamingEnabledConfig,
49-
RefreshableSplitFetcherTask refreshableSplitFetcherTask,
50-
RefreshableSplitFetcher splitFetcher,
49+
SplitSynchronizationTask splitSynchronizationTask,
50+
SplitFetcherImp splitFetcher,
5151
RefreshableSegmentFetcher segmentFetcher,
5252
SplitCache splitCache,
5353
String authUrl,
@@ -56,7 +56,7 @@ public static SyncManagerImp build(boolean streamingEnabledConfig,
5656
int authRetryBackOffBase,
5757
CloseableHttpClient sseHttpClient) {
5858
LinkedBlockingQueue<PushManager.Status> pushMessages = new LinkedBlockingQueue<>();
59-
Synchronizer synchronizer = new SynchronizerImp(refreshableSplitFetcherTask, splitFetcher, segmentFetcher, splitCache);
59+
Synchronizer synchronizer = new SynchronizerImp(splitSynchronizationTask, splitFetcher, segmentFetcher, splitCache);
6060
PushManager pushManager = PushManagerImp.build(synchronizer, streamingServiceUrl, authUrl, httpClient, authRetryBackOffBase, pushMessages, sseHttpClient);
6161
return new SyncManagerImp(streamingEnabledConfig, synchronizer, pushManager, pushMessages);
6262
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.google.common.util.concurrent.ThreadFactoryBuilder;
44

5-
import io.split.engine.cache.SplitCache;
6-
import io.split.engine.experiments.RefreshableSplitFetcher;
7-
import io.split.engine.experiments.RefreshableSplitFetcherTask;
5+
import io.split.cache.SplitCache;
6+
import io.split.engine.experiments.SplitFetcherImp;
7+
import io.split.engine.experiments.SplitSynchronizationTask;
88
import io.split.engine.segments.RefreshableSegmentFetcher;
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
@@ -19,17 +19,17 @@
1919
public class SynchronizerImp implements Synchronizer {
2020
private static final Logger _log = LoggerFactory.getLogger(Synchronizer.class);
2121

22-
private final RefreshableSplitFetcherTask _refreshableSplitFetcherTask;
23-
private final RefreshableSplitFetcher _splitFetcher;
22+
private final SplitSynchronizationTask _splitSynchronizationTask;
23+
private final SplitFetcherImp _splitFetcher;
2424
private final RefreshableSegmentFetcher _segmentFetcher;
2525
private final ScheduledExecutorService _syncAllScheduledExecutorService;
2626
private final SplitCache _splitCache;
2727

28-
public SynchronizerImp(RefreshableSplitFetcherTask refreshableSplitTask,
29-
RefreshableSplitFetcher splitFetcher,
28+
public SynchronizerImp(SplitSynchronizationTask splitSynchronizationTask,
29+
SplitFetcherImp splitFetcher,
3030
RefreshableSegmentFetcher segmentFetcher,
3131
SplitCache splitCache) {
32-
_refreshableSplitFetcherTask = checkNotNull(refreshableSplitTask);
32+
_splitSynchronizationTask = checkNotNull(splitSynchronizationTask);
3333
_splitFetcher = checkNotNull(splitFetcher);
3434
_segmentFetcher = checkNotNull(segmentFetcher);
3535
_splitCache = checkNotNull(splitCache);
@@ -52,14 +52,14 @@ public void syncAll() {
5252
@Override
5353
public void startPeriodicFetching() {
5454
_log.debug("Starting Periodic Fetching ...");
55-
_refreshableSplitFetcherTask.startPeriodicFetching();
55+
_splitSynchronizationTask.startPeriodicFetching();
5656
_segmentFetcher.startPeriodicFetching();
5757
}
5858

5959
@Override
6060
public void stopPeriodicFetching() {
6161
_log.debug("Stop Periodic Fetching ...");
62-
_refreshableSplitFetcherTask.stop();
62+
_splitSynchronizationTask.stop();
6363
_segmentFetcher.stop();
6464
}
6565

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import io.split.client.dtos.ConditionType;
44
import io.split.client.exceptions.ChangeNumberExceptionWrapper;
55
import io.split.engine.SDKReadinessGates;
6-
import io.split.engine.cache.SplitCache;
6+
import io.split.cache.SplitCache;
77
import io.split.engine.experiments.ParsedCondition;
88
import io.split.engine.experiments.ParsedSplit;
9-
import io.split.engine.experiments.SplitFetcher;
109
import io.split.engine.splitter.Splitter;
1110
import io.split.grammar.Treatments;
1211
import org.slf4j.Logger;

‎client/src/main/java/io/split/engine/experiments/RefreshableSplitFetcher.java‎ renamed to ‎client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import io.split.client.dtos.SplitChange;
55
import io.split.client.dtos.Status;
66
import io.split.engine.SDKReadinessGates;
7-
import io.split.engine.cache.SplitCache;
7+
import io.split.cache.SplitCache;
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
1010

@@ -15,9 +15,9 @@
1515
*
1616
* @author adil
1717
*/
18-
public class RefreshableSplitFetcher implements SplitFetcher, Runnable {
18+
public class SplitFetcherImp implements SplitFetcher, Runnable {
1919

20-
private static final Logger _log = LoggerFactory.getLogger(RefreshableSplitFetcher.class);
20+
private static final Logger _log = LoggerFactory.getLogger(SplitFetcherImp.class);
2121

2222
private final SplitParser _parser;
2323
private final SplitChangeFetcher _splitChangeFetcher;
@@ -35,7 +35,7 @@ public class RefreshableSplitFetcher implements SplitFetcher, Runnable {
3535
* an ARCHIVED split is received, we know if we need to remove a traffic type from the multiset.
3636
*/
3737

38-
public RefreshableSplitFetcher(SplitChangeFetcher splitChangeFetcher, SplitParser parser, SDKReadinessGates gates, SplitCache splitCache) {
38+
public SplitFetcherImp(SplitChangeFetcher splitChangeFetcher, SplitParser parser, SDKReadinessGates gates, SplitCache splitCache) {
3939
_splitChangeFetcher = checkNotNull(splitChangeFetcher);
4040
_parser = checkNotNull(parser);
4141
_gates = checkNotNull(gates);

0 commit comments

Comments
 (0)