Merge pull request #2 from optimizely/vignesh/change-revenue-to-eventValue

Change revenue to eventValue

Author: Vignesh Raja

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

@@ -180,21 +180,21 @@ public void track(@Nonnull String eventName,
 
     public void track(@Nonnull String eventName,
                       @Nonnull String userId,
-                      long revenue) throws UnknownEventTypeException {
-        track(eventName, userId, Collections.<String, String>emptyMap(), revenue);
+                      long eventValue) throws UnknownEventTypeException {
+        track(eventName, userId, Collections.<String, String>emptyMap(), eventValue);
     }
 
     public void track(@Nonnull String eventName,
                       @Nonnull String userId,
                       @Nonnull Map<String, String> attributes,
-                      long revenue) throws UnknownEventTypeException {
-        track(eventName, userId, attributes, (Long)revenue);
+                      long eventValue) throws UnknownEventTypeException {
+        track(eventName, userId, attributes, (Long)eventValue);
     }
 
     private void track(@Nonnull String eventName,
                        @Nonnull String userId,
                        @Nonnull Map<String, String> attributes,
-                       @CheckForNull Long revenue) throws UnknownEventTypeException {
+                       @CheckForNull Long eventValue) throws UnknownEventTypeException {
 
         ProjectConfig currentConfig = getProjectConfig();
 
@@ -212,14 +212,14 @@ private void track(@Nonnull String eventName,
         // create the conversion event request parameters, then dispatch
         String endpointUrl = eventBuilder.getEndpointUrl(currentConfig.getProjectId());
         Map<String, String> conversionParams;
-        if (revenue == null) {
+        if (eventValue == null) {
             conversionParams = eventBuilder.createConversionParams(currentConfig, bucketer, userId,
                                                                    eventType.getId(), eventType.getKey(),
                                                                    attributes);
         } else {
             conversionParams = eventBuilder.createConversionParams(currentConfig, bucketer, userId,
                                                                    eventType.getId(), eventType.getKey(), attributes,
-                                                                   revenue);
+                                                                   eventValue);
         }
 
         if (conversionParams == null) {

core-api/src/main/java/com/optimizely/ab/event/internal/EventBuilder.java

@@ -54,7 +54,7 @@ public class EventBuilder {
     private static final String GOAL_NAME_PARAM = "n";
     private static final String PPID_PARAM = "p";
     private static final String PROJECT_ID_PARAM = "a";
-    private static final String REVENUE_PARAM = "v";
+    private static final String EVENT_VALUE_PARAM = "v";
     private static final String SEGMENT_PARAM_PREFIX = "s";
     private static final String SOURCE_PARAM = "src";
     private static final String TIME_PARAM = "time";
@@ -89,8 +89,8 @@ public Map<String, String> createConversionParams(@Nonnull ProjectConfig project
                                                       @Nonnull String eventId,
                                                       @Nonnull String eventName,
                                                       @Nonnull Map<String, String> attributes,
-                                                      long revenue) {
-        return createConversionParams(projectConfig, bucketer, userId, eventId, eventName, attributes, (Long)revenue);
+                                                      long eventValue) {
+        return createConversionParams(projectConfig, bucketer, userId, eventId, eventName, attributes, (Long)eventValue);
     }
 
     private Map<String, String> createConversionParams(@Nonnull ProjectConfig projectConfig,
@@ -99,7 +99,7 @@ private Map<String, String> createConversionParams(@Nonnull ProjectConfig projec
                                                        @Nonnull String eventId,
                                                        @Nonnull String eventName,
                                                        @Nonnull Map<String, String> attributes,
-                                                       @CheckForNull Long revenue) {
+                                                       @CheckForNull Long eventValue) {
 
         Map<String, String> requestParams = new HashMap<String, String>();
         List<Experiment> addedExperiments =
@@ -110,7 +110,7 @@ private Map<String, String> createConversionParams(@Nonnull ProjectConfig projec
         }
 
         addCommonRequestParams(requestParams, projectConfig, userId, attributes);
-        addConversionGoal(requestParams, projectConfig, eventId, eventName, revenue);
+        addConversionGoal(requestParams, projectConfig, eventId, eventName, eventValue);
 
         return requestParams;
     }
@@ -256,15 +256,15 @@ private void addImpressionGoal(Map<String, String> requestParams, Experiment act
      * @param projectConfig the project config
      * @param eventId the goal being converted on
      * @param eventName the name of the custom event goal
-     * @param revenue the optional revenue for the event
+     * @param eventValue the optional event value for the event
      */
     private void addConversionGoal(Map<String, String> requestParams, ProjectConfig projectConfig, String eventId,
-                                   String eventName, @CheckForNull Long revenue) {
+                                   String eventName, @CheckForNull Long eventValue) {
 
         String eventIds = eventId;
-        if (revenue != null) {
-            requestParams.put(REVENUE_PARAM, revenue.toString());
-            // to ensure that the revenue value is also included in "total revenue", pull in the default revenue goal
+        if (eventValue != null) {
+            // record the event value for the total revenue goal
+            requestParams.put(EVENT_VALUE_PARAM, eventValue.toString());
             EventType revenueGoal = projectConfig.getEventNameMapping().get(EventType.TOTAL_REVENUE_GOAL_KEY);
             if (revenueGoal != null) {
                 eventIds = eventId + "," + revenueGoal.getId();