Merge pull request #36 from optimizely/allow-multiple-managers

These changes should enable multiple OptimizelyManager and AndroidOptimizely parings for each project. Some users might find it convenient to be able to run multiple Optimizely projects inside of the same app. For example, one project might test the copy of notifications shown from Android services and another project is used for Activity testing.

Author: jophde

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

@@ -56,7 +56,7 @@
  * Handles loading the Optimizely data file
  */
 public class OptimizelyManager {
-    @NonNull private static AndroidOptimizely androidOptimizely = new AndroidOptimizely(null,
+    @NonNull private AndroidOptimizely androidOptimizely = new AndroidOptimizely(null,
             LoggerFactory.getLogger(AndroidOptimizely.class));
     @NonNull private final String projectId;
     @NonNull private final Long eventHandlerDispatchInterval;
@@ -266,7 +266,7 @@ protected void onPostExecute(UserExperimentRecord userExperimentRecord) {
                 serviceScheduler.schedule(intent, dataFileDownloadIntervalTimeUnit.toMillis(dataFileDownloadInterval));
 
                 try {
-                    OptimizelyManager.androidOptimizely = buildOptimizely(context, dataFile, userExperimentRecord);
+                    OptimizelyManager.this.androidOptimizely = buildOptimizely(context, dataFile, userExperimentRecord);
                     OptimizelyManager.this.userExperimentRecord = userExperimentRecord;
                     logger.info("Sending Optimizely instance to listener");
 

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventDAOTest.java

@@ -54,12 +54,12 @@ public class EventDAOTest {
     public void setupEventDAO() {
         logger = mock(Logger.class);
         context = InstrumentationRegistry.getTargetContext();
-        eventDAO = EventDAO.getInstance(context, logger);
+        eventDAO = EventDAO.getInstance(context, "1", logger);
     }
 
     @After
     public void tearDownEventDAO() {
-        context.deleteDatabase(EventSQLiteOpenHelper.DB_NAME);
+        assertTrue(context.deleteDatabase(String.format(EventSQLiteOpenHelper.DB_NAME , "1")));
     }
 
     @Test

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventDispatcherTest.java

@@ -67,7 +67,7 @@ public void setup() {
         context = InstrumentationRegistry.getTargetContext();
         logger = mock(Logger.class);
         client = mock(Client.class);
-        eventDAO = EventDAO.getInstance(context, logger);
+        eventDAO = EventDAO.getInstance(context, "1", logger);
         eventClient = new EventClient(client, logger);
         serviceScheduler = mock(ServiceScheduler.class);
         optlyStorage = mock(OptlyStorage.class);
@@ -77,7 +77,7 @@ public void setup() {
 
     @After
     public void tearDown() {
-        context.deleteDatabase(EventSQLiteOpenHelper.DB_NAME);
+        context.deleteDatabase(String.format(EventSQLiteOpenHelper.DB_NAME, "1"));
     }
 
     @Test

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventSQLiteOpenHelperTest.java

@@ -18,6 +18,8 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -48,13 +50,14 @@ public void setup() {
 
     @After
     public void teardown() {
-        context.deleteDatabase(EventSQLiteOpenHelper.DB_NAME);
+        context.deleteDatabase(String.format(EventSQLiteOpenHelper.DB_NAME, "1"));
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void onCreateMakesTables() {
         EventSQLiteOpenHelper eventSQLiteOpenHelper =
-                new EventSQLiteOpenHelper(context, EventSQLiteOpenHelper.DB_NAME, null, 1, logger);
+                new EventSQLiteOpenHelper(context, "1", null, 1, logger);
         SQLiteDatabase db = eventSQLiteOpenHelper.getWritableDatabase();
         String[] projection = {
                 EventTable.Column._ID,

event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventDAO.java

@@ -46,8 +46,8 @@ private EventDAO(@NonNull EventSQLiteOpenHelper dbHelper, @NonNull Logger logger
     }
 
     @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
-    static EventDAO getInstance(@NonNull Context context, @NonNull Logger logger) {
-        EventSQLiteOpenHelper sqLiteOpenHelper = new EventSQLiteOpenHelper(context, EventSQLiteOpenHelper.DB_NAME, null, EventSQLiteOpenHelper.VERSION, null, LoggerFactory.getLogger(EventSQLiteOpenHelper.class));
+    static EventDAO getInstance(@NonNull Context context, @NonNull String projectId, @NonNull Logger logger) {
+        EventSQLiteOpenHelper sqLiteOpenHelper = new EventSQLiteOpenHelper(context, projectId, null, EventSQLiteOpenHelper.VERSION, LoggerFactory.getLogger(EventSQLiteOpenHelper.class));
         return new EventDAO(sqLiteOpenHelper, logger);
     }
 

event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventIntentService.java

@@ -63,7 +63,7 @@ public void onCreate() {
         OptlyStorage optlyStorage = new OptlyStorage(this);
         EventClient eventClient = new EventClient(new Client(optlyStorage,
                 LoggerFactory.getLogger(Client.class)), LoggerFactory.getLogger(EventClient.class));
-        EventDAO eventDAO = EventDAO.getInstance(this, LoggerFactory.getLogger(EventDAO.class));
+        EventDAO eventDAO = EventDAO.getInstance(this, "1", LoggerFactory.getLogger(EventDAO.class));
         ServiceScheduler serviceScheduler = new ServiceScheduler(
                 (AlarmManager) getSystemService(ALARM_SERVICE),
                 new ServiceScheduler.PendingIntentFactory(this),

event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventSQLiteOpenHelper.java

@@ -21,6 +21,8 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 
 import org.slf4j.Logger;
@@ -31,7 +33,7 @@
 class EventSQLiteOpenHelper extends SQLiteOpenHelper {
 
     static final int VERSION = 1;
-    static final String DB_NAME = "optly-events";
+    static final String DB_NAME = "optly-events-%s";
 
     static final String SQL_CREATE_EVENT_TABLE =
             "CREATE TABLE " + EventTable.NAME + " (" +
@@ -43,17 +45,16 @@ class EventSQLiteOpenHelper extends SQLiteOpenHelper {
     private static final String SQL_DELETE_EVENT_TABLE =
             "DROP TABLE IF EXISTS " + EventTable.NAME;
 
-    private final Logger logger;
-
-    EventSQLiteOpenHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version, Logger logger) {
-        super(context, name, factory, version);
-        this.logger = logger;
-    }
+    @NonNull private final Logger logger;
+    @NonNull private final String projectId;
+    @NonNull private final Context context;
 
     @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
-    EventSQLiteOpenHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version, DatabaseErrorHandler errorHandler, Logger logger) {
-        super(context, name, factory, version, errorHandler);
+    EventSQLiteOpenHelper(@NonNull Context context, @NonNull String projectId, @Nullable SQLiteDatabase.CursorFactory factory, int version, @NonNull Logger logger) {
+        super(context, String.format(DB_NAME, projectId), factory, version, null);
         this.logger = logger;
+        this.projectId = projectId;
+        this.context = context;
     }
 
     /**
@@ -62,6 +63,8 @@ class EventSQLiteOpenHelper extends SQLiteOpenHelper {
      */
     @Override
     public void onCreate(SQLiteDatabase db) {
+        // Deletes the old events db that stored events for all projects
+        context.deleteDatabase("optly-events");
         db.execSQL(SQL_CREATE_EVENT_TABLE);
         logger.info("Created event table with SQL: {}", SQL_CREATE_EVENT_TABLE);
     }
@@ -73,6 +76,10 @@ public void onCreate(SQLiteDatabase db) {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        // TODO Create an upgrade strategy once we actually upgrade the schema.
+
+    }
+
+    public String getDbName() {
+        return String.format(DB_NAME, projectId);
     }
 }