Skip to content

Commit 2211547

Browse files
roninopfroninopf
committed
fix warnings
1 parent e179438 commit 2211547

16 files changed

+88
-93
lines changed

‎swift-sdk/Internal/ApiClient.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ struct DeviceMetadata: Codable {
1515
class ApiClient {
1616
init(apiKey: String,
1717
authProvider: AuthProvider?,
18-
endPoint: String,
18+
endpoint: String,
1919
networkSession: NetworkSessionProtocol,
2020
deviceMetadata: DeviceMetadata,
2121
dateProvider: DateProviderProtocol) {
2222
self.apiKey = apiKey
2323
self.authProvider = authProvider
24-
self.endPoint = endPoint
24+
self.endpoint = endpoint
2525
self.networkSession = networkSession
2626
self.deviceMetadata = deviceMetadata
2727
self.dateProvider = dateProvider
@@ -34,8 +34,7 @@ class ApiClient {
3434

3535
let currentDate = dateProvider.currentDate
3636
let apiCallRequest = IterableAPICallRequest(apiKey: apiKey,
37-
endPoint: endPoint,
38-
auth: authProvider.auth,
37+
endpoint: endpoint,
3938
authToken: authProvider.auth.authToken,
4039
deviceMetadata: deviceMetadata,
4140
iterableRequest: iterableRequest).addingCreatedAt(currentDate)
@@ -88,7 +87,7 @@ class ApiClient {
8887

8988
private let apiKey: String
9089
private weak var authProvider: AuthProvider?
91-
private let endPoint: String
90+
private let endpoint: String
9291
private let networkSession: NetworkSessionProtocol
9392
private let deviceMetadata: DeviceMetadata
9493
private let dateProvider: DateProviderProtocol

‎swift-sdk/Internal/DependencyContainer.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protocol DependencyContainerProtocol: RedirectNetworkSessionProvider {
2121
func createPersistenceContextProvider() -> IterablePersistenceContextProvider?
2222
func createRequestHandler(apiKey: String,
2323
config: IterableConfig,
24-
endPoint: String,
24+
endpoint: String,
2525
authProvider: AuthProvider?,
2626
authManager: IterableAuthManagerProtocol,
2727
deviceMetadata: DeviceMetadata,
@@ -59,15 +59,15 @@ extension DependencyContainerProtocol {
5959

6060
func createRequestHandler(apiKey: String,
6161
config: IterableConfig,
62-
endPoint: String,
62+
endpoint: String,
6363
authProvider: AuthProvider?,
6464
authManager: IterableAuthManagerProtocol,
6565
deviceMetadata: DeviceMetadata,
6666
offlineMode: Bool) -> RequestHandlerProtocol {
6767
let onlineProcessor = OnlineRequestProcessor(apiKey: apiKey,
6868
authProvider: authProvider,
6969
authManager: authManager,
70-
endPoint: endPoint,
70+
endpoint: endpoint,
7171
networkSession: networkSession,
7272
deviceMetadata: deviceMetadata,
7373
dateProvider: dateProvider)
@@ -79,7 +79,7 @@ extension DependencyContainerProtocol {
7979
let offlineProcessor = OfflineRequestProcessor(apiKey: apiKey,
8080
authProvider: authProvider,
8181
authManager: authManager,
82-
endPoint: endPoint,
82+
endpoint: endpoint,
8383
deviceMetadata: deviceMetadata,
8484
taskScheduler: createTaskScheduler(persistenceContextProvider: persistenceContextProvider,
8585
healthMonitor: healthMonitor),

‎swift-sdk/Internal/InternalIterableAPI.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
437437
lazy var apiClient: ApiClientProtocol = {
438438
ApiClient(apiKey: apiKey,
439439
authProvider: self,
440-
endPoint: apiEndPoint,
440+
endpoint: apiEndPoint,
441441
networkSession: networkSession,
442442
deviceMetadata: deviceMetadata,
443443
dateProvider: dateProvider)
@@ -447,7 +447,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
447447
let offlineMode = self.localStorage.offlineMode
448448
return dependencyContainer.createRequestHandler(apiKey: apiKey,
449449
config: config,
450-
endPoint: apiEndPoint,
450+
endpoint: apiEndPoint,
451451
authProvider: self,
452452
authManager: authManager,
453453
deviceMetadata: deviceMetadata,

‎swift-sdk/Internal/IterableAPICallRequest.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import Foundation
88
/// This struct must be `Codable`.
99
struct IterableAPICallRequest {
1010
let apiKey: String
11-
let endPoint: String
12-
let auth: Auth
11+
let endpoint: String
1312
let authToken: String?
1413
let deviceMetadata: DeviceMetadata
1514
let iterableRequest: IterableRequest
@@ -22,13 +21,13 @@ struct IterableAPICallRequest {
2221
func convertToURLRequest(sentAt: Date, processorType: ProcessorType = .online) -> URLRequest? {
2322
switch iterableRequest {
2423
case let .get(getRequest):
25-
return IterableRequestUtil.createGetRequest(forApiEndPoint: endPoint,
24+
return IterableRequestUtil.createGetRequest(forApiEndPoint: endpoint,
2625
path: getRequest.path,
2726
headers: createIterableHeaders(sentAt: sentAt,
2827
processorType: processorType),
2928
args: getRequest.args)
3029
case let .post(postRequest):
31-
return IterableRequestUtil.createPostRequest(forApiEndPoint: endPoint,
30+
return IterableRequestUtil.createPostRequest(forApiEndPoint: endpoint,
3231
path: postRequest.path,
3332
headers: createIterableHeaders(sentAt: sentAt,
3433
processorType: processorType),
@@ -53,8 +52,7 @@ struct IterableAPICallRequest {
5352

5453
private func addingBodyField(key: AnyHashable, value: Any) -> IterableAPICallRequest {
5554
IterableAPICallRequest(apiKey: apiKey,
56-
endPoint: endPoint,
57-
auth: auth,
55+
endpoint: endpoint,
5856
authToken: authToken,
5957
deviceMetadata: deviceMetadata,
6058
iterableRequest: iterableRequest.addingBodyField(key: key, value: value))
@@ -69,7 +67,7 @@ struct IterableAPICallRequest {
6967
JsonKey.Header.requestProcessor: Self.name(for: processorType)
7068
]
7169

72-
if let authToken = auth.authToken {
70+
if let authToken = authToken {
7371
headers[JsonKey.Header.authorization] = "Bearer \(authToken)"
7472
}
7573

‎swift-sdk/Internal/IterableHtmlMessageViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class IterableHtmlMessageViewController: UIViewController {
110110
}
111111

112112
static func create(parameters: Parameters,
113-
eventTracker: @escaping @autoclosure () -> MessageViewControllerEventTrackerProtocol? = MessageViewControllerEventTracker(requestHandler: IterableAPI.internalImplementation?.requestHandler),
113+
eventTracker: @escaping @autoclosure () -> MessageViewControllerEventTrackerProtocol? = MessageViewControllerEventTracker(requestHandler: IterableAPI.implementation?.requestHandler),
114114
onClickCallback: ((URL) -> Void)?,
115115
delegate: MessageViewControllerDelegate? = nil) -> IterableHtmlMessageViewController {
116116
IterableHtmlMessageViewController(parameters: parameters, eventTrackerProvider: eventTracker(), onClickCallback: onClickCallback, delegate: delegate)

‎swift-sdk/Internal/OfflineRequestProcessor.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
88
init(apiKey: String,
99
authProvider: AuthProvider?,
1010
authManager: IterableAuthManagerProtocol?,
11-
endPoint: String,
11+
endpoint: String,
1212
deviceMetadata: DeviceMetadata,
1313
taskScheduler: IterableTaskScheduler,
1414
taskRunner: IterableTaskRunner,
@@ -18,7 +18,7 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
1818
self.apiKey = apiKey
1919
self.authProvider = authProvider
2020
self.authManager = authManager
21-
self.endPoint = endPoint
21+
self.endpoint = endpoint
2222
self.deviceMetadata = deviceMetadata
2323
self.taskScheduler = taskScheduler
2424
self.taskRunner = taskRunner
@@ -239,7 +239,7 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
239239
private let apiKey: String
240240
private weak var authProvider: AuthProvider?
241241
private weak var authManager: IterableAuthManagerProtocol?
242-
private let endPoint: String
242+
private let endpoint: String
243243
private let deviceMetadata: DeviceMetadata
244244
private let notificationListener: NotificationListener
245245
private let taskScheduler: IterableTaskScheduler
@@ -263,8 +263,7 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
263263
}
264264

265265
let apiCallRequest = IterableAPICallRequest(apiKey: apiKey,
266-
endPoint: endPoint,
267-
auth: authProvider.auth,
266+
endpoint: endpoint,
268267
authToken: authManager?.getAuthToken(),
269268
deviceMetadata: deviceMetadata,
270269
iterableRequest: iterableRequest)

‎swift-sdk/Internal/OnlineRequestProcessor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
99
init(apiKey: String,
1010
authProvider: AuthProvider?,
1111
authManager: IterableAuthManagerProtocol?,
12-
endPoint: String,
12+
endpoint: String,
1313
networkSession: NetworkSessionProtocol,
1414
deviceMetadata: DeviceMetadata,
1515
dateProvider: DateProviderProtocol) {
1616
self.authManager = authManager
1717
apiClient = ApiClient(apiKey: apiKey,
1818
authProvider: authProvider,
19-
endPoint: endPoint,
19+
endpoint: endpoint,
2020
networkSession: networkSession,
2121
deviceMetadata: deviceMetadata,
2222
dateProvider: dateProvider)

‎swift-sdk/IterableAPI.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import Foundation
66
import UIKit
77

8-
@objcMembers
9-
public final class IterableAPI: NSObject {
8+
@objcMembers public final class IterableAPI: NSObject {
109
/// The current SDK version
1110
public static let sdkVersion = "6.4.13"
1211

‎tests/common/CommonExtensions.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,15 @@ struct MockRedirectNetworkSession: NetworkSessionProtocol {
196196
}
197197
}
198198
}
199-
199+
200200
private static func number(fromString str: String) -> NSNumber {
201201
if let intValue = Int(str) {
202202
return NSNumber(value: intValue)
203203
}
204204

205205
return NSNumber(value: 0)
206206
}
207-
207+
208208
private let networkSession: NetworkSessionProtocol
209209
}
210210

@@ -242,13 +242,13 @@ extension IterableAPI {
242242
apnsTypeChecker: apnsTypeChecker,
243243
persistenceContextProvider: persistenceContextProvider)
244244

245-
internalImplementation = InternalIterableAPI(apiKey: apiKey,
246-
launchOptions: launchOptions,
247-
config: config,
248-
apiEndPointOverride: apiEndPointOverride,
249-
dependencyContainer: mockDependencyContainer)
245+
implementation = InternalIterableAPI(apiKey: apiKey,
246+
launchOptions: launchOptions,
247+
config: config,
248+
apiEndPointOverride: apiEndPointOverride,
249+
dependencyContainer: mockDependencyContainer)
250250

251-
internalImplementation?.start().wait()
251+
implementation?.start().wait()
252252
}
253253
}
254254

‎tests/common/MockNetworkSession.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class MockNetworkSession: NetworkSessionProtocol {
7373

7474
convenience init(statusCode: Int = MockNetworkSession.defaultStatus, delay: TimeInterval = 0.0) {
7575
self.init(statusCode: statusCode,
76-
data: [:].toJsonData(),
76+
data: MockNetworkSession.defaultData,
7777
delay: delay,
7878
error: nil)
7979
}
@@ -192,7 +192,7 @@ class MockNetworkSession: NetworkSessionProtocol {
192192
}
193193

194194
private static let defaultStatus = 200
195-
private static let defaultData = [:].toJsonData()
195+
private static let defaultData = Dictionary<AnyHashable, Any>().toJsonData()
196196
private static let defaultHttpVersion = "HTTP/1.1"
197197
private static let defaultHeaderFields: [String: String] = [:]
198198

@@ -233,15 +233,15 @@ class NoNetworkNetworkSession: NetworkSessionProtocol {
233233
DispatchQueue.main.async {
234234
let response = HTTPURLResponse(url: request.url!, statusCode: 200, httpVersion: "HTTP/1.1", headerFields: [:])
235235
let error = NSError(domain: NSURLErrorDomain, code: -1009, userInfo: nil)
236-
completionHandler(try! JSONSerialization.data(withJSONObject: [:], options: []), response, error)
236+
completionHandler(try! JSONSerialization.data(withJSONObject: Dictionary<AnyHashable, Any>(), options: []), response, error)
237237
}
238238
}
239239

240240
func makeDataRequest(with url: URL, completionHandler: @escaping NetworkSessionProtocol.CompletionHandler) {
241241
DispatchQueue.main.async {
242242
let response = HTTPURLResponse(url: url, statusCode: 200, httpVersion: "HTTP/1.1", headerFields: [:])
243243
let error = NSError(domain: NSURLErrorDomain, code: -1009, userInfo: nil)
244-
completionHandler(try! JSONSerialization.data(withJSONObject: [:], options: []), response, error)
244+
completionHandler(try! JSONSerialization.data(withJSONObject: Dictionary<AnyHashable, Any>(), options: []), response, error)
245245
}
246246
}
247247

0 commit comments

Comments
 (0)