Skip to content
Snippets Groups Projects
Commit 54152340 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Rename ResponseHandler to DataMapper, make mapData method async

parent 60330663
No related branches found
No related tags found
No related merge requests found
......@@ -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 */,
......
......@@ -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
......
......@@ -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?
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment