From d823be8d8096639ee8a817ab6bf180b693b404eb Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Mon, 13 Dec 2021 18:26:34 +0100
Subject: [PATCH] Cleanup
---
AppleLibs/Network/Requests/DataManager.swift | 10 +++++-----
AppleLibs/Network/Requests/DataMapper.swift | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/AppleLibs/Network/Requests/DataManager.swift b/AppleLibs/Network/Requests/DataManager.swift
index 061f3ab..7d94ed0 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 31c29fc..220d2b6 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.
--
GitLab