build success

Author: khvn26

src/main/java/com/flagsmith/flagengine/segments/SegmentEvaluator.java

@@ -12,25 +12,21 @@
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
-import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
-import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class SegmentEvaluator {
   private static ObjectMapper mapper = new ObjectMapper();
-  private static Configuration jacksonNodeConf = Configuration.builder()
-      .jsonProvider(new JacksonJsonNodeJsonProvider())
-      .mappingProvider(new JacksonMappingProvider(mapper))
-      .options(Option.DEFAULT_PATH_LEAF_TO_NULL)
-      .build();
+  private static Configuration jsonPathConfiguration = Configuration
+      .defaultConfiguration()
+      .setOptions(Option.SUPPRESS_EXCEPTIONS);
 
   /**
    * Check if context is in segment.
@@ -107,7 +103,7 @@ private static Boolean contextMatchesCondition(
         }
 
         if (!(contextValue instanceof Boolean)) {
-          contextValue = contextValue.toString();
+          contextValue = String.valueOf(contextValue);
         }
 
         return conditionList.contains(contextValue);
@@ -198,7 +194,10 @@ private static Boolean contextMatchesCondition(
    */
   private static Object getContextValue(EvaluationContext context, String property) {
     if (property.startsWith("$.")) {
-      return JsonPath.using(jacksonNodeConf).parse(mapper.valueToTree(context)).read(property);
+      return JsonPath
+          .using(jsonPathConfiguration)
+          .parse(mapper.convertValue(context, Map.class))
+          .read(property);
     }
     if (context.getIdentity() != null) {
       return context.getIdentity().getTraits().getAdditionalProperties().get(property);

src/main/java/com/flagsmith/models/Flags.java

@@ -127,7 +127,7 @@ public static Flags fromEvaluationResult(
     Map<String, BaseFlag> flagMap = evaluationResult.getFlags().stream()
         .collect(
             Collectors.toMap(
-                (fs) -> fs.getFeatureKey(),
+                (fs) -> fs.getName(),
                 (fs) -> {
                   Flag flag = new Flag();
                   flag.setFeatureName(fs.getName());

src/test/java/com/flagsmith/FlagsmithClientTest.java

@@ -624,12 +624,17 @@ public void testUpdateEnvironment_StoresIdentityOverrides_WhenGetEnvironmentRetu
                 // Given
                 EvaluationContext evaluationContext = FlagsmithTestHelper.evaluationContext();
 
+                FlagsmithConfig config = FlagsmithConfig.newBuilder()
+                                .withLocalEvaluation(true)
+                                .build();
+
                 FlagsmithApiWrapper mockApiWrapper = mock(FlagsmithApiWrapper.class);
                 when(mockApiWrapper.getEvaluationContext()).thenReturn(evaluationContext);
+                when(mockApiWrapper.getConfig()).thenReturn(config);
 
                 FlagsmithClient client = FlagsmithClient.newBuilder()
                                 .withFlagsmithApiWrapper(mockApiWrapper)
-                                .withConfiguration(FlagsmithConfig.newBuilder().withLocalEvaluation(true).build())
+                                .withConfiguration(config)
                                 .setApiKey("ser.dummy-key")
                                 .build();
 

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

@@ -97,9 +97,9 @@ public void testEngine(EvaluationContext evaluationContext, JsonNode expectedRes
       FeatureStateModel fsm = flags.get(i);
       FlagResult fr = sortedResults.get(i);
 
-      assertEquals(fr.getName(), fsm.getFeature().getName());
-      assertEquals(fr.getEnabled(), fsm.getEnabled());
-      assertEquals(fr.getValue(), fsm.getValue());
+      assertEquals(fsm.getFeature().getName(), fr.getName());
+      assertEquals(fsm.getEnabled(), fr.getEnabled());
+      assertEquals(fsm.getValue(), fr.getValue());
     }
   }
 }