[FSSDK-11448] Java Implementation: Add Experiment ID and Variation ID to Decision Notification

Author: esrakartalOpt

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

@@ -1095,6 +1095,8 @@ private Variation getVariation(@Nonnull ProjectConfig projectConfig,
             .withExperimentKey(experiment.getKey())
             .withVariation(variation)
             .withType(notificationType)
+            .withExperimentId(experiment.getId())
+            .withVariationId(variation.getId())
             .build();
 
         notificationCenter.send(decisionNotification);
@@ -1336,6 +1338,8 @@ private OptimizelyDecision createOptimizelyDecision(
 
 
         Boolean decisionEventDispatched = false;
+        String experimentId = flagDecision.experiment != null ? flagDecision.experiment.getId() : null;
+        String variationId = flagDecision.variation != null ? flagDecision.variation.getId() : null;
 
         Map<String, Object> attributes = user.getAttributes();
         Map<String, ?> copiedAttributes = new HashMap<>(attributes);
@@ -1362,6 +1366,8 @@ private OptimizelyDecision createOptimizelyDecision(
             .withRuleKey(ruleKey)
             .withReasons(reasonsToReport)
             .withDecisionEventDispatched(decisionEventDispatched)
+            .withExperimentId(experimentId)
+            .withVariationId(variationId)
             .build();
         notificationCenter.send(decisionNotification);
 

core-api/src/main/java/com/optimizely/ab/notification/DecisionNotification.java

@@ -97,9 +97,12 @@ public static ExperimentDecisionNotificationBuilder newExperimentDecisionNotific
     public static class ExperimentDecisionNotificationBuilder {
         public final static String EXPERIMENT_KEY = "experimentKey";
         public final static String VARIATION_KEY = "variationKey";
+        public final static String EXPERIMENT_ID = "experimentId";
+        public final static String VARIATION_ID = "variationId";
 
         private String type;
         private String experimentKey;
+        private String experimentId;
         private Variation variation;
         private String userId;
         private Map<String, ?> attributes;
@@ -130,6 +133,11 @@ public ExperimentDecisionNotificationBuilder withVariation(Variation variation)
             return this;
         }
 
+        public ExperimentDecisionNotificationBuilder withExperimentId(Variation experimentId) {
+            this.experimentId = experimentId;
+            return this;
+        }
+
         public DecisionNotification build() {
             if (type == null) {
                 throw new OptimizelyRuntimeException("type not set");
@@ -141,7 +149,9 @@ public DecisionNotification build() {
 
             decisionInfo = new HashMap<>();
             decisionInfo.put(EXPERIMENT_KEY, experimentKey);
+            decisionInfo.put(EXPERIMENT_ID, experimentId);
             decisionInfo.put(VARIATION_KEY, variation != null ? variation.getKey() : null);
+            decisionInfo.put(VARIATION_ID, variation != null ? variation.getId() : null);
 
             return new DecisionNotification(
                 type,
@@ -364,6 +374,8 @@ public static class FlagDecisionNotificationBuilder {
         public final static String RULE_KEY = "ruleKey";
         public final static String REASONS = "reasons";
         public final static String DECISION_EVENT_DISPATCHED = "decisionEventDispatched";
+        public final static String EXPERIMENT_ID = "experimentId";
+        public final static String VARIATION_ID = "variationId";
 
         private String flagKey;
         private Boolean enabled;
@@ -374,6 +386,8 @@ public static class FlagDecisionNotificationBuilder {
         private String ruleKey;
         private List<String> reasons;
         private Boolean decisionEventDispatched;
+        private String experimentId;
+        private String variationId;
 
         private Map<String, Object> decisionInfo;
 
@@ -422,6 +436,16 @@ public FlagDecisionNotificationBuilder withDecisionEventDispatched(Boolean dispa
             return this;
         }
 
+        public FlagDecisionNotificationBuilder withExperimentId(String experimentId) {
+            this.experimentId = experimentId;
+            return this;
+        }
+
+        public FlagDecisionNotificationBuilder withVariationId(String variationId) {
+            this.variationId = variationId;
+            return this;
+        }
+
         public DecisionNotification build() {
             if (flagKey == null) {
                 throw new OptimizelyRuntimeException("flagKey not set");
@@ -439,6 +463,8 @@ public DecisionNotification build() {
                 put(RULE_KEY, ruleKey);
                 put(REASONS, reasons);
                 put(DECISION_EVENT_DISPATCHED, decisionEventDispatched);
+                put(EXPERIMENT_ID, experimentId);
+                put(VARIATION_ID, variationId);
             }};
 
             return new DecisionNotification(