fix cmab interfaces

Author: jaeopt

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

@@ -19,6 +19,8 @@
 import com.optimizely.ab.OptimizelyUserContext;
 import com.optimizely.ab.optimizelydecision.OptimizelyDecideOption;
 import com.optimizely.ab.optimizelydecision.OptimizelyDecision;
+import com.optimizely.ab.optimizelydecision.OptimizelyDecisionCallback;;
+import com.optimizely.ab.optimizelydecision.OptimizelyDecisionsCallback;
 
 import java.util.Collections;
 import java.util.List;
@@ -70,7 +72,7 @@ public OptimizelyUserContextAndroid(@NonNull Optimizely optimizely,
     @Override
     public OptimizelyDecision decide(@NonNull String key,
                                      @NonNull List<OptimizelyDecideOption> options) {
-        return optimizely.decideSync(copy(), key, options);
+        return getOptimizely().decideSync(copy(), key, options);
     }
 
     /**
@@ -105,7 +107,7 @@ public OptimizelyDecision decide(@NonNull String key) {
     @Override
     public Map<String, OptimizelyDecision> decideForKeys(@NonNull List<String> keys,
                                                          @NonNull List<OptimizelyDecideOption> options) {
-        return optimizely.decideForKeysSync(copy(), keys, options);
+        return getOptimizely().decideForKeysSync(copy(), keys, options);
     }
 
     /**
@@ -135,7 +137,7 @@ public Map<String, OptimizelyDecision> decideForKeys(@NonNull List<String> keys)
      */
     @Override
     public Map<String, OptimizelyDecision> decideAll(@NonNull List<OptimizelyDecideOption> options) {
-        return optimizely.decideAllSync(copy(), options);
+        return getOptimizely().decideAllSync(copy(), options);
     }
 
     /**
@@ -159,10 +161,10 @@ public Map<String, OptimizelyDecision> decideAll() {
      * @param callback A callback to invoke when the decision is available.
      * @param options A list of options for decision-making.
      */
-    public void decideAsync(@Nonnull String key,
-                            @Nonnull OptimizelyDecisionCallback callback,
-                            @Nonnull List<OptimizelyDecideOption> options) {
-        optimizely.decideAsync(copy(), key, callback, options);
+    public void decideAsync(@NonNull String key,
+                            @NonNull OptimizelyDecisionCallback callback,
+                            @NonNull List<OptimizelyDecideOption> options) {
+        getOptimizely().decideAsync(copy(), key, callback, options);
     }
 
     /**
@@ -171,7 +173,7 @@ public void decideAsync(@Nonnull String key,
      * @param key A flag key for which a decision will be made.
      * @param callback A callback to invoke when the decision is available.
      */
-    public void decideAsync(@Nonnull String key, @Nonnull OptimizelyDecisionCallback callback) {
+    public void decideAsync(@NonNull String key, @NonNull OptimizelyDecisionCallback callback) {
         decideAsync(key, callback, Collections.emptyList());
     }
 
@@ -182,10 +184,10 @@ public void decideAsync(@Nonnull String key, @Nonnull OptimizelyDecisionCallback
      * @param callback A callback to invoke when decisions are available.
      * @param options A list of options for decision-making.
      */
-    public void decideForKeysAsync(@Nonnull List<String> keys,
-                                   @Nonnull OptimizelyDecisionsCallback callback,
-                                   @Nonnull List<OptimizelyDecideOption> options) {
-        optimizely.decideForKeysAsync(copy(), keys, callback, options);
+    public void decideForKeysAsync(@NonNull List<String> keys,
+                                   @NonNull OptimizelyDecisionsCallback callback,
+                                   @NonNull List<OptimizelyDecideOption> options) {
+        getOptimizely().decideForKeysAsync(copy(), keys, callback, options);
     }
 
     /**
@@ -194,7 +196,7 @@ public void decideForKeysAsync(@Nonnull List<String> keys,
      * @param keys A list of flag keys for which decisions will be made.
      * @param callback A callback to invoke when decisions are available.
      */
-    public void decideForKeysAsync(@Nonnull List<String> keys, @Nonnull OptimizelyDecisionsCallback callback) {
+    public void decideForKeysAsync(@NonNull List<String> keys, @NonNull OptimizelyDecisionsCallback callback) {
         decideForKeysAsync(keys, callback, Collections.emptyList());
     }
 
@@ -204,17 +206,17 @@ public void decideForKeysAsync(@Nonnull List<String> keys, @Nonnull OptimizelyDe
      * @param callback A callback to invoke when decisions are available.
      * @param options A list of options for decision-making.
      */
-    public void decideAllAsync(@Nonnull OptimizelyDecisionsCallback callback,
-                               @Nonnull List<OptimizelyDecideOption> options) {
-        optimizely.decideAllAsync(copy(), callback, options);
+    public void decideAllAsync(@NonNull OptimizelyDecisionsCallback callback,
+                               @NonNull List<OptimizelyDecideOption> options) {
+        getOptimizely().decideAllAsync(copy(), callback, options);
     }
 
     /**
      * Returns decision results asynchronously for all active flag keys.
      *
      * @param callback A callback to invoke when decisions are available.
      */
-    public void decideAllAsync(@Nonnull OptimizelyDecisionsCallback callback) {
+    public void decideAllAsync(@NonNull OptimizelyDecisionsCallback callback) {
         decideAllAsync(callback, Collections.emptyList());
     }
 

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

@@ -34,7 +34,7 @@ open class DefaultCmabClient(private val client: Client) : CmabClient {
     constructor(context: Context) : this(Client(OptlyStorage(context), LoggerFactory.getLogger(OptlyStorage::class.java)))
 
     @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
-    open fun fetchDecision(
+    override fun fetchDecision(
         ruleId: String?,
         userId: String?,
         attributes: Map<String?, Any?>?,
@@ -43,7 +43,10 @@ open class DefaultCmabClient(private val client: Client) : CmabClient {
         val request: Client.Request<String?> = Client.Request {
             var urlConnection: HttpURLConnection? = null
             try {
-                val apiEndpoint = String.format(CmabClientHelper.CMAB_PREDICTION_ENDPOINT, ruleId)
+                // [TESTING]
+//                val apiEndpoint = String.format(CmabClientHelper.CMAB_PREDICTION_ENDPOINT, ruleId)
+                val apiEndpoint = String.format("https://prediction.cmab.optimizely.com/predict/%s", ruleId)
+
                 val requestBody: String =
                     CmabClientHelper.buildRequestJson(userId, ruleId, attributes, cmabUuid)