Change signature of dispatchEvent to take in LogEvent object rather than url and request parameters

Author: Vignesh Raja

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

@@ -29,7 +29,10 @@
 import com.optimizely.ab.error.NoOpErrorHandler;
 import com.optimizely.ab.error.RaiseExceptionErrorHandler;
 import com.optimizely.ab.event.EventHandler;
+import com.optimizely.ab.event.LogEvent;
 import com.optimizely.ab.event.internal.EventBuilder;
+import com.optimizely.ab.event.internal.EventBuilderV1;
+import com.optimizely.ab.event.internal.EventBuilderV2;
 import com.optimizely.ab.internal.ProjectValidationUtils;
 
 import org.slf4j.Logger;
@@ -161,12 +164,12 @@ private Optimizely(@Nonnull ProjectConfig projectConfig,
             return null;
         }
 
-        String endpointUrl = eventBuilder.getEndpointUrl(projectConfig.getProjectId());
-        Map<String, String> impressionParams = eventBuilder.createImpressionParams(projectConfig, experiment,
-                                                                                   variation, userId, attributes);
+        LogEvent impressionEvent =
+                eventBuilder.createImpressionEvent(projectConfig, experiment, variation, userId, attributes);
         logger.info("Activating user \"{}\" in experiment \"{}\".", userId, experiment.getKey());
-        logger.debug("Dispatching impression event to URL {} with params {}.", endpointUrl, impressionParams);
-        eventHandler.dispatchEvent(endpointUrl, impressionParams);
+        logger.debug("Dispatching impression event to URL {} with params {}.", impressionEvent.getEndpointUrl(),
+                     impressionEvent.getRequestParams());
+        eventHandler.dispatchEvent(impressionEvent);
 
         return variation;
     }
@@ -216,27 +219,27 @@ private void track(@Nonnull String eventName,
         attributes = filterAttributes(currentConfig, attributes);
 
         // create the conversion event request parameters, then dispatch
-        String endpointUrl = eventBuilder.getEndpointUrl(currentConfig.getProjectId());
-        Map<String, String> conversionParams;
+        LogEvent conversionEvent;
         if (eventValue == null) {
-            conversionParams = eventBuilder.createConversionParams(currentConfig, bucketer, userId,
-                                                                   eventType.getId(), eventType.getKey(),
-                                                                   attributes);
+            conversionEvent = eventBuilder.createConversionEvent(currentConfig, bucketer, userId,
+                                                                 eventType.getId(), eventType.getKey(),
+                                                                 attributes);
         } else {
-            conversionParams = eventBuilder.createConversionParams(currentConfig, bucketer, userId,
-                                                                   eventType.getId(), eventType.getKey(), attributes,
-                                                                   eventValue);
+            conversionEvent = eventBuilder.createConversionEvent(currentConfig, bucketer, userId,
+                                                                 eventType.getId(), eventType.getKey(), attributes,
+                                                                 eventValue);
         }
 
-        if (conversionParams == null) {
+        if (conversionEvent == null) {
             logger.info("There are no valid experiments for event \"{}\" to track.", eventName);
             logger.info("Not tracking event \"{}\" for user \"{}\".", eventName, userId);
             return;
         }
 
         logger.info("Tracking event \"{}\" for user \"{}\".", eventName, userId);
-        logger.debug("Dispatching conversion event to URL {} with params {}.", endpointUrl, conversionParams);
-        eventHandler.dispatchEvent(endpointUrl, conversionParams);
+        logger.debug("Dispatching conversion event to URL {} with params {}.", conversionEvent.getEndpointUrl(),
+                     conversionEvent.getRequestParams());
+        eventHandler.dispatchEvent(conversionEvent);
     }
 
     //======== getVariation calls ========//
@@ -474,7 +477,7 @@ public Optimizely build() {
             }
 
             if (eventBuilder == null) {
-                eventBuilder = new EventBuilder();
+                eventBuilder = new EventBuilderV1();
             }
 
             if (errorHandler == null) {

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

@@ -23,5 +23,5 @@
  */
 public interface EventHandler {
 
-    void dispatchEvent(String url, Map<String, String> params);
+    void dispatchEvent(LogEvent logEvent);
 }

core-httpclient-impl/src/main/java/com/optimizely/ab/event/LogEvent.java renamed to core-api/src/main/java/com/optimizely/ab/event/LogEvent.java

@@ -29,7 +29,8 @@ public class NoopEventHandler implements EventHandler {
     private static final Logger logger = LoggerFactory.getLogger(NoopEventHandler.class);
 
     @Override
-    public void dispatchEvent(String url, Map<String, String> params) {
-        logger.debug("Called dispatchEvent with URL: {} and params: {}", url, params);
+    public void dispatchEvent(LogEvent logEvent) {
+        logger.debug("Called dispatchEvent with URL: {} and params: {}", logEvent.getEndpointUrl(),
+                     logEvent.getRequestParams());
     }
 }