change request datafile to download datafile with completion handler

Author: wangjoshuah

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.h

@@ -24,12 +24,12 @@
 @protocol OPTLYDatafileManager <NSObject>
 
 /** 
- * Request the datafile for the project ID
+ * Download the datafile for the project ID
  * @param projectId The project ID of the datafile to request.
  * @param completion Completion handler.
  */
-- (void)requestDatafile:(nonnull NSString *)projectId
-      completionHandler:(nullable OPTLYHTTPRequestManagerResponse)completion;
+- (void)downloadDatafile:(nonnull NSString *)projectId
+       completionHandler:(nullable OPTLYHTTPRequestManagerResponse)completion;
 
 @end
 

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.m

@@ -46,7 +46,7 @@ - (instancetype)initWithBuilder:(OPTLYDatafileManagerBuilder *)builder {
             _dataStore = [OPTLYDataStore new];
 
             // download datafile when we start the datafile manager
-            [self downloadDatafile];
+            [self downloadDatafile:self.projectId completionHandler:nil];
 
             // Only fetch the datafile if the polling interval is greater than 0
             if (self.datafileFetchInterval > 0) {
@@ -60,24 +60,23 @@ - (instancetype)initWithBuilder:(OPTLYDatafileManagerBuilder *)builder {
     }
 }
 
-- (void)downloadDatafile {
-    [self requestDatafile:self.projectId
-        completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-            if (error != nil) {
-                // TODO: Josh W. handle errors
-            }
-            else if ([(NSHTTPURLResponse *)response statusCode] == 200) { // got datafile OK
-                [self saveDatafile:data];
-            }
-            else {
-                // TODO: Josh W. handle bad response
-            }
-        }];
-}
-
-- (void)requestDatafile:(NSString *)projectId completionHandler:(OPTLYHTTPRequestManagerResponse)completion {
+- (void)downloadDatafile:(NSString *)projectId completionHandler:(OPTLYHTTPRequestManagerResponse)completion {
     [self.networkService downloadProjectConfig:self.projectId
-                             completionHandler:completion];
+                             completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     // TODO: Josh W. handle errors
+                                 }
+                                 else if ([(NSHTTPURLResponse *)response statusCode] == 200) { // got datafile OK
+                                     [self saveDatafile:data];
+                                 }
+                                 else {
+                                     // TODO: Josh W. handle bad response
+                                 }
+                                 // call the completion handler
+                                 if (completion != nil) {
+                                     completion(data, response, error);
+                                 }
+                             }];
 }
 
 - (void)saveDatafile:(NSData *)datafile {

OptimizelySDKDatafileManager/OptimizelySDKDatafileManagerTests/OPTLYDatafileManagerTest.m

@@ -107,11 +107,11 @@ - (void)testRequestDatafileHandlesCompletionEvenWithBadRequest {
     __weak XCTestExpectation *expectation = [self expectationWithDescription:@"testInitializeClientAsync"];
 
     // request datafile
-    [datafileManager requestDatafile:datafileManager.projectId
-                   completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-                       completionWasCalled = true;
-                       XCTAssertEqual([(NSHTTPURLResponse *)response statusCode], 400);
-                       [expectation fulfill];
+    [datafileManager downloadDatafile:datafileManager.projectId
+                    completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+                        completionWasCalled = true;
+                        XCTAssertEqual([(NSHTTPURLResponse *)response statusCode], 400);
+                        [expectation fulfill];
     }];
 
     // wait for async start to finish