Merge branch 'master' into 2.1.x

Author: Mike Ng

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Optimizely Java X SDK Changelog
 
+## 2.1.2
+
+August 1st, 2018
+
+### Bug Fixes
+* Move serialization to LogEvent.getBody() to improve performance of API calls ([#201](https://github.com/optimizely/java-sdk/pull/201))
+
 ## 2.1.1
 
 June 19th, 2018

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

@@ -35,9 +35,8 @@
 import com.optimizely.ab.event.EventHandler;
 import com.optimizely.ab.event.LogEvent;
 import com.optimizely.ab.event.internal.BuildVersionInfo;
-import com.optimizely.ab.event.internal.EventBuilder;
+import com.optimizely.ab.event.internal.EventFactory;
 import com.optimizely.ab.event.internal.payload.EventBatch.ClientEngine;
-import com.optimizely.ab.internal.ControlAttribute;
 import com.optimizely.ab.notification.NotificationCenter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,7 +81,7 @@ public class Optimizely {
     private static final Logger logger = LoggerFactory.getLogger(Optimizely.class);
 
     @VisibleForTesting final DecisionService decisionService;
-    @VisibleForTesting final EventBuilder eventBuilder;
+    @VisibleForTesting final EventFactory eventFactory;
     @VisibleForTesting final ProjectConfig projectConfig;
     @VisibleForTesting final EventHandler eventHandler;
     @VisibleForTesting final ErrorHandler errorHandler;
@@ -93,13 +92,13 @@ public class Optimizely {
     private Optimizely(@Nonnull ProjectConfig projectConfig,
                        @Nonnull DecisionService decisionService,
                        @Nonnull EventHandler eventHandler,
-                       @Nonnull EventBuilder eventBuilder,
+                       @Nonnull EventFactory eventFactory,
                        @Nonnull ErrorHandler errorHandler,
                        @Nullable UserProfileService userProfileService) {
         this.projectConfig = projectConfig;
         this.decisionService = decisionService;
         this.eventHandler = eventHandler;
-        this.eventBuilder = eventBuilder;
+        this.eventFactory = eventFactory;
         this.errorHandler = errorHandler;
         this.userProfileService = userProfileService;
     }
@@ -193,16 +192,20 @@ private void sendImpression(@Nonnull ProjectConfig projectConfig,
                                 @Nonnull Map<String, String> filteredAttributes,
                                 @Nonnull Variation variation) {
         if (experiment.isRunning()) {
-            LogEvent impressionEvent = eventBuilder.createImpressionEvent(
+            LogEvent impressionEvent = eventFactory.createImpressionEvent(
                     projectConfig,
                     experiment,
                     variation,
                     userId,
                     filteredAttributes);
             logger.info("Activating user \"{}\" in experiment \"{}\".", userId, experiment.getKey());
-            logger.debug(
-                    "Dispatching impression event to URL {} with params {} and payload \"{}\".",
-                    impressionEvent.getEndpointUrl(), impressionEvent.getRequestParams(), impressionEvent.getBody());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug(
+                        "Dispatching impression event to URL {} with params {} and payload \"{}\".",
+                        impressionEvent.getEndpointUrl(), impressionEvent.getRequestParams(), impressionEvent.getBody());
+            }
+
             try {
                 eventHandler.dispatchEvent(impressionEvent);
             } catch (Exception e) {
@@ -279,7 +282,7 @@ public void track(@Nonnull String eventName,
         }
 
         // create the conversion event request parameters, then dispatch
-        LogEvent conversionEvent = eventBuilder.createConversionEvent(
+        LogEvent conversionEvent = eventFactory.createConversionEvent(
                 projectConfig,
                 experimentVariationMap,
                 userId,
@@ -295,8 +298,12 @@ public void track(@Nonnull String eventName,
         }
 
         logger.info("Tracking event \"{}\" for user \"{}\".", eventName, userId);
-        logger.debug("Dispatching conversion event to URL {} with params {} and payload \"{}\".",
-                conversionEvent.getEndpointUrl(), conversionEvent.getRequestParams(), conversionEvent.getBody());
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("Dispatching conversion event to URL {} with params {} and payload \"{}\".",
+                    conversionEvent.getEndpointUrl(), conversionEvent.getRequestParams(), conversionEvent.getBody());
+        }
+
         try {
             eventHandler.dispatchEvent(conversionEvent);
         } catch (Exception e) {
@@ -829,7 +836,7 @@ public static class Builder {
         private DecisionService decisionService;
         private ErrorHandler errorHandler;
         private EventHandler eventHandler;
-        private EventBuilder eventBuilder;
+        private EventFactory eventFactory;
         private ClientEngine clientEngine;
         private String clientVersion;
         private ProjectConfig projectConfig;
@@ -871,8 +878,8 @@ public Builder withClientVersion(String clientVersion) {
             return this;
         }
 
-        protected Builder withEventBuilder(EventBuilder eventBuilder) {
-            this.eventBuilder = eventBuilder;
+        protected Builder withEventBuilder(EventFactory eventFactory) {
+            this.eventFactory = eventFactory;
             return this;
         }
 
@@ -900,8 +907,8 @@ public Optimizely build() throws ConfigParseException {
             }
 
 
-            if (eventBuilder == null) {
-                eventBuilder = new EventBuilder(clientEngine, clientVersion);
+            if (eventFactory == null) {
+                eventFactory = new EventFactory(clientEngine, clientVersion);
             }
 
             if (errorHandler == null) {
@@ -912,7 +919,7 @@ public Optimizely build() throws ConfigParseException {
                 decisionService = new DecisionService(bucketer, errorHandler, projectConfig, userProfileService);
             }
 
-            Optimizely optimizely = new Optimizely(projectConfig, decisionService, eventHandler, eventBuilder, errorHandler, userProfileService);
+            Optimizely optimizely = new Optimizely(projectConfig, decisionService, eventHandler, eventFactory, errorHandler, userProfileService);
             optimizely.initialize();
             return optimizely;
         }

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

@@ -16,6 +16,10 @@
  */
 package com.optimizely.ab.event;
 
+import com.optimizely.ab.event.internal.payload.EventBatch;
+import com.optimizely.ab.event.internal.serializer.DefaultJsonSerializer;
+import com.optimizely.ab.event.internal.serializer.Serializer;
+
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -30,16 +34,16 @@ public class LogEvent {
     private final RequestMethod requestMethod;
     private final String endpointUrl;
     private final Map<String, String> requestParams;
-    private final String body;
+    private final EventBatch eventBatch;
 
     public LogEvent(@Nonnull RequestMethod requestMethod,
                     @Nonnull String endpointUrl,
                     @Nonnull Map<String, String> requestParams,
-                    @Nonnull String body) {
+                    EventBatch eventBatch) {
         this.requestMethod = requestMethod;
         this.endpointUrl = endpointUrl;
         this.requestParams = requestParams;
-        this.body = body;
+        this.eventBatch = eventBatch;
     }
 
     //======== Getters ========//
@@ -57,7 +61,12 @@ public Map<String, String> getRequestParams() {
     }
 
     public String getBody() {
-        return body;
+        if (eventBatch == null) {
+            return "";
+        }
+
+        Serializer serializer = DefaultJsonSerializer.getInstance();
+        return serializer.serialize(eventBatch);
     }
 
     //======== Overriding method ========//
@@ -68,7 +77,7 @@ public String toString() {
                "requestMethod=" + requestMethod +
                ", endpointUrl='" + endpointUrl + '\'' +
                ", requestParams=" + requestParams +
-               ", body='" + body + '\'' +
+               ", body='" + getBody() + '\'' +
                '}';
     }