remove support for legacy ups (#468)

Support for legacy UserProfileService is removed. It's 7yrs old, so not expected in any devices.

Author: jaeopt

user-profile/src/androidTest/java/com/optimizely/ab/android/user_profile/DefaultUserProfileServiceTest.java

@@ -51,7 +51,6 @@ public class DefaultUserProfileServiceTest {
     private UserProfileCache.DiskCache diskCache;
     private ExecutorService executor;
     private Logger logger;
-    private UserProfileCache.LegacyDiskCache legacyDiskCache;
     private Map<String, Map<String, Object>> memoryCache;
     private String projectId;
     private UserProfileCache userProfileCache;
@@ -66,11 +65,10 @@ public void setup() {
         logger = mock(Logger.class);
         cache = new Cache(InstrumentationRegistry.getInstrumentation().getTargetContext(), logger);
         executor =Executors.newSingleThreadExecutor();
-        legacyDiskCache = new UserProfileCache.LegacyDiskCache(cache, executor, logger, projectId);
         memoryCache = new ConcurrentHashMap<>();
         projectId = "123";
         diskCache = new UserProfileCache.DiskCache(cache, executor, logger, projectId);
-        userProfileCache = new UserProfileCache(diskCache, logger, memoryCache, legacyDiskCache);
+        userProfileCache = new UserProfileCache(diskCache, logger, memoryCache);
         userProfileService = new DefaultUserProfileService(userProfileCache, logger);
 
         // Test data.

user-profile/src/androidTest/java/com/optimizely/ab/android/user_profile/LegacyDiskCacheTest.java

@@ -53,7 +53,6 @@ public class UserProfileCacheTest {
     private Logger logger;
     private Cache cache;
     private UserProfileCache.DiskCache diskCache;
-    private UserProfileCache.LegacyDiskCache legacyDiskCache;
     private Map<String, Map<String, Object>> memoryCache;
     private String projectId;
     private UserProfileCache userProfileCache;
@@ -69,9 +68,8 @@ public void setup() throws JSONException {
         projectId = "1";
         cache = new Cache(InstrumentationRegistry.getInstrumentation().getTargetContext(), logger);
         diskCache = new UserProfileCache.DiskCache(cache, executor, logger, projectId);
-        legacyDiskCache = new UserProfileCache.LegacyDiskCache(cache, executor, logger, projectId);
         memoryCache = new ConcurrentHashMap<>();
-        userProfileCache = new UserProfileCache(diskCache, logger, memoryCache, legacyDiskCache);
+        userProfileCache = new UserProfileCache(diskCache, logger, memoryCache);
 
         // Test data.
         userId1 = "user_1";

user-profile/src/androidTest/java/com/optimizely/ab/android/user_profile/UserProfileCacheTest.java

@@ -62,14 +62,17 @@ public class DefaultUserProfileService implements UserProfileService {
      */
     public static UserProfileService newInstance(@NonNull String projectId, @NonNull Context context) {
         UserProfileCache userProfileCache = new UserProfileCache(
-                new UserProfileCache.DiskCache(new Cache(context, LoggerFactory.getLogger(Cache.class)),
-                        Executors.newSingleThreadExecutor(), LoggerFactory.getLogger(UserProfileCache.DiskCache.class),
-                        projectId),
+                new UserProfileCache.DiskCache(
+                    new Cache(
+                        context,
+                        LoggerFactory.getLogger(Cache.class)
+                    ),
+                    Executors.newSingleThreadExecutor(),
+                    LoggerFactory.getLogger(UserProfileCache.DiskCache.class),
+                    projectId
+                ),
                 LoggerFactory.getLogger(UserProfileCache.class),
-                new ConcurrentHashMap<String, Map<String, Object>>(),
-                new UserProfileCache.LegacyDiskCache(new Cache(context, LoggerFactory.getLogger(Cache.class)),
-                        Executors.newSingleThreadExecutor(),
-                        LoggerFactory.getLogger(UserProfileCache.LegacyDiskCache.class), projectId));
+                new ConcurrentHashMap<String, Map<String, Object>>());
 
         return new DefaultUserProfileService(userProfileCache,
                 LoggerFactory.getLogger(DefaultUserProfileService.class));

user-profile/src/main/java/com/optimizely/ab/android/user_profile/DefaultUserProfileService.java

@@ -47,15 +47,13 @@ class UserProfileCache {
     @NonNull @VisibleForTesting protected final DiskCache diskCache;
     @NonNull private final Logger logger;
     @NonNull private final Map<String, Map<String, Object>> memoryCache;
-    @NonNull private final LegacyDiskCache legacyDiskCache;
 
-    UserProfileCache(@NonNull DiskCache diskCache, @NonNull Logger logger,
-                     @NonNull Map<String, Map<String, Object>> memoryCache,
-                     @NonNull LegacyDiskCache legacyDiskCache) {
+    UserProfileCache(@NonNull DiskCache diskCache,
+                     @NonNull Logger logger,
+                     @NonNull Map<String, Map<String, Object>> memoryCache) {
         this.logger = logger;
         this.diskCache = diskCache;
         this.memoryCache = memoryCache;
-        this.legacyDiskCache = legacyDiskCache;
     }
 
     /**
@@ -85,49 +83,6 @@ Map<String, Object> lookup(String userId) {
         return memoryCache.get(userId);
     }
 
-    /**
-     * Migrate legacy user profiles if found.
-     * <p>
-     * Note: this will overwrite a newer `UserProfile` cache in the unlikely event that a legacy cache and new cache
-     * both exist on disk.
-     */
-    @VisibleForTesting
-    void migrateLegacyUserProfiles() {
-        JSONObject legacyUserProfilesJson = legacyDiskCache.load();
-
-        if (legacyUserProfilesJson == null) {
-            logger.info("No legacy user profiles to migrate.");
-            return;
-        }
-
-        try {
-            Iterator<String> userIdIterator = legacyUserProfilesJson.keys();
-            while (userIdIterator.hasNext()) {
-                String userId = userIdIterator.next();
-                JSONObject legacyUserProfileJson = legacyUserProfilesJson.getJSONObject(userId);
-
-                Map<String, Map<String, String>> experimentBucketMap = new ConcurrentHashMap<>();
-                Iterator<String> experimentIdIterator = legacyUserProfileJson.keys();
-                while (experimentIdIterator.hasNext()) {
-                    String experimentId = experimentIdIterator.next();
-                    String variationId = legacyUserProfileJson.getString(experimentId);
-                    Map<String, String> decisionMap = new ConcurrentHashMap<>();
-                    decisionMap.put(variationIdKey, variationId);
-                    experimentBucketMap.put(experimentId, decisionMap);
-                }
-
-                Map<String, Object> userProfileMap = new ConcurrentHashMap<>();
-                userProfileMap.put(userIdKey, userId);
-                userProfileMap.put(experimentBucketMapKey, experimentBucketMap);
-                save(userProfileMap);
-            }
-        } catch (JSONException e) {
-            logger.warn("Unable to deserialize legacy user profiles. Will delete legacy user profile cache file.", e);
-        } finally {
-            legacyDiskCache.delete();
-        }
-    }
-
     /**
      * Remove a user profile.
      *
@@ -218,9 +173,6 @@ void save(Map<String, Object> userProfileMap) {
      * Load the cache from disk to memory.
      */
     void start() {
-        // Migrate legacy user profiles if found.
-        migrateLegacyUserProfiles();
-
         try {
             JSONObject userProfilesJson = diskCache.load();
             Map<String, Map<String, Object>> userProfilesMap = UserProfileCacheUtils.convertJSONObjectToMap
@@ -295,71 +247,4 @@ protected Boolean doInBackground(Void[] params) {
             task.executeOnExecutor(executor);
         }
     }
-
-    /**
-     * Stores a map of userIds to a map of expIds to variationIds in a file.
-     *
-     * @deprecated This class is only used to migrate legacy user profiles to the new {@link UserProfileCache}.
-     */
-    static class LegacyDiskCache {
-
-        private static final String FILE_NAME = "optly-user-profile-%s.json";
-        @NonNull private final Cache cache;
-        @NonNull private final Executor executor;
-        @NonNull private final Logger logger;
-        @NonNull private final String projectId;
-
-        LegacyDiskCache(@NonNull Cache cache, @NonNull Executor executor, @NonNull Logger logger,
-                        @NonNull String projectId) {
-            this.cache = cache;
-            this.executor = executor;
-            this.logger = logger;
-            this.projectId = projectId;
-        }
-
-        @VisibleForTesting
-        String getFileName() {
-            return String.format(FILE_NAME, projectId);
-        }
-
-        /**
-         * Load legacy user profiles from disk if found.
-         */
-        @Nullable
-        JSONObject load() {
-            String cacheString = cache.load(getFileName());
-
-            if (cacheString == null) {
-                logger.info("Legacy user profile cache not found.");
-                return null;
-            }
-
-            try {
-                return new JSONObject(cacheString);
-            } catch (JSONException e) {
-                logger.warn("Unable to parse legacy user profiles. Will delete legacy user profile cache file.", e);
-                delete();
-                return null;
-            }
-        }
-
-        /**
-         * Delete the legacy user profile cache from disk in a background thread.
-         */
-        void delete() {
-            AsyncTask<Void, Void, Boolean> task = new AsyncTask<Void, Void, Boolean>() {
-                @Override
-                protected Boolean doInBackground(Void[] params) {
-                    Boolean deleted = cache.delete(getFileName());
-                    if (deleted) {
-                        logger.info("Deleted legacy user profile from disk.");
-                    } else {
-                        logger.warn("Unable to delete legacy user profile from disk.");
-                    }
-                    return deleted;
-                }
-            };
-            task.executeOnExecutor(executor);
-        }
-    }
 }