diff --git a/AppleLibs.xcodeproj/project.pbxproj b/AppleLibs.xcodeproj/project.pbxproj index 0d835a9b55d1086b30d85ded350a8a210b378f97..2ac32d947ec9cf839dce83fa42552c7abf63d70c 100644 --- a/AppleLibs.xcodeproj/project.pbxproj +++ b/AppleLibs.xcodeproj/project.pbxproj @@ -20,7 +20,7 @@ F673A9952635EF510017AD37 /* HttpStatusCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F673A98F2635EF510017AD37 /* HttpStatusCode.swift */; }; F673A9962635EF510017AD37 /* ResponseError.swift in Sources */ = {isa = PBXBuildFile; fileRef = F673A9902635EF510017AD37 /* ResponseError.swift */; }; F673A9972635EF510017AD37 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = F673A9912635EF510017AD37 /* Request.swift */; }; - F673A9982635EF510017AD37 /* ResponseHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F673A9922635EF510017AD37 /* ResponseHandler.swift */; }; + F673A9982635EF510017AD37 /* DataMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F673A9922635EF510017AD37 /* DataMapper.swift */; }; F673A9992635EF510017AD37 /* RequestBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F673A9932635EF510017AD37 /* RequestBuilder.swift */; }; F68BFE6B263B28B000E893E5 /* UIViewController+Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = F68BFE6A263B28B000E893E5 /* UIViewController+Screenshot.swift */; }; F68C2D422616482A00042967 /* IsoDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F68C2D412616482A00042967 /* IsoDateFormatter.swift */; }; @@ -58,7 +58,7 @@ F673A98F2635EF510017AD37 /* HttpStatusCode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpStatusCode.swift; sourceTree = "<group>"; }; F673A9902635EF510017AD37 /* ResponseError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResponseError.swift; sourceTree = "<group>"; }; F673A9912635EF510017AD37 /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; }; - F673A9922635EF510017AD37 /* ResponseHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResponseHandler.swift; sourceTree = "<group>"; }; + F673A9922635EF510017AD37 /* DataMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataMapper.swift; sourceTree = "<group>"; }; F673A9932635EF510017AD37 /* RequestBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestBuilder.swift; sourceTree = "<group>"; }; F68BFE6A263B28B000E893E5 /* UIViewController+Screenshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Screenshot.swift"; sourceTree = "<group>"; }; F68C2D412616482A00042967 /* IsoDateFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IsoDateFormatter.swift; sourceTree = "<group>"; }; @@ -144,7 +144,7 @@ F673A9912635EF510017AD37 /* Request.swift */, F673A9932635EF510017AD37 /* RequestBuilder.swift */, F673A9902635EF510017AD37 /* ResponseError.swift */, - F673A9922635EF510017AD37 /* ResponseHandler.swift */, + F673A9922635EF510017AD37 /* DataMapper.swift */, ); path = Requests; sourceTree = "<group>"; @@ -348,7 +348,7 @@ F6991D0A275AC34200C5AFFD /* TemplatedString.swift in Sources */, F673A9952635EF510017AD37 /* HttpStatusCode.swift in Sources */, F6450F6D26A0CEA200076347 /* UIColor+Hex.swift in Sources */, - F673A9982635EF510017AD37 /* ResponseHandler.swift in Sources */, + F673A9982635EF510017AD37 /* DataMapper.swift in Sources */, F623A6742635B5BE00F50371 /* Enum+Extended.swift in Sources */, F673A9962635EF510017AD37 /* ResponseError.swift in Sources */, F673A9992635EF510017AD37 /* RequestBuilder.swift in Sources */, diff --git a/AppleLibs/Network/Requests/DataManager.swift b/AppleLibs/Network/Requests/DataManager.swift index 69a1d5adf979c3cb2f325f4a46ab3faaecdde981..061f3ab5d24010511ee18db81ea633a0af515fee 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: ResponseHandler?, sender: Any?) async throws -> Any? + func handleResponse(request: Request, data: Data?, responseHandler: DataMapper?, sender: Any?) async throws -> Any? } public protocol HttpSuccessFilter { @available(iOS 15.0.0, *) - func handleResponse(data: Data?, response: HTTPURLResponse, responseHandler: ResponseHandler?, sender: Any?) async throws -> Any? + func handleResponse(data: Data?, response: HTTPURLResponse, responseHandler: 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: ResponseHandler? = nil, sender: Any? = nil) async throws -> Any? { + public func request(request r: Request, responseHandler: DataMapper? = nil, sender: Any? = nil) async throws -> Any? { print("Request: \(r)") let request = delegate?.manipulateRequest(request: r) ?? r diff --git a/AppleLibs/Network/Requests/ResponseHandler.swift b/AppleLibs/Network/Requests/DataMapper.swift similarity index 54% rename from AppleLibs/Network/Requests/ResponseHandler.swift rename to AppleLibs/Network/Requests/DataMapper.swift index 091026f1270bfd8cd7be1b77749c06d28333c0c8..31c29fc19b86fc79f81d21fa46259efe11b39dc0 100644 --- a/AppleLibs/Network/Requests/ResponseHandler.swift +++ b/AppleLibs/Network/Requests/DataMapper.swift @@ -8,7 +8,8 @@ import Foundation -public protocol ResponseHandler +public protocol DataMapper { - func handleResponse(data: Data?, response: URLResponse?, sender: Any?) throws -> Any? + @available(iOS 15.0.0, *) + func mapData(data: Data?, response: URLResponse?, sender: Any?) async throws -> Any? }