update: refactor build to use cmabClient instead of default service

Author: FarhanAnjum-opti

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

@@ -20,7 +20,10 @@
 import com.optimizely.ab.bucketing.DecisionService;
 import com.optimizely.ab.bucketing.FeatureDecision;
 import com.optimizely.ab.bucketing.UserProfileService;
+import com.optimizely.ab.cmab.service.CmabCacheValue;
 import com.optimizely.ab.cmab.service.CmabService;
+import com.optimizely.ab.cmab.service.CmabServiceOptions;
+import com.optimizely.ab.cmab.service.DefaultCmabService;
 import com.optimizely.ab.config.AtomicProjectConfigManager;
 import com.optimizely.ab.config.DatafileProjectConfig;
 import com.optimizely.ab.config.EventType;
@@ -46,6 +49,7 @@
 import com.optimizely.ab.event.internal.UserEvent;
 import com.optimizely.ab.event.internal.UserEventFactory;
 import com.optimizely.ab.event.internal.payload.EventBatch;
+import com.optimizely.ab.internal.DefaultLRUCache;
 import com.optimizely.ab.internal.NotificationRegistry;
 import com.optimizely.ab.notification.ActivateNotification;
 import com.optimizely.ab.notification.DecisionNotification;
@@ -70,12 +74,14 @@
 import com.optimizely.ab.optimizelydecision.OptimizelyDecideOption;
 import com.optimizely.ab.optimizelydecision.OptimizelyDecision;
 import com.optimizely.ab.optimizelyjson.OptimizelyJSON;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
+
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -85,6 +91,7 @@
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 
+import com.optimizely.ab.cmab.client.CmabClient;
 import static com.optimizely.ab.internal.SafetyUtils.tryClose;
 
 /**
@@ -1998,8 +2005,13 @@ public Builder withODPManager(ODPManager odpManager) {
             return this;
         }
 
-        public Builder withCmabService(CmabService cmabService) {
-            this.cmabService = cmabService;
+        public Builder withCmabClient(CmabClient cmabClient) {
+            int DEFAULT_MAX_SIZE = 1000;
+            int DEFAULT_CMAB_CACHE_TIMEOUT = 30 * 60 * 1000;
+            DefaultLRUCache<CmabCacheValue> cmabCache = new DefaultLRUCache<>(DEFAULT_MAX_SIZE, DEFAULT_CMAB_CACHE_TIMEOUT);
+            CmabServiceOptions cmabServiceOptions = new CmabServiceOptions(logger, cmabCache, cmabClient);
+            DefaultCmabService defaultCmabService = new DefaultCmabService(cmabServiceOptions);
+            this.cmabService = defaultCmabService;
             return this;
         }
 
@@ -2033,6 +2045,10 @@ public Optimizely build() {
                 bucketer = new Bucketer();
             }
 
+            if (cmabService == null) {
+                logger.warn("CMAB service is not initiated. CMAB functionality will not be available.");
+            }
+
             if (decisionService == null) {
                 decisionService = new DecisionService(bucketer, errorHandler, userProfileService, cmabService);
             }

core-httpclient-impl/src/main/java/com/optimizely/ab/OptimizelyFactory.java

@@ -24,16 +24,12 @@
 
 import com.optimizely.ab.cmab.DefaultCmabClient;
 import com.optimizely.ab.cmab.client.CmabClientConfig;
-import com.optimizely.ab.cmab.service.CmabCacheValue;
-import com.optimizely.ab.cmab.service.CmabServiceOptions;
-import com.optimizely.ab.cmab.service.DefaultCmabService;
 import com.optimizely.ab.config.HttpProjectConfigManager;
 import com.optimizely.ab.config.ProjectConfig;
 import com.optimizely.ab.config.ProjectConfigManager;
 import com.optimizely.ab.event.AsyncEventHandler;
 import com.optimizely.ab.event.BatchEventProcessor;
 import com.optimizely.ab.event.EventHandler;
-import com.optimizely.ab.internal.DefaultLRUCache;
 import com.optimizely.ab.internal.PropertyUtils;
 import com.optimizely.ab.notification.NotificationCenter;
 import com.optimizely.ab.odp.DefaultODPApiManager;
@@ -377,18 +373,13 @@ public static Optimizely newDefaultInstance(ProjectConfigManager configManager,
             .build();
 
         DefaultCmabClient defaultCmabClient = new DefaultCmabClient(CmabClientConfig.withDefaultRetry());
-        int DEFAULT_MAX_SIZE = 1000;
-        int DEFAULT_CMAB_CACHE_TIMEOUT = 30 * 60 * 1000;
-        DefaultLRUCache<CmabCacheValue> cmabCache = new DefaultLRUCache<>(DEFAULT_MAX_SIZE, DEFAULT_CMAB_CACHE_TIMEOUT);
-        CmabServiceOptions cmabServiceOptions = new CmabServiceOptions(logger, cmabCache, defaultCmabClient);
-        DefaultCmabService cmabService = new DefaultCmabService(cmabServiceOptions);
 
         return Optimizely.builder()
             .withEventProcessor(eventProcessor)
             .withConfigManager(configManager)
             .withNotificationCenter(notificationCenter)
             .withODPManager(odpManager)
-            .withCmabService(cmabService)
+            .withCmabClient(defaultCmabClient)
             .build();
     }
 }