fix event disptach order

Author: raju-opti

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

@@ -1318,13 +1318,17 @@ Map<String, OptimizelyDecision> decideForKeys(@Nonnull OptimizelyUserContext use
 
         List<FeatureFlag> flagsWithoutForcedDecision = new ArrayList<>();
 
+        List<String> validKeys = new ArrayList<>();
+
         for (String key : keys) {
             FeatureFlag flag = projectConfig.getFeatureKeyMapping().get(key);
             if (flag == null) {
                 decisionMap.put(key, OptimizelyDecision.newErrorDecision(key, user, DecisionMessage.FLAG_KEY_INVALID.reason(key)));
                 continue;
             }
 
+            validKeys.add(key);
+
             DecisionReasons decisionReasons = DefaultDecisionReasons.newInstance(allOptions);
             Optional<FeatureDecision> forcedDecision = getForcedDecision(key, decisionReasons, projectConfig, user);
             decisionReasonsMap.put(key, decisionReasons);
@@ -1346,9 +1350,8 @@ Map<String, OptimizelyDecision> decideForKeys(@Nonnull OptimizelyUserContext use
             decisionReasonsMap.get(flagKey).merge(decision.getReasons());
         }
 
-        for (Map.Entry<String, FeatureDecision> entry: flagDecisions.entrySet()) {
-            String key = entry.getKey();
-            FeatureDecision flagDecision = entry.getValue();
+        for (String key: validKeys) {
+            FeatureDecision flagDecision = flagDecisions.get(key);
             DecisionReasons decisionReasons = decisionReasonsMap.get((key));
 
             OptimizelyDecision optimizelyDecision = createOptimizelyDecision(

core-api/src/test/java/com/optimizely/ab/OptimizelyUserContextTest.java

@@ -408,17 +408,17 @@ public void decideAll_allFlags() {
         List<ImpressionEvent> sentEvents = argumentCaptor.getAllValues();
         assertEquals(sentEvents.size(), 3);
 
-        assertEquals(sentEvents.get(2).getExperimentKey(), "exp_with_audience");
-        assertEquals(sentEvents.get(2).getVariationKey(), "a");
-        assertEquals(sentEvents.get(2).getUserContext().getUserId(), userId);
+        assertEquals(sentEvents.get(0).getExperimentKey(), "exp_with_audience");
+        assertEquals(sentEvents.get(0).getVariationKey(), "a");
+        assertEquals(sentEvents.get(0).getUserContext().getUserId(), userId);
 
 
         assertEquals(sentEvents.get(1).getExperimentKey(), "exp_no_audience");
         assertEquals(sentEvents.get(1).getVariationKey(), "variation_with_traffic");
         assertEquals(sentEvents.get(1).getUserContext().getUserId(), userId);
 
-        assertEquals(sentEvents.get(0).getExperimentKey(), "");
-        assertEquals(sentEvents.get(0).getUserContext().getUserId(), userId);
+        assertEquals(sentEvents.get(2).getExperimentKey(), "");
+        assertEquals(sentEvents.get(2).getUserContext().getUserId(), userId);
     }
 
     @Test