data file CDN url changed (#234)

Author: arafay-folio3

OptimizelySDKCore/OptimizelySDKCore/OPTLYNetworkService.m

@@ -19,7 +19,7 @@
 
 // ---- Datafile Download URLs ----
 // TODO: Move this to the Datafile manager and parameterize the URL for the datafile download
-NSString * const OPTLYNetworkServiceCDNServerURL    = @"https://cdn.optimizely.com/public/";
+NSString * const OPTLYNetworkServiceCDNServerURL    = @"https://cdn.optimizely.com/json/";
 NSString * const OPTLYNetworkServiceS3ServerURL     = @"https://optimizely.s3.amazonaws.com/";
 
 // ---- The total backoff and retry interval is: pow(2, attempts) * interval ----
@@ -103,7 +103,7 @@ - (void)dispatchEvent:(nonnull NSDictionary *)params
 + (NSURL *)projectConfigURLPath:(NSString *)projectId
 {
     NSURL *cdnURL = [NSURL URLWithString:OPTLYNetworkServiceCDNServerURL];
-    NSString *filePath = [NSString stringWithFormat:@"%@%@/datafile_v%@.json", cdnURL.absoluteString, projectId, kExpectedDatafileVersion];
+    NSString *filePath = [NSString stringWithFormat:@"%@%@.json", cdnURL.absoluteString, projectId];
     return [NSURL URLWithString:filePath];
 }
 

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.m

@@ -31,7 +31,7 @@
 #import "OPTLYFeatureFlag.h"
 #import "OPTLYRollout.h"
 
-NSString * const kExpectedDatafileVersion  = @"3";
+NSString * const kExpectedDatafileVersion  = @"4";
 
 @interface OPTLYProjectConfig()
 

OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYNetworkServiceTest.m

@@ -21,7 +21,7 @@
 
 static NSString *const kDatafileVersion = @"3";
 
-static NSString *const kExpectedCDNURLTemplate = @"https://cdn.optimizely.com/public/%@/datafile_v%@.json";
+static NSString *const kExpectedCDNURLTemplate = @"https://cdn.optimizely.com/json/%@.json";
 static NSString *const kDatamodelDatafileName = @"optimizely_6372300739";
 static NSString *const kLastModifiedDate = @"Mon, 28 Nov 2016 06:10:59 GMT";
 static NSString *const kProjectId = @"6372300739";
@@ -97,7 +97,7 @@ - (void)testDownloadProjectConfigWithLastModifiedRequestRetrievesProperDatafileV
 }
 
 - (void)testProjectConfigURLPathReturnsExpectedUrl {
-    NSString *expectedURLString = [NSString stringWithFormat:kExpectedCDNURLTemplate, kProjectId, kDatafileVersion];
+    NSString *expectedURLString = [NSString stringWithFormat:kExpectedCDNURLTemplate, kProjectId];
     NSURL *expectedURL = [NSURL URLWithString:expectedURLString];
 
     NSURL *cdnURL = [OPTLYNetworkService projectConfigURLPath:kProjectId];

OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYDatafileManagerTest.m

@@ -19,7 +19,7 @@
 #import "OPTLYDatafileManagerBasic.h"
 
 static NSString *const kProjectId = @"6372300739";
-static NSString *const kExpectedCDNURLTemplate = @"https://cdn.optimizely.com/public/%@/datafile_v%@.json";
+static NSString *const kExpectedCDNURLTemplate = @"https://cdn.optimizely.com/json/%@.json";
 
 @interface OPTLYDatafileManagerTest : XCTestCase
 
@@ -28,7 +28,7 @@ @interface OPTLYDatafileManagerTest : XCTestCase
 @implementation OPTLYDatafileManagerTest
 
 - (void)testProjectConfigURLPathReturnsExpectedURL {
-    NSString *expectedURLString = [NSString stringWithFormat:kExpectedCDNURLTemplate, kProjectId, kExpectedDatafileVersion];
+    NSString *expectedURLString = [NSString stringWithFormat:kExpectedCDNURLTemplate, kProjectId];
     NSURL *expectedURL = [NSURL URLWithString:expectedURLString];
 
     NSURL *cdnURL = [OPTLYDatafileManagerUtility projectConfigURLPath:kProjectId];