support feature metadata, unset segments in context

Author: khvn26

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "src/test/java/com/flagsmith/flagengine/enginetestdata"]
 	path = src/test/java/com/flagsmith/flagengine/enginetestdata
 	url = git@github.com:Flagsmith/engine-test-data.git
-	tag = v2.4.0
+	tag = v2.5.0

src/main/java/com/flagsmith/flagengine/Engine.java

@@ -48,37 +48,41 @@ private static SegmentEvaluationResult evaluateSegments(
     List<SegmentResult> segments = new ArrayList<>();
     HashMap<String, ImmutablePair<String, FeatureContext>> segmentFeatureContexts = new HashMap<>();
 
-    for (SegmentContext segmentContext : context.getSegments().getAdditionalProperties().values()) {
-      if (SegmentEvaluator.isContextInSegment(context, segmentContext)) {
-        segments.add(new SegmentResult().withKey(segmentContext.getKey())
-            .withName(segmentContext.getName())
-            .withMetadata(segmentContext.getMetadata()));
-
-        List<FeatureContext> segmentOverrides = segmentContext.getOverrides();
-
-        if (segmentOverrides != null) {
-          for (FeatureContext featureContext : segmentOverrides) {
-            String featureKey = featureContext.getFeatureKey();
-
-            if (segmentFeatureContexts.containsKey(featureKey)) {
-              ImmutablePair<String, FeatureContext> existing = segmentFeatureContexts
-                  .get(featureKey);
-              FeatureContext existingFeatureContext = existing.getRight();
-
-              Double existingPriority = existingFeatureContext.getPriority() == null
-                  ? EngineConstants.WEAKEST_PRIORITY
-                  : existingFeatureContext.getPriority();
-              Double featurePriority = featureContext.getPriority() == null
-                  ? EngineConstants.WEAKEST_PRIORITY
-                  : featureContext.getPriority();
-
-              if (existingPriority < featurePriority) {
-                continue;
+    Segments contextSegments = context.getSegments();
+
+    if (contextSegments != null) {
+      for (SegmentContext segmentContext : contextSegments.getAdditionalProperties().values()) {
+        if (SegmentEvaluator.isContextInSegment(context, segmentContext)) {
+          segments.add(new SegmentResult().withKey(segmentContext.getKey())
+              .withName(segmentContext.getName())
+              .withMetadata(segmentContext.getMetadata()));
+
+          List<FeatureContext> segmentOverrides = segmentContext.getOverrides();
+
+          if (segmentOverrides != null) {
+            for (FeatureContext featureContext : segmentOverrides) {
+              String featureKey = featureContext.getFeatureKey();
+
+              if (segmentFeatureContexts.containsKey(featureKey)) {
+                ImmutablePair<String, FeatureContext> existing = segmentFeatureContexts
+                    .get(featureKey);
+                FeatureContext existingFeatureContext = existing.getRight();
+
+                Double existingPriority = existingFeatureContext.getPriority() == null
+                    ? EngineConstants.WEAKEST_PRIORITY
+                    : existingFeatureContext.getPriority();
+                Double featurePriority = featureContext.getPriority() == null
+                    ? EngineConstants.WEAKEST_PRIORITY
+                    : featureContext.getPriority();
+
+                if (existingPriority < featurePriority) {
+                  continue;
+                }
               }
+              segmentFeatureContexts.put(featureKey,
+                  new ImmutablePair<String, FeatureContext>(
+                      segmentContext.getName(), featureContext));
             }
-            segmentFeatureContexts.put(featureKey,
-                new ImmutablePair<String, FeatureContext>(
-                    segmentContext.getName(), featureContext));
           }
         }
       }
@@ -110,7 +114,8 @@ private static Flags evaluateFeatures(
                   .withName(featureContext.getName())
                   .withValue(featureContext.getValue())
                   .withReason(
-                      "TARGETING_MATCH; segment=" + segmentNameFeaturePair.getLeft()));
+                      "TARGETING_MATCH; segment=" + segmentNameFeaturePair.getLeft())
+                  .withMetadata(featureContext.getMetadata()));
         } else {
           flags.setAdditionalProperty(featureContext.getName(),
               getFlagResultFromFeatureContext(featureContext, identityKey));
@@ -146,7 +151,8 @@ private static FlagResult getFlagResultFromFeatureContext(
                 .withFeatureKey(featureContext.getFeatureKey())
                 .withName(featureContext.getName())
                 .withValue(variant.getValue())
-                .withReason("SPLIT; weight=" + weight.intValue());
+                .withReason("SPLIT; weight=" + weight.intValue())
+                .withMetadata(featureContext.getMetadata());
           }
           startPercentage = limit;
         }
@@ -157,6 +163,7 @@ private static FlagResult getFlagResultFromFeatureContext(
         .withFeatureKey(featureContext.getFeatureKey())
         .withName(featureContext.getName())
         .withValue(featureContext.getValue())
-        .withReason("DEFAULT");
+        .withReason("DEFAULT")
+        .withMetadata(featureContext.getMetadata());
   }
 }