Changed default values to null instead of empty in EventEnvelopePayload

intuit · Apr 6, 2017 · 11f4381 · 11f4381
1 parent d7a3756
commit 11f4381
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/modules/event-objects/src/main/java/com/intuit/wasabi/eventobjects/EventEnvelopePayload.java b/modules/event-objects/src/main/java/com/intuit/wasabi/eventobjects/EventEnvelopePayload.java
@@ -88,27 +88,25 @@ public String toJson() {
         JSONObject eventJson = new JSONObject();
 
         eventJson.put("messageType", MessageType.EVENT.toString());
-        eventJson.put("applicationName", applicationName != null ? applicationName.toString(): "");
-        eventJson.put("experimentLabel", experimentLabel != null ? experimentLabel.toString(): "");
+        eventJson.put("applicationName", applicationName != null ? applicationName.toString(): null);
+        eventJson.put("experimentLabel", experimentLabel != null ? experimentLabel.toString(): null);
         eventJson.put("userID",
-                assignment != null && assignment.getUserID() != null ? assignment.getUserID().toString(): "");
+                assignment != null && assignment.getUserID() != null ? assignment.getUserID().toString(): null);
         eventJson.put("bucketLabel",
-                assignment != null && assignment.getBucketLabel() != null ? assignment.getBucketLabel().toString(): "");
+                assignment != null && assignment.getBucketLabel() != null ?
+                        assignment.getBucketLabel().toString(): null);
         eventJson.put("time_uuid", makeUUID().toString());
         eventJson.put("experimentID",
-                assignment != null && assignment.getExperimentID() != null ? assignment.getExperimentID().toString(): "");
+                assignment != null && assignment.getExperimentID() != null ?
+                        assignment.getExperimentID().toString(): null);
         eventJson.put("context",
-                assignment != null && assignment.getContext() != null ? assignment.getContext().toString(): "");
+                assignment != null && assignment.getContext() != null ? assignment.getContext().toString(): null);
         eventJson.put("epochTimestamp",
-                event != null && event.getTimestamp() != null ? event.getTimestamp().getTime(): "");
-        eventJson.put("eventType",
-                event != null && event.getType() != null ? event.getType().toString(): "");
-        eventJson.put("eventName",
-                event != null && event.getName() != null ? event.getName().toString(): "");
-        eventJson.put("eventPayload",
-                event != null ? event.getPayload(): "");
-        eventJson.put("value",
-                event != null ? event.getValue(): "");
+                event != null && event.getTimestamp() != null ? event.getTimestamp().getTime(): null);
+        eventJson.put("eventType", event != null && event.getType() != null ? event.getType() + "": "null");
+        eventJson.put("eventName", event != null && event.getName() != null ? event.getName() + "": "null");
+        eventJson.put("eventPayload", event != null ? event.getPayload(): null);
+        eventJson.put("value", event != null ? event.getValue(): null);
 
         return eventJson.toString();
     }