Add factory method for DefaultCmabService

Author: muzahidul-opti

Sources/CMAB/CmabService.swift

@@ -175,3 +175,12 @@ class DefaultCmabService: CmabService {
         return filteredUserAttributes
     }
 }
+
+extension DefaultCmabService {
+    static func createDefault() -> DefaultCmabService {
+        let DEFAULT_CMAB_CACHE_TIMEOUT = 30 * 60 * 1000  // 30 minutes in milliseconds
+        let DEFAULT_CMAB_CACHE_SIZE = 1000
+        let cache = LruCache<String, CmabCacheValue>(size: DEFAULT_CMAB_CACHE_SIZE, timeoutInSecs: DEFAULT_CMAB_CACHE_TIMEOUT)
+        return DefaultCmabService(cmabClient: DefaultCmabClient(), cmabCache: cache)
+    }
+}

Sources/Implementation/DefaultDecisionService.swift

@@ -36,9 +36,6 @@ struct VariationDecision {
 
 typealias UserProfile = OPTUserProfileService.UPProfile
 
-let DEFAULT_CMAB_CACHE_TIMEOUT = 30 * 60 * 1000  // 30 minutes in milliseconds
-let DEFAULT_CMAB_CACHE_SIZE = 1000
-
 class DefaultDecisionService: OPTDecisionService {
     let bucketer: OPTBucketer
     let userProfileService: OPTUserProfileService
@@ -54,19 +51,16 @@ class DefaultDecisionService: OPTDecisionService {
         return threadSafeLogger.logger
     }
 
-    init(userProfileService: OPTUserProfileService) {
+    init(userProfileService: OPTUserProfileService, cmabService: CmabService) {
         self.bucketer = DefaultBucketer()
-        // fixme: cmab service need to inject from outside
         self.userProfileService = userProfileService
-        let cache = LruCache<String, CmabCacheValue>(size: DEFAULT_CMAB_CACHE_SIZE, timeoutInSecs: DEFAULT_CMAB_CACHE_TIMEOUT)
-        self.cmabService = DefaultCmabService(cmabClient: DefaultCmabClient(), cmabCache: cache)
+        self.cmabService = cmabService
     }
 
-    init(userProfileService: OPTUserProfileService, bucketer: OPTBucketer) {
+    init(userProfileService: OPTUserProfileService, bucketer: OPTBucketer, cmabService: CmabService) {
         self.bucketer = bucketer
         self.userProfileService = userProfileService
-        let cache = LruCache<String, CmabCacheValue>(size: DEFAULT_CMAB_CACHE_SIZE, timeoutInSecs: DEFAULT_CMAB_CACHE_TIMEOUT)
-        self.cmabService = DefaultCmabService(cmabClient: DefaultCmabClient(), cmabCache: cache)
+        self.cmabService = cmabService
     }
 
     // MARK: - CMAB decision

Sources/Optimizely/OptimizelyClient.swift

@@ -108,11 +108,13 @@ open class OptimizelyClient: NSObject {
         let logger = logger ?? DefaultLogger()
         type(of: logger).logLevel = defaultLogLevel ?? .info
 
+        let cmabService = DefaultCmabService.createDefault()
+        
         self.registerServices(sdkKey: sdkKey,
                               logger: logger,
                               eventDispatcher: eventDispatcher ?? DefaultEventDispatcher.sharedInstance,
                               datafileHandler: datafileHandler ?? DefaultDatafileHandler(),
-                              decisionService: DefaultDecisionService(userProfileService: userProfileService),
+                              decisionService: DefaultDecisionService(userProfileService: userProfileService, cmabService: cmabService),
                               notificationCenter: DefaultNotificationCenter())
 
         self.logger = HandlerRegistryService.shared.injectLogger()