Changes CDN URL of datafile and edits Unit tests related to it (#190)

Author: mnoman09

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

@@ -110,7 +110,7 @@ public void initializeInt() {
 
         assertEquals(optimizelyManager.isDatafileCached(InstrumentationRegistry.getTargetContext()), false);
 
-        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/public/1/datafile_v3.json" );
+        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/json/1.json" );
 
         assertNotNull(optimizelyManager.getOptimizely());
         assertNotNull(optimizelyManager.getDatafileHandler());
@@ -126,7 +126,7 @@ public void initializeSync() {
 
         assertEquals(optimizelyManager.isDatafileCached(InstrumentationRegistry.getTargetContext()), false);
 
-        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/public/1/datafile_v3.json" );
+        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/json/1.json" );
 
         assertNotNull(optimizelyManager.getOptimizely());
         assertNotNull(optimizelyManager.getDatafileHandler());
@@ -164,7 +164,7 @@ public void getDatafile() {
         */
         assertEquals(optimizelyManager.isDatafileCached(InstrumentationRegistry.getTargetContext()), false);
         String datafile =  optimizelyManager.getDatafile(InstrumentationRegistry.getTargetContext(), R.raw.datafile);
-        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/public/1/datafile_v3.json" );
+        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/json/1.json" );
         assertNotNull(datafile);
         assertNotNull(optimizelyManager.getDatafileHandler());
     }
@@ -185,7 +185,7 @@ public void onStart(OptimizelyClient optimizely) {
 
         assertEquals(optimizelyManager.isDatafileCached(InstrumentationRegistry.getTargetContext()), false);
 
-        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/public/1/datafile_v3.json" );
+        assertEquals(optimizelyManager.getDatafileUrl("1"), "https://cdn.optimizely.com/json/1.json" );
 
 
     }

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

@@ -207,9 +207,9 @@ public void testIntentExtraData(){
     @Test
     public void testGetDatafileUrl(){
         // HARD-CODING link here to make sure we don't unintentionally mess up the datafile version
-        // and url by accidentally changing those constants. Bumping datafile versions will force
+        // and url by accidentally changing those constants.
         // us to update this test.
         String datafileUrl = DatafileService.getDatafileUrl("1");
-        assertEquals("https://cdn.optimizely.com/public/1/datafile_v3.json", datafileUrl);
+        assertEquals("https://cdn.optimizely.com/json/1.json", datafileUrl);
     }
 }

datafile-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DatafileService.java

@@ -45,8 +45,7 @@ public class DatafileService extends Service {
      * Extra containing the project id this instance of Optimizely was built with
      */
     public static final String EXTRA_PROJECT_ID = "com.optimizely.ab.android.EXTRA_PROJECT_ID";
-    public static final String FORMAT_VERSIONED_CDN_URL = "https://cdn.optimizely.com/public/%s/datafile_v%s.json";
-    static final String DATAFILE_VERSION = "3";
+    public static final String FORMAT_VERSIONED_CDN_URL = "https://cdn.optimizely.com/json/%s.json";
     public static final Integer JOB_ID = 2113;
 
     @NonNull private final IBinder binder = new LocalBinder();
@@ -110,7 +109,7 @@ public boolean isBound() {
     }
 
     public static @NonNull String getDatafileUrl(@NonNull String projectId) {
-        return String.format(FORMAT_VERSIONED_CDN_URL, projectId, DATAFILE_VERSION);
+        return String.format(FORMAT_VERSIONED_CDN_URL, projectId);
     }
 
     public void stop() {