Skip to content

Commit d4e5b1e

Browse files
khvn26khvn26
committed
minimise formatting changes pt. 3
1 parent 89f420a commit d4e5b1e

File tree

7 files changed

+72
-58
lines changed

7 files changed

+72
-58
lines changed

‎src/main/java/com/flagsmith/FlagsmithApiWrapper.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public FlagsmithApiWrapper(
8989
}
9090

9191
/**
92-
* Instantiate with config, custom headers, logger, apikey and request
93-
* processor.
92+
* Instantiate with config, custom headers, logger, apikey and request processor.
9493
*
9594
* @param defaultConfig config object
9695
* @param customHeaders custom headers list
@@ -149,7 +148,8 @@ public Flags getFeatureFlags(boolean doThrow) {
149148
featureFlags = Flags.fromApiFlags(
150149
featureFlagsResponse,
151150
getConfig().getAnalyticsProcessor(),
152-
getConfig().getFlagsmithFlagDefaults());
151+
getConfig().getFlagsmithFlagDefaults()
152+
);
153153

154154
if (getCache() != null && getCache().getEnvFlagsCacheKey() != null) {
155155
getCache().getCache().put(getCache().getEnvFlagsCacheKey(), featureFlags);
@@ -173,7 +173,8 @@ public Flags getFeatureFlags(boolean doThrow) {
173173

174174
@Override
175175
public Flags identifyUserWithTraits(
176-
String identifier, List<? extends TraitModel> traits, boolean isTransient, boolean doThrow) {
176+
String identifier, List<? extends TraitModel> traits, boolean isTransient, boolean doThrow
177+
) {
177178
assertValidUser(identifier);
178179
Flags flags = null;
179180
String cacheKey = null;
@@ -222,7 +223,8 @@ public Flags identifyUserWithTraits(
222223
flags = Flags.fromApiFlags(
223224
flagsArray,
224225
getConfig().getAnalyticsProcessor(),
225-
getConfig().getFlagsmithFlagDefaults());
226+
getConfig().getFlagsmithFlagDefaults()
227+
);
226228

227229
if (cacheKey != null) {
228230
getCache().getCache().put(cacheKey, flags);
@@ -322,7 +324,7 @@ public Request newGetRequest(HttpUrl url) {
322324
/**
323325
* Returns a build request with GET.
324326
*
325-
* @param url - URL to invoke
327+
* @param url - URL to invoke
326328
* @param body - body to post
327329
*/
328330
@Override
@@ -334,8 +336,7 @@ public Request newPostRequest(HttpUrl url, RequestBody body) {
334336
}
335337

336338
/**
337-
* Close the FlagsmithAPIWrapper instance, cleaning up any dependent threads or
338-
* services
339+
* Close the FlagsmithAPIWrapper instance, cleaning up any dependent threads or services
339340
* which need cleaning up before the instance can be fully destroyed.
340341
*/
341342
public void close() {

‎src/test/java/com/flagsmith/FlagsmithApiWrapperTest.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.junit.jupiter.api.BeforeEach;
4141
import org.junit.jupiter.api.Test;
4242

43+
4344
public class FlagsmithApiWrapperTest {
4445

4546
private final String API_KEY = "OUR_API_KEY";
@@ -80,8 +81,7 @@ void getFeatureFlags_retries() {
8081
}
8182

8283
// Assert
83-
// Since the Retry object is local to the call, the only external behaviour we
84-
// can watch
84+
// Since the Retry object is local to the call, the only external behaviour we can watch
8585
// is the logger
8686
verify(flagsmithLogger, times(2)).httpError(any(), any(Response.class), anyBoolean());
8787
}
@@ -124,21 +124,22 @@ public void getFeatureFlags_noUser_fail() {
124124
public void identifyUserWithTraits_success() throws JsonProcessingException {
125125
// Arrange
126126
final List<TraitModel> traits = new ArrayList<TraitModel>(Arrays.asList(new TraitModel()));
127-
String responseBody = mapper
128-
.writeValueAsString(getFlagsAndTraitsResponse(Arrays.asList(getNewFlag()), Arrays.asList(new TraitModel())));
127+
String responseBody = mapper.writeValueAsString(getFlagsAndTraitsResponse(Arrays.asList(getNewFlag()), Arrays.asList(new TraitModel())));
129128
interceptor.addRule()
130129
.post(BASE_URL + "/identities/")
131130
.respond(responseBody, MEDIATYPE_JSON);
132131

133132
// Act
134133
final Flags actualFeatureFlags = sut.identifyUserWithTraits(
135-
"user-w-traits", traits, false, true);
134+
"user-w-traits", traits, false, true
135+
);
136136

137137
// Assert
138138
Map<String, BaseFlag> flag1 = newFlagsList(Arrays.asList(getNewFlag())).getFlags();
139139
Map<String, BaseFlag> flag2 = actualFeatureFlags.getFlags();
140140
assertEquals(
141-
flag1, flag2);
141+
flag1, flag2
142+
);
142143
verify(flagsmithLogger, times(1)).info(anyString(), any(), any());
143144
verify(flagsmithLogger, times(0)).httpError(any(), any(Response.class), anyBoolean());
144145
verify(flagsmithLogger, times(0)).httpError(any(), any(IOException.class), anyBoolean());
@@ -167,7 +168,7 @@ public void testClose_ClosesRequestProcessor() {
167168
// Given
168169
RequestProcessor mockedRequestProcessor = mock(RequestProcessor.class);
169170
FlagsmithApiWrapper apiWrapper = new FlagsmithApiWrapper(
170-
defaultConfig, null, flagsmithLogger, API_KEY, mockedRequestProcessor);
171+
defaultConfig, null, flagsmithLogger, API_KEY, mockedRequestProcessor);
171172

172173
// When
173174
apiWrapper.close();
@@ -203,7 +204,8 @@ private FeatureStateModel getNewFlag() {
203204

204205
private Flags newFlagsList(List<FeatureStateModel> flags) {
205206
return Flags.fromApiFlags(
206-
flags, null, defaultConfig.getFlagsmithFlagDefaults());
207+
flags, null, defaultConfig.getFlagsmithFlagDefaults()
208+
);
207209
}
208210

209211
private JsonNode getFlagsAndTraitsResponse(List<FeatureStateModel> flags, List<TraitModel> traits) {

‎src/test/java/com/flagsmith/FlagsmithTestHelper.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public static int createUserIdentity(String userIdentity, String environmentApiK
8383
return RestAssured.given()
8484
.body(ImmutableMap.of(
8585
"identifier", userIdentity,
86-
"environment", environmentApiKey))
86+
"environment", environmentApiKey
87+
))
8788
.headers(defaultHeaders())
8889
.post("/api/v1/environments/{apiKey}/identities/", environmentApiKey)
8990
.then()
@@ -97,7 +98,8 @@ public static Map<String, Object> createEnvironment(String name, int projectId)
9798
return RestAssured.given()
9899
.body(ImmutableMap.of(
99100
"name", name,
100-
"project", projectId))
101+
"project", projectId
102+
))
101103
.headers(defaultHeaders())
102104
.post("/api/v1/environments/")
103105
.then()
@@ -121,7 +123,8 @@ public static void switchFlag(int featureId, boolean enabled, String apiKey) {
121123
RestAssured.given()
122124
.body(ImmutableMap.of(
123125
"enabled", enabled,
124-
"feature", featureId))
126+
"feature", featureId
127+
))
125128
.headers(defaultHeaders())
126129
.post("/api/v1/environments/{apiKey}/featurestates/", apiKey)
127130
.then()
@@ -137,7 +140,8 @@ public static void switchFlag(int featureId, boolean enabled, String apiKey) {
137140
RestAssured.given()
138141
.body(ImmutableMap.of(
139142
"enabled", enabled,
140-
"feature", featureId))
143+
"feature", featureId
144+
))
141145
.headers(defaultHeaders())
142146
.put("/api/v1/environments/{apiKey}/featurestates/{featureStateId}/",
143147
apiKey, featureStateId)
@@ -166,7 +170,8 @@ public static void switchFlagForUser(int featureId, int userIdentityId, boolean
166170
RestAssured.given()
167171
.body(ImmutableMap.of(
168172
"enabled", enabled,
169-
"feature", featureId))
173+
"feature", featureId
174+
))
170175
.headers(defaultHeaders())
171176
.post("/api/v1/environments/{apiKey}/identities/{identityId}/featurestates/", apiKey,
172177
userIdentityId)
@@ -187,7 +192,8 @@ public static void switchFlagForUser(int featureId, int userIdentityId, boolean
187192
RestAssured.given()
188193
.body(ImmutableMap.of(
189194
"enabled", enabled,
190-
"feature", featureId))
195+
"feature", featureId
196+
))
191197
.headers(defaultHeaders())
192198
.put(
193199
"/api/v1/environments/{apiKey}/identities/{identityId}/featurestates/{featureStateId}/",
@@ -207,7 +213,8 @@ public static void assignTraitToUserIdentity(String userIdentifier, String trait
207213
.body(ImmutableMap.of(
208214
"identity", ImmutableMap.of("identifier", userIdentifier),
209215
"trait_key", traitKey,
210-
"trait_value", traitValue))
216+
"trait_value", traitValue
217+
))
211218
.headers(defaultHeaders())
212219
.header("x-environment-key", apiKey)
213220
.post("/api/v1/traits/")
@@ -219,7 +226,8 @@ public static int createProject(String name, int organisationId) {
219226
return RestAssured.given()
220227
.body(ImmutableMap.of(
221228
"name", name,
222-
"organisation", organisationId))
229+
"organisation", organisationId
230+
))
223231
.headers(defaultHeaders())
224232
.post("/api/v1/projects/")
225233
.then()
@@ -230,7 +238,8 @@ public static int createProject(String name, int organisationId) {
230238
}
231239

232240
public static BaseFlag flag(
233-
String name, String description, String type, boolean enabled, String value) {
241+
String name, String description, String type, boolean enabled, String value
242+
) {
234243
final FeatureStateModel result = new FeatureStateModel();
235244
result.setEnabled(enabled);
236245
result.setValue(value);
@@ -372,8 +381,8 @@ public static List<FeatureStateModel> getFlags() {
372381
try {
373382
return MapperFactory.getMapper().readValue(
374383
featureJson,
375-
new TypeReference<List<FeatureStateModel>>() {
376-
});
384+
new TypeReference<List<FeatureStateModel>>() {}
385+
);
377386
} catch (JsonProcessingException e) {
378387
e.printStackTrace();
379388
// environment model json
@@ -430,7 +439,7 @@ public static JsonNode getIdentityRequest(String identifier, List<? extends Trai
430439
}
431440

432441
public static JsonNode getIdentityRequest(
433-
String identifier, List<? extends TraitModel> traits, boolean isTransient) {
442+
String identifier, List<? extends TraitModel> traits, boolean isTransient) {
434443
final ObjectNode flagsAndTraits = MapperFactory.getMapper().createObjectNode();
435444
flagsAndTraits.putPOJO("identifier", identifier);
436445
flagsAndTraits.put("transient", isTransient);

‎src/test/java/com/flagsmith/flagengine/EngineTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import static org.junit.jupiter.api.Assertions.assertEquals;
2626

2727
public class EngineTest {
28-
private static final String ENVIRONMENT_JSON_FILE_LOCATION = "src/test/java/com/flagsmith/flagengine/enginetestdata/"
29-
+
30-
"data/environment_n9fbf9h3v4fFgH3U3ngWhb.json";
28+
private static final String ENVIRONMENT_JSON_FILE_LOCATION =
29+
"src/test/java/com/flagsmith/flagengine/enginetestdata/" +
30+
"data/environment_n9fbf9h3v4fFgH3U3ngWhb.json";
3131
private static ObjectMapper objectMapper = MapperFactory.getMapper();
3232

3333
private static Stream<Arguments> engineTestData() {
@@ -37,8 +37,7 @@ private static Stream<Arguments> engineTestData() {
3737
JsonNode environmentDocument = engineTestData.get("environment");
3838
JsonNode identitiesAndResponses = engineTestData.get("identities_and_responses");
3939

40-
EvaluationContext baseEvaluationContext = EngineMappers
41-
.mapEnvironmentDocumentToContext(environmentDocument);
40+
EvaluationContext baseEvaluationContext = EngineMappers.mapEnvironmentDocumentToContext(environmentDocument);
4241

4342
List<Arguments> returnValues = new ArrayList<>();
4443

@@ -84,8 +83,7 @@ public void testEngine(EvaluationContext evaluationContext, JsonNode expectedRes
8483

8584
List<FeatureStateModel> flags = objectMapper.convertValue(
8685
expectedResponse.get("flags"),
87-
new TypeReference<List<FeatureStateModel>>() {
88-
});
86+
new TypeReference<List<FeatureStateModel>>() {});
8987

9088
flags.sort((fsm1, fsm2) -> fsm1.getFeature().getName().compareTo(fsm2.getFeature().getName()));
9189
List<FlagResult> sortedResults = evaluationResult.getFlags().stream()

‎src/test/java/com/flagsmith/flagengine/unit/segments/SegmentEvaluatorTest.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,20 @@ private static Stream<Arguments> identitiesInSegments() {
4343
Arguments.of(segmentNestedRules(), threeIdentityTraits(), Boolean.TRUE),
4444
Arguments.of(segmentConditionsAndNestedRules(), emptyIdentityTraits(), Boolean.FALSE),
4545
Arguments.of(segmentConditionsAndNestedRules(), oneIdentityTrait(), Boolean.FALSE),
46-
Arguments.of(segmentConditionsAndNestedRules(), threeIdentityTraits(), Boolean.TRUE));
46+
Arguments.of(segmentConditionsAndNestedRules(), threeIdentityTraits(), Boolean.TRUE)
47+
);
4748
}
4849

4950
@ParameterizedTest
5051
@MethodSource("identitiesInSegments")
5152
public void testContextInSegment(SegmentContext segment, List<TraitModel> identityTraits,
52-
Boolean expectedResponse) {
53+
Boolean expectedResponse) {
5354

5455
final EvaluationContext context = EngineMappers.mapContextAndIdentityDataToContext(
5556
FlagsmithTestHelper.evaluationContext(), "foo",
5657
identityTraits.stream().collect(
57-
java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue)));
58+
java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue))
59+
);
5860

5961
Boolean actualResult = SegmentEvaluator.isContextInSegment(context, segment);
6062

@@ -68,22 +70,23 @@ private static Stream<Arguments> traitExistenceChecks() {
6870
Arguments.of(SegmentConditions.IS_SET, "foo", new ArrayList<>(Arrays.asList(
6971
new TraitModel("foo", "bar"))), true),
7072
Arguments.of(SegmentConditions.IS_NOT_SET, "foo", new ArrayList<>(Arrays.asList(
71-
new TraitModel("foo", "bar"))), false));
73+
new TraitModel("foo", "bar"))), false)
74+
);
7275
}
7376

7477
@ParameterizedTest
7578
@MethodSource("traitExistenceChecks")
7679
public void testTraitExistenceConditions(SegmentConditions conditionOperator, String conditionProperty,
77-
List<TraitModel> traitModels, Boolean expectedResult) {
80+
List<TraitModel> traitModels, Boolean expectedResult) {
7881
// Given
7982
// An identity to test with which has the traits as defined in the DataProvider
8083
final EvaluationContext context = EngineMappers.mapContextAndIdentityDataToContext(
8184
FlagsmithTestHelper.evaluationContext(), "foo",
8285
traitModels.stream().collect(
83-
java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue)));
86+
java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue))
87+
);
8488

85-
// And a segment which has the operator and property value as defined in the
86-
// DataProvider
89+
// And a segment which has the operator and property value as defined in the DataProvider
8790
SegmentContext segment = new SegmentContext().withName("testSegment").withRules(
8891
Arrays.asList(new SegmentRule().withType(SegmentRule.Type.ALL).withConditions(
8992
Arrays.asList(new SegmentCondition()

‎src/test/java/com/flagsmith/flagengine/unit/segments/SegmentModelTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ private static Stream<Arguments> conditionTestData() {
102102
Arguments.of(SegmentConditions.IN, 1.5, "1.5", true),
103103
// Flagsmith's engine does not evaluate `IN` condition for booleans
104104
// due to ambiguous serialization across supported platforms.
105-
Arguments.of(SegmentConditions.IN, false, "false", false));
105+
Arguments.of(SegmentConditions.IN, false, "false", false)
106+
);
106107
}
107108

108109
@ParameterizedTest

‎src/test/java/com/flagsmith/offline/LocalFileHandlerTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
import static org.junit.Assert.assertEquals;
1212

1313
public class LocalFileHandlerTest {
14-
@Test
15-
public void testLocalFileHandler() throws FlagsmithClientError, IOException {
16-
// Given
17-
File file = File.createTempFile("temp", ".txt");
18-
try (FileWriter fileWriter = new FileWriter(file, true)) {
19-
fileWriter.write(FlagsmithTestHelper.environmentString());
20-
fileWriter.flush();
21-
}
14+
@Test
15+
public void testLocalFileHandler() throws FlagsmithClientError, IOException {
16+
// Given
17+
File file = File.createTempFile("temp",".txt");
18+
try (FileWriter fileWriter = new FileWriter(file, true)) {
19+
fileWriter.write(FlagsmithTestHelper.environmentString());
20+
fileWriter.flush();
21+
}
2222

23-
// When
24-
LocalFileHandler handler = new LocalFileHandler(file.getAbsolutePath());
23+
// When
24+
LocalFileHandler handler = new LocalFileHandler(file.getAbsolutePath());
2525

26-
// Then
27-
assertEquals(FlagsmithTestHelper.evaluationContext(), handler.getEvaluationContext());
26+
// Then
27+
assertEquals(FlagsmithTestHelper.evaluationContext(), handler.getEvaluationContext());
2828

29-
file.delete();
30-
}
29+
file.delete();
30+
}
3131
}

0 commit comments

Comments
 (0)