Updating as per API changes. Need to fix some tests still.

aliabbasrizvi · aliabbasrizvi · commit 30bf387ed865 · 2019-01-08T16:33:33.000-08:00
diff --git a/core-api/src/main/java/com/optimizely/ab/event/internal/EventFactory.java b/core-api/src/main/java/com/optimizely/ab/event/internal/EventFactory.java
@@ -110,8 +110,6 @@ public LogEvent createConversionEvent(@Nonnull ProjectConfig projectConfig,
                                           @Nonnull Map<String, ?> attributes,
                                           @Nonnull Map<String, ?> eventTags) {
 
-        ArrayList<Decision> decisions = new ArrayList<Decision>();
-
         EventType eventType = projectConfig.getEventNameMapping().get(eventName);
 
         Event conversionEvent = new Event.Builder()
@@ -126,9 +124,8 @@ public LogEvent createConversionEvent(@Nonnull ProjectConfig projectConfig,
             .build();
 
         Snapshot snapshot = new Snapshot.Builder()
-            .setDecisions(decisions)
-            .setEvents(Collections.singletonList((conversionEvent)))
-            .build();
+                .setEvents(Collections.singletonList((conversionEvent)))
+                .build();
 
         Visitor visitor = new Visitor.Builder()
             .setVisitorId(userId)
diff --git a/core-api/src/main/java/com/optimizely/ab/event/internal/payload/EventBatch.java b/core-api/src/main/java/com/optimizely/ab/event/internal/payload/EventBatch.java
@@ -44,6 +44,8 @@ public String getClientEngineValue() {
     @JsonProperty("account_id")
     String accountId;
     List<Visitor> visitors;
+    @JsonProperty("enrich_decisions")
+    Boolean enrichDecisions;
     @JsonProperty("anonymize_ip")
     Boolean anonymizeIp;
     @JsonProperty("client_name")
@@ -61,6 +63,7 @@ public EventBatch() {
     private EventBatch(String clientName, String clientVersion, String accountId, List<Visitor> visitors, Boolean anonymizeIp, String projectId, String revision) {
         this.accountId = accountId;
         this.visitors = visitors;
+        this.enrichDecisions = true;
         this.anonymizeIp = anonymizeIp;
         this.clientName = clientName;
         this.clientVersion = clientVersion;
@@ -84,6 +87,12 @@ public void setVisitors(List<Visitor> visitors) {
         this.visitors = visitors;
     }
 
+    public Boolean getEnrichDecisions() { return enrichDecisions; }
+
+    public void setEnrichDecisions(Boolean enrichDecisions) {
+        this.enrichDecisions = enrichDecisions;
+    }
+
     public Boolean getAnonymizeIp() {
         return anonymizeIp;
     }
diff --git a/core-api/src/main/java/com/optimizely/ab/event/internal/serializer/JsonSimpleSerializer.java b/core-api/src/main/java/com/optimizely/ab/event/internal/serializer/JsonSimpleSerializer.java
@@ -42,6 +42,7 @@ private JSONObject serializeEventBatch(EventBatch eventBatch) {
         JSONObject jsonObject = new JSONObject();
 
         jsonObject.put("account_id", eventBatch.getAccountId());
+        jsonObject.put("enrich_decisions", eventBatch.getEnrichDecisions());
         jsonObject.put("visitors", serializeVisitors(eventBatch.getVisitors()));
         if (eventBatch.getAnonymizeIp() != null) jsonObject.put("anonymize_ip", eventBatch.getAnonymizeIp());
         if (eventBatch.getClientName() != null) jsonObject.put("client_name", eventBatch.getClientName());
@@ -50,7 +51,6 @@ private JSONObject serializeEventBatch(EventBatch eventBatch) {
         if (eventBatch.getRevision() != null) jsonObject.put("revision", eventBatch.getRevision());
 
         return jsonObject;
-
     }
 
     private JSONArray serializeVisitors(List<Visitor> visitors) {
@@ -90,7 +90,7 @@ private JSONArray serializeSnapshots(List<Snapshot> snapshots) {
     private JSONObject serializeSnapshot(Snapshot snapshot) {
         JSONObject jsonObject = new JSONObject();
 
-        jsonObject.put("decisions", serializeDecisions(snapshot.getDecisions()));
+        if (snapshot.getDecisions() != null) jsonObject.put("decisions", serializeDecisions(snapshot.getDecisions()));
         jsonObject.put("events", serializeEvents(snapshot.getEvents()));
 
         return jsonObject;
diff --git a/core-api/src/test/java/com/optimizely/ab/event/internal/EventFactoryTest.java b/core-api/src/test/java/com/optimizely/ab/event/internal/EventFactoryTest.java
@@ -500,8 +500,6 @@ public void createConversionEvent() throws Exception {
                 attributeMap,
                 eventTagMap);
 
-        List<Decision> expectedDecisions = new ArrayList<Decision>();
-
         // verify that the request endpoint is correct
         assertThat(conversionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
 
@@ -528,7 +526,6 @@ public void createConversionEvent() throws Exception {
         }
 
         assertEquals(conversion.getVisitors().get(0).getAttributes(), expectedUserFeatures);
-        assertThat(conversion.getVisitors().get(0).getSnapshots().get(0).getDecisions(), containsInAnyOrder(expectedDecisions.toArray()));
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getEntityId(), eventType.getId());
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getKey(), eventType.getKey());
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getRevenue(), null);
@@ -564,8 +561,6 @@ public void createConversionEventPassingUserAgentAttribute() throws Exception {
                 attributeMap,
                 eventTagMap);
 
-        List<Decision> expectedDecisions = new ArrayList<Decision>();
-
         // verify that the request endpoint is correct
         assertThat(conversionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
 
@@ -598,7 +593,6 @@ public void createConversionEventPassingUserAgentAttribute() throws Exception {
         }
 
         assertEquals(conversion.getVisitors().get(0).getAttributes(), expectedUserFeatures);
-        assertThat(conversion.getVisitors().get(0).getSnapshots().get(0).getDecisions(), containsInAnyOrder(expectedDecisions.toArray()));
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getEntityId(), eventType.getId());
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getKey(), eventType.getKey());
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getRevenue(), null);
@@ -877,8 +871,6 @@ public void createConversionEventWithBucketingId() throws Exception {
                 attributeMap,
                 eventTagMap);
 
-        List<Decision> expectedDecisions = new ArrayList<Decision>();
-
         // verify that the request endpoint is correct
         assertThat(conversionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
 
@@ -912,7 +904,6 @@ public void createConversionEventWithBucketingId() throws Exception {
         }
 
         assertEquals(conversion.getVisitors().get(0).getAttributes(), expectedUserFeatures);
-        assertThat(conversion.getVisitors().get(0).getSnapshots().get(0).getDecisions(), containsInAnyOrder(expectedDecisions.toArray()));
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getEntityId(), eventType.getId());
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getType(), eventType.getKey());
         assertEquals(conversion.getVisitors().get(0).getSnapshots().get(0).getEvents().get(0).getKey(), eventType.getKey());
diff --git a/core-api/src/test/java/com/optimizely/ab/event/internal/serializer/SerializerTestUtils.java b/core-api/src/test/java/com/optimizely/ab/event/internal/serializer/SerializerTestUtils.java
@@ -102,12 +102,24 @@ static EventBatch generateImpressionWithSessionId() {
     }
 
     static EventBatch generateConversion() {
-        EventBatch conversion = generateImpression();
-        conversion.setClientVersion("0.1.1");
-        conversion.setAnonymizeIp(true);
-        conversion.setRevision(revision);
+        Snapshot snapshot = new Snapshot.Builder()
+            .setEvents(events)
+            .build();
 
-        return conversion;
+        Visitor visitor = new Visitor.Builder()
+            .setVisitorId(visitorId)
+            .setAttributes(userFeatures)
+            .setSnapshots(Collections.singletonList(snapshot))
+            .build();
+
+        return new EventBatch.Builder()
+            .setClientVersion("0.1.1")
+            .setAccountId(accountId)
+            .setVisitors(Collections.singletonList(visitor))
+            .setAnonymizeIp(true)
+            .setProjectId(projectId)
+            .setRevision(revision)
+            .build();
     }
 
     static EventBatch generateConversionWithSessionId() {
diff --git a/core-api/src/test/resources/serializer/conversion-session-id.json b/core-api/src/test/resources/serializer/conversion-session-id.json
@@ -4,14 +4,6 @@
     {
       "snapshots": [
         {
-          "decisions": [
-            {
-              "variation_id": "4",
-              "campaign_id": "2",
-              "experiment_id": "5",
-              "is_campaign_holdback": false
-            }
-          ],
           "events": [
             {
               "revenue": 5000,
@@ -39,6 +31,7 @@
   "client_name": "java-sdk",
   "client_version": "0.1.1",
   "anonymize_ip": true,
+  "enrich_decisions": true,
   "project_id": "1",
   "revision": "1"
 }
diff --git a/core-api/src/test/resources/serializer/conversion.json b/core-api/src/test/resources/serializer/conversion.json
@@ -4,14 +4,6 @@
     {
       "snapshots": [
         {
-          "decisions": [
-            {
-              "variation_id": "4",
-              "campaign_id": "2",
-              "experiment_id": "5",
-              "is_campaign_holdback": false
-            }
-          ],
           "events": [
             {
               "revenue": 5000,
@@ -38,6 +30,7 @@
   "client_name": "java-sdk",
   "client_version": "0.1.1",
   "anonymize_ip": true,
+  "enrich_decisions": true,
   "project_id": "1",
   "revision": "1"
 }
diff --git a/core-api/src/test/resources/serializer/impression-session-id.json b/core-api/src/test/resources/serializer/impression-session-id.json
@@ -39,6 +39,7 @@
   "client_name": "java-sdk",
   "client_version": "0.1.1",
   "anonymize_ip": true,
+  "enrich_decisions": true,
   "project_id": "1",
   "revision": "1"
 }
diff --git a/core-api/src/test/resources/serializer/impression.json b/core-api/src/test/resources/serializer/impression.json
@@ -38,6 +38,7 @@
   "client_name": "java-sdk",
   "client_version": "0.1.1",
   "anonymize_ip": true,
+  "enrich_decisions": true,
   "project_id": "1",
   "revision": "1"
 }

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,6 @@`
`4`	`4`	`{`
`5`	`5`	`"snapshots": [`
`6`	`6`	`{`
`7`		`- "decisions": [`
`8`		`- {`
`9`		`- "variation_id": "4",`
`10`		`- "campaign_id": "2",`
`11`		`- "experiment_id": "5",`
`12`		`- "is_campaign_holdback": false`
`13`		`- }`
`14`		`- ],`
`15`	`7`	`"events": [`
`16`	`8`	`{`
`17`	`9`	`"revenue": 5000,`
`@@ -39,6 +31,7 @@`
`39`	`31`	`"client_name": "java-sdk",`
`40`	`32`	`"client_version": "0.1.1",`
`41`	`33`	`"anonymize_ip": true,`
	`34`	`+ "enrich_decisions": true,`
`42`	`35`	`"project_id": "1",`
`43`	`36`	`"revision": "1"`
`44`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`"client_name": "java-sdk",`
`40`	`40`	`"client_version": "0.1.1",`
`41`	`41`	`"anonymize_ip": true,`
	`42`	`+ "enrich_decisions": true,`
`42`	`43`	`"project_id": "1",`
`43`	`44`	`"revision": "1"`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`"client_name": "java-sdk",`
`39`	`39`	`"client_version": "0.1.1",`
`40`	`40`	`"anonymize_ip": true,`
	`41`	`+ "enrich_decisions": true,`
`41`	`42`	`"project_id": "1",`
`42`	`43`	`"revision": "1"`
`43`	`44`	`}`