fix per reviews

Author: jaeopt

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

@@ -41,9 +41,7 @@
 import com.optimizely.ab.android.odp.VuidManager;
 import com.optimizely.ab.android.sdk.cmab.CmabClientHelperAndroid;
 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;

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

@@ -19,7 +19,7 @@
 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.OptimizelyDecisionCallback;
 import com.optimizely.ab.optimizelydecision.OptimizelyDecisionsCallback;
 
 import java.util.Collections;

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

@@ -66,7 +66,7 @@ open class DefaultCmabClient : CmabClient {
                 val requestBody: String =
                     cmabClientHelper.buildRequestJson(userId, ruleId, attributes, cmabUuid)
 
-                logger.info("Fetching CMAB decision: " + apiEndpoint + " with body: " + requestBody)
+                logger.info("Fetching CMAB decision: {} with body: {}", apiEndpoint, requestBody)
 
                 val url = URL(apiEndpoint)
                 urlConnection = client.openConnection(url)
@@ -99,7 +99,7 @@ open class DefaultCmabClient : CmabClient {
 
                     return@Request cmabClientHelper.parseVariationId(json)
                 } else {
-                    logger.debug("Failed to fetching CMAB decision for ruleId=" + ruleId + " and userId=" + userId + ": status=" + status);
+                    logger.debug("Failed to fetch CMAB decision for ruleId={} and userId={}: status={}", ruleId, userId, status)
                     val errorMessage: String = java.lang.String.format(
                         cmabClientHelper.cmabFetchFailed,
                         urlConnection.responseMessage
@@ -108,7 +108,7 @@ open class DefaultCmabClient : CmabClient {
                     throw CmabFetchException(errorMessage)
                 }
             } catch (e: Exception) {
-                logger.debug("Failed to fetching CMAB decision for ruleId=" + ruleId + " and userId=" + userId);
+                logger.debug("Failed to fetch CMAB decision for ruleId={} and userId={}", ruleId, userId);
                 val errorMessage: String =
                     java.lang.String.format(cmabClientHelper.cmabFetchFailed, e.message)
                 logger.error(errorMessage)
@@ -131,11 +131,11 @@ open class DefaultCmabClient : CmabClient {
         var CONNECTION_TIMEOUT = 10 * 1000
         var READ_TIMEOUT = 60 * 1000
 
-        // cmab service retries only once with 1sec interval
+        // cmab service retries twice with 1sec interval
 
         // the numerical base for the exponential backoff (1 second)
         const val REQUEST_BACKOFF_TIMEOUT = 1
-        // retry only once = 2 total attempts
+        // retry twice = 3 total attempts
         const val REQUEST_RETRIES_POWER = 2
     }
 }

shared/src/androidTest/java/com/optimizely/ab/android/shared/ClientTest.java

@@ -149,7 +149,7 @@ public void testExpBackoffFailure() {
     public void testExpBackoffFailure_with_one_second_timeout() {
         Client.Request request = mock(Client.Request.class);
         when(request.execute()).thenReturn(null);
-        // one second timeout is a corner case - pow(1, 4) = 1
+        // With power=2, there are 3 total attempts (1 initial + 2 retries), and the timeout remains 1 second for each retry.
         assertNull(client.execute(request, 1, 2));
         ArgumentCaptor<Integer> captor = ArgumentCaptor.forClass(Integer.class);
         verify(logger, times(2)).info(eq("Request failed, waiting {} seconds to try again"), captor.capture());

test-app/src/main/java/com/optimizely/ab/android/test_app/Samples/APISamplesInJava.java

@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.content.IntentFilter;
-import android.graphics.Path;
 import android.net.wifi.WifiManager;
 import android.util.Log;