cleanup

Author: FarhanAnjum-opti

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

@@ -1611,125 +1611,6 @@ void decideAllAsync(@Nonnull OptimizelyUserContext userContext,
         fetcher.start();
     }
 
-    /**
-     * Returns a decision result ({@link OptimizelyDecision}) for a given flag key and a user context,
-     * skipping CMAB logic and using only traditional A/B testing.
-     * This will be called by mobile apps which will make synchronous decisions only (for backward compatibility with android-sdk)
-     *
-     * @param user    An OptimizelyUserContext associated with this OptimizelyClient.
-     * @param key     A flag key for which a decision will be made.
-     * @param options A list of options for decision-making.
-     * @return A decision result using traditional A/B testing logic only.
-     */
-    OptimizelyDecision decideSync(@Nonnull OptimizelyUserContext user,
-                                  @Nonnull String key,
-                                  @Nonnull List<OptimizelyDecideOption> options) {
-        ProjectConfig projectConfig = getProjectConfig();
-        if (projectConfig == null) {
-            return OptimizelyDecision.newErrorDecision(key, user, DecisionMessage.SDK_NOT_READY.reason());
-        }
-
-        List<OptimizelyDecideOption> allOptions = getAllOptions(options);
-        allOptions.remove(OptimizelyDecideOption.ENABLED_FLAGS_ONLY);
-
-        return decideForKeysSync(user, Arrays.asList(key), allOptions, true).get(key);
-    }
-
-    /**
-     * Returns decision results for multiple flag keys, skipping CMAB logic and using only traditional A/B testing.
-     * This will be called by mobile apps which will make synchronous decisions only (for backward compatibility with android-sdk)
-     *
-     * @param user    An OptimizelyUserContext associated with this OptimizelyClient.
-     * @param keys    A list of flag keys for which decisions will be made.
-     * @param options A list of options for decision-making.
-     * @return All decision results mapped by flag keys, using traditional A/B testing logic only.
-     */
-    Map<String, OptimizelyDecision> decideForKeysSync(@Nonnull OptimizelyUserContext user,
-                                                      @Nonnull List<String> keys,
-                                                      @Nonnull List<OptimizelyDecideOption> options) {
-        return decideForKeysSync(user, keys, options, false);
-    }
-
-    private Map<String, OptimizelyDecision> decideForKeysSync(@Nonnull OptimizelyUserContext user,
-                                                              @Nonnull List<String> keys,
-                                                              @Nonnull List<OptimizelyDecideOption> options,
-                                                              boolean ignoreDefaultOptions) {
-        return decideForKeys(user, keys, options, ignoreDefaultOptions, DecisionPath.WITHOUT_CMAB);
-    }
-
-    /**
-     * Returns decision results for all active flag keys, skipping CMAB logic and using only traditional A/B testing.
-     * This will be called by mobile apps which will make synchronous decisions only (for backward compatibility with android-sdk)
-     *
-     * @param user    An OptimizelyUserContext associated with this OptimizelyClient.
-     * @param options A list of options for decision-making.
-     * @return All decision results mapped by flag keys, using traditional A/B testing logic only.
-     */
-    Map<String, OptimizelyDecision> decideAllSync(@Nonnull OptimizelyUserContext user,
-                                                  @Nonnull List<OptimizelyDecideOption> options) {
-        Map<String, OptimizelyDecision> decisionMap = new HashMap<>();
-
-        ProjectConfig projectConfig = getProjectConfig();
-        if (projectConfig == null) {
-            logger.error("Optimizely instance is not valid, failing decideAllSync call.");
-            return decisionMap;
-        }
-
-        List<FeatureFlag> allFlags = projectConfig.getFeatureFlags();
-        List<String> allFlagKeys = new ArrayList<>();
-        for (int i = 0; i < allFlags.size(); i++) allFlagKeys.add(allFlags.get(i).getKey());
-
-        return decideForKeysSync(user, allFlagKeys, options);
-    }
-
-    //============ decide async ============//
-
-    /**
-     * Returns a decision result asynchronously for a given flag key and a user context.
-     *
-     * @param userContext The user context to make decisions for
-     * @param key A flag key for which a decision will be made
-     * @param callback A callback to invoke when the decision is available
-     * @param options A list of options for decision-making
-     */
-    void decideAsync(@Nonnull OptimizelyUserContext userContext,
-                     @Nonnull String key,
-                     @Nonnull List<OptimizelyDecideOption> options,
-                     @Nonnull OptimizelyDecisionCallback callback) {
-        AsyncDecisionFetcher fetcher = new AsyncDecisionFetcher(userContext, key, options, callback);
-        fetcher.start();
-    }
-
-    /**
-     * Returns decision results asynchronously for multiple flag keys.
-     *
-     * @param userContext The user context to make decisions for
-     * @param keys        A list of flag keys for which decisions will be made
-     * @param callback    A callback to invoke when decisions are available
-     * @param options     A list of options for decision-making
-     */
-    void decideForKeysAsync(@Nonnull OptimizelyUserContext userContext,
-                            @Nonnull List<String> keys,
-                            @Nonnull List<OptimizelyDecideOption> options,
-                            @Nonnull OptimizelyDecisionsCallback callback) {
-        AsyncDecisionFetcher fetcher = new AsyncDecisionFetcher(userContext, keys, options, callback);
-        fetcher.start();
-    }
-
-    /**
-     * Returns decision results asynchronously for all active flag keys.
-     *
-     * @param userContext The user context to make decisions for
-     * @param callback A callback to invoke when decisions are available
-     * @param options A list of options for decision-making
-     */
-    void decideAllAsync(@Nonnull OptimizelyUserContext userContext,
-                        @Nonnull List<OptimizelyDecideOption> options,
-                        @Nonnull OptimizelyDecisionsCallback callback) {
-        AsyncDecisionFetcher fetcher = new AsyncDecisionFetcher(userContext, options, callback);
-        fetcher.start();
-    }
-
     private List<OptimizelyDecideOption> getAllOptions(List<OptimizelyDecideOption> options) {
         List<OptimizelyDecideOption> copiedOptions = new ArrayList(defaultDecideOptions);
         if (options != null) {

core-api/src/main/java/com/optimizely/ab/bucketing/Bucketer.java

@@ -192,4 +192,4 @@ int generateBucketValue(int hashCode) {
         return (int) Math.floor(MAX_TRAFFIC_VALUE * ratio);
     }
 
-}
+}

core-api/src/main/java/com/optimizely/ab/bucketing/DecisionService.java

@@ -84,7 +84,6 @@ public class DecisionService {
      * @param bucketer           Base bucketer to allocate new users to an experiment.
      * @param errorHandler       The error handler of the Optimizely client.
      * @param userProfileService UserProfileService implementation for storing user info.
-     * @param cmabService        Cmab Service for decision making.
      */
     public DecisionService(@Nonnull Bucketer bucketer,
                            @Nonnull ErrorHandler errorHandler,

core-api/src/main/java/com/optimizely/ab/event/internal/payload/DecisionMetadata.java

@@ -16,11 +16,11 @@
  */
 package com.optimizely.ab.event.internal.payload;
 
-import java.util.StringJoiner;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.optimizely.ab.annotations.VisibleForTesting;
 
+import java.util.StringJoiner;
+
 public class DecisionMetadata {
 
     @JsonProperty("flag_key")

core-api/src/main/java/com/optimizely/ab/internal/CacheWithRemove.java

@@ -54,9 +54,6 @@
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 public class OptimizelyUserContextTest {

core-api/src/test/java/com/optimizely/ab/OptimizelyUserContextTest.java

@@ -16,28 +16,24 @@
  */
 package com.optimizely.ab.event.internal;
 
-import java.util.Collections;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import org.mockito.runners.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableMap;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.ProjectConfig;
 import com.optimizely.ab.config.Variation;
 import com.optimizely.ab.event.internal.payload.DecisionMetadata;
 import com.optimizely.ab.internal.ReservedEventKey;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 
 @RunWith(MockitoJUnitRunner.class)

core-api/src/test/java/com/optimizely/ab/event/internal/UserEventFactoryTest.java

@@ -35,7 +35,6 @@
 import com.optimizely.ab.cmab.client.CmabFetchException;
 import com.optimizely.ab.cmab.client.CmabInvalidResponseException;
 import com.optimizely.ab.cmab.client.RetryConfig;
-import com.optimizely.ab.cmab.client.CmabClientHelper;
 
 public class DefaultCmabClient implements CmabClient {