Merge pull request #134 from Aldo10012/cleanup_adaptors

Cleanup adaptors

Author: Aldo10012

Sources/EZNetworking/Services/ServerSentEvent/Adaptors/Protocols/ServerSentEventCallbackClient.swift

@@ -17,29 +17,6 @@ public class DataUploader: DataUploadable {
         self.validator = validator
     }
 
-    // MARK: - CORE - async/await
-
-    public func uploadData(_ data: Data, with request: Request, progress: UploadProgressHandler?) async throws -> Data {
-        try Task.checkCancellation()
-        configureProgressTracking { percentage in
-            guard !Task.isCancelled else { return }
-            progress?(percentage)
-        }
-        do {
-            let urlRequest = try request.getURLRequest()
-            let (data, urlResponse) = try await session.urlSession.upload(for: urlRequest, from: data)
-            try Task.checkCancellation()
-            try validator.validateStatus(from: urlResponse)
-            return data
-        } catch let cancellationError as CancellationError {
-            throw cancellationError
-        } catch {
-            throw mapError(error)
-        }
-    }
-
-    // MARK: - Adapter - AsyncStream
-
     public func uploadDataStream(_ data: Data, with request: Request) -> AsyncStream<UploadStreamEvent> {
         AsyncStream { continuation in
             let task = Task {
@@ -62,55 +39,27 @@ public class DataUploader: DataUploadable {
         }
     }
 
-    // MARK: - Adapter - callbacks
-
-    @discardableResult
-    public func uploadDataTask(_ data: Data, with request: Request, progress: UploadProgressHandler?, completion: @escaping (UploadCompletionHandler)) -> CancellableRequest {
-        let taskBox = TaskBox()
-        let cancellableRequest = CancellableRequest { [weak self] in
-            taskBox.task = self?.createTaskAndPerform(data, with: request, progress: progress, completion: completion)
-        } onCancel: {
-            taskBox.task?.cancel()
+    private func uploadData(_ data: Data, with request: Request, progress: UploadProgressHandler?) async throws -> Data {
+        try Task.checkCancellation()
+        configureProgressTracking { percentage in
+            guard !Task.isCancelled else { return }
+            progress?(percentage)
         }
-        cancellableRequest.resume()
-        return cancellableRequest
-    }
-
-    // MARK: - Adapter - Publisher
-
-    public func uploadDataPublisher(_ data: Data, with request: Request, progress: UploadProgressHandler?) -> AnyPublisher<Data, NetworkingError> {
-        Deferred {
-            let taskBox = TaskBox()
-            return Future<Data, NetworkingError> { [weak self] promise in
-                taskBox.task = self?.createTaskAndPerform(data, with: request, progress: progress, completion: { promise($0) })
-            }
-            .handleEvents(receiveCancel: {
-                taskBox.task?.cancel()
-            })
+        do {
+            let urlRequest = try request.getURLRequest()
+            let (data, urlResponse) = try await session.urlSession.upload(for: urlRequest, from: data)
+            try Task.checkCancellation()
+            try validator.validateStatus(from: urlResponse)
+            return data
+        } catch let cancellationError as CancellationError {
+            throw cancellationError
+        } catch {
+            throw mapError(error)
         }
-        .eraseToAnyPublisher()
     }
 
     // MARK: - Helpers
 
-    private func createTaskAndPerform(
-        _ data: Data,
-        with request: Request,
-        progress: UploadProgressHandler?,
-        completion: @escaping ((Result<Data, NetworkingError>) -> Void)
-    ) -> Task<Void, Never> {
-        Task {
-            do {
-                let data = try await uploadData(data, with: request, progress: progress)
-                completion(.success(data))
-            } catch is CancellationError {
-                // Do nothing, task has been cancelled
-            } catch {
-                completion(.failure(mapError(error)))
-            }
-        }
-    }
-
     private func mapError(_ error: Error) -> NetworkingError {
         if let networkError = error as? NetworkingError { return networkError }
         if let urlError = error as? URLError { return .requestFailed(reason: .urlError(underlying: urlError)) }

Sources/EZNetworking/Services/ServerSentEvent/Adaptors/Protocols/ServerSentEventPublisherClient.swift

@@ -2,8 +2,5 @@ import Combine
 import Foundation
 
 public protocol DataUploadable {
-    func uploadData(_ data: Data, with request: Request, progress: UploadProgressHandler?) async throws -> Data
     func uploadDataStream(_ data: Data, with request: Request) -> AsyncStream<UploadStreamEvent>
-    func uploadDataTask(_ data: Data, with request: Request, progress: UploadProgressHandler?, completion: @escaping (UploadCompletionHandler)) -> CancellableRequest
-    func uploadDataPublisher(_ data: Data, with request: Request, progress: UploadProgressHandler?) -> AnyPublisher<Data, NetworkingError>
 }