minimise formatting changes pt. 3

Author: khvn26

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

@@ -89,8 +89,7 @@ public FlagsmithApiWrapper(
   }
 
   /**
-   * Instantiate with config, custom headers, logger, apikey and request
-   * processor.
+   * Instantiate with config, custom headers, logger, apikey and request processor.
    *
    * @param defaultConfig config object
    * @param customHeaders custom headers list
@@ -149,7 +148,8 @@ public Flags getFeatureFlags(boolean doThrow) {
       featureFlags = Flags.fromApiFlags(
           featureFlagsResponse,
           getConfig().getAnalyticsProcessor(),
-          getConfig().getFlagsmithFlagDefaults());
+          getConfig().getFlagsmithFlagDefaults()
+      );
 
       if (getCache() != null && getCache().getEnvFlagsCacheKey() != null) {
         getCache().getCache().put(getCache().getEnvFlagsCacheKey(), featureFlags);
@@ -173,7 +173,8 @@ public Flags getFeatureFlags(boolean doThrow) {
 
   @Override
   public Flags identifyUserWithTraits(
-      String identifier, List<? extends TraitModel> traits, boolean isTransient, boolean doThrow) {
+      String identifier, List<? extends TraitModel> traits, boolean isTransient, boolean doThrow
+  ) {
     assertValidUser(identifier);
     Flags flags = null;
     String cacheKey = null;
@@ -222,7 +223,8 @@ public Flags identifyUserWithTraits(
       flags = Flags.fromApiFlags(
           flagsArray,
           getConfig().getAnalyticsProcessor(),
-          getConfig().getFlagsmithFlagDefaults());
+          getConfig().getFlagsmithFlagDefaults()
+      );
 
       if (cacheKey != null) {
         getCache().getCache().put(cacheKey, flags);
@@ -322,7 +324,7 @@ public Request newGetRequest(HttpUrl url) {
   /**
    * Returns a build request with GET.
    *
-   * @param url  - URL to invoke
+   * @param url - URL to invoke
    * @param body - body to post
    */
   @Override
@@ -334,8 +336,7 @@ public Request newPostRequest(HttpUrl url, RequestBody body) {
   }
 
   /**
-   * Close the FlagsmithAPIWrapper instance, cleaning up any dependent threads or
-   * services
+   * Close the FlagsmithAPIWrapper instance, cleaning up any dependent threads or services
    * which need cleaning up before the instance can be fully destroyed.
    */
   public void close() {

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

@@ -40,6 +40,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+
 public class FlagsmithApiWrapperTest {
 
   private final String API_KEY = "OUR_API_KEY";
@@ -80,8 +81,7 @@ void getFeatureFlags_retries() {
     }
 
     // Assert
-    // Since the Retry object is local to the call, the only external behaviour we
-    // can watch
+    // Since the Retry object is local to the call, the only external behaviour we can watch
     // is the logger
     verify(flagsmithLogger, times(2)).httpError(any(), any(Response.class), anyBoolean());
   }
@@ -124,21 +124,22 @@ public void getFeatureFlags_noUser_fail() {
   public void identifyUserWithTraits_success() throws JsonProcessingException {
     // Arrange
     final List<TraitModel> traits = new ArrayList<TraitModel>(Arrays.asList(new TraitModel()));
-    String responseBody = mapper
-        .writeValueAsString(getFlagsAndTraitsResponse(Arrays.asList(getNewFlag()), Arrays.asList(new TraitModel())));
+    String responseBody = mapper.writeValueAsString(getFlagsAndTraitsResponse(Arrays.asList(getNewFlag()), Arrays.asList(new TraitModel())));
     interceptor.addRule()
         .post(BASE_URL + "/identities/")
         .respond(responseBody, MEDIATYPE_JSON);
 
     // Act
     final Flags actualFeatureFlags = sut.identifyUserWithTraits(
-        "user-w-traits", traits, false, true);
+        "user-w-traits", traits, false, true
+    );
 
     // Assert
     Map<String, BaseFlag> flag1 = newFlagsList(Arrays.asList(getNewFlag())).getFlags();
     Map<String, BaseFlag> flag2 = actualFeatureFlags.getFlags();
     assertEquals(
-        flag1, flag2);
+        flag1, flag2
+    );
     verify(flagsmithLogger, times(1)).info(anyString(), any(), any());
     verify(flagsmithLogger, times(0)).httpError(any(), any(Response.class), anyBoolean());
     verify(flagsmithLogger, times(0)).httpError(any(), any(IOException.class), anyBoolean());
@@ -167,7 +168,7 @@ public void testClose_ClosesRequestProcessor() {
     // Given
     RequestProcessor mockedRequestProcessor = mock(RequestProcessor.class);
     FlagsmithApiWrapper apiWrapper = new FlagsmithApiWrapper(
-        defaultConfig, null, flagsmithLogger, API_KEY, mockedRequestProcessor);
+            defaultConfig, null, flagsmithLogger, API_KEY, mockedRequestProcessor);
 
     // When
     apiWrapper.close();
@@ -203,7 +204,8 @@ private FeatureStateModel getNewFlag() {
 
   private Flags newFlagsList(List<FeatureStateModel> flags) {
     return Flags.fromApiFlags(
-        flags, null, defaultConfig.getFlagsmithFlagDefaults());
+        flags, null, defaultConfig.getFlagsmithFlagDefaults()
+    );
   }
 
   private JsonNode getFlagsAndTraitsResponse(List<FeatureStateModel> flags, List<TraitModel> traits) {

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

@@ -83,7 +83,8 @@ public static int createUserIdentity(String userIdentity, String environmentApiK
     return RestAssured.given()
         .body(ImmutableMap.of(
             "identifier", userIdentity,
-            "environment", environmentApiKey))
+            "environment", environmentApiKey
+        ))
         .headers(defaultHeaders())
         .post("/api/v1/environments/{apiKey}/identities/", environmentApiKey)
         .then()
@@ -97,7 +98,8 @@ public static Map<String, Object> createEnvironment(String name, int projectId)
     return RestAssured.given()
         .body(ImmutableMap.of(
             "name", name,
-            "project", projectId))
+            "project", projectId
+        ))
         .headers(defaultHeaders())
         .post("/api/v1/environments/")
         .then()
@@ -121,7 +123,8 @@ public static void switchFlag(int featureId, boolean enabled, String apiKey) {
       RestAssured.given()
           .body(ImmutableMap.of(
               "enabled", enabled,
-              "feature", featureId))
+              "feature", featureId
+          ))
           .headers(defaultHeaders())
           .post("/api/v1/environments/{apiKey}/featurestates/", apiKey)
           .then()
@@ -137,7 +140,8 @@ public static void switchFlag(int featureId, boolean enabled, String apiKey) {
         RestAssured.given()
             .body(ImmutableMap.of(
                 "enabled", enabled,
-                "feature", featureId))
+                "feature", featureId
+            ))
             .headers(defaultHeaders())
             .put("/api/v1/environments/{apiKey}/featurestates/{featureStateId}/",
                 apiKey, featureStateId)
@@ -166,7 +170,8 @@ public static void switchFlagForUser(int featureId, int userIdentityId, boolean
       RestAssured.given()
           .body(ImmutableMap.of(
               "enabled", enabled,
-              "feature", featureId))
+              "feature", featureId
+          ))
           .headers(defaultHeaders())
           .post("/api/v1/environments/{apiKey}/identities/{identityId}/featurestates/", apiKey,
               userIdentityId)
@@ -187,7 +192,8 @@ public static void switchFlagForUser(int featureId, int userIdentityId, boolean
         RestAssured.given()
             .body(ImmutableMap.of(
                 "enabled", enabled,
-                "feature", featureId))
+                "feature", featureId
+          ))
             .headers(defaultHeaders())
             .put(
                 "/api/v1/environments/{apiKey}/identities/{identityId}/featurestates/{featureStateId}/",
@@ -207,7 +213,8 @@ public static void assignTraitToUserIdentity(String userIdentifier, String trait
         .body(ImmutableMap.of(
             "identity", ImmutableMap.of("identifier", userIdentifier),
             "trait_key", traitKey,
-            "trait_value", traitValue))
+            "trait_value", traitValue
+        ))
         .headers(defaultHeaders())
         .header("x-environment-key", apiKey)
         .post("/api/v1/traits/")
@@ -219,7 +226,8 @@ public static int createProject(String name, int organisationId) {
     return RestAssured.given()
         .body(ImmutableMap.of(
             "name", name,
-            "organisation", organisationId))
+            "organisation", organisationId
+        ))
         .headers(defaultHeaders())
         .post("/api/v1/projects/")
         .then()
@@ -230,7 +238,8 @@ public static int createProject(String name, int organisationId) {
   }
 
   public static BaseFlag flag(
-      String name, String description, String type, boolean enabled, String value) {
+      String name, String description, String type, boolean enabled, String value
+  ) {
     final FeatureStateModel result = new FeatureStateModel();
     result.setEnabled(enabled);
     result.setValue(value);
@@ -372,8 +381,8 @@ public static List<FeatureStateModel> getFlags() {
     try {
       return MapperFactory.getMapper().readValue(
           featureJson,
-          new TypeReference<List<FeatureStateModel>>() {
-          });
+          new TypeReference<List<FeatureStateModel>>() {}
+      );
     } catch (JsonProcessingException e) {
       e.printStackTrace();
       // environment model json
@@ -430,7 +439,7 @@ public static JsonNode getIdentityRequest(String identifier, List<? extends Trai
   }
 
   public static JsonNode getIdentityRequest(
-      String identifier, List<? extends TraitModel> traits, boolean isTransient) {
+    String identifier, List<? extends TraitModel> traits, boolean isTransient) {
     final ObjectNode flagsAndTraits = MapperFactory.getMapper().createObjectNode();
     flagsAndTraits.putPOJO("identifier", identifier);
     flagsAndTraits.put("transient", isTransient);

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

@@ -25,9 +25,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EngineTest {
-  private static final String ENVIRONMENT_JSON_FILE_LOCATION = "src/test/java/com/flagsmith/flagengine/enginetestdata/"
-      +
-      "data/environment_n9fbf9h3v4fFgH3U3ngWhb.json";
+  private static final String ENVIRONMENT_JSON_FILE_LOCATION =
+      "src/test/java/com/flagsmith/flagengine/enginetestdata/" +
+          "data/environment_n9fbf9h3v4fFgH3U3ngWhb.json";
   private static ObjectMapper objectMapper = MapperFactory.getMapper();
 
   private static Stream<Arguments> engineTestData() {
@@ -37,8 +37,7 @@ private static Stream<Arguments> engineTestData() {
       JsonNode environmentDocument = engineTestData.get("environment");
       JsonNode identitiesAndResponses = engineTestData.get("identities_and_responses");
 
-      EvaluationContext baseEvaluationContext = EngineMappers
-          .mapEnvironmentDocumentToContext(environmentDocument);
+      EvaluationContext baseEvaluationContext = EngineMappers.mapEnvironmentDocumentToContext(environmentDocument);
 
       List<Arguments> returnValues = new ArrayList<>();
 
@@ -84,8 +83,7 @@ public void testEngine(EvaluationContext evaluationContext, JsonNode expectedRes
 
     List<FeatureStateModel> flags = objectMapper.convertValue(
         expectedResponse.get("flags"),
-        new TypeReference<List<FeatureStateModel>>() {
-        });
+        new TypeReference<List<FeatureStateModel>>() {});
 
     flags.sort((fsm1, fsm2) -> fsm1.getFeature().getName().compareTo(fsm2.getFeature().getName()));
     List<FlagResult> sortedResults = evaluationResult.getFlags().stream()

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

@@ -43,18 +43,20 @@ private static Stream<Arguments> identitiesInSegments() {
         Arguments.of(segmentNestedRules(), threeIdentityTraits(), Boolean.TRUE),
         Arguments.of(segmentConditionsAndNestedRules(), emptyIdentityTraits(), Boolean.FALSE),
         Arguments.of(segmentConditionsAndNestedRules(), oneIdentityTrait(), Boolean.FALSE),
-        Arguments.of(segmentConditionsAndNestedRules(), threeIdentityTraits(), Boolean.TRUE));
+        Arguments.of(segmentConditionsAndNestedRules(), threeIdentityTraits(), Boolean.TRUE)
+    );
   }
 
   @ParameterizedTest
   @MethodSource("identitiesInSegments")
   public void testContextInSegment(SegmentContext segment, List<TraitModel> identityTraits,
-      Boolean expectedResponse) {
+                                    Boolean expectedResponse) {
 
     final EvaluationContext context = EngineMappers.mapContextAndIdentityDataToContext(
         FlagsmithTestHelper.evaluationContext(), "foo",
         identityTraits.stream().collect(
-            java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue)));
+            java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue))
+    );
 
     Boolean actualResult = SegmentEvaluator.isContextInSegment(context, segment);
 
@@ -68,22 +70,23 @@ private static Stream<Arguments> traitExistenceChecks() {
         Arguments.of(SegmentConditions.IS_SET, "foo", new ArrayList<>(Arrays.asList(
             new TraitModel("foo", "bar"))), true),
         Arguments.of(SegmentConditions.IS_NOT_SET, "foo", new ArrayList<>(Arrays.asList(
-            new TraitModel("foo", "bar"))), false));
+            new TraitModel("foo", "bar"))), false)
+    );
   }
 
   @ParameterizedTest
   @MethodSource("traitExistenceChecks")
   public void testTraitExistenceConditions(SegmentConditions conditionOperator, String conditionProperty,
-      List<TraitModel> traitModels, Boolean expectedResult) {
+                                           List<TraitModel> traitModels, Boolean expectedResult) {
     // Given
     // An identity to test with which has the traits as defined in the DataProvider
     final EvaluationContext context = EngineMappers.mapContextAndIdentityDataToContext(
         FlagsmithTestHelper.evaluationContext(), "foo",
         traitModels.stream().collect(
-            java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue)));
+            java.util.stream.Collectors.toMap(TraitModel::getTraitKey, TraitModel::getTraitValue))
+    );
 
-    // And a segment which has the operator and property value as defined in the
-    // DataProvider
+    // And a segment which has the operator and property value as defined in the DataProvider
     SegmentContext segment = new SegmentContext().withName("testSegment").withRules(
         Arrays.asList(new SegmentRule().withType(SegmentRule.Type.ALL).withConditions(
             Arrays.asList(new SegmentCondition()

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

@@ -102,7 +102,8 @@ private static Stream<Arguments> conditionTestData() {
         Arguments.of(SegmentConditions.IN, 1.5, "1.5", true),
         // Flagsmith's engine does not evaluate `IN` condition for booleans
         // due to ambiguous serialization across supported platforms.
-        Arguments.of(SegmentConditions.IN, false, "false", false));
+        Arguments.of(SegmentConditions.IN, false, "false", false)
+    );
   }
 
   @ParameterizedTest

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

@@ -11,21 +11,21 @@
 import static org.junit.Assert.assertEquals;
 
 public class LocalFileHandlerTest {
-  @Test
-  public void testLocalFileHandler() throws FlagsmithClientError, IOException {
-    // Given
-    File file = File.createTempFile("temp", ".txt");
-    try (FileWriter fileWriter = new FileWriter(file, true)) {
-      fileWriter.write(FlagsmithTestHelper.environmentString());
-      fileWriter.flush();
-    }
+    @Test
+    public void testLocalFileHandler() throws FlagsmithClientError, IOException {
+        // Given
+        File file = File.createTempFile("temp",".txt");
+        try (FileWriter fileWriter = new FileWriter(file, true)) {
+          fileWriter.write(FlagsmithTestHelper.environmentString());
+          fileWriter.flush();
+        }
 
-    // When
-    LocalFileHandler handler = new LocalFileHandler(file.getAbsolutePath());
+        // When
+        LocalFileHandler handler = new LocalFileHandler(file.getAbsolutePath());
 
-    // Then
-    assertEquals(FlagsmithTestHelper.evaluationContext(), handler.getEvaluationContext());
+        // Then
+        assertEquals(FlagsmithTestHelper.evaluationContext(), handler.getEvaluationContext());
 
-    file.delete();
-  }
+        file.delete();
+    }
 }