Update OptimizelyUserContext to copy FD, update DecisionService to user SimpleEntry from AbstractMap instead of Pair since no longer supported in Java 11

Author: The-inside-man

core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java

@@ -53,6 +53,20 @@ public OptimizelyUserContext(@Nonnull Optimizely optimizely,
         }
     }
 
+    public OptimizelyUserContext(@Nonnull Optimizely optimizely,
+                                 @Nonnull String userId,
+                                 @Nonnull Map<String, ?> attributes,
+                                 @Nullable Map<String, OptimizelyForcedDecision> forcedDecisionsMap) {
+        this.optimizely = optimizely;
+        this.userId = userId;
+        if (attributes != null) {
+            this.attributes = Collections.synchronizedMap(new HashMap<>(attributes));
+        } else {
+            this.attributes = Collections.synchronizedMap(new HashMap<>());
+        }
+        this.forcedDecisionsMap = forcedDecisionsMap;
+    }
+
     public OptimizelyUserContext(@Nonnull Optimizely optimizely, @Nonnull String userId) {
         this(optimizely, userId, Collections.EMPTY_MAP);
     }
@@ -70,7 +84,7 @@ public Optimizely getOptimizely() {
     }
 
     public OptimizelyUserContext copy() {
-        return new OptimizelyUserContext(optimizely, userId, attributes);
+        return new OptimizelyUserContext(optimizely, userId, attributes, forcedDecisionsMap);
     }
 
     /**

core-api/src/main/java/com/optimizely/ab/bucketing/DecisionService.java

@@ -30,10 +30,7 @@
 import org.slf4j.LoggerFactory;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static com.optimizely.ab.internal.LoggingConstants.LoggingEntityType.EXPERIMENT;
@@ -311,7 +308,7 @@ DecisionResponse<FeatureDecision> getVariationForFeatureInRollout(@Nonnull Featu
         int index = 0;
         while (index < rolloutRulesLength) {
 
-            DecisionResponse<Map> decisionVariationResponse = getVariationFromDeliveryRule(
+            DecisionResponse<AbstractMap.SimpleEntry> decisionVariationResponse = getVariationFromDeliveryRule(
                 projectConfig,
                 featureFlag.getKey(),
                 rollout.getExperiments(),
@@ -320,9 +317,9 @@ DecisionResponse<FeatureDecision> getVariationForFeatureInRollout(@Nonnull Featu
             );
             reasons.merge(decisionVariationResponse.getReasons());
 
-            Map<Variation, Boolean> response = decisionVariationResponse.getResult();
-            Variation variation = (Variation)response.keySet().toArray()[0];
-            Boolean skipToEveryoneElse = response.get(variation);
+            AbstractMap.SimpleEntry<Variation, Boolean> response = decisionVariationResponse.getResult();
+            Variation variation = response.getKey();
+            Boolean skipToEveryoneElse = response.getValue();
             if (variation != null) {
                 Experiment rule = rollout.getExperiments().get(index);
                 FeatureDecision featureDecision = new FeatureDecision(rule, variation, FeatureDecision.DecisionSource.ROLLOUT);
@@ -631,15 +628,14 @@ private boolean validateUserId(String userId) {
      * @return                  Returns a DecisionResponse Object containing a Pair<Variation, Boolean>
      *                          where the Variation is the result and the Boolean is the skipToEveryoneElse.
      */
-    DecisionResponse<Map> getVariationFromDeliveryRule(@Nonnull ProjectConfig projectConfig,
+    DecisionResponse<AbstractMap.SimpleEntry> getVariationFromDeliveryRule(@Nonnull ProjectConfig projectConfig,
                                                        @Nonnull String flagKey,
                                                        @Nonnull List<Experiment> rules,
                                                        @Nonnull int ruleIndex,
                                                        @Nonnull OptimizelyUserContext user) {
         DecisionReasons reasons = DefaultDecisionReasons.newInstance();
         Boolean skipToEveryoneElse = false;
-        Map<Variation, Boolean> variationToSkipToEveryoneElse = new HashMap<>();;
-
+        AbstractMap.SimpleEntry<Variation, Boolean> variationToSkipToEveryoneElsePair;
         // Check forced-decisions first
         Experiment rule = rules.get(ruleIndex);
         OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, rule.getKey());
@@ -648,8 +644,8 @@ DecisionResponse<Map> getVariationFromDeliveryRule(@Nonnull ProjectConfig projec
 
         Variation variation = forcedDecisionResponse.getResult();
         if (variation != null) {
-            variationToSkipToEveryoneElse.put(variation, false);
-            return new DecisionResponse(variationToSkipToEveryoneElse, reasons);
+            variationToSkipToEveryoneElsePair = new AbstractMap.SimpleEntry<>(variation, false);
+            return new DecisionResponse(variationToSkipToEveryoneElsePair, reasons);
         }
 
         // Handle a regular decision
@@ -694,8 +690,8 @@ DecisionResponse<Map> getVariationFromDeliveryRule(@Nonnull ProjectConfig projec
             reasons.addInfo(message);
             logger.debug(message);
         }
-        variationToSkipToEveryoneElse.put(bucketedVariation, skipToEveryoneElse);
-        return new DecisionResponse(variationToSkipToEveryoneElse, reasons);
+        variationToSkipToEveryoneElsePair = new AbstractMap.SimpleEntry<>(bucketedVariation, skipToEveryoneElse);
+        return new DecisionResponse(variationToSkipToEveryoneElsePair, reasons);
     }
 
 }

core-api/src/test/java/com/optimizely/ab/bucketing/DecisionServiceTest.java

@@ -32,10 +32,7 @@
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.optimizely.ab.config.DatafileProjectConfigTestUtils.*;
 import static com.optimizely.ab.config.ValidProjectConfigV4.*;
@@ -727,16 +724,16 @@ public void getVariationFromDeliveryRuleTest() {
                 expectedVariation = variation;
             }
         }
-        DecisionResponse<Map> decisionResponse = decisionService.getVariationFromDeliveryRule(
+        DecisionResponse<AbstractMap.SimpleEntry> decisionResponse = decisionService.getVariationFromDeliveryRule(
             v4ProjectConfig,
             FEATURE_FLAG_MULTI_VARIATE_FEATURE.getKey(),
             rules,
             index,
             optimizely.createUserContext(genericUserId, Collections.singletonMap(ATTRIBUTE_NATIONALITY_KEY, AUDIENCE_ENGLISH_CITIZENS_VALUE))
         );
 
-        Variation variation = (Variation) decisionResponse.getResult().values().toArray()[0];
-        Boolean skipToEveryoneElse = (Boolean) decisionResponse.getResult().get(variation);
+        Variation variation = (Variation) decisionResponse.getResult().getKey();
+        Boolean skipToEveryoneElse = (Boolean) decisionResponse.getResult().getValue();
         assertNotNull(decisionResponse.getResult());
         assertNotNull(variation);
         assertNotNull(expectedVariation);