Remove experiment decision changes

Author: esrakartalOpt

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

@@ -97,13 +97,9 @@ 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 String variationId;
         private Variation variation;
         private String userId;
         private Map<String, ?> attributes;
@@ -134,16 +130,6 @@ public ExperimentDecisionNotificationBuilder withVariation(Variation variation)
             return this;
         }
 
-        public ExperimentDecisionNotificationBuilder withExperimentId(String experimentId) {
-            this.experimentId = experimentId;
-            return this;
-        }
-
-        public ExperimentDecisionNotificationBuilder withVariationId(String variationId) {
-            this.variationId = variationId;
-            return this;
-        }
-
         public DecisionNotification build() {
             if (type == null) {
                 throw new OptimizelyRuntimeException("type not set");
@@ -155,9 +141,7 @@ 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, variationId);
 
             return new DecisionNotification(
                 type,

core-api/src/test/java/com/optimizely/ab/notification/DecisionNotificationTest.java

@@ -37,15 +37,13 @@ public class DecisionNotificationTest {
 
     private static final Boolean FEATURE_ENABLED = Boolean.FALSE;
     private static final String EXPERIMENT_KEY = "experimentKey";
-    private static final String EXPERIMENT_ID = "1234567";
     private static final String FEATURE_KEY = "featureKey";
     private static final String FEATURE_VARIABLE_KEY = "featureVariableKey";
     private static final String FEATURE_TEST = "featureTest";
     private static final String FEATURE_TEST_VARIATION = "featureTestVariation";
     private static final String USER_ID = "userID";
     private static final Map<String, String> USER_ATTRIBUTES = Collections.singletonMap("user", "attr");
     private static final Variation VARIATION = mock(Variation.class);
-    private static final String VARIATION_ID = "1234567";
 
     private FeatureTestSourceInfo featureTestSourceInfo;
     private RolloutSourceInfo rolloutSourceInfo;
@@ -60,8 +58,6 @@ public void setUp() {
             .withAttributes(USER_ATTRIBUTES)
             .withExperimentKey(EXPERIMENT_KEY)
             .withVariation(VARIATION)
-            .withExperimentId(EXPERIMENT_ID)
-            .withVariationId(VARIATION_ID)
             .withType(NotificationCenter.DecisionNotificationType.AB_TEST.toString())
             .build();
         featureTestSourceInfo = new FeatureTestSourceInfo(FEATURE_TEST, FEATURE_TEST_VARIATION);
@@ -111,8 +107,6 @@ public void testGetDecisionInfo() {
         HashMap<String, String> expectedExperimentDecisionInfo = new HashMap<>();
         expectedExperimentDecisionInfo.put(DecisionNotification.ExperimentDecisionNotificationBuilder.EXPERIMENT_KEY, EXPERIMENT_KEY);
         expectedExperimentDecisionInfo.put(DecisionNotification.ExperimentDecisionNotificationBuilder.VARIATION_KEY, VARIATION.getKey());
-        expectedExperimentDecisionInfo.put(DecisionNotification.ExperimentDecisionNotificationBuilder.EXPERIMENT_ID, EXPERIMENT_ID);
-        expectedExperimentDecisionInfo.put(DecisionNotification.ExperimentDecisionNotificationBuilder.VARIATION_ID, VARIATION_ID);
         assertEquals(expectedExperimentDecisionInfo, experimentDecisionNotification.getDecisionInfo());
 
         // Assert for Feature's DecisionInfo