Skip to content

Commit 1b075a5

Browse files
committed
linter
1 parent 48e8cae commit 1b075a5

File tree

4 files changed

+58
-58
lines changed

4 files changed

+58
-58
lines changed

src/main/java/com/eppo/sdk/EppoClient.java

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
import cloud.eppo.logging.BanditLogger;
66
import com.eppo.sdk.helpers.AppDetails;
77
import com.eppo.sdk.helpers.FetchConfigurationsTask;
8+
import java.util.Timer;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011

11-
import java.util.Timer;
12-
1312
public class EppoClient extends BaseEppoClient {
1413
private static final Logger log = LoggerFactory.getLogger(EppoClient.class);
1514

@@ -30,15 +29,15 @@ public static EppoClient getInstance() {
3029
}
3130

3231
private EppoClient(
33-
String apiKey,
34-
String host,
35-
String sdkName,
36-
String sdkVersion,
37-
AssignmentLogger assignmentLogger,
38-
BanditLogger banditLogger,
39-
boolean isGracefulModel
40-
) {
41-
super(apiKey, host, sdkName, sdkVersion, assignmentLogger, banditLogger, isGracefulModel, false);
32+
String apiKey,
33+
String host,
34+
String sdkName,
35+
String sdkVersion,
36+
AssignmentLogger assignmentLogger,
37+
BanditLogger banditLogger,
38+
boolean isGracefulModel) {
39+
super(
40+
apiKey, host, sdkName, sdkVersion, assignmentLogger, banditLogger, isGracefulModel, false);
4241
}
4342

4443
public static void stopPolling() {
@@ -98,26 +97,30 @@ public EppoClient buildAndInit() {
9897

9998
if (instance != null) {
10099
if (forceReinitialize) { // TODO: unit test this
101-
log.warn("Eppo SDK is already initialized, reinitializing since forceReinitialize is true");
100+
log.warn(
101+
"Eppo SDK is already initialized, reinitializing since forceReinitialize is true");
102102
} else {
103-
log.warn("Eppo SDK is already initialized, skipping reinitialization since forceReinitialize is false");
103+
log.warn(
104+
"Eppo SDK is already initialized, skipping reinitialization since forceReinitialize is false");
104105
return instance;
105106
}
106107
}
107108

108-
instance = new EppoClient(apiKey, sdkName, sdkVersion, host, assignmentLogger, banditLogger, isGracefulMode);
109+
instance =
110+
new EppoClient(
111+
apiKey, sdkName, sdkVersion, host, assignmentLogger, banditLogger, isGracefulMode);
109112

110113
// Stop any active polling
111114
stopPolling();
112115

113116
// Set up polling for experiment configurations
114117
pollTimer = new Timer(true);
115118
FetchConfigurationsTask fetchConfigurationsTask =
116-
new FetchConfigurationsTask(
117-
() -> instance.loadConfiguration(),
118-
pollTimer,
119-
pollingIntervalMs,
120-
pollingIntervalMs / DEFAULT_JITTER_INTERVAL_RATIO);
119+
new FetchConfigurationsTask(
120+
() -> instance.loadConfiguration(),
121+
pollTimer,
122+
pollingIntervalMs,
123+
pollingIntervalMs / DEFAULT_JITTER_INTERVAL_RATIO);
121124

122125
// Kick off the first fetch
123126
fetchConfigurationsTask.run();

src/main/java/com/eppo/sdk/helpers/FetchConfigurationsTask.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Timer;
44
import java.util.TimerTask;
5-
65
import org.slf4j.Logger;
76
import org.slf4j.LoggerFactory;
87

@@ -14,10 +13,7 @@ public class FetchConfigurationsTask extends TimerTask {
1413
private final long jitterInMillis;
1514

1615
public FetchConfigurationsTask(
17-
Runnable runnable,
18-
Timer timer,
19-
long intervalInMillis,
20-
long jitterInMillis) {
16+
Runnable runnable, Timer timer, long intervalInMillis, long jitterInMillis) {
2117
this.runnable = runnable;
2218
this.timer = timer;
2319
this.intervalInMillis = intervalInMillis;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

src/test/java/com/eppo/sdk/EppoClientTest.java

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
import com.github.tomakehurst.wiremock.client.WireMock;
2323
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
2424
import java.io.File;
25-
2625
import java.lang.reflect.Field;
2726
import java.util.stream.Stream;
28-
2927
import org.apache.commons.io.FileUtils;
28+
import org.junit.jupiter.api.AfterAll;
3029
import org.junit.jupiter.api.AfterEach;
3130
import org.junit.jupiter.api.BeforeAll;
32-
import org.junit.jupiter.api.AfterAll;
3331
import org.junit.jupiter.api.Test;
3432
import org.junit.jupiter.api.extension.ExtendWith;
3533
import org.junit.jupiter.params.ParameterizedTest;
@@ -45,7 +43,8 @@ public class EppoClientTest {
4543
private static WireMockServer mockServer;
4644

4745
private static final String DUMMY_FLAG_API_KEY = "dummy-flags-api-key"; // Will load flags-v1
48-
private static final String DUMMY_BANDIT_API_KEY = "dummy-bandits-api-key"; // Will load bandit-flags-v1
46+
private static final String DUMMY_BANDIT_API_KEY =
47+
"dummy-bandits-api-key"; // Will load bandit-flags-v1
4948
private AssignmentLogger mockAssignmentLogger;
5049
private BanditLogger mockBanditLogger;
5150

@@ -55,20 +54,21 @@ public static void initMockServer() {
5554
mockServer.start();
5655

5756
// If we get the dummy flag API key, return flags-v1.json
58-
String ufcFlagsResponseJson =
59-
readConfig(
60-
"src/test/resources/shared/ufc/flags-v1.json");
57+
String ufcFlagsResponseJson = readConfig("src/test/resources/shared/ufc/flags-v1.json");
6158
mockServer.stubFor(
62-
WireMock.get(WireMock.urlMatching(".*flag-config/v1/config\\?.*apiKey="+DUMMY_FLAG_API_KEY+".*"))
59+
WireMock.get(
60+
WireMock.urlMatching(
61+
".*flag-config/v1/config\\?.*apiKey=" + DUMMY_FLAG_API_KEY + ".*"))
6362
.willReturn(WireMock.okJson(ufcFlagsResponseJson)));
6463

6564
// If we get the dummy bandit API key, return bandit-flags-v1.json
6665
String banditFlagsResponseJson =
67-
readConfig(
68-
"src/test/resources/shared/ufc/bandit-flags-v1.json");
66+
readConfig("src/test/resources/shared/ufc/bandit-flags-v1.json");
6967
mockServer.stubFor(
70-
WireMock.get(WireMock.urlMatching(".*flag-config/v1/config\\?.*apiKey="+DUMMY_BANDIT_API_KEY+".*"))
71-
.willReturn(WireMock.okJson(banditFlagsResponseJson)));
68+
WireMock.get(
69+
WireMock.urlMatching(
70+
".*flag-config/v1/config\\?.*apiKey=" + DUMMY_BANDIT_API_KEY + ".*"))
71+
.willReturn(WireMock.okJson(banditFlagsResponseJson)));
7272

7373
// Return bandit models (no need to switch on API key)
7474
String banditModelsResponseJson =
@@ -154,7 +154,7 @@ public void testLoggers() {
154154
actions.put("reebok", rebookAttributes);
155155

156156
BanditResult banditResult =
157-
eppoClient.getBanditAction(flagKey, subjectKey, subjectAttributes, actions, "control");
157+
eppoClient.getBanditAction(flagKey, subjectKey, subjectAttributes, actions, "control");
158158

159159
// Verify assignment
160160
assertEquals("banner_bandit", banditResult.getVariation());
@@ -166,7 +166,7 @@ public void testLoggers() {
166166

167167
// Verify bandit logger called
168168
ArgumentCaptor<BanditAssignment> banditLogCaptor =
169-
ArgumentCaptor.forClass(BanditAssignment.class);
169+
ArgumentCaptor.forClass(BanditAssignment.class);
170170
verify(mockBanditLogger, times(1)).logBanditAssignment(banditLogCaptor.capture());
171171
}
172172

@@ -180,33 +180,32 @@ public void getInstanceWhenUninitialized() {
180180
public void testErrorGracefulModeOn() {
181181
initBuggyClient();
182182
EppoClient.getInstance().setIsGracefulFailureMode(true);
183-
assertEquals(1.234, EppoClient.getInstance().getDoubleAssignment("numeric_flag", "subject1", 1.234));
183+
assertEquals(
184+
1.234, EppoClient.getInstance().getDoubleAssignment("numeric_flag", "subject1", 1.234));
184185
}
185186

186187
@Test
187188
public void testErrorGracefulModeOff() {
188189
initBuggyClient();
189190
EppoClient.getInstance().setIsGracefulFailureMode(false);
190-
assertThrows(Exception.class, () -> EppoClient.getInstance().getDoubleAssignment("numeric_flag", "subject1", 1.234));
191+
assertThrows(
192+
Exception.class,
193+
() -> EppoClient.getInstance().getDoubleAssignment("numeric_flag", "subject1", 1.234));
191194
}
192195

193196
@Test
194197
public void testReinitializeWithoutForcing() {
195198
EppoClient firstInstance = initClient(DUMMY_FLAG_API_KEY);
196-
EppoClient secondInstance = new EppoClient.Builder()
197-
.apiKey(DUMMY_FLAG_API_KEY)
198-
.buildAndInit();
199+
EppoClient secondInstance = new EppoClient.Builder().apiKey(DUMMY_FLAG_API_KEY).buildAndInit();
199200

200201
assertSame(firstInstance, secondInstance);
201202
}
202203

203204
@Test
204205
public void testReinitializeWitForcing() {
205206
EppoClient firstInstance = initClient(DUMMY_FLAG_API_KEY);
206-
EppoClient secondInstance = new EppoClient.Builder()
207-
.apiKey(DUMMY_FLAG_API_KEY)
208-
.forceReinitialize(true)
209-
.buildAndInit();
207+
EppoClient secondInstance =
208+
new EppoClient.Builder().apiKey(DUMMY_FLAG_API_KEY).forceReinitialize(true).buildAndInit();
210209

211210
assertNotSame(firstInstance, secondInstance);
212211
}
@@ -218,11 +217,12 @@ public void testPolling() {
218217
TestUtils.setBaseClientHttpClientOverrideField(httpClientSpy);
219218

220219
new EppoClient.Builder()
221-
.apiKey(DUMMY_FLAG_API_KEY)
222-
.pollingIntervalMs(20)
223-
.forceReinitialize(true)
224-
.buildAndInit();
220+
.apiKey(DUMMY_FLAG_API_KEY)
221+
.pollingIntervalMs(20)
222+
.forceReinitialize(true)
223+
.buildAndInit();
225224

225+
// Method will be called immediately on init
226226
verify(httpClientSpy, times(1)).get(anyString());
227227

228228
// Sleep for 25 ms to allow another polling cycle to complete
@@ -252,13 +252,13 @@ private EppoClient initClient(String apiKey) {
252252
mockBanditLogger = mock(BanditLogger.class);
253253

254254
return new EppoClient.Builder()
255-
.apiKey(apiKey)
256-
.host(TEST_HOST)
257-
.assignmentLogger(mockAssignmentLogger)
258-
.banditLogger(mockBanditLogger)
259-
.isGracefulMode(false)
260-
.forceReinitialize(true) // Useful for tests
261-
.buildAndInit();
255+
.apiKey(apiKey)
256+
.host(TEST_HOST)
257+
.assignmentLogger(mockAssignmentLogger)
258+
.banditLogger(mockBanditLogger)
259+
.isGracefulMode(false)
260+
.forceReinitialize(true) // Useful for tests
261+
.buildAndInit();
262262
}
263263

264264
private void uninitClient() {

0 commit comments

Comments
 (0)