(chore):make the config a atomic property (#247)

* make the config a atomic property

* add a unit test

* add convenience wrapper around config for atomic property. access atomicConfig from config

* change podfile version

Author: thomaszurkan-optimizely

OptimizelySDK/Optimizely/OptimizelyClient.swift

@@ -24,7 +24,15 @@ open class OptimizelyClient: NSObject {
     // MARK: - Properties
 
     var sdkKey: String
-    var config: ProjectConfig?
+    private var atomicConfig: AtomicProperty<ProjectConfig> = AtomicProperty<ProjectConfig>()
+    var config: ProjectConfig? {
+        get {
+            return atomicConfig.property
+        }
+        set {
+            atomicConfig.property = newValue
+        }
+    }
 
     public var version: String {
         return Utils.sdkVersion
@@ -52,8 +60,6 @@ open class OptimizelyClient: NSObject {
         return HandlerRegistryService.shared.injectNotificationCenter(sdkKey: self.sdkKey)!
     }
 
-    private let reInitLock = Dispatch.DispatchSemaphore(value: 1)
-    
     // MARK: - Public interfaces
 
     /// Optimizely Manager
@@ -151,7 +157,6 @@ open class OptimizelyClient: NSObject {
 
             datafileHandler.startUpdates(sdkKey: self.sdkKey) { data in
                 // new datafile came in...
-                self.reInitLock.wait(); defer { self.reInitLock.signal() }
                 if let config = try? ProjectConfig(datafile: data) {
                     do {
                         if let users = self.config?.whitelistUsers {

OptimizelySDK/OptimizelyTests/OptimizelyTests-APIs/OptimizelyClientTests_Valid.swift

@@ -59,6 +59,20 @@ class OptimizelyClientTests_Valid: XCTestCase {
         try! self.optimizely.start(datafile: datafile)
     }
 
+    func testMultiStart() {
+        try! self.optimizely.start(datafile: datafile)
+        try! self.optimizely.start(datafile: datafile)
+        DispatchQueue.global().async {
+            for _ in 0...10 {
+                try! self.optimizely.start(datafile: self.datafile)
+            }
+        }
+        sleep(1)
+        let variationKey: String = try! self.optimizely.activate(experimentKey: kExperimentKey, userId: kUserId)
+        XCTAssert(variationKey == kVariationKey)
+
+    }
+    
     func testActivate() {
         let variationKey: String = try! self.optimizely.activate(experimentKey: kExperimentKey, userId: kUserId)
         XCTAssert(variationKey == kVariationKey)

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/BatchEventBuilderTests_Attributes.swift

@@ -192,7 +192,7 @@ class BatchEventBuilderTests_Attributes: XCTestCase {
 
     func testEventAttributesWhenAttributesEmpty() {
         // clear all audience conditions to accept empty attributes
-        var experiment = optimizely.config!.project!.experiments.filter({$0.key == experimentKey}).first!
+        var experiment = optimizely.config!.project.experiments.filter({$0.key == experimentKey}).first!
         experiment.audienceConditions = nil
         experiment.audienceIds = []
         optimizely.config!.project!.experiments = [experiment]

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/BatchEventBuilderTests_EventTags.swift

@@ -31,7 +31,7 @@ class BatchEventBuilderTests_EventTags: XCTestCase {
         optimizely = OTUtils.createOptimizely(datafileName: "audience_targeting",
                                                   clearUserProfileService: true,
                                                   eventDispatcher: eventDispatcher)!
-        project = optimizely.config!.project!
+        project = optimizely.config!.project
     }
 
     func testEventTags() {

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/BucketTests_BucketVariation.swift

@@ -109,7 +109,7 @@ class BucketTests_BucketVariation: XCTestCase {
 
         self.optimizely = OTUtils.createOptimizely(datafileName: "empty_datafile",
                                                    clearUserProfileService: true)
-        self.config = self.optimizely.config!
+        self.config = self.optimizely.config
         self.bucketer = ((optimizely.decisionService as! DefaultDecisionService).bucketer as! DefaultBucketer)
     }
 

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/BucketTests_GroupToExp.swift

@@ -105,7 +105,7 @@ class BucketTests_GroupToExp: XCTestCase {
 
         self.optimizely = OTUtils.createOptimizely(datafileName: "empty_datafile",
                                                    clearUserProfileService: true)
-        self.config = self.optimizely.config!
+        self.config = self.optimizely.config
         self.bucketer = ((optimizely.decisionService as! DefaultDecisionService).bucketer as! DefaultBucketer)
     }
 

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/DecisionServiceTests_UserProfiles.swift

@@ -56,7 +56,7 @@ class DecisionServiceTests_UserProfiles: XCTestCase {
 
         self.optimizely = OTUtils.createOptimizely(datafileName: "empty_datafile",
                                                    clearUserProfileService: true)
-        self.config = self.optimizely.config!
+        self.config = self.optimizely.config
         self.decisionService = (optimizely.decisionService as! DefaultDecisionService)
     }