Create experimentRules array directly instead of from Map Values (#444)

Author: The-inside-man

core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigService.java

@@ -26,6 +26,7 @@ public class OptimizelyConfigService {
     private ProjectConfig projectConfig;
     private OptimizelyConfig optimizelyConfig;
     private List<OptimizelyAudience> audiences;
+    private List<OptimizelyExperiment> experimentRules;
     private Map<String, String> audiencesMap;
     private Map<String, List<FeatureVariable>> featureIdToVariablesMap = new HashMap<>();
     private Map<String, OptimizelyExperiment> experimentMapByExperimentId = new HashMap<>();
@@ -221,10 +222,8 @@ Map<String, OptimizelyFeature> getFeaturesMap(Map<String, OptimizelyExperiment>
         Map<String, OptimizelyFeature> optimizelyFeatureKeyMap = new HashMap<>();
         for (FeatureFlag featureFlag : featureFlags) {
             Map<String, OptimizelyExperiment> experimentsMapForFeature =
-                getExperimentsMapForFeature(featureFlag.getExperimentIds(), allExperimentsMap);
+                getExperimentsMapForFeature(featureFlag.getExperimentIds());
 
-            List<OptimizelyExperiment> experimentRules =
-                new ArrayList<OptimizelyExperiment>(experimentsMapForFeature.values());
             List<OptimizelyExperiment> deliveryRules =
                 this.getDeliveryRules(featureFlag.getRolloutId(), featureFlag.getId());
 
@@ -267,17 +266,22 @@ List<OptimizelyExperiment> getDeliveryRules(String rolloutId, String featureId)
     }
 
     @VisibleForTesting
-    Map<String, OptimizelyExperiment> getExperimentsMapForFeature(List<String> experimentIds, Map<String, OptimizelyExperiment> allExperimentsMap) {
+    Map<String, OptimizelyExperiment> getExperimentsMapForFeature(List<String> experimentIds) {
         if (experimentIds == null) {
             return Collections.emptyMap();
         }
 
+        List<OptimizelyExperiment> experimentRulesList = new ArrayList<>();
+
         Map<String, OptimizelyExperiment> optimizelyExperimentKeyMap = new HashMap<>();
         for (String experimentId : experimentIds) {
-            Experiment experiment = projectConfig.getExperimentIdMapping().get(experimentId);
-            optimizelyExperimentKeyMap.put(experiment.getKey(), experimentMapByExperimentId.get(experiment.getId()));
+            OptimizelyExperiment optimizelyExperiment = experimentMapByExperimentId.get(experimentId);
+            optimizelyExperimentKeyMap.put(optimizelyExperiment.getKey(), optimizelyExperiment);
+            experimentRulesList.add(optimizelyExperiment);
         }
 
+        this.experimentRules = experimentRulesList;
+
         return optimizelyExperimentKeyMap;
     }
 

core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigServiceTest.java

@@ -87,7 +87,7 @@ public void testGetFeatureVariablesMap() {
     public void testGetExperimentsMapForFeature() {
         List<String> experimentIds = projectConfig.getFeatureFlags().get(1).getExperimentIds();
         Map<String, OptimizelyExperiment> optimizelyFeatureExperimentMap =
-            optimizelyConfigService.getExperimentsMapForFeature(experimentIds, optimizelyConfigService.getExperimentsMap());
+            optimizelyConfigService.getExperimentsMapForFeature(experimentIds);
         assertEquals(expectedConfig.getFeaturesMap().get("multi_variate_feature").getExperimentsMap().size(), optimizelyFeatureExperimentMap.size());
     }