Cleanup

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)
             }

AppleLibs/Network/Requests/DataMapper.swift

 //
-//  ResponseHandler.swift
+//  DataMapper.swift
 //  DocumentRepositoryMobile
 //
 //  Created by Tobias on 08.11.18.