fix cmabservice instantiation

Author: jaeopt

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java

@@ -39,9 +39,15 @@
 import com.optimizely.ab.android.event_handler.EventDispatcher;
 import com.optimizely.ab.android.odp.DefaultODPApiManager;
 import com.optimizely.ab.android.odp.VuidManager;
+import com.optimizely.ab.android.sdk.cmab.DefaultCmabClient;
+import com.optimizely.ab.android.shared.Client;
 import com.optimizely.ab.android.shared.DatafileConfig;
+import com.optimizely.ab.android.shared.OptlyStorage;
 import com.optimizely.ab.android.user_profile.DefaultUserProfileService;
 import com.optimizely.ab.bucketing.UserProfileService;
+import com.optimizely.ab.cmab.client.CmabClient;
+import com.optimizely.ab.cmab.service.CmabService;
+import com.optimizely.ab.cmab.service.DefaultCmabService;
 import com.optimizely.ab.config.ProjectConfig;
 import com.optimizely.ab.config.parser.ConfigParseException;
 import com.optimizely.ab.error.ErrorHandler;
@@ -58,7 +64,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.beans.DefaultPersistenceDelegate;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
@@ -786,7 +791,7 @@ public static class Builder {
         @Nullable private List<OptimizelyDecideOption> defaultDecideOptions = null;
         @Nullable private ODPEventManager odpEventManager;
         @Nullable private ODPSegmentManager odpSegmentManager;
-        @Nullable private CMABClient cmabClient;
+        @Nullable private CmabClient cmabClient;
 
         private int odpSegmentCacheSize = 100;
         private int odpSegmentCacheTimeoutInSecs = 10*60;
@@ -1198,7 +1203,7 @@ public OptimizelyManager build(Context context) {
 
             DefaultCmabService.Builder cmabBuilder = DefaultCmabService.builder();
             if (cmabClient == null) {
-                cmabClient = new DefaultCmabClient();
+                cmabClient = new DefaultCmabClient(context);
             }
             cmabBuilder.withClient(cmabClient);
             cmabBuilder.withCmabCacheSize(cmabCacheSize);

android-sdk/src/main/java/com/optimizely/ab/android/sdk/cmab/DefaultCmabClient.kt

@@ -14,23 +14,33 @@
 
 package com.optimizely.ab.android.sdk.cmab
 
+import android.content.Context
 import androidx.annotation.VisibleForTesting
 import com.optimizely.ab.android.shared.Client
-import org.slf4j.Logger
+import com.optimizely.ab.android.shared.OptlyStorage
+import com.optimizely.ab.cmab.client.CmabClient
+import com.optimizely.ab.cmab.client.CmabClientHelper
+import com.optimizely.ab.cmab.client.CmabFetchException
+import com.optimizely.ab.cmab.client.CmabInvalidResponseException
+import org.slf4j.LoggerFactory
 import java.net.HttpURLConnection
 import java.net.URL
 
 @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
-open class DefaultCmabClient(private val client: Client, private val logger: Logger) {
+open class DefaultCmabClient(private val client: Client) : CmabClient {
+
+    private val logger = LoggerFactory.getLogger(DefaultCmabClient::class.java)
+
+    constructor(context: Context) : this(Client(OptlyStorage(context), LoggerFactory.getLogger(OptlyStorage::class.java)))
 
     @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
-    fun fetchDecision(
+    open fun fetchDecision(
         ruleId: String?,
         userId: String?,
         attributes: Map<String?, Any?>?,
         cmabUuid: String?
-    ): String {
-        val request: Client.Request<String> = Client.Request {
+    ): String? {
+        val request: Client.Request<String?> = Client.Request {
             var urlConnection: HttpURLConnection? = null
             try {
                 val apiEndpoint = String.format(CmabClientHelper.CMAB_PREDICTION_ENDPOINT, ruleId)
@@ -40,6 +50,7 @@ open class DefaultCmabClient(private val client: Client, private val logger: Log
                 val url = URL(apiEndpoint)
                 urlConnection = client.openConnection(url)
                 if (urlConnection == null) {
+                    logger.error("Error opening connection to $apiEndpoint")
                     return@Request null
                 }
 
@@ -88,15 +99,7 @@ open class DefaultCmabClient(private val client: Client, private val logger: Log
                 }
             }
         }
-        val response = client.execute(request, REQUEST_BACKOFF_TIMEOUT, REQUEST_RETRIES_POWER)
-        val parser: ResponseJsonParser = ResponseJsonParserFactory.getParser()
-        try {
-            return parser.parseQualifiedSegments(response)
-        } catch (e: java.lang.Exception) {
-            logger.error("Audience segments fetch failed (Error Parsing Response)")
-            logger.debug(e.message)
-        }
-        return null
+        return client.execute(request, REQUEST_BACKOFF_TIMEOUT, REQUEST_RETRIES_POWER)
     }
 
     companion object {

shared/build.gradle

@@ -45,7 +45,10 @@ android {
 }
 
 dependencies {
-    api ("com.optimizely.ab:core-api:$java_core_ver") {
+//    api ("com.optimizely.ab:core-api:$java_core_ver") {
+//        exclude group: 'com.google.code.findbugs'
+//    }
+    api ("com.optimizely.ab:core-api:3.1.0-SNAPSHOT") {
         exclude group: 'com.google.code.findbugs'
     }