Skip to content

Updated Factory #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2025
Merged

Updated Factory #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client/src/main/java/io/split/client/SplitFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
_telemetrySyncTask = new TelemetrySyncTask(config.getTelemetryRefreshRate(), _telemetrySynchronizer,
config.getThreadFactory());

FallbackTreatmentCalculatorImp fallbackTreatmentCalculatorImp = new FallbackTreatmentCalculatorImp(null);
FallbackTreatmentCalculatorImp fallbackTreatmentCalculatorImp = new FallbackTreatmentCalculatorImp(config.fallbackTreatments());
// Evaluator
_evaluator = new EvaluatorImp(splitCache, segmentCache, ruleBasedSegmentCache, fallbackTreatmentCalculatorImp);

Expand Down Expand Up @@ -352,7 +352,7 @@ protected SplitFactoryImpl(String apiToken, SplitClientConfig config, CustomStor
_telemetrySynchronizer = new TelemetryConsumerSubmitter(customStorageWrapper, _sdkMetadata);
UserCustomRuleBasedSegmentAdapterConsumer userCustomRuleBasedSegmentAdapterConsumer =
new UserCustomRuleBasedSegmentAdapterConsumer(customStorageWrapper);
FallbackTreatmentCalculatorImp fallbackTreatmentCalculatorImp = new FallbackTreatmentCalculatorImp(null);
FallbackTreatmentCalculatorImp fallbackTreatmentCalculatorImp = new FallbackTreatmentCalculatorImp(config.fallbackTreatments());
_evaluator = new EvaluatorImp(userCustomSplitAdapterConsumer, userCustomSegmentAdapterConsumer,
userCustomRuleBasedSegmentAdapterConsumer, fallbackTreatmentCalculatorImp);
_impressionsSender = PluggableImpressionSender.create(customStorageWrapper);
Expand Down Expand Up @@ -453,7 +453,7 @@ protected SplitFactoryImpl(SplitClientConfig config) {
SplitTasks splitTasks = SplitTasks.build(_splitSynchronizationTask, _segmentSynchronizationTaskImp,
_impressionsManager, null, null, null);

FallbackTreatmentCalculatorImp fallbackTreatmentCalculatorImp = new FallbackTreatmentCalculatorImp(null);
FallbackTreatmentCalculatorImp fallbackTreatmentCalculatorImp = new FallbackTreatmentCalculatorImp(config.fallbackTreatments());
// Evaluator
_evaluator = new EvaluatorImp(splitCache, segmentCache, ruleBasedSegmentCache, fallbackTreatmentCalculatorImp);

Expand Down
218 changes: 218 additions & 0 deletions client/src/test/java/io/split/client/SplitClientIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import io.split.SplitMockServer;
import io.split.client.api.SplitView;
import io.split.client.dtos.EvaluationOptions;
import io.split.client.dtos.FallbackTreatment;
import io.split.client.dtos.FallbackTreatmentsConfiguration;
import io.split.client.impressions.ImpressionsManager;
import io.split.client.utils.CustomDispatcher;
import io.split.storages.enums.OperationMode;
Expand Down Expand Up @@ -1175,6 +1177,222 @@ public MockResponse dispatch(RecordedRequest request) {
splitServer.shutdown();
}

@Test
public void FallbackTreatmentGlobalAndByFlagTest() throws Exception {
String splits = new String(Files.readAllBytes(Paths.get("src/test/resources/splits_imp_toggle.json")), StandardCharsets.UTF_8);
List<RecordedRequest> allRequests = new ArrayList<>();
Dispatcher dispatcher = new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest request) {
allRequests.add(request);
switch (request.getPath()) {
case "/api/splitChanges?s=1.3&since=-1&rbSince=-1":
return new MockResponse().setResponseCode(200).setBody(splits);
case "/api/splitChanges?s=1.3&since=1602796638344&rbSince=-1":
return new MockResponse().setResponseCode(200).setBody("{\"ff\":{\"d\":[], \"s\":1602796638344, \"t\":1602796638344}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}");
case "/api/testImpressions/bulk":
return new MockResponse().setResponseCode(200);
case "/api/testImpressions/count":
return new MockResponse().setResponseCode(200);
case "/v1/keys/ss":
return new MockResponse().setResponseCode(200);
case "/v1/metrics/usage":
return new MockResponse().setResponseCode(200);
case "/v1/metrics/config":
return new MockResponse().setResponseCode(200);
}
return new MockResponse().setResponseCode(404);
}
};

MockWebServer server = new MockWebServer();
server.setDispatcher(dispatcher);

server.start();
String serverURL = String.format("http://%s:%s", server.getHostName(), server.getPort());
FallbackTreatmentsConfiguration fallbackTreatmentsConfiguration = new FallbackTreatmentsConfiguration(new FallbackTreatment("on-fallback", "{\"prop1\", \"val1\"}"),
new HashMap<String, FallbackTreatment>() {{ put("feature", new FallbackTreatment("off-fallback", "{\"prop2\", \"val2\"}")); }});

SplitClientConfig config = SplitClientConfig.builder()
.setBlockUntilReadyTimeout(10000)
.endpoint(serverURL, serverURL)
.telemetryURL(serverURL + "/v1")
.authServiceURL(String.format("%s/api/auth/enabled", serverURL))
.streamingEnabled(false)
.featuresRefreshRate(5)
.impressionsMode(ImpressionsManager.Mode.DEBUG)
.fallbackTreatments(fallbackTreatmentsConfiguration)
.build();

SplitFactory factory = SplitFactoryBuilder.build("fake-api-token", config);
SplitClient client = factory.client();
client.blockUntilReady();

Assert.assertEquals("off", client.getTreatment("user1", "without_impression_toggle"));
Assert.assertEquals("off-fallback", client.getTreatmentWithConfig("user2", "feature").treatment());
Assert.assertEquals("{\"prop2\", \"val2\"}", client.getTreatmentWithConfig("user2", "feature").config());
Assert.assertEquals("on-fallback", client.getTreatmentWithConfig("user2", "feature2").treatment());
Assert.assertEquals("{\"prop1\", \"val1\"}", client.getTreatmentWithConfig("user2", "feature2").config());

client.destroy();
boolean check1 = false;
for (int i=0; i < allRequests.size(); i++ ) {
if (allRequests.get(i).getPath().equals("/api/testImpressions/bulk") ) {
String body = allRequests.get(i).getBody().readUtf8();
if (body.contains("user1")) {
check1 = true;
Assert.assertTrue(body.contains("without_impression_toggle"));
}
}
}
server.shutdown();
Assert.assertTrue(check1);
}

@Test
public void FallbackTreatmentGlobalTest() throws Exception {
String splits = new String(Files.readAllBytes(Paths.get("src/test/resources/splits_imp_toggle.json")), StandardCharsets.UTF_8);
List<RecordedRequest> allRequests = new ArrayList<>();
Dispatcher dispatcher = new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest request) {
allRequests.add(request);
switch (request.getPath()) {
case "/api/splitChanges?s=1.3&since=-1&rbSince=-1":
return new MockResponse().setResponseCode(200).setBody(splits);
case "/api/splitChanges?s=1.3&since=1602796638344&rbSince=-1":
return new MockResponse().setResponseCode(200).setBody("{\"ff\":{\"d\":[], \"s\":1602796638344, \"t\":1602796638344}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}");
case "/api/testImpressions/bulk":
return new MockResponse().setResponseCode(200);
case "/api/testImpressions/count":
return new MockResponse().setResponseCode(200);
case "/v1/keys/ss":
return new MockResponse().setResponseCode(200);
case "/v1/metrics/usage":
return new MockResponse().setResponseCode(200);
case "/v1/metrics/config":
return new MockResponse().setResponseCode(200);
}
return new MockResponse().setResponseCode(404);
}
};

MockWebServer server = new MockWebServer();
server.setDispatcher(dispatcher);

server.start();
String serverURL = String.format("http://%s:%s", server.getHostName(), server.getPort());
FallbackTreatmentsConfiguration fallbackTreatmentsConfiguration = new FallbackTreatmentsConfiguration(new FallbackTreatment("on-fallback", "{\"prop1\", \"val1\"}"),
null);

SplitClientConfig config = SplitClientConfig.builder()
.setBlockUntilReadyTimeout(10000)
.endpoint(serverURL, serverURL)
.telemetryURL(serverURL + "/v1")
.authServiceURL(String.format("%s/api/auth/enabled", serverURL))
.streamingEnabled(false)
.featuresRefreshRate(5)
.impressionsMode(ImpressionsManager.Mode.DEBUG)
.fallbackTreatments(fallbackTreatmentsConfiguration)
.build();

SplitFactory factory = SplitFactoryBuilder.build("fake-api-token", config);
SplitClient client = factory.client();
client.blockUntilReady();

Assert.assertEquals("off", client.getTreatment("user1", "without_impression_toggle"));
Assert.assertEquals("on-fallback", client.getTreatmentWithConfig("user2", "feature").treatment());
Assert.assertEquals("{\"prop1\", \"val1\"}", client.getTreatmentWithConfig("user2", "feature").config());
Assert.assertEquals("on-fallback", client.getTreatmentWithConfig("user2", "feature2").treatment());
Assert.assertEquals("{\"prop1\", \"val1\"}", client.getTreatmentWithConfig("user2", "feature2").config());

client.destroy();
boolean check1 = false;
for (int i=0; i < allRequests.size(); i++ ) {
if (allRequests.get(i).getPath().equals("/api/testImpressions/bulk") ) {
String body = allRequests.get(i).getBody().readUtf8();
if (body.contains("user1")) {
check1 = true;
Assert.assertTrue(body.contains("without_impression_toggle"));
}
}
}
server.shutdown();
Assert.assertTrue(check1);
}

@Test
public void FallbackTreatmentByFlagTest() throws Exception {
String splits = new String(Files.readAllBytes(Paths.get("src/test/resources/splits_imp_toggle.json")), StandardCharsets.UTF_8);
List<RecordedRequest> allRequests = new ArrayList<>();
Dispatcher dispatcher = new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest request) {
allRequests.add(request);
switch (request.getPath()) {
case "/api/splitChanges?s=1.3&since=-1&rbSince=-1":
return new MockResponse().setResponseCode(200).setBody(splits);
case "/api/splitChanges?s=1.3&since=1602796638344&rbSince=-1":
return new MockResponse().setResponseCode(200).setBody("{\"ff\":{\"d\":[], \"s\":1602796638344, \"t\":1602796638344}, \"rbs\":{\"d\":[],\"s\":-1,\"t\":-1}}");
case "/api/testImpressions/bulk":
return new MockResponse().setResponseCode(200);
case "/api/testImpressions/count":
return new MockResponse().setResponseCode(200);
case "/v1/keys/ss":
return new MockResponse().setResponseCode(200);
case "/v1/metrics/usage":
return new MockResponse().setResponseCode(200);
case "/v1/metrics/config":
return new MockResponse().setResponseCode(200);
}
return new MockResponse().setResponseCode(404);
}
};

MockWebServer server = new MockWebServer();
server.setDispatcher(dispatcher);

server.start();
String serverURL = String.format("http://%s:%s", server.getHostName(), server.getPort());
FallbackTreatmentsConfiguration fallbackTreatmentsConfiguration = new FallbackTreatmentsConfiguration(null,
new HashMap<String, FallbackTreatment>() {{ put("feature", new FallbackTreatment("off-fallback", "{\"prop2\", \"val2\"}")); }});

SplitClientConfig config = SplitClientConfig.builder()
.setBlockUntilReadyTimeout(10000)
.endpoint(serverURL, serverURL)
.telemetryURL(serverURL + "/v1")
.authServiceURL(String.format("%s/api/auth/enabled", serverURL))
.streamingEnabled(false)
.featuresRefreshRate(5)
.impressionsMode(ImpressionsManager.Mode.DEBUG)
.fallbackTreatments(fallbackTreatmentsConfiguration)
.build();

SplitFactory factory = SplitFactoryBuilder.build("fake-api-token", config);
SplitClient client = factory.client();
client.blockUntilReady();

Assert.assertEquals("off", client.getTreatment("user1", "without_impression_toggle"));
Assert.assertEquals("off-fallback", client.getTreatmentWithConfig("user2", "feature").treatment());
Assert.assertEquals("{\"prop2\", \"val2\"}", client.getTreatmentWithConfig("user2", "feature").config());
Assert.assertEquals("control", client.getTreatmentWithConfig("user2", "feature2").treatment());
Assert.assertEquals(null, client.getTreatmentWithConfig("user2", "feature2").config());

client.destroy();
boolean check1 = false;
for (int i=0; i < allRequests.size(); i++ ) {
if (allRequests.get(i).getPath().equals("/api/testImpressions/bulk") ) {
String body = allRequests.get(i).getBody().readUtf8();
if (body.contains("user1")) {
check1 = true;
Assert.assertTrue(body.contains("without_impression_toggle"));
}
}
}
server.shutdown();
Assert.assertTrue(check1);
}

private SSEMockServer buildSSEMockServer(SSEMockServer.SseEventQueue eventQueue) {
return new SSEMockServer(eventQueue, (token, version, channel) -> {
if (!"1.1".equals(version)) {
Expand Down
33 changes: 33 additions & 0 deletions client/src/test/java/io/split/client/SplitFactoryImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package io.split.client;

import io.split.client.dtos.FallbackTreatment;
import io.split.client.dtos.FallbackTreatmentCalculatorImp;
import io.split.client.dtos.FallbackTreatmentsConfiguration;
import io.split.client.dtos.ProxyConfiguration;
import io.split.client.impressions.ImpressionsManager;
import io.split.client.utils.FileTypeEnum;
import io.split.engine.evaluator.EvaluatorImp;
import io.split.integrations.IntegrationsConfig;
import io.split.service.SplitHttpClientImpl;
import io.split.storages.enums.OperationMode;
Expand Down Expand Up @@ -56,11 +60,26 @@ public void testFactoryInstantiation() throws Exception {
.authServiceURL(AUTH_SERVICE)
.setBlockUntilReadyTimeout(10000)
.telemetryURL(SplitClientConfig.TELEMETRY_ENDPOINT)
.fallbackTreatments(new FallbackTreatmentsConfiguration(new FallbackTreatment("on"), null))
.build();
SplitFactoryImpl splitFactory = new SplitFactoryImpl(API_KEY, splitClientConfig);

assertNotNull(splitFactory.client());
assertNotNull(splitFactory.manager());

Field fallbackField = SplitClientImpl.class.getDeclaredField("_fallbackTreatmentCalculator");
fallbackField.setAccessible(true);
FallbackTreatmentCalculatorImp fallbackCalc = (FallbackTreatmentCalculatorImp) fallbackField.get(splitFactory.client());
assertNotNull(fallbackCalc);

Field evalField = SplitClientImpl.class.getDeclaredField("_evaluator");
evalField.setAccessible(true);
EvaluatorImp evaluatorImp = (EvaluatorImp) evalField.get(splitFactory.client());
assertNotNull(fallbackCalc);
fallbackField = EvaluatorImp.class.getDeclaredField("_fallbackTreatmentCalculator");
fallbackField.setAccessible(true);
fallbackCalc = (FallbackTreatmentCalculatorImp) fallbackField.get(evaluatorImp);
assertNotNull(fallbackCalc);
}

@Test
Expand Down Expand Up @@ -365,6 +384,20 @@ public void testFactoryConsumerInstantiation() throws Exception {
Thread.sleep(1500);
Mockito.verify(userStorageWrapper, Mockito.times(1)).connect();
Mockito.verify(telemetrySynchronizer, Mockito.times(1)).synchronizeConfig(Mockito.anyObject(), Mockito.anyLong(), Mockito.anyObject(), Mockito.anyObject());

Field fallbackField = SplitClientImpl.class.getDeclaredField("_fallbackTreatmentCalculator");
fallbackField.setAccessible(true);
FallbackTreatmentCalculatorImp fallbackCalc = (FallbackTreatmentCalculatorImp) fallbackField.get(splitFactory.client());
assertNotNull(fallbackCalc);

Field evalField = SplitClientImpl.class.getDeclaredField("_evaluator");
evalField.setAccessible(true);
EvaluatorImp evaluatorImp = (EvaluatorImp) evalField.get(splitFactory.client());
assertNotNull(fallbackCalc);
fallbackField = EvaluatorImp.class.getDeclaredField("_fallbackTreatmentCalculator");
fallbackField.setAccessible(true);
fallbackCalc = (FallbackTreatmentCalculatorImp) fallbackField.get(evaluatorImp);
assertNotNull(fallbackCalc);
}

@Test
Expand Down