move datafile manager back to shard from core

Author: wangjoshuah

OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj

@@ -214,10 +214,6 @@
 		EA5249651DC7B69A00AF6685 /* OPTLYEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5249631DC7B69A00AF6685 /* OPTLYEventDispatcher.m */; };
 		EA5249771DC7C6EF00AF6685 /* OPTLYEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = EA5249621DC7B69A00AF6685 /* OPTLYEventDispatcher.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EA5249F21DC7FACF00AF6685 /* OPTLYEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5249631DC7B69A00AF6685 /* OPTLYEventDispatcher.m */; };
-		EA6E1CD91DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EA6E1CDA1DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EA6E1CDB1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */; };
-		EA6E1CDC1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */; };
 		EA87A02A1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EA87A02B1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EA87A02C1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = EA87A0291DE31453002E9EF7 /* OPTLYUserProfile.m */; };
@@ -381,8 +377,6 @@
 		EA3C68161DC1E66C00C578CA /* OptimizelySDKCoreTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OptimizelySDKCoreTests-Info.plist"; sourceTree = "<group>"; };
 		EA5249621DC7B69A00AF6685 /* OPTLYEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYEventDispatcher.h; sourceTree = "<group>"; };
 		EA5249631DC7B69A00AF6685 /* OPTLYEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYEventDispatcher.m; sourceTree = "<group>"; };
-		EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OPTLYDatafileManager.h; path = OptimizelySDKCore/OPTLYDatafileManager.h; sourceTree = "<group>"; };
-		EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OPTLYDatafileManager.m; path = OptimizelySDKCore/OPTLYDatafileManager.m; sourceTree = "<group>"; };
 		EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OPTLYUserProfile.h; path = OptimizelySDKCore/OPTLYUserProfile.h; sourceTree = "<group>"; };
 		EA87A0291DE31453002E9EF7 /* OPTLYUserProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OPTLYUserProfile.m; path = OptimizelySDKCore/OPTLYUserProfile.m; sourceTree = "<group>"; };
 		EA8FD0D71DE9798E00D950AD /* OPTLYHTTPRequestManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYHTTPRequestManager.h; sourceTree = "<group>"; };
@@ -648,7 +642,6 @@
 				EA2FA83F1DC5E11F00B1D81B /* Bucketer */,
 				EA2FA90B1DC6F17400B1D81B /* Builder */,
 				EA2FA8401DC5E13A00B1D81B /* Data Models */,
-				EA6E1CD61DED59AE00D533BB /* Datafile Manager */,
 				EA2FA8411DC5E14700B1D81B /* Error Handler */,
 				EA2FA8421DC5E15700B1D81B /* Event Builder */,
 				EA5249611DC7B64C00AF6685 /* Event Dispatcher */,
@@ -694,16 +687,6 @@
 			name = "Event Dispatcher";
 			sourceTree = "<group>";
 		};
-		EA6E1CD61DED59AE00D533BB /* Datafile Manager */ = {
-			isa = PBXGroup;
-			children = (
-				EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */,
-				EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */,
-			);
-			name = "Datafile Manager";
-			path = ..;
-			sourceTree = "<group>";
-		};
 		EA87A0271DE3142A002E9EF7 /* UserProfile */ = {
 			isa = PBXGroup;
 			children = (
@@ -752,7 +735,6 @@
 				EA064BC71DD3FC8800DF7537 /* OPTLYQueue.h in Headers */,
 				EA8FD0DB1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */,
 				EA8FD0DF1DE9798E00D950AD /* OPTLYNetworkService.h in Headers */,
-				EA6E1CD91DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */,
 				EA2FAB791DC6F5F400B1D81B /* OPTLYMacros.h in Headers */,
 				EA2FAAF41DC6F57200B1D81B /* OPTLYEventTicket.h in Headers */,
 				EA2FAB121DC6F57200B1D81B /* OPTLYTrafficAllocation.h in Headers */,
@@ -803,7 +785,6 @@
 				EA064BC81DD3FC8800DF7537 /* OPTLYQueue.h in Headers */,
 				EA2C242E1DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.h in Headers */,
 				EA8FD0DC1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */,
-				EA6E1CDA1DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */,
 				EA8FD0E01DE9798E00D950AD /* OPTLYNetworkService.h in Headers */,
 				EA2FAC7B1DC70EBC00B1D81B /* murmur3.h in Headers */,
 				EA2FAB7A1DC6F5F400B1D81B /* OPTLYMacros.h in Headers */,
@@ -1179,7 +1160,6 @@
 				EA2FAC111DC6FFC600B1D81B /* OPTLYEventAudience.m in Sources */,
 				EA2FAC121DC6FFC600B1D81B /* OPTLYEventDecision.m in Sources */,
 				EA2FAC131DC6FFC600B1D81B /* OPTLYEventDecisionTicket.m in Sources */,
-				EA6E1CDB1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */,
 				EA2FAC141DC6FFC600B1D81B /* OPTLYEventFeature.m in Sources */,
 				EA2FAC151DC6FFC600B1D81B /* OPTLYEventHeader.m in Sources */,
 				EA2FAC161DC6FFC600B1D81B /* OPTLYEventLayerState.m in Sources */,
@@ -1251,7 +1231,6 @@
 				EA2FABEC1DC6FFA100B1D81B /* OPTLYEventAudience.m in Sources */,
 				EA2FABED1DC6FFA100B1D81B /* OPTLYEventDecision.m in Sources */,
 				EA2FABEE1DC6FFA100B1D81B /* OPTLYEventDecisionTicket.m in Sources */,
-				EA6E1CDC1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */,
 				EA2FABEF1DC6FFA100B1D81B /* OPTLYEventFeature.m in Sources */,
 				EA2FABF01DC6FFA100B1D81B /* OPTLYEventHeader.m in Sources */,
 				EA2FABF11DC6FFA100B1D81B /* OPTLYEventLayerState.m in Sources */,

OptimizelySDKCore/OptimizelySDKCore/OPTLYBuilder.m

@@ -16,7 +16,6 @@
 
 #import "OPTLYBucketer.h"
 #import "OPTLYBuilder.h"
-#import "OPTLYDatafileManager.h"
 #import "OPTLYErrorHandler.h"
 #import "OPTLYEventBuilder.h"
 #import "OPTLYEventDispatcher.h"
@@ -86,13 +85,6 @@ - (NSData *)datafile {
     return _datafile;
 }
 
-- (id<OPTLYDatafileManager>)datafileManager {
-    if (!_datafileManager) {
-        _datafileManager = [[OPTLYDatafileManagerDefault alloc] init];
-    }
-    return _datafileManager;
-}
-
 - (id<OPTLYErrorHandler>)errorHandler {
     if (!_errorHandler) {
         _errorHandler = [[OPTLYErrorHandlerNoOp alloc] init];

OptimizelySDKCore/OptimizelySDKCore/Optimizely.h

@@ -18,7 +18,7 @@
 #import "OPTLYBuilder.h"
 
 @class OPTLYProjectConfig, OPTLYVariation;
-@protocol OPTLYBucketer, OPTLYDatafileManager, OPTLYErrorHandler, OPTLYEventBuilder, OPTLYEventDispatcher, OPTLYLogger;
+@protocol OPTLYBucketer, OPTLYErrorHandler, OPTLYEventBuilder, OPTLYEventDispatcher, OPTLYLogger;
 
 // ---- Live Variable Getter Errors ----
 
@@ -222,7 +222,6 @@ typedef NS_ENUM(NSInteger, OPTLYLiveVariableError) {
 
 @property (nonatomic, strong, readonly, nullable) id<OPTLYBucketer> bucketer;
 @property (nonatomic, strong, readonly, nullable) OPTLYProjectConfig *config;
-@property (nonatomic, strong, readonly, nullable) id<OPTLYDatafileManager> datafileManager;
 @property (nonatomic, strong, readonly, nullable) id<OPTLYErrorHandler> errorHandler;
 @property (nonatomic, strong, readonly, nullable) id<OPTLYEventBuilder> eventBuilder;
 @property (nonatomic, strong, readonly, nullable) id<OPTLYEventDispatcher> eventDispatcher;

OptimizelySDKCore/OptimizelySDKCore/Optimizely.m

@@ -53,7 +53,6 @@ - (instancetype)initWithBuilder:(OPTLYBuilder *)builder {
         if (self != nil) {
             _bucketer = builder.bucketer;
             _config = builder.config;
-            _datafileManager = builder.datafileManager;
             _eventBuilder = builder.eventBuilder;
             _eventDispatcher = builder.eventDispatcher;
             _errorHandler = builder.errorHandler;

OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYBuilderTest.m

@@ -16,7 +16,6 @@
 
 #import <XCTest/XCTest.h>
 #import "Optimizely.h"
-#import "OPTLYDatafileManager.h"
 #import "OPTLYErrorHandler.h"
 #import "OPTLYEventDispatcher.h"
 #import "OPTLYLogger.h"
@@ -45,7 +44,6 @@ - (void)testBuilderBuildsDefaults {
     XCTAssertNotNil(optimizely);
     XCTAssertNotNil(optimizely.bucketer);
     XCTAssertNotNil(optimizely.config);
-    XCTAssertNotNil(optimizely.datafileManager);
     XCTAssertNotNil(optimizely.errorHandler);
     XCTAssertNotNil(optimizely.eventBuilder);
     XCTAssertNotNil(optimizely.eventDispatcher);
@@ -109,21 +107,6 @@ - (void)testBuilderCanAssignLogger {
     XCTAssertEqual(logger, customOptimizely.logger, @"Should be the same object with custom builder");
 }
 
-- (void)testBuilderCanAssignDatafileManager {
-    NSData *datafile = [OPTLYTestHelper loadJSONDatafileIntoDataObject:kDataModelDatafileName];
-    
-    id<OPTLYDatafileManager> datafileManager = [OPTLYDatafileManagerNoOp new];
-    
-    Optimizely *customOptimizely = [Optimizely initWithBuilderBlock:^(OPTLYBuilder *builder) {
-        builder.datafile = datafile;
-        builder.datafileManager = datafileManager;
-    }];
-    
-    XCTAssertNotNil(customOptimizely);
-    XCTAssertNotNil(customOptimizely.datafileManager);
-    XCTAssertEqualObjects(datafileManager, customOptimizely.datafileManager, @"This module should be the same as that created in the OPLTYManager builder.");
-}
-
 - (void)testInitializationWithoutBuilder {
     Optimizely *optimizely = [Optimizely initWithBuilderBlock:nil];
     XCTAssertNil(optimizely);

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.h

@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #import <Foundation/Foundation.h>
-#import <OptimizelySDKCore/OPTLYDatafileManager.h>
+#import <OptimizelySDKShared/OPTLYDatafileManager.h>
 #import "OPTLYDatafileManagerBuilder.h"
 
 @protocol OPTLYDatafileManager, OPTLYErrorHandler, OPTLYLogger;

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManagerBuilder.h

@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #import <Foundation/Foundation.h>
-#import <OptimizelySDKCore/OPTLYDatafileManager.h>
+#import <OptimizelySDKShared/OPTLYDatafileManager.h>
 
 @class OPTLYDatafileManagerBuilder;
 @protocol OPTLYErrorHandler, OPTLYLogger;

OptimizelySDKShared/OptimizelySDKShared.xcodeproj/project.pbxproj

@@ -29,6 +29,10 @@
 		2D08FBA01DCA5FA8006CA063 /* OPTLYClientBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D08FB9E1DCA5FA8006CA063 /* OPTLYClientBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2D08FBA21DCA5FB3006CA063 /* OPTLYClientBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D08FBA11DCA5FB3006CA063 /* OPTLYClientBuilder.m */; };
 		2D08FBA31DCA5FB3006CA063 /* OPTLYClientBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D08FBA11DCA5FB3006CA063 /* OPTLYClientBuilder.m */; };
+		2D3EC7A01DEFB63E0014D9A7 /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2D3EC7A11DEFB63E0014D9A7 /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */; };
+		2D3EC7A21DEFB6420014D9A7 /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2D3EC7A31DEFB6420014D9A7 /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */; };
 		2DB3D1561DC8163900ECF72E /* OPTLYManagerBuilderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB3D1521DC8163600ECF72E /* OPTLYManagerBuilderTest.m */; };
 		2DB3D1571DC8163A00ECF72E /* OPTLYManagerBuilderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB3D1521DC8163600ECF72E /* OPTLYManagerBuilderTest.m */; };
 		2DB3D1581DC8164800ECF72E /* OptimizelySDKSharedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EA3C68381DC1E68E00C578CA /* OptimizelySDKSharedTests.m */; };
@@ -147,6 +151,8 @@
 		2D08FB851DCA5E66006CA063 /* validator_whitelisting_test_datafile.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = validator_whitelisting_test_datafile.json; path = TestData/validator_whitelisting_test_datafile.json; sourceTree = "<group>"; };
 		2D08FB9E1DCA5FA8006CA063 /* OPTLYClientBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYClientBuilder.h; sourceTree = "<group>"; };
 		2D08FBA11DCA5FB3006CA063 /* OPTLYClientBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYClientBuilder.m; sourceTree = "<group>"; };
+		2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYDatafileManager.h; sourceTree = "<group>"; };
+		2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYDatafileManager.m; sourceTree = "<group>"; };
 		2DB3D1521DC8163600ECF72E /* OPTLYManagerBuilderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYManagerBuilderTest.m; sourceTree = "<group>"; };
 		2DB3D17A1DC816D600ECF72E /* OPTLYManagerBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYManagerBuilder.h; sourceTree = "<group>"; };
 		2DB3D17B1DC816D600ECF72E /* OPTLYManagerBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYManagerBuilder.m; sourceTree = "<group>"; };
@@ -258,6 +264,15 @@
 			name = TestData;
 			sourceTree = "<group>";
 		};
+		2D3EC79B1DEFB5F30014D9A7 /* Datafile Manger */ = {
+			isa = PBXGroup;
+			children = (
+				2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */,
+				2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */,
+			);
+			name = "Datafile Manger";
+			sourceTree = "<group>";
+		};
 		B770041BA173BC0CC7E9DB5F /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -311,6 +326,7 @@
 				EA3C682C1DC1E68E00C578CA /* OptimizelySDKShared.h */,
 				EA52478F1DC7246C00AF6685 /* Manager */,
 				2D08FB671DCA5A78006CA063 /* Client */,
+				2D3EC79B1DEFB5F30014D9A7 /* Datafile Manger */,
 				EA5247911DC7248200AF6685 /* DataStore */,
 			);
 			path = OptimizelySDKShared;
@@ -394,6 +410,7 @@
 				2D08FB9F1DCA5FA8006CA063 /* OPTLYClientBuilder.h in Headers */,
 				EA5249971DC7D8AD00AF6685 /* OptimizelySDKShared.h in Headers */,
 				2D08FB6B1DCA5A99006CA063 /* OPTLYClient.h in Headers */,
+				2D3EC7A01DEFB63E0014D9A7 /* OPTLYDatafileManager.h in Headers */,
 				EA5247851DC7226400AF6685 /* OPTLYManager.h in Headers */,
 				EA064BD21DD4030700DF7537 /* OPTLYDataStore.h in Headers */,
 				2DB3D17C1DC816D600ECF72E /* OPTLYManagerBuilder.h in Headers */,
@@ -408,6 +425,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2D08FBA01DCA5FA8006CA063 /* OPTLYClientBuilder.h in Headers */,
+				2D3EC7A21DEFB6420014D9A7 /* OPTLYDatafileManager.h in Headers */,
 				EA52499A1DC7D8B800AF6685 /* OptimizelySDKShared.h in Headers */,
 				2DB3D1801DC8181100ECF72E /* OPTLYManagerBuilder.h in Headers */,
 				2D08FB6C1DCA5A99006CA063 /* OPTLYClient.h in Headers */,
@@ -797,6 +815,7 @@
 				2DB3D17D1DC816D600ECF72E /* OPTLYManagerBuilder.m in Sources */,
 				EA064BD41DD4030700DF7537 /* OPTLYDataStore.m in Sources */,
 				EA29D9551DCED4580034A4FE /* OPTLYDatabaseEntity.m in Sources */,
+				2D3EC7A11DEFB63E0014D9A7 /* OPTLYDatafileManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -823,6 +842,7 @@
 				2D08FB6F1DCA5B3D006CA063 /* OPTLYClient.m in Sources */,
 				2D08FBA31DCA5FB3006CA063 /* OPTLYClientBuilder.m in Sources */,
 				2DB3D1811DC8181400ECF72E /* OPTLYManagerBuilder.m in Sources */,
+				2D3EC7A31DEFB6420014D9A7 /* OPTLYDatafileManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

OptimizelySDKCore/OptimizelySDKCore/OPTLYDatafileManager.h renamed to OptimizelySDKShared/OptimizelySDKShared/OPTLYDatafileManager.h

@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #import "OPTLYDatafileManager.h"
-#import "OPTLYNetworkService.h"
+#import <OptimizelySDKCore/OPTLYNetworkService.h>
 
 @implementation OPTLYDatafileManagerUtility