diff --git a/AppleLibs/Network/Requests/DataManager.swift b/AppleLibs/Network/Requests/DataManager.swift index 061f3ab5d24010511ee18db81ea633a0af515fee..7d94ed059172cfc5968a61c499d715938ac84636 100644 --- a/AppleLibs/Network/Requests/DataManager.swift +++ b/AppleLibs/Network/Requests/DataManager.swift @@ -12,13 +12,13 @@ import os.log public protocol HttpResponseFilter { @available(iOS 15.0.0, *) - func handleResponse(request: Request, data: Data?, responseHandler: DataMapper?, sender: Any?) async throws -> Any? + func handleResponse(request: Request, data: Data?, dataMapper: DataMapper?, sender: Any?) async throws -> Any? } public protocol HttpSuccessFilter { @available(iOS 15.0.0, *) - func handleResponse(data: Data?, response: HTTPURLResponse, responseHandler: DataMapper?, sender: Any?) async throws -> Any? + func handleResponse(data: Data?, response: HTTPURLResponse, dataMapper: DataMapper?, sender: Any?) async throws -> Any? } public protocol DataManagerDelegate @@ -91,7 +91,7 @@ public class DataManager: NSObject, URLSessionDelegate @available(iOS 15.0, *) @available(macCatalyst 15.0.0, *) @discardableResult - public func request(request r: Request, responseHandler: DataMapper? = nil, sender: Any? = nil) async throws -> Any? { + public func request(request r: Request, dataMapper: DataMapper? = nil, sender: Any? = nil) async throws -> Any? { print("Request: \(r)") let request = delegate?.manipulateRequest(request: r) ?? r @@ -113,9 +113,9 @@ public class DataManager: NSObject, URLSessionDelegate do { if response.is2xx { - return try await self.responseOkFilter.handleResponse(data: data, response: response, responseHandler: responseHandler, sender: sender) + return try await self.responseOkFilter.handleResponse(data: data, response: response, dataMapper: dataMapper, sender: sender) } else if let filter = self.responseFilters[response.statusCode] { - return try await filter.handleResponse(request: request, data: data, responseHandler: responseHandler, sender: sender) + return try await filter.handleResponse(request: request, data: data, dataMapper: dataMapper, sender: sender) } else { throw ResponseError.getErrorForStatusCode(code: response.statusCode) } diff --git a/AppleLibs/Network/Requests/DataMapper.swift b/AppleLibs/Network/Requests/DataMapper.swift index 31c29fc19b86fc79f81d21fa46259efe11b39dc0..220d2b6869131894d091202f55a4a5569eb76569 100644 --- a/AppleLibs/Network/Requests/DataMapper.swift +++ b/AppleLibs/Network/Requests/DataMapper.swift @@ -1,5 +1,5 @@ // -// ResponseHandler.swift +// DataMapper.swift // DocumentRepositoryMobile // // Created by Tobias on 08.11.18.