add new sdkKey cdn location and allow the datafileconfig to be passed… (#207)

* add new sdkKey cdn location and allow the datafileconfig to be passed in overriding host if need be

* update to have only one url string

Author: thomaszurkan-optimizely

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyManagerTest.java

@@ -33,7 +33,6 @@
 import com.optimizely.ab.android.datafile_handler.DatafileService;
 import com.optimizely.ab.android.datafile_handler.DefaultDatafileHandler;
 import com.optimizely.ab.android.event_handler.DefaultEventHandler;
-import com.optimizely.ab.android.sdk.test.R;
 import com.optimizely.ab.android.shared.DatafileConfig;
 import com.optimizely.ab.android.shared.ServiceScheduler;
 import com.optimizely.ab.android.user_profile.DefaultUserProfileService;
@@ -72,7 +71,7 @@
 public class OptimizelyManagerTest {
 
     private String testProjectId = "7595190003";
-    private String testSdkKey = "123-2232323-343423423-435345345";
+    private String testSdkKey = "EQRZ12XAR22424";
     private ListeningExecutorService executor;
     private Logger logger;
     private OptimizelyManager optimizelyManager;
@@ -95,7 +94,7 @@ public void setup() {
         executor = MoreExecutors.newDirectExecutorService();
         DatafileHandler datafileHandler = mock(DefaultDatafileHandler.class);
         EventHandler eventHandler = mock(DefaultEventHandler.class);
-        optimizelyManager = new OptimizelyManager(testProjectId, null,logger, 3600L, datafileHandler, null, 3600L,
+        optimizelyManager = new OptimizelyManager(testProjectId, null, null, logger, 3600L, datafileHandler, null, 3600L,
                 eventHandler, null);
     }
 
@@ -146,7 +145,7 @@ public void initializeSyncWithEnvironment() {
         Logger logger = mock(Logger.class);
         DatafileHandler datafileHandler = mock(DefaultDatafileHandler.class);
         EventHandler eventHandler = mock(DefaultEventHandler.class);
-        OptimizelyManager optimizelyManager = new OptimizelyManager(testProjectId, testSdkKey,logger, 3600L, datafileHandler, null, 3600L,
+        OptimizelyManager optimizelyManager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, 3600L, datafileHandler, null, 3600L,
                 eventHandler, null);
         /*
          * Scenario#1: when datafile is not Empty
@@ -156,7 +155,7 @@ public void initializeSyncWithEnvironment() {
 
         assertEquals(optimizelyManager.isDatafileCached(InstrumentationRegistry.getTargetContext()), false);
 
-        assertEquals(optimizelyManager.getDatafileUrl(), "https://cdn.optimizely.com/json/123-2232323-343423423-435345345.json" );
+        assertEquals(optimizelyManager.getDatafileUrl(), String.format((DatafileConfig.defaultHost + DatafileConfig.environmentUrlSuffix), testSdkKey));
 
         assertNotNull(optimizelyManager.getOptimizely());
         assertNotNull(optimizelyManager.getDatafileHandler());
@@ -203,7 +202,7 @@ public void initializeAsyncWithEnvironment() {
         Logger logger = mock(Logger.class);
         DatafileHandler datafileHandler = mock(DefaultDatafileHandler.class);
         EventHandler eventHandler = mock(DefaultEventHandler.class);
-        final OptimizelyManager optimizelyManager = new OptimizelyManager(testProjectId, testSdkKey,logger, 3600L, datafileHandler, null, 3600L,
+        final OptimizelyManager optimizelyManager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, 3600L, datafileHandler, null, 3600L,
                 eventHandler, null);
 
         /*
@@ -235,7 +234,7 @@ public void onStart(OptimizelyClient optimizely) {
 
         assertEquals(optimizelyManager.isDatafileCached(InstrumentationRegistry.getTargetContext()), false);
 
-        assertEquals(optimizelyManager.getDatafileUrl(), "https://cdn.optimizely.com/json/123-2232323-343423423-435345345.json" );
+        assertEquals(optimizelyManager.getDatafileUrl(), String.format((DatafileConfig.defaultHost + DatafileConfig.environmentUrlSuffix), testSdkKey) );
 
 
     }

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

@@ -76,6 +76,7 @@ public class OptimizelyManager {
 
     OptimizelyManager(@Nullable String projectId,
                       @Nullable String sdkKey,
+                      @Nullable DatafileConfig datafileConfig,
                       @NonNull Logger logger,
                       long datafileDownloadInterval,
                       @NonNull DatafileHandler datafileHandler,
@@ -89,7 +90,12 @@ public class OptimizelyManager {
         }
         this.projectId = projectId;
         this.sdkKey = sdkKey;
-        this.datafileConfig = new DatafileConfig(this.projectId, this.sdkKey);
+        if (datafileConfig == null) {
+            this.datafileConfig = new DatafileConfig(this.projectId, this.sdkKey);
+        }
+        else {
+            this.datafileConfig = datafileConfig;
+        }
         this.logger = logger;
         this.datafileDownloadInterval = datafileDownloadInterval;
         this.datafileHandler = datafileHandler;
@@ -605,6 +611,7 @@ public static class Builder {
         @Nullable private ErrorHandler errorHandler = null;
         @Nullable private UserProfileService userProfileService = null;
         @Nullable private String sdkKey = null;
+        @Nullable private DatafileConfig datafileConfig = null;
 
         @Deprecated
         Builder(@Nullable String projectId) {
@@ -698,6 +705,11 @@ public Builder withUserProfileService(UserProfileService userProfileService) {
             return this;
         }
 
+        public Builder withDatafileConfig(DatafileConfig datafileConfig) {
+            this.datafileConfig = datafileConfig;
+            return this;
+        }
+
         /**
          * Get a new {@link Builder} instance to create {@link OptimizelyManager} with.
          * @param  context the application context used to create default service if not provided.
@@ -752,6 +764,7 @@ public OptimizelyManager build(Context context) {
             }
 
             return new OptimizelyManager(projectId, sdkKey,
+                    datafileConfig,
                     logger,
                     datafileDownloadInterval,
                     datafileHandler,

datafile-handler/src/androidTest/java/com/optimizely/ab/android/datafile_handler/DatafileServiceTest.java

@@ -220,6 +220,6 @@ public void testGetDatafileEnvironmentUrl(){
         // and url by accidentally changing those constants.
         // us to update this test.
         String datafileUrl = new DatafileConfig("1", "2").getUrl();
-        assertEquals("https://cdn.optimizely.com/json/2.json", datafileUrl);
+        assertEquals("https://cdn.optimizely.com/datafiles/2.json", datafileUrl);
     }
 }

shared/src/main/java/com/optimizely/ab/android/shared/DatafileConfig.java

@@ -28,22 +28,45 @@
  * if you change environments or projects and no longer want updates from the previous.
  */
 public class DatafileConfig {
-    public static String projectUrl = "https://cdn.optimizely.com/json/%s.json";
-    public static String delimitor = "::::";
+    public static String defaultHost = "https://cdn.optimizely.com";
+    public static String projectUrlSuffix = "/json/%s.json";
+    public static String environmentUrlSuffix = "/datafiles/%s.json";
+    public static String delimiter = "::::";
 
     private final String projectId;
     private final String sdkKey;
+    private final String host;
+    private final String datafileUrlString;
 
     /**
      * Constructor used to construct a DatafileConfig to get cache key, url,
      * for the appropriate environment.  One or the other can be null.  But, not both.
      * @param projectId project id string.
      * @param sdkKey the environment url.
+     * @param host used to override the DatafileConfig.defaultHost used for datafile synchronization.
      */
-    public DatafileConfig(String projectId, String sdkKey) {
+    public DatafileConfig(String projectId, String sdkKey, String host) {
         assert(projectId != null || sdkKey != null);
         this.projectId = projectId;
         this.sdkKey = sdkKey;
+        this.host = host;
+
+        if (sdkKey != null) {
+            this.datafileUrlString = String.format((this.host + environmentUrlSuffix), sdkKey);
+        }
+        else {
+            this.datafileUrlString = String.format((this.host + projectUrlSuffix), projectId);
+        }
+    }
+
+    /**
+     * Constructor used to construct a DatafileConfig to get cache key, url,
+     * for the appropriate environment.  One or the other can be null.  But, not both.
+     * @param projectId project id string.
+     * @param sdkKey the environment url.
+     */
+    public DatafileConfig(String projectId, String sdkKey) {
+        this(projectId, sdkKey, defaultHost);
     }
 
     /**
@@ -60,7 +83,7 @@ public String getKey() {
      * @return url of current project configuration.
      */
     public String getUrl() {
-        return String.format(projectUrl, getKey());
+        return datafileUrlString;
     }
 
     public String toJSONString() {
@@ -101,7 +124,7 @@ public static DatafileConfig fromJSONString(String jsonString) {
      */
     @Override
     public String toString() {
-        return projectId != null ? projectId : "null" + delimitor + (sdkKey != null? sdkKey : "null");
+        return projectId != null ? projectId : "null" + delimiter + (sdkKey != null? sdkKey : "null");
     }
 
     public boolean equals(Object o) {

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

@@ -71,10 +71,7 @@ public void onCreate() {
         // This app is built against a real Optimizely project with real experiments set.  Automated
         // espresso tests are run against this project id.  Changing it will make the Optimizely
         // must match the project id of the compiled in Optimizely data file in rest/raw/data_file.json.
-         OptimizelyManager.Builder builder = OptimizelyManager.builder();
-         if (BuildConfig.DEBUG) {
-                    builder = builder.withSDKKey(PROJECT_ID);
-         }
+         OptimizelyManager.Builder builder = OptimizelyManager.builder(PROJECT_ID);
          optimizelyManager =  builder.withEventDispatchInterval(60L * 10L)
                 .withDatafileDownloadInterval(60L * 10L)
                 .build(getApplicationContext());