diff --git a/DemoSwiftApp/Samples/SamplesForAPI.swift b/DemoSwiftApp/Samples/SamplesForAPI.swift index 3db23843..39179edd 100644 --- a/DemoSwiftApp/Samples/SamplesForAPI.swift +++ b/DemoSwiftApp/Samples/SamplesForAPI.swift @@ -265,8 +265,9 @@ class SamplesForAPI { static func checkAudienceSegments(optimizely: OptimizelyClient) { // override the default handler if cache size and timeout need to be customized - let optimizely = OptimizelyClient(sdkKey: "FCnSegiEkRry9rhVMroit4", - periodicDownloadInterval: 60) + let optimizely = OptimizelyClient(sdkKey: "VivZyCGPHY369D4z8T9yG", // odp-test + periodicDownloadInterval: 60, + defaultLogLevel: .debug) optimizely.start { result in if case .failure(let error) = result { print("[AudienceSegments] SDK initialization failed: \(error)") diff --git a/OptimizelySwiftSDK.xcodeproj/project.pbxproj b/OptimizelySwiftSDK.xcodeproj/project.pbxproj index 02791b8e..039369ce 100644 --- a/OptimizelySwiftSDK.xcodeproj/project.pbxproj +++ b/OptimizelySwiftSDK.xcodeproj/project.pbxproj @@ -1830,38 +1830,38 @@ 848617D52863DC2700B7F41B /* OdpSegmentManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617C72863DC2700B7F41B /* OdpSegmentManager.swift */; }; 848617D62863DC2700B7F41B /* OdpSegmentManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617C72863DC2700B7F41B /* OdpSegmentManager.swift */; }; 848617D72863DC2700B7F41B /* OdpSegmentManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617C72863DC2700B7F41B /* OdpSegmentManager.swift */; }; - 848617DA2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617DB2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617DC2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617DD2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617DE2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617DF2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E02863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E12863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E22863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E32863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E42863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E52863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E62863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E72863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E82863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617E92863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */; }; - 848617EA2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617EB2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617EC2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617ED2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617EE2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617EF2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F02863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F12863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F22863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F32863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F42863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F52863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F62863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F72863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F82863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; - 848617F92863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */; }; + 848617DA2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617DB2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617DC2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617DD2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617DE2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617DF2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E02863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E12863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E22863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E32863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E42863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E52863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E62863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E72863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E82863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617E92863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */; }; + 848617EA2863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617EB2863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617EC2863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617ED2863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617EE2863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617EF2863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F02863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F12863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F22863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F32863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F42863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F52863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F62863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F72863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F82863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; + 848617F92863E21200B7F41B /* OdpEventApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617D92863E21200B7F41B /* OdpEventApiManager.swift */; }; 848617FB286CF33700B7F41B /* OdpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617FA286CF33700B7F41B /* OdpEvent.swift */; }; 848617FC286CF33700B7F41B /* OdpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617FA286CF33700B7F41B /* OdpEvent.swift */; }; 848617FD286CF33700B7F41B /* OdpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848617FA286CF33700B7F41B /* OdpEvent.swift */; }; @@ -1886,10 +1886,10 @@ 84861816286D0B8900B7F41B /* OdpVuidManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8486180F286D0B8900B7F41B /* OdpVuidManagerTests.swift */; }; 84861817286D0B8900B7F41B /* OdpEventManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84861810286D0B8900B7F41B /* OdpEventManagerTests.swift */; }; 84861818286D0B8900B7F41B /* OdpEventManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84861810286D0B8900B7F41B /* OdpEventManagerTests.swift */; }; - 8486181B286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84861819286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift */; }; - 8486181C286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84861819286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift */; }; - 8486181D286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8486181A286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift */; }; - 8486181E286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8486181A286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift */; }; + 8486181B286D188B00B7F41B /* OdpSegmentApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84861819286D188B00B7F41B /* OdpSegmentApiManagerTests.swift */; }; + 8486181C286D188B00B7F41B /* OdpSegmentApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84861819286D188B00B7F41B /* OdpSegmentApiManagerTests.swift */; }; + 8486181D286D188B00B7F41B /* OdpEventApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8486181A286D188B00B7F41B /* OdpEventApiManagerTests.swift */; }; + 8486181E286D188B00B7F41B /* OdpEventApiManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8486181A286D188B00B7F41B /* OdpEventApiManagerTests.swift */; }; 84958C5E280F22FE008655C7 /* OptimizelyUserContextTests_Performance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84958C5D280F22FE008655C7 /* OptimizelyUserContextTests_Performance.swift */; }; 84958C5F280F22FE008655C7 /* OptimizelyUserContextTests_Performance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84958C5D280F22FE008655C7 /* OptimizelyUserContextTests_Performance.swift */; }; 84B4D75027E2A7550078CDA4 /* OptimizelySegmentOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B4D74F27E2A7550078CDA4 /* OptimizelySegmentOption.swift */; }; @@ -2394,15 +2394,15 @@ 8464149F289B2D0700C45EE2 /* decide_audience_segments.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = decide_audience_segments.json; sourceTree = ""; }; 846414A0289B2D0700C45EE2 /* odp_integrated_no_segments.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = odp_integrated_no_segments.json; sourceTree = ""; }; 848617C72863DC2700B7F41B /* OdpSegmentManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpSegmentManager.swift; sourceTree = ""; }; - 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZaiusGraphQLApiManager.swift; sourceTree = ""; }; - 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZaiusRestApiManager.swift; sourceTree = ""; }; + 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpSegmentApiManager.swift; sourceTree = ""; }; + 848617D92863E21200B7F41B /* OdpEventApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpEventApiManager.swift; sourceTree = ""; }; 848617FA286CF33700B7F41B /* OdpEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpEvent.swift; sourceTree = ""; }; 8486180D286D0B8900B7F41B /* OdpSegmentManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpSegmentManagerTests.swift; sourceTree = ""; }; 8486180E286D0B8900B7F41B /* OdpManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpManagerTests.swift; sourceTree = ""; }; 8486180F286D0B8900B7F41B /* OdpVuidManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpVuidManagerTests.swift; sourceTree = ""; }; 84861810286D0B8900B7F41B /* OdpEventManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpEventManagerTests.swift; sourceTree = ""; }; - 84861819286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpZaiusGraphQLApiManagerTests.swift; sourceTree = ""; }; - 8486181A286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpZaiusRestApiManagerTests.swift; sourceTree = ""; }; + 84861819286D188B00B7F41B /* OdpSegmentApiManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpSegmentApiManagerTests.swift; sourceTree = ""; }; + 8486181A286D188B00B7F41B /* OdpEventApiManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OdpEventApiManagerTests.swift; sourceTree = ""; }; 84958C5D280F22FE008655C7 /* OptimizelyUserContextTests_Performance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptimizelyUserContextTests_Performance.swift; sourceTree = ""; }; 84B4D74F27E2A7550078CDA4 /* OptimizelySegmentOption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OptimizelySegmentOption.swift; sourceTree = ""; }; 84E2E9412852A378001114AB /* OdpVuidManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OdpVuidManager.swift; sourceTree = ""; }; @@ -2626,12 +2626,12 @@ 84E2E9412852A378001114AB /* OdpVuidManager.swift */, 848617C72863DC2700B7F41B /* OdpSegmentManager.swift */, 84E2E9712855875E001114AB /* OdpEventManager.swift */, + 848617D82863E21200B7F41B /* OdpSegmentApiManager.swift */, + 848617D92863E21200B7F41B /* OdpEventApiManager.swift */, 848617FA286CF33700B7F41B /* OdpEvent.swift */, - 84B4D74F27E2A7550078CDA4 /* OptimizelySegmentOption.swift */, 84518B20287737070023F104 /* OdpConfig.swift */, + 84B4D74F27E2A7550078CDA4 /* OptimizelySegmentOption.swift */, 6E6522FF278E688B00954EA1 /* LruCache.swift */, - 848617D82863E21200B7F41B /* ZaiusGraphQLApiManager.swift */, - 848617D92863E21200B7F41B /* ZaiusRestApiManager.swift */, ); path = ODP; sourceTree = ""; @@ -2934,8 +2934,8 @@ 8486180E286D0B8900B7F41B /* OdpManagerTests.swift */, 8486180D286D0B8900B7F41B /* OdpSegmentManagerTests.swift */, 8486180F286D0B8900B7F41B /* OdpVuidManagerTests.swift */, - 84861819286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift */, - 8486181A286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift */, + 84861819286D188B00B7F41B /* OdpSegmentApiManagerTests.swift */, + 8486181A286D188B00B7F41B /* OdpEventApiManagerTests.swift */, 6E27EC9A266EF11000B4A6D4 /* OptimizelyDecisionTests.swift */, 6E75198122C5211100B2B157 /* OptimizelyErrorTests.swift */, 6EC6DD6824AE94820017D296 /* OptimizelyUserContextTests.swift */, @@ -4102,7 +4102,7 @@ 6E14CDAA2423F9C300010234 /* SDKVersion.swift in Sources */, 845945C3287758A100D13E11 /* OdpConfig.swift in Sources */, 6E14CD832423F9A100010234 /* DataStoreQueueStackImpl.swift in Sources */, - 848617F12863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F12863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E14CD812423F9A100010234 /* DataStoreUserDefaults.swift in Sources */, 6E14CD802423F9A100010234 /* DataStoreMemory.swift in Sources */, 6E14CDA02423F9C300010234 /* OptimizelyClient+Extension.swift in Sources */, @@ -4165,7 +4165,7 @@ 6E14CD872423F9A100010234 /* Audience.swift in Sources */, 6E14CD7D2423F98D00010234 /* DefaultBucketer.swift in Sources */, 6E14CD792423F98D00010234 /* OPTLogger.swift in Sources */, - 848617E12863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E12863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E14CD992423F9C300010234 /* OPTNotificationCenter.swift in Sources */, 6E14CD722423F96B00010234 /* OptimizelyClient+ObjC.swift in Sources */, 6E14CDA62423F9C300010234 /* HandlerRegistryService.swift in Sources */, @@ -4211,7 +4211,7 @@ 6E424CF426324B620081004A /* DecisionInfo.swift in Sources */, 6E5D120D2638DCE1000ABFC3 /* EventDispatcherTests_MultiClients.swift in Sources */, 6E424CF526324B620081004A /* DefaultBucketer.swift in Sources */, - 848617E02863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E02863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6EE5911A2649CF640013AD66 /* LoggerTests_MultiClients.swift in Sources */, 84E2E96728540B5E001114AB /* OptimizelySdkSettings.swift in Sources */, 6E424D5426324C4D0081004A /* OptimizelyUserContext.swift in Sources */, @@ -4287,7 +4287,7 @@ 6E424CBB26324B1D0081004A /* MurmurHash3.swift in Sources */, 8464087628130D3200CCF97D /* Integration.swift in Sources */, 848617CE2863DC2700B7F41B /* OdpSegmentManager.swift in Sources */, - 848617F02863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F02863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E424CBC26324B1D0081004A /* HandlerRegistryService.swift in Sources */, 6E424CBD26324B1D0081004A /* LogMessage.swift in Sources */, 6E424CBE26324B1D0081004A /* AtomicProperty.swift in Sources */, @@ -4337,7 +4337,7 @@ 6E75186522C520D400B2B157 /* Rollout.swift in Sources */, 6E86CEA324FDC836005DAFED /* OptimizelyUserContext+ObjC.swift in Sources */, 6E75190122C520D500B2B157 /* Attribute.swift in Sources */, - 848617DB2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617DB2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E7516B322C520D400B2B157 /* DefaultUserProfileService.swift in Sources */, 84E2E9432852A378001114AB /* OdpVuidManager.swift in Sources */, 6E75183522C520D400B2B157 /* EventForDispatch.swift in Sources */, @@ -4353,7 +4353,7 @@ 6E75185922C520D400B2B157 /* FeatureVariable.swift in Sources */, 6E4544AB270E67C800F2CEBC /* NetworkReachability.swift in Sources */, 6E7517ED22C520D400B2B157 /* DataStoreMemory.swift in Sources */, - 848617EB2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617EB2863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E75172B22C520D400B2B157 /* Constants.swift in Sources */, 6E7516BF22C520D400B2B157 /* DefaultEventDispatcher.swift in Sources */, 6E424BDE263228E90081004A /* AtomicArray.swift in Sources */, @@ -4406,7 +4406,7 @@ 6E7516BA22C520D400B2B157 /* DefaultUserProfileService.swift in Sources */, 845945C7287758A300D13E11 /* OdpConfig.swift in Sources */, 6E75175622C520D400B2B157 /* LogMessage.swift in Sources */, - 848617F62863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F62863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E75193822C520D500B2B157 /* OPTDataStore.swift in Sources */, 6E75191422C520D500B2B157 /* BackgroundingCallbacks.swift in Sources */, 6E75172622C520D400B2B157 /* OptimizelyResult.swift in Sources */, @@ -4469,7 +4469,7 @@ 6E7518B422C520D400B2B157 /* Group.swift in Sources */, 6E7518CC22C520D400B2B157 /* Audience.swift in Sources */, 6E75176E22C520D400B2B157 /* Utils.swift in Sources */, - 848617E62863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E62863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E75182422C520D400B2B157 /* BatchEventBuilder.swift in Sources */, 6E75174A22C520D400B2B157 /* HandlerRegistryService.swift in Sources */, 6E7516F622C520D400B2B157 /* OptimizelyError.swift in Sources */, @@ -4523,7 +4523,7 @@ 6E75181422C520D400B2B157 /* DataStoreQueueStackImpl.swift in Sources */, 6E593FB625BB9C5500EC72BC /* OptimizelyClientTests_Decide.swift in Sources */, 6E7516C222C520D400B2B157 /* DefaultEventDispatcher.swift in Sources */, - 848617F22863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F22863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E75188022C520D400B2B157 /* TrafficAllocation.swift in Sources */, 6E9B11DD22C548A200C22D81 /* OptimizelyClientTests_Valid.swift in Sources */, 0B97DDA0249D4A24003DE606 /* SemanticVersion.swift in Sources */, @@ -4594,7 +4594,7 @@ 6E4544B2270E67C800F2CEBC /* NetworkReachability.swift in Sources */, 6E75184422C520D400B2B157 /* Event.swift in Sources */, 6E75194022C520D500B2B157 /* OPTDecisionService.swift in Sources */, - 848617E22863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E22863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E7518E022C520D400B2B157 /* ConditionLeaf.swift in Sources */, 6E7518B022C520D400B2B157 /* Group.swift in Sources */, 6E75185022C520D400B2B157 /* ProjectConfig.swift in Sources */, @@ -4640,9 +4640,9 @@ 6E994B3D25A3E6EA00999262 /* DecisionResponse.swift in Sources */, 6E75170D22C520D400B2B157 /* OptimizelyClient.swift in Sources */, 6E75177922C520D400B2B157 /* SDKVersion.swift in Sources */, - 848617F52863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F52863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 0B97DDA2249D4A25003DE606 /* SemanticVersion.swift in Sources */, - 848617E52863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E52863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E7516C522C520D400B2B157 /* DefaultEventDispatcher.swift in Sources */, 6E75189B22C520D400B2B157 /* Experiment.swift in Sources */, 845945C6287758A300D13E11 /* OdpConfig.swift in Sources */, @@ -4723,7 +4723,7 @@ files = ( 6E7E9B382523F8BF009E4426 /* OptimizelyUserContextTests_Decide_Reasons.swift in Sources */, 6E9B117022C5487100C22D81 /* DecisionListenerTests.swift in Sources */, - 848617F72863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F72863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E9B116122C5487100C22D81 /* OptimizelyErrorTests.swift in Sources */, 6E9B116522C5487100C22D81 /* BatchEventBuilderTest.swift in Sources */, 84861808286CF33700B7F41B /* OdpEvent.swift in Sources */, @@ -4784,7 +4784,7 @@ 6EA2CC2D2345618E001E7531 /* OptimizelyConfig.swift in Sources */, C78CAFAE24486E0A009FE876 /* OptimizelyJSON+ObjC.swift in Sources */, 6E7517AB22C520D400B2B157 /* Array+Extension.swift in Sources */, - 8486181E286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift in Sources */, + 8486181E286D188B00B7F41B /* OdpEventApiManagerTests.swift in Sources */, 6E75186122C520D400B2B157 /* FeatureVariable.swift in Sources */, 6E75172722C520D400B2B157 /* OptimizelyResult.swift in Sources */, 6E7518FD22C520D500B2B157 /* UserAttribute.swift in Sources */, @@ -4816,7 +4816,7 @@ 6E9B116622C5487100C22D81 /* DecisionServiceTests_UserProfiles.swift in Sources */, 6E34A6202319EBB800BAE302 /* Notifications.swift in Sources */, 6E75173322C520D400B2B157 /* Constants.swift in Sources */, - 8486181C286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift in Sources */, + 8486181C286D188B00B7F41B /* OdpSegmentApiManagerTests.swift in Sources */, 6E7518A922C520D400B2B157 /* FeatureFlag.swift in Sources */, 84B4D75D27E2A7550078CDA4 /* OptimizelySegmentOption.swift in Sources */, 6E0A72D526C5B9AE00FF92B5 /* OptimizelyUserContextTests_ForcedDecisions.swift in Sources */, @@ -4829,7 +4829,7 @@ 6E75179322C520D400B2B157 /* OptimizelyClient+Extension.swift in Sources */, 6E9B117122C5487100C22D81 /* DecisionServiceTests_Features.swift in Sources */, 6E9B116F22C5487100C22D81 /* BucketTests_BucketVariation.swift in Sources */, - 848617E72863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E72863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E994B3F25A3E6EA00999262 /* DecisionResponse.swift in Sources */, 6E75174B22C520D400B2B157 /* HandlerRegistryService.swift in Sources */, 6E6522EB278E4F3800954EA1 /* OdpManager.swift in Sources */, @@ -4914,7 +4914,7 @@ 6E7516E022C520D400B2B157 /* OPTUserProfileService.swift in Sources */, 6E34A6212319EBB800BAE302 /* Notifications.swift in Sources */, 6E9B119D22C5488300C22D81 /* UserAttributeTests.swift in Sources */, - 848617F82863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F82863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E5D12292638DDF4000ABFC3 /* MockEventDispatcher.swift in Sources */, 6E75183E22C520D400B2B157 /* EventForDispatch.swift in Sources */, 6E9B11A022C5488300C22D81 /* ExperimentTests.swift in Sources */, @@ -4973,7 +4973,7 @@ 6E75189222C520D400B2B157 /* Project.swift in Sources */, 6E7516F822C520D400B2B157 /* OptimizelyError.swift in Sources */, 84B4D75E27E2A7550078CDA4 /* OptimizelySegmentOption.swift in Sources */, - 848617E82863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E82863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E424C09263228FD0081004A /* AtomicDictionary.swift in Sources */, 6E75189E22C520D400B2B157 /* Experiment.swift in Sources */, 6E75178822C520D400B2B157 /* ArrayEventForDispatch+Extension.swift in Sources */, @@ -5061,7 +5061,7 @@ 6E9B114F22C5486E00C22D81 /* DefaultUserProfileServiceTests.swift in Sources */, 6E7518F722C520D500B2B157 /* UserAttribute.swift in Sources */, 6E75174522C520D400B2B157 /* HandlerRegistryService.swift in Sources */, - 8486181B286D188B00B7F41B /* OdpZaiusGraphQLApiManagerTests.swift in Sources */, + 8486181B286D188B00B7F41B /* OdpSegmentApiManagerTests.swift in Sources */, 6E8A3D492637408500DAEA13 /* MockDatafileHandler.swift in Sources */, 6E981FC2232C363300FADDD6 /* DecisionListenerTests_Datafile.swift in Sources */, 6E9B114A22C5486E00C22D81 /* BucketTests_Others.swift in Sources */, @@ -5071,14 +5071,14 @@ 6E7518D322C520D400B2B157 /* AttributeValue.swift in Sources */, 6E0A72D426C5B9AE00FF92B5 /* OptimizelyUserContextTests_ForcedDecisions.swift in Sources */, 6EF41A332522BE1900EAADF1 /* OptimizelyUserContextTests_Decide.swift in Sources */, - 848617EF2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617EF2863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E27ECBE266FD78600B4A6D4 /* DecisionReasonsTests.swift in Sources */, 6E9B115E22C5486E00C22D81 /* DataStoreTests.swift in Sources */, 6E4544AF270E67C800F2CEBC /* NetworkReachability.swift in Sources */, 6E75177522C520D400B2B157 /* SDKVersion.swift in Sources */, 848617CD2863DC2700B7F41B /* OdpSegmentManager.swift in Sources */, 6E75180722C520D400B2B157 /* DataStoreFile.swift in Sources */, - 8486181D286D188B00B7F41B /* OdpZaiusRestApiManagerTests.swift in Sources */, + 8486181D286D188B00B7F41B /* OdpEventApiManagerTests.swift in Sources */, 6E75183722C520D400B2B157 /* EventForDispatch.swift in Sources */, 6E9B115D22C5486E00C22D81 /* BatchEventBuilderTests_EventTags.swift in Sources */, 6E75173922C520D400B2B157 /* MurmurHash3.swift in Sources */, @@ -5096,7 +5096,7 @@ 6E9B115722C5486E00C22D81 /* DecisionServiceTests_Features.swift in Sources */, 6E9B115522C5486E00C22D81 /* BucketTests_BucketVariation.swift in Sources */, 6E994B3825A3E6EA00999262 /* DecisionResponse.swift in Sources */, - 848617DF2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617DF2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 84861813286D0B8900B7F41B /* OdpManagerTests.swift in Sources */, 6E7516FD22C520D400B2B157 /* OptimizelyLogLevel.swift in Sources */, 6E75187322C520D400B2B157 /* Variation.swift in Sources */, @@ -5180,7 +5180,7 @@ 6E7516DB22C520D400B2B157 /* OPTUserProfileService.swift in Sources */, 6E34A61C2319EBB800BAE302 /* Notifications.swift in Sources */, 6E9B118722C5488100C22D81 /* UserAttributeTests.swift in Sources */, - 848617F32863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F32863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E5D12242638DDF4000ABFC3 /* MockEventDispatcher.swift in Sources */, 6E75183922C520D400B2B157 /* EventForDispatch.swift in Sources */, 6E9B118A22C5488100C22D81 /* ExperimentTests.swift in Sources */, @@ -5239,7 +5239,7 @@ 6E75188D22C520D400B2B157 /* Project.swift in Sources */, 6E7516F322C520D400B2B157 /* OptimizelyError.swift in Sources */, 84B4D75927E2A7550078CDA4 /* OptimizelySegmentOption.swift in Sources */, - 848617E32863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E32863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E424C04263228FD0081004A /* AtomicDictionary.swift in Sources */, 6E75189922C520D400B2B157 /* Experiment.swift in Sources */, 6E75178322C520D400B2B157 /* ArrayEventForDispatch+Extension.swift in Sources */, @@ -5275,7 +5275,7 @@ 6EC6DD4924ABF89B0017D296 /* OptimizelyUserContext.swift in Sources */, 6E75188222C520D400B2B157 /* TrafficAllocation.swift in Sources */, 6E5D12252638DDF4000ABFC3 /* MockEventDispatcher.swift in Sources */, - 848617F42863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F42863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6ECB60D0234D5D9C00016D41 /* OptimizelyConfig+ObjC.swift in Sources */, 6E9B11E322C548AF00C22D81 /* ThrowableConditionListTest.swift in Sources */, 6E75176022C520D400B2B157 /* AtomicProperty.swift in Sources */, @@ -5316,7 +5316,7 @@ 84E7ABC527D2A1F100447CAE /* ThreadSafeLogger.swift in Sources */, 6E7518BE22C520D400B2B157 /* Variable.swift in Sources */, 6E7518CA22C520D400B2B157 /* Audience.swift in Sources */, - 848617E42863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E42863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E75187622C520D400B2B157 /* Variation.swift in Sources */, 6E7517F222C520D400B2B157 /* DataStoreMemory.swift in Sources */, 6E9B11AF22C5489400C22D81 /* MockUrlSession.swift in Sources */, @@ -5376,7 +5376,7 @@ 6EC6DD4E24ABF89B0017D296 /* OptimizelyUserContext.swift in Sources */, 6E75188722C520D400B2B157 /* TrafficAllocation.swift in Sources */, 6E5D122A2638DDF4000ABFC3 /* MockEventDispatcher.swift in Sources */, - 848617F92863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617F92863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6ECB60D5234D5D9C00016D41 /* OptimizelyConfig+ObjC.swift in Sources */, 6E9B11E522C548B100C22D81 /* ThrowableConditionListTest.swift in Sources */, 6E75176522C520D400B2B157 /* AtomicProperty.swift in Sources */, @@ -5417,7 +5417,7 @@ 84E7ABCA27D2A1F100447CAE /* ThreadSafeLogger.swift in Sources */, 6E7518C322C520D400B2B157 /* Variable.swift in Sources */, 6E7518CF22C520D400B2B157 /* Audience.swift in Sources */, - 848617E92863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617E92863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E75187B22C520D400B2B157 /* Variation.swift in Sources */, 6E7517F722C520D400B2B157 /* DataStoreMemory.swift in Sources */, 6E9B11B922C5489700C22D81 /* MockUrlSession.swift in Sources */, @@ -5483,7 +5483,7 @@ 6E75180422C520D400B2B157 /* DataStoreFile.swift in Sources */, 6E86CEA224FDC836005DAFED /* OptimizelyUserContext+ObjC.swift in Sources */, 6E75195422C520D500B2B157 /* OPTBucketer.swift in Sources */, - 848617DA2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617DA2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E75171E22C520D400B2B157 /* OptimizelyResult.swift in Sources */, 84E2E9422852A378001114AB /* OdpVuidManager.swift in Sources */, 6E75172A22C520D400B2B157 /* Constants.swift in Sources */, @@ -5499,7 +5499,7 @@ 6E7517F822C520D400B2B157 /* DataStoreUserDefaults.swift in Sources */, 6E4544AA270E67C800F2CEBC /* NetworkReachability.swift in Sources */, 6E7517A222C520D400B2B157 /* Array+Extension.swift in Sources */, - 848617EA2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617EA2863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E75194822C520D500B2B157 /* OPTDatafileHandler.swift in Sources */, 6E7518E822C520D400B2B157 /* ConditionHolder.swift in Sources */, 6E424BDD263228E90081004A /* AtomicArray.swift in Sources */, @@ -5552,7 +5552,7 @@ 6E7516B422C520D400B2B157 /* DefaultUserProfileService.swift in Sources */, 845945C02877589F00D13E11 /* OdpConfig.swift in Sources */, 6E75175022C520D400B2B157 /* LogMessage.swift in Sources */, - 848617EE2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617EE2863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 6E75193222C520D500B2B157 /* OPTDataStore.swift in Sources */, 6E75190E22C520D500B2B157 /* BackgroundingCallbacks.swift in Sources */, 6E75172022C520D400B2B157 /* OptimizelyResult.swift in Sources */, @@ -5615,7 +5615,7 @@ 6E7518AE22C520D400B2B157 /* Group.swift in Sources */, 6E7518C622C520D400B2B157 /* Audience.swift in Sources */, 6E75176822C520D400B2B157 /* Utils.swift in Sources */, - 848617DE2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617DE2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 6E75181E22C520D400B2B157 /* BatchEventBuilder.swift in Sources */, 6E75174422C520D400B2B157 /* HandlerRegistryService.swift in Sources */, 6E7516F022C520D400B2B157 /* OptimizelyError.swift in Sources */, @@ -5711,7 +5711,7 @@ 75C71A3025E454460084187E /* FeatureFlag.swift in Sources */, 75C71A3125E454460084187E /* Group.swift in Sources */, 75C71A3225E454460084187E /* Variable.swift in Sources */, - 848617DD2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617DD2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, 75C71A3325E454460084187E /* Attribute.swift in Sources */, 75C71A3425E454460084187E /* BackgroundingCallbacks.swift in Sources */, 75C71A3525E454460084187E /* OPTNotificationCenter.swift in Sources */, @@ -5728,7 +5728,7 @@ 75C71A3F25E454460084187E /* Constants.swift in Sources */, 75C71A4025E454460084187E /* Notifications.swift in Sources */, 75C71A4125E454460084187E /* MurmurHash3.swift in Sources */, - 848617ED2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617ED2863E21200B7F41B /* OdpEventApiManager.swift in Sources */, 848617FE286CF33700B7F41B /* OdpEvent.swift in Sources */, 75C71A4225E454460084187E /* HandlerRegistryService.swift in Sources */, 75C71A4325E454460084187E /* LogMessage.swift in Sources */, @@ -5772,7 +5772,7 @@ BD64854F2491474500F30986 /* DataStoreFile.swift in Sources */, 6E86CEA424FDC836005DAFED /* OptimizelyUserContext+ObjC.swift in Sources */, BD6485502491474500F30986 /* OPTBucketer.swift in Sources */, - 848617DC2863E21200B7F41B /* ZaiusGraphQLApiManager.swift in Sources */, + 848617DC2863E21200B7F41B /* OdpSegmentApiManager.swift in Sources */, BD6485512491474500F30986 /* OptimizelyResult.swift in Sources */, 84E2E9442852A378001114AB /* OdpVuidManager.swift in Sources */, BD6485522491474500F30986 /* Constants.swift in Sources */, @@ -5788,7 +5788,7 @@ BD64855C2491474500F30986 /* DataStoreUserDefaults.swift in Sources */, 6E4544AC270E67C800F2CEBC /* NetworkReachability.swift in Sources */, BD64855D2491474500F30986 /* Array+Extension.swift in Sources */, - 848617EC2863E21200B7F41B /* ZaiusRestApiManager.swift in Sources */, + 848617EC2863E21200B7F41B /* OdpEventApiManager.swift in Sources */, BD64855E2491474500F30986 /* OPTDatafileHandler.swift in Sources */, BD64855F2491474500F30986 /* ConditionHolder.swift in Sources */, 6E424BDF263228E90081004A /* AtomicArray.swift in Sources */, diff --git a/Sources/ODP/ZaiusRestApiManager.swift b/Sources/ODP/OdpEventApiManager.swift similarity index 99% rename from Sources/ODP/ZaiusRestApiManager.swift rename to Sources/ODP/OdpEventApiManager.swift index 29729a2d..5034b544 100644 --- a/Sources/ODP/ZaiusRestApiManager.swift +++ b/Sources/ODP/OdpEventApiManager.swift @@ -30,7 +30,7 @@ import Foundation {"title":"Accepted","status":202,"timestamp":"2022-06-30T20:59:52.046Z"} */ -class ZaiusRestApiManager { +class OdpEventApiManager { func sendOdpEvents(apiKey: String, apiHost: String, diff --git a/Sources/ODP/OdpEventManager.swift b/Sources/ODP/OdpEventManager.swift index 3422b6a4..57d98994 100644 --- a/Sources/ODP/OdpEventManager.swift +++ b/Sources/ODP/OdpEventManager.swift @@ -19,18 +19,18 @@ import UIKit class OdpEventManager { var odpConfig: OdpConfig - var zaiusMgr: ZaiusRestApiManager + var apiMgr: OdpEventApiManager var maxQueueSize = 100 let maxBatchEvents = 10 let queueLock: DispatchQueue let eventQueue: DataStoreQueueStackImpl - + let logger = OPTLoggerFactory.getLogger() - - init(sdkKey: String, odpConfig: OdpConfig? = nil, apiManager: ZaiusRestApiManager? = nil) { + + init(sdkKey: String, odpConfig: OdpConfig? = nil, apiManager: OdpEventApiManager? = nil) { self.odpConfig = odpConfig ?? OdpConfig() - self.zaiusMgr = apiManager ?? ZaiusRestApiManager() + self.apiMgr = apiManager ?? OdpEventApiManager() self.queueLock = DispatchQueue(label: "event") @@ -60,7 +60,7 @@ class OdpEventManager { ], data: [:]) } - + func sendEvent(type: String, action: String, identifiers: [String: String], data: [String: Any?]) { let event = OdpEvent(type: type, action: action, @@ -82,7 +82,7 @@ class OdpEventManager { "os_version": Utils.osVersion, // "13.2", ... "device_type": Utils.deviceType, // fixed set = ("Phone", "Tablet", "Smart TV", "Watch", “PC”, "Other") "model": Utils.deviceModel // ("iPhone 12", "iPad 2", "Pixel 2", "SM-A515F", ...) - + // [optional] // "data_source_instance": , // if need subtypes of data_source ] @@ -90,7 +90,7 @@ class OdpEventManager { data.merge(customData) { (_, custom) in custom } // keep custom data if conflicts return data } - + // MARK: - dispatch func dispatch(_ event: OdpEvent) { @@ -100,7 +100,7 @@ class OdpEventManager { let error = OptimizelyError.eventDispatchFailed("ODP EventQueue is full") self.logger.e(error) } - + flush() } @@ -110,11 +110,11 @@ class OdpEventManager { reset() return } - + guard let odpApiKey = odpConfig.apiKey, let odpApiHost = odpConfig.apiHost else { return } - + queueLock.async { func removeStoredEvents(num: Int) { if let removedItem = self.eventQueue.removeFirstItems(count: num), removedItem.count > 0 { @@ -128,20 +128,20 @@ class OdpEventManager { // sync group used to ensure that the sendEvent is synchronous. // used in flushEvents let sync = DispatchGroup() - + while let events: [OdpEvent] = self.eventQueue.getFirstItems(count: self.maxBatchEvents) { let numEvents = events.count - + // multiple auto-retries are disabled for now // - this may be too much since they'll be retried any way when next events arrive. // - also, no guarantee on success after multiple retries, so it helps minimal with extra complexity. - + var odpError: OptimizelyError? sync.enter() // make the send event synchronous. enter our notify - self.zaiusMgr.sendOdpEvents(apiKey: odpApiKey, - apiHost: odpApiHost, - events: events) { error in + self.apiMgr.sendOdpEvents(apiKey: odpApiKey, + apiHost: odpApiHost, + events: events) { error in odpError = error sync.leave() // our send is done. } @@ -161,7 +161,7 @@ class OdpEventManager { } } } - + removeStoredEvents(num: numEvents) } } diff --git a/Sources/ODP/ZaiusGraphQLApiManager.swift b/Sources/ODP/OdpSegmentApiManager.swift similarity index 99% rename from Sources/ODP/ZaiusGraphQLApiManager.swift rename to Sources/ODP/OdpSegmentApiManager.swift index 4f83951a..be769652 100644 --- a/Sources/ODP/ZaiusGraphQLApiManager.swift +++ b/Sources/ODP/OdpSegmentApiManager.swift @@ -95,7 +95,7 @@ import Foundation } */ -class ZaiusGraphQLApiManager { +class OdpSegmentApiManager { let logger = OPTLoggerFactory.getLogger() func fetchSegments(apiKey: String, diff --git a/Sources/ODP/OdpSegmentManager.swift b/Sources/ODP/OdpSegmentManager.swift index 6a75415a..37fe5c1d 100644 --- a/Sources/ODP/OdpSegmentManager.swift +++ b/Sources/ODP/OdpSegmentManager.swift @@ -19,16 +19,16 @@ import Foundation class OdpSegmentManager { var odpConfig: OdpConfig var segmentsCache: LruCache - var zaiusMgr: ZaiusGraphQLApiManager - + var apiMgr: OdpSegmentApiManager + let logger = OPTLoggerFactory.getLogger() - + init(cacheSize: Int, cacheTimeoutInSecs: Int, odpConfig: OdpConfig? = nil, - apiManager: ZaiusGraphQLApiManager? = nil) { + apiManager: OdpSegmentApiManager? = nil) { self.odpConfig = odpConfig ?? OdpConfig() - self.zaiusMgr = apiManager ?? ZaiusGraphQLApiManager() + self.apiMgr = apiManager ?? OdpSegmentApiManager() self.segmentsCache = LruCache(size: cacheSize, timeoutInSecs: cacheTimeoutInSecs) @@ -51,7 +51,7 @@ class OdpSegmentManager { } let cacheKey = makeCacheKey(userKey, userValue) - + let ignoreCache = options.contains(.ignoreCache) let resetCache = options.contains(.resetCache) @@ -66,11 +66,11 @@ class OdpSegmentManager { } } - zaiusMgr.fetchSegments(apiKey: odpApiKey, - apiHost: odpApiHost, - userKey: userKey, - userValue: userValue, - segmentsToCheck: segmentsToCheck) { segments, err in + apiMgr.fetchSegments(apiKey: odpApiKey, + apiHost: odpApiHost, + userKey: userKey, + userValue: userValue, + segmentsToCheck: segmentsToCheck) { segments, err in if err == nil, let segments = segments { if !ignoreCache { self.segmentsCache.save(key: cacheKey, value: segments) diff --git a/Tests/OptimizelyTests-Common/OdpZaiusRestApiManagerTests.swift b/Tests/OptimizelyTests-Common/OdpEventApiManagerTests.swift similarity index 86% rename from Tests/OptimizelyTests-Common/OdpZaiusRestApiManagerTests.swift rename to Tests/OptimizelyTests-Common/OdpEventApiManagerTests.swift index fc9c2617..9609c626 100644 --- a/Tests/OptimizelyTests-Common/OdpZaiusRestApiManagerTests.swift +++ b/Tests/OptimizelyTests-Common/OdpEventApiManagerTests.swift @@ -16,7 +16,7 @@ import XCTest -class ZaiusRestApiManagerTests: XCTestCase { +class OdpEventApiManagerTests: XCTestCase { let userKey = "vuid" let userValue = "test-user-value" let apiKey = "test-api-key" @@ -30,17 +30,17 @@ class ZaiusRestApiManagerTests: XCTestCase { // MARK: - success func testSendOdpEvents_validRequest() { - let session = MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.successResponseData) - let api = MockZaiusApiManager(session) - + let session = MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.successResponseData) + let api = MockOdpEventApiManager(session) + let sem = DispatchSemaphore(value: 0) api.sendOdpEvents(apiKey: apiKey, apiHost: apiHost, events: events) { _ in sem.signal() } XCTAssertEqual(.success, sem.wait(timeout: .now() + .seconds(1))) - + let request = session.receivedApiRequest! - + XCTAssertEqual(apiHost + "/v3/events", request.url?.absoluteString) XCTAssertEqual("POST", request.httpMethod) XCTAssertEqual("application/json", request.value(forHTTPHeaderField: "Content-Type")) @@ -53,10 +53,10 @@ class ZaiusRestApiManagerTests: XCTestCase { XCTAssert(OTUtils.compareDictionaries(expectedArray[i], bodyArray[i])) } } - + func testSendOdpEvents_success() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 200, - responseData: MockZaiusUrlSession.successResponseData)) + let api = MockOdpEventApiManager(MockOdpUrlSession(statusCode: 200, + responseData: MockOdpUrlSession.successResponseData)) let sem = DispatchSemaphore(value: 0) api.sendOdpEvents(apiKey: apiKey, apiHost: apiHost, events: events) { error in XCTAssertNil(error) @@ -68,7 +68,7 @@ class ZaiusRestApiManagerTests: XCTestCase { // MARK: - errors func testSendOdpEvents_networkError_retry() { - let api = MockZaiusApiManager(MockZaiusUrlSession(withError: true)) + let api = MockOdpEventApiManager(MockOdpUrlSession(withError: true)) let sem = DispatchSemaphore(value: 0) api.sendOdpEvents(apiKey: apiKey, apiHost: apiHost, events: events) { error in @@ -81,10 +81,10 @@ class ZaiusRestApiManagerTests: XCTestCase { } XCTAssertEqual(.success, sem.wait(timeout: .now() + .seconds(1))) } - + func testSendOdpEvents_400_noRetry() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 400, responseData: MockZaiusUrlSession.failureResponseData)) - + let api = MockOdpEventApiManager(MockOdpUrlSession(statusCode: 400, responseData: MockOdpUrlSession.failureResponseData)) + let sem = DispatchSemaphore(value: 0) api.sendOdpEvents(apiKey: apiKey, apiHost: apiHost, events: events) { error in if case .odpEventFailed(_, let canRetry) = error { @@ -98,8 +98,8 @@ class ZaiusRestApiManagerTests: XCTestCase { } func testSendOdpEvents_500_retry() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 500, responseData: "server error")) - + let api = MockOdpEventApiManager(MockOdpUrlSession(statusCode: 500, responseData: "server error")) + let sem = DispatchSemaphore(value: 0) api.sendOdpEvents(apiKey: apiKey, apiHost: apiHost, events: events) { error in if case .odpEventFailed(_, let canRetry) = error { @@ -120,16 +120,16 @@ class ZaiusRestApiManagerTests: XCTestCase { // - validate both for nil and NSNull OdpEvent(type: "t1", action: "a1", identifiers: ["id1": "value1"], data: ["key1": "value1", "key2": nil, "key3": NSNull()]), ] - - let session = MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.successResponseData) - let api = MockZaiusApiManager(session) - + + let session = MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.successResponseData) + let api = MockOdpEventApiManager(session) + let sem = DispatchSemaphore(value: 0) api.sendOdpEvents(apiKey: apiKey, apiHost: apiHost, events: events) { _ in sem.signal() } XCTAssertEqual(.success, sem.wait(timeout: .now() + .seconds(1))) - + let request = session.receivedApiRequest! let jsonDispatched = String(bytes: request.httpBody!, encoding: .utf8)! @@ -144,14 +144,14 @@ class ZaiusRestApiManagerTests: XCTestCase { // tests below will be skipped in CI (travis/actions) since they use the live ODP server. #if DEBUG -extension ZaiusRestApiManagerTests { +extension OdpEventApiManagerTests { var odpApiKey: String { return "W4WzcEs-ABgXorzY7h1LCQ" } var odpApiHost: String { return "https://api.zaius.com" } var odpValidUserId: String { return "tester-101"} - + func testLiveOdpRest() { - let manager = ZaiusRestApiManager() + let manager = OdpEventApiManager() let sem = DispatchSemaphore(value: 0) manager.sendOdpEvents(apiKey: odpApiKey, @@ -167,7 +167,7 @@ extension ZaiusRestApiManagerTests { } func testLiveOdpRest_error() { - let manager = ZaiusRestApiManager() + let manager = OdpEventApiManager() let sem = DispatchSemaphore(value: 0) manager.sendOdpEvents(apiKey: odpApiKey, @@ -185,11 +185,11 @@ extension ZaiusRestApiManagerTests { #endif -// MARK: - MockZaiusApiManager +// MARK: - MockOdpEventApiManager -extension ZaiusRestApiManagerTests { +extension OdpEventApiManagerTests { - class MockZaiusApiManager: ZaiusRestApiManager { + class MockOdpEventApiManager: OdpEventApiManager { let mockUrlSession: URLSession init(_ urlSession: URLSession) { @@ -201,7 +201,7 @@ extension ZaiusRestApiManagerTests { } } - class MockZaiusUrlSession: URLSession { + class MockOdpUrlSession: URLSession { static var validSessions = 0 var statusCode: Int var withError: Bool @@ -224,7 +224,7 @@ extension ZaiusRestApiManagerTests { Self.validSessions += 1 self.statusCode = statusCode self.withError = withError - self.responseData = responseData ?? MockZaiusUrlSession.successResponseData + self.responseData = responseData ?? MockOdpUrlSession.successResponseData } override func dataTask(with request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask { diff --git a/Tests/OptimizelyTests-Common/OdpEventManagerTests.swift b/Tests/OptimizelyTests-Common/OdpEventManagerTests.swift index f54ed856..1776945d 100644 --- a/Tests/OptimizelyTests-Common/OdpEventManagerTests.swift +++ b/Tests/OptimizelyTests-Common/OdpEventManagerTests.swift @@ -19,7 +19,7 @@ import XCTest class OdpEventManagerTests: XCTestCase { var manager: OdpEventManager! var odpConfig: OdpConfig! - var apiManager = MockZaiusApiManager() + var apiManager = MockOdpEventApiManager() var options = [OptimizelySegmentOption]() @@ -284,8 +284,8 @@ class OdpEventManagerTests: XCTestCase { // MARK: - multiple skdKeys func testMultipleSdkKeys_doNotInterfere() { - let apiManager1 = MockZaiusApiManager() - let apiManager2 = MockZaiusApiManager() + let apiManager1 = MockOdpEventApiManager() + let apiManager2 = MockOdpEventApiManager() let odpConfig1 = OdpConfig() let odpConfig2 = OdpConfig() @@ -450,9 +450,9 @@ class OdpEventManagerTests: XCTestCase { } } - // MARK: - MockZaiusApiManager + // MARK: - MockOdpEventApiManager - class MockZaiusApiManager: ZaiusRestApiManager { + class MockOdpEventApiManager: OdpEventApiManager { var receivedApiKey: String! var receivedApiHost: String! var dispatchedBatchEvents = [[OdpEvent]]() diff --git a/Tests/OptimizelyTests-Common/OdpZaiusGraphQLApiManagerTests.swift b/Tests/OptimizelyTests-Common/OdpSegmentApiManagerTests.swift similarity index 88% rename from Tests/OptimizelyTests-Common/OdpZaiusGraphQLApiManagerTests.swift rename to Tests/OptimizelyTests-Common/OdpSegmentApiManagerTests.swift index 0a6ecb96..b6795ac1 100644 --- a/Tests/OptimizelyTests-Common/OdpZaiusGraphQLApiManagerTests.swift +++ b/Tests/OptimizelyTests-Common/OdpSegmentApiManagerTests.swift @@ -16,7 +16,7 @@ import XCTest -class ZaiusGraphQLApiManagerTests: XCTestCase { +class OdpSegmentApiManagerTests: XCTestCase { let userKey = "vuid" let userValue = "test-user-value" let apiKey = "test-api-key" @@ -27,7 +27,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { // MARK: - Request func testFetchQualifiedSegments_validRequest() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.goodResponseData)) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.goodResponseData)) api.fetchSegments(apiKey: apiKey, apiHost: apiHost, @@ -35,7 +35,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { userValue: userValue, segmentsToCheck: ["a", "b", "c"]) {_,_ in } - let request = ZaiusGraphQLApiManagerTests.createdApiRequest! + let request = OdpSegmentApiManagerTests.createdApiRequest! let expectedBody = [ "query": "query {customer(\(userKey): \"\(userValue)\") {audiences(subset:[\"a\",\"b\",\"c\"]) {edges {node {name state}}}}}" ] @@ -50,7 +50,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { // MARK: - Success func testFetchQualifiedSegments_success() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.goodResponseData)) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.goodResponseData)) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -66,7 +66,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { } func testFetchQualifiedSegments_successWithEmptySegments() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.goodEmptyResponseData)) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.goodEmptyResponseData)) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -84,7 +84,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { // MARK: - Failure func testFetchQualifiedSegments_invalidIdentifier() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.invalidIdentifierResponseData)) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.invalidIdentifierResponseData)) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -104,7 +104,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { } func testFetchQualifiedSegments_otherException() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.otherExceptionResponseData)) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.otherExceptionResponseData)) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -124,7 +124,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { } func testFetchQualifiedSegments_badResponse() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 200, responseData: MockZaiusUrlSession.badResponseData)) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 200, responseData: MockOdpUrlSession.badResponseData)) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -144,7 +144,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { } func testFetchQualifiedSegments_networkError() { - let api = MockZaiusApiManager(MockZaiusUrlSession(withError: true)) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(withError: true)) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -164,7 +164,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { } func testFetchQualifiedSegments_400() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 403, responseData: "Bad Request")) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 403, responseData: "Bad Request")) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -184,7 +184,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { } func testFetchQualifiedSegments_500() { - let api = MockZaiusApiManager(MockZaiusUrlSession(statusCode: 500, responseData: "Server Error")) + let api = MockOdpSegmentApiManager(MockOdpUrlSession(statusCode: 500, responseData: "Server Error")) let sem = DispatchSemaphore(value: 0) api.fetchSegments(apiKey: apiKey, @@ -206,7 +206,7 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { // MARK: - Others func testMakeSubsetFilter() { - let api = ZaiusGraphQLApiManager() + let api = OdpSegmentApiManager() XCTAssertEqual("(subset:[])", api.makeSubsetFilter(segments: [])) XCTAssertEqual("(subset:[\"a\"])", api.makeSubsetFilter(segments: ["a"])) @@ -229,14 +229,14 @@ class ZaiusGraphQLApiManagerTests: XCTestCase { // tests below will be skipped in CI (travis/actions) since they use the live ODP server. #if DEBUG -extension ZaiusGraphQLApiManagerTests { +extension OdpSegmentApiManagerTests { var odpApiKey: String { return "W4WzcEs-ABgXorzY7h1LCQ" } var odpApiHost: String { return "https://api.zaius.com" } var odpValidUserId: String { return "tester-101"} func testLiveOdpGraphQL() { - let manager = ZaiusGraphQLApiManager() + let manager = OdpSegmentApiManager() let sem = DispatchSemaphore(value: 0) manager.fetchSegments(apiKey: odpApiKey, @@ -252,7 +252,7 @@ extension ZaiusGraphQLApiManagerTests { } func testLiveOdpGraphQL_defaultParameters_userNotRegistered() { - let manager = ZaiusGraphQLApiManager() + let manager = OdpSegmentApiManager() let sem = DispatchSemaphore(value: 0) manager.fetchSegments(apiKey: odpApiKey, @@ -280,11 +280,11 @@ extension ZaiusGraphQLApiManagerTests { #endif -// MARK: - MockZaiusApiManager +// MARK: - MockOdpSegmentApiManager -extension ZaiusGraphQLApiManagerTests { +extension OdpSegmentApiManagerTests { - class MockZaiusApiManager: ZaiusGraphQLApiManager { + class MockOdpSegmentApiManager: OdpSegmentApiManager { let mockUrlSession: URLSession init(_ urlSession: URLSession) { @@ -296,9 +296,9 @@ extension ZaiusGraphQLApiManagerTests { } } - // MARK: - MockZaiusUrlSession + // MARK: - MockOdpUrlSession - class MockZaiusUrlSession: URLSession { + class MockOdpUrlSession: URLSession { static var validSessions = 0 var statusCode: Int var withError: Bool @@ -320,11 +320,11 @@ extension ZaiusGraphQLApiManagerTests { Self.validSessions += 1 self.statusCode = statusCode self.withError = withError - self.responseData = responseData ?? MockZaiusUrlSession.goodResponseData + self.responseData = responseData ?? MockOdpUrlSession.goodResponseData } override func dataTask(with request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask { - ZaiusGraphQLApiManagerTests.createdApiRequest = request + OdpSegmentApiManagerTests.createdApiRequest = request return MockDataTask() { let statusCode = self.statusCode != 0 ? self.statusCode : 200 diff --git a/Tests/OptimizelyTests-Common/OdpSegmentManagerTests.swift b/Tests/OptimizelyTests-Common/OdpSegmentManagerTests.swift index 3955d27b..97a0133e 100644 --- a/Tests/OptimizelyTests-Common/OdpSegmentManagerTests.swift +++ b/Tests/OptimizelyTests-Common/OdpSegmentManagerTests.swift @@ -19,7 +19,7 @@ import XCTest class OdpSegmentManagerTests: XCTestCase { var manager: OdpSegmentManager! var odpConfig: OdpConfig! - var apiManager = MockZaiusApiManager() + var apiManager = MockOdpSegmentApiManager() var options = [OptimizelySegmentOption]() @@ -145,9 +145,9 @@ class OdpSegmentManagerTests: XCTestCase { return manager.segmentsCache.map.count } - // MARK: - MockZaiusApiManager + // MARK: - MockOdpSegmentApiManager - class MockZaiusApiManager: ZaiusGraphQLApiManager { + class MockOdpSegmentApiManager: OdpSegmentApiManager { var receivedApiKey: String! var receivedApiHost: String! diff --git a/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_ODP.swift b/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_ODP.swift index 44f2d5c2..39d894da 100644 --- a/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_ODP.swift +++ b/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_ODP.swift @@ -202,7 +202,7 @@ extension OptimizelyUserContextTests_ODP { /* this test is not good since createUserContext with not-registered-user will auto register the user. - the same live odp test with not-registered-user will be done in ZaiusGraphQLApiManagerTests, so skipped here. + the same live odp test with not-registered-user will be done in OdpSegmentApiManagerTests, so skipped here. func testLiveOdpGraphQL_defaultParameters_userNotRegistered() { let optimizely = OptimizelyClient(sdkKey: OTUtils.randomSdkKey) @@ -241,7 +241,7 @@ class MockOdpManager: OdpManager { init(sdkKey: String, disable: Bool, cacheSize: Int, cacheTimeoutInSecs: Int) { super.init(sdkKey: sdkKey, disable: disable, cacheSize: cacheSize, cacheTimeoutInSecs: cacheTimeoutInSecs) - self.segmentManager?.zaiusMgr = MockZaiusApiManager() + self.segmentManager?.apiMgr = MockOdpSegmentApiManager() } override func fetchQualifiedSegments(userId: String, @@ -258,9 +258,9 @@ class MockOdpManager: OdpManager { } } -// MARK: - MockZaiusApiManager +// MARK: - MockOdpSegmentApiManager -class MockZaiusApiManager: ZaiusGraphQLApiManager { +class MockOdpSegmentApiManager: OdpSegmentApiManager { var receivedApiKey: String! var receivedApiHost: String!