RequestSender is non-throwing

venigreat · Oct 2, 2019 · 73556ee · 73556ee
1 parent 87bd9d0
commit 73556ee
Show file tree

Hide file tree

Showing 25 changed files with 60 additions and 37 deletions.
diff --git a/Sources/DistWorker/DistWorker.swift b/Sources/DistWorker/DistWorker.swift
@@ -66,7 +66,7 @@ public final class DistWorker: SchedulerDelegate {
         didFetchAnalyticsConfiguration: @escaping (AnalyticsConfiguration) throws -> (),
         completion: @escaping () -> ()
     ) throws {
-        try workerRegisterer.registerWithServer(
+        workerRegisterer.registerWithServer(
             workerId: workerId,
             callbackQueue: callbackQueue
         ) { [weak self] result in
@@ -116,7 +116,7 @@ public final class DistWorker: SchedulerDelegate {
     }
 
     private func reportAliveness() throws {
-        try reportAliveSender.reportAlive(
+        reportAliveSender.reportAlive(
             bucketIdsBeingProcessedProvider: currentlyBeingProcessedBucketsTracker.bucketIdsBeingProcessed,
             workerId: workerId,
             requestSignature: try requestSignature.dematerialize(),
@@ -248,7 +248,7 @@ public final class DistWorker: SchedulerDelegate {
                 return requestId
             }
 
-            try bucketResultSender.send(
+            bucketResultSender.send(
                 testingResult: testingResult,
                 requestId: requestId,
                 workerId: workerId,

diff --git a/Sources/LocalQueueServerRunner/LocalQueueServerRunner.swift b/Sources/LocalQueueServerRunner/LocalQueueServerRunner.swift
@@ -82,7 +82,7 @@ public final class LocalQueueServerRunner {
     }
 
     private func ensureQueueWithMatchingVersionIsNotRunning(version: Version) throws {
-        let portToQueueServerVersion = try remotePortDeterminer.queryPortAndQueueServerVersion(timeout: 10)
+        let portToQueueServerVersion = remotePortDeterminer.queryPortAndQueueServerVersion(timeout: 10)
 
         try portToQueueServerVersion.forEach { (item: (key: Int, value: Version)) in
             if item.value == version {

diff --git a/Sources/QueueClient/Clients/BucketResultSender/BucketResultSender.swift b/Sources/QueueClient/Clients/BucketResultSender/BucketResultSender.swift
@@ -10,5 +10,5 @@ public protocol BucketResultSender {
         requestSignature: RequestSignature,
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<BucketId, Error>) -> ()
-    ) throws
+    )
 }
diff --git a/Sources/QueueClient/Clients/BucketResultSender/BucketResultSenderImpl.swift b/Sources/QueueClient/Clients/BucketResultSender/BucketResultSenderImpl.swift
@@ -18,8 +18,8 @@ public final class BucketResultSenderImpl: BucketResultSender {
         requestSignature: RequestSignature,
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<BucketId, Error>) -> ()
-    ) throws {
-        try requestSender.sendRequestWithCallback(
+    ) {
+        requestSender.sendRequestWithCallback(
             pathWithSlash: RESTMethod.bucketResult.withPrependingSlash,
             payload: PushBucketResultRequest(
                 workerId: workerId,

diff --git a/Sources/QueueClient/Clients/QueueServerVersionFetcher/QueueServerVersionFetcher.swift b/Sources/QueueClient/Clients/QueueServerVersionFetcher/QueueServerVersionFetcher.swift
@@ -7,5 +7,5 @@ public protocol QueueServerVersionFetcher {
     func fetchQueueServerVersion(
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<Version, Error>) -> Void
-    ) throws
+    )
 }
diff --git a/Sources/QueueClient/Clients/QueueServerVersionFetcher/QueueServerVersionFetcherImpl.swift b/Sources/QueueClient/Clients/QueueServerVersionFetcher/QueueServerVersionFetcherImpl.swift
@@ -15,8 +15,8 @@ public final class QueueServerVersionFetcherImpl: QueueServerVersionFetcher {
     public func fetchQueueServerVersion(
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<Version, Error>) -> Void
-    ) throws {
-        try requestSender.sendRequestWithCallback(
+    ) {
+        requestSender.sendRequestWithCallback(
             pathWithSlash: RESTMethod.queueVersion.withPrependingSlash,
             payload: QueueVersionRequest(),
             callbackQueue: callbackQueue,

diff --git a/Sources/QueueClient/Clients/ReportAliveSender/ReportAliveSender.swift b/Sources/QueueClient/Clients/ReportAliveSender/ReportAliveSender.swift
@@ -10,5 +10,5 @@ public protocol ReportAliveSender {
         requestSignature: RequestSignature,
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<ReportAliveResponse, Error>) -> ()
-    ) throws
+    )
 }
diff --git a/Sources/QueueClient/Clients/ReportAliveSender/ReportAliveSenderImpl.swift b/Sources/QueueClient/Clients/ReportAliveSender/ReportAliveSenderImpl.swift
@@ -17,8 +17,8 @@ public final class ReportAliveSenderImpl: ReportAliveSender {
         requestSignature: RequestSignature,
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<ReportAliveResponse, Error>) -> ()
-    ) throws {
-        try requestSender.sendRequestWithCallback(
+    ) {
+        requestSender.sendRequestWithCallback(
             pathWithSlash: RESTMethod.reportAlive.withPrependingSlash,
             payload: ReportAliveRequest(
                 workerId: workerId,

diff --git a/Sources/QueueClient/Clients/WorkerRegisterer/WorkerRegisterer.swift b/Sources/QueueClient/Clients/WorkerRegisterer/WorkerRegisterer.swift
@@ -6,5 +6,5 @@ public protocol WorkerRegisterer {
         workerId: WorkerId,
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<WorkerConfiguration, Error>) -> Void
-    ) throws
+    )
 }
diff --git a/Sources/QueueClient/Clients/WorkerRegisterer/WorkerRegistererImpl.swift b/Sources/QueueClient/Clients/WorkerRegisterer/WorkerRegistererImpl.swift
@@ -14,8 +14,8 @@ public final class WorkerRegistererImpl: WorkerRegisterer {
         workerId: WorkerId,
         callbackQueue: DispatchQueue,
         completion: @escaping (Either<WorkerConfiguration, Error>) -> Void
-    ) throws {
-        try requestSender.sendRequestWithCallback(
+    ) {
+        requestSender.sendRequestWithCallback(
             pathWithSlash: RESTMethod.registerWorker.withPrependingSlash,
             payload: RegisterWorkerRequest(workerId: workerId),
             callbackQueue: callbackQueue,

diff --git a/Sources/RemotePortDeterminer/RemotePortDeterminer.swift b/Sources/RemotePortDeterminer/RemotePortDeterminer.swift
@@ -2,5 +2,5 @@ import Foundation
 import Version
 
 public protocol RemotePortDeterminer {
-    func queryPortAndQueueServerVersion(timeout: TimeInterval) throws -> [Int: Version]
+    func queryPortAndQueueServerVersion(timeout: TimeInterval) -> [Int: Version]
 }
diff --git a/Sources/RemotePortDeterminer/RemoteQueuePortScanner.swift b/Sources/RemotePortDeterminer/RemoteQueuePortScanner.swift
@@ -23,7 +23,7 @@ public final class RemoteQueuePortScanner: RemotePortDeterminer {
         self.requestSenderProvider = requestSenderProvider
     }
 
-    public func queryPortAndQueueServerVersion(timeout: TimeInterval) throws -> [Int: Version] {
+    public func queryPortAndQueueServerVersion(timeout: TimeInterval) -> [Int: Version] {
         let group = DispatchGroup()
 
         let portToVersion = AtomicValue<[Int: Version]>([:])
@@ -38,7 +38,7 @@ public final class RemoteQueuePortScanner: RemotePortDeterminer {
                 )
             )
 
-            try queueServerVersionFetcher.fetchQueueServerVersion(
+            queueServerVersionFetcher.fetchQueueServerVersion(
                 callbackQueue: workQueue
             ) { (result: Either<Version, Error>) in
                 if let version = try? result.dematerialize() {

diff --git a/Sources/RemoteQueue/RemoteQueueDetector.swift b/Sources/RemoteQueue/RemoteQueueDetector.swift
@@ -16,7 +16,7 @@ public final class RemoteQueueDetector {
 
     public func findSuitableRemoteRunningQueuePorts(timeout: TimeInterval) throws -> Set<Int> {
         let localVersion = try localQueueClientVersionProvider.version()
-        let availableQueues = try remotePortDeterminer.queryPortAndQueueServerVersion(timeout: timeout)
+        let availableQueues = remotePortDeterminer.queryPortAndQueueServerVersion(timeout: timeout)
         let ports = availableQueues
             .filter { keyValue -> Bool in keyValue.value == localVersion }
             .map { $0.key }

diff --git a/Sources/RequestSender/RequestSender.swift b/Sources/RequestSender/RequestSender.swift
@@ -10,7 +10,7 @@ public protocol RequestSender {
         payload: Payload,
         callbackQueue: DispatchQueue,
         callback: @escaping (Either<Response, RequestSenderError>) -> ()
-    ) throws where Payload : Encodable, Response : Decodable
+    ) where Payload : Encodable, Response : Decodable
 
     func close()
 }
diff --git a/Sources/RequestSender/RequestSenderError.swift b/Sources/RequestSender/RequestSenderError.swift
@@ -7,6 +7,7 @@ public enum RequestSenderError: Error, CustomStringConvertible {
     case parseError(Error, Data)
     case sessionIsClosed(URL)
     case unableToCreateUrl(URLComponents)
+    case cannotIssueRequest(Error)
 
     public var description: String {
         switch self {
@@ -24,6 +25,8 @@ public enum RequestSenderError: Error, CustomStringConvertible {
             return "Cannot send request to '\(url)' because session is closed"
         case .unableToCreateUrl(let components):
             return "Unable to convert components to url: \(components)"
+        case .cannotIssueRequest(let error):
+            return "Failed to issue request: \(error)"
         }
     }
 }
diff --git a/Sources/RequestSender/RequestSenderImpl.swift b/Sources/RequestSender/RequestSenderImpl.swift
@@ -25,6 +25,26 @@ public final class RequestSenderImpl: RequestSender {
         payload: Payload,
         callbackQueue: DispatchQueue,
         callback: @escaping (Either<Response, RequestSenderError>) -> ()
+    ) where Payload : Encodable, Response : Decodable {
+        do {
+            try sendRequest(
+                pathWithSlash: pathWithSlash,
+                payload: payload,
+                callbackQueue: callbackQueue,
+                callback: callback
+            )
+        } catch {
+            callbackQueue.async {
+                callback(.error(.cannotIssueRequest(error)))
+            }
+        }
+    }
+
+    private func sendRequest<Payload, Response>(
+        pathWithSlash: String,
+        payload: Payload,
+        callbackQueue: DispatchQueue,
+        callback: @escaping (Either<Response, RequestSenderError>) -> ()
     ) throws where Payload : Encodable, Response : Decodable {
         let url = try createUrl(pathWithSlash: pathWithSlash)
 

diff --git a/Tests/QueueClientTests/BucketResultSenderTests.swift b/Tests/QueueClientTests/BucketResultSenderTests.swift
@@ -20,7 +20,7 @@ final class BucketResultSenderTests: XCTestCase {
         )
 
         let callbackExpectation = expectation(description: "callback should be called")
-        try sender.send(
+        sender.send(
             testingResult: testingResult,
             requestId: "request id",
             workerId: "worker id",
@@ -44,7 +44,7 @@ final class BucketResultSenderTests: XCTestCase {
         )
 
         let callbackExpectation = expectation(description: "callback should be called")
-        try sender.send(
+        sender.send(
             testingResult: testingResult,
             requestId: "request id",
             workerId: "worker id",

diff --git a/Tests/QueueClientTests/QueueServerVersionFetcherTests.swift b/Tests/QueueClientTests/QueueServerVersionFetcherTests.swift
@@ -22,7 +22,7 @@ final class QueueServerVersionFetcherTests: XCTestCase {
         )
 
         let completionHandlerCalledExpectation = expectation(description: "Completion handler has been called")
-        try fetcher.fetchQueueServerVersion(
+        fetcher.fetchQueueServerVersion(
             callbackQueue: callbackQueue
         ) { (result: Either<Version, Error>) in
             XCTAssertEqual(

diff --git a/Tests/QueueClientTests/ReportAliveSenderTests.swift b/Tests/QueueClientTests/ReportAliveSenderTests.swift
@@ -26,7 +26,7 @@ final class ReportAliveSenderTests: XCTestCase {
         }
 
         let completionHandlerCalledExpectation = expectation(description: "Completion handler has been called")
-        try reportAliveSender.reportAlive(
+        reportAliveSender.reportAlive(
             bucketIdsBeingProcessedProvider: provider(),
             workerId: "worker id",
             requestSignature: RequestSignature(value: "signature"),

diff --git a/Tests/QueueClientTests/WorkerRegistererImplTests.swift b/Tests/QueueClientTests/WorkerRegistererImplTests.swift
@@ -26,7 +26,7 @@ final class WorkerRegistererImplTests: XCTestCase {
 
         var result: Either<WorkerConfiguration, Error>?
 
-        try workerRegisterer.registerWithServer(
+        workerRegisterer.registerWithServer(
             workerId: workerId,
             callbackQueue: callbackQueue
         ) { localResult in

diff --git a/Tests/QueueServerTests/QueueHTTPRESTServerTests.swift b/Tests/QueueServerTests/QueueHTTPRESTServerTests.swift
@@ -69,7 +69,7 @@ final class QueueHTTPRESTServerTests: XCTestCase {
 
         let expectation = self.expectation(description: "registerWithServer completion is called")
 
-        try workerRegisterer.registerWithServer(
+        workerRegisterer.registerWithServer(
             workerId: workerId,
             callbackQueue: callbackQueue
         ) { result in
@@ -173,7 +173,7 @@ final class QueueHTTPRESTServerTests: XCTestCase {
         )
 
         let callbackExpectation = expectation(description: "result sender callback has been invoked")
-        try resultSender.send(
+        resultSender.send(
             testingResult: testingResult,
             requestId: requestId,
             workerId: workerId,
@@ -220,7 +220,7 @@ final class QueueHTTPRESTServerTests: XCTestCase {
 
         let resultHasBeenProcessedExpectation = expectation(description: "Report alive sender completion handler invoked")
 
-        try reportAlivenessSender.reportAlive(
+        reportAlivenessSender.reportAlive(
             bucketIdsBeingProcessedProvider: Set(),
             workerId: workerId,
             requestSignature: expectedRequestSignature,
@@ -266,7 +266,7 @@ final class QueueHTTPRESTServerTests: XCTestCase {
         )
 
         let requestFinishedExpectation = expectation(description: "Request processed")
-        try fetcher.fetchQueueServerVersion(
+        fetcher.fetchQueueServerVersion(
             callbackQueue: callbackQueue
         ) { result in
             XCTAssertEqual(

diff --git a/Tests/QueueServerTests/QueueServerTests.swift b/Tests/QueueServerTests/QueueServerTests.swift
@@ -114,7 +114,7 @@ final class QueueServerTests: XCTestCase {
         var actualResults = [JobResults]()
 
         _ = try runSyncronously { [callbackQueue, workerId] completion in
-            try workerRegisterer.registerWithServer(
+            workerRegisterer.registerWithServer(
                 workerId: workerId,
                 callbackQueue: callbackQueue
             ) { _ in
@@ -152,7 +152,7 @@ final class QueueServerTests: XCTestCase {
         )
 
         let response: Either<BucketId, Error> = try runSyncronously { [callbackQueue, workerId, requestSignature] completion in
-            try resultSender.send(
+            resultSender.send(
                 testingResult: testingResult,
                 requestId: "request",
                 workerId: workerId,

diff --git a/Tests/RemotePortDeterminerTests/RemoteQueuePortScannerTests.swift b/Tests/RemotePortDeterminerTests/RemoteQueuePortScannerTests.swift
@@ -18,7 +18,7 @@ final class RemoteQueuePortScannerTests: XCTestCase {
             portRange: 12000...12005,
             requestSenderProvider: requestSenderProvider
         )
-        let result = try scanner.queryPortAndQueueServerVersion(timeout: 10.0)
+        let result = scanner.queryPortAndQueueServerVersion(timeout: 10.0)
         XCTAssertEqual(result, [:])
     }
 
@@ -39,7 +39,7 @@ final class RemoteQueuePortScannerTests: XCTestCase {
             portRange: port...port,
             requestSenderProvider: requestSenderProvider
         )
-        let result = try scanner.queryPortAndQueueServerVersion(timeout: 10.0)
+        let result = scanner.queryPortAndQueueServerVersion(timeout: 10.0)
         XCTAssertEqual(result, [port: expectedVersion])
     }
 }
diff --git a/Tests/RequestSenderTestHelpers/FakeRequestSender.swift b/Tests/RequestSenderTestHelpers/FakeRequestSender.swift
@@ -17,7 +17,7 @@ public final class FakeRequestSender: RequestSender {
         payload: Payload,
         callbackQueue: DispatchQueue,
         callback: @escaping (Either<Response, RequestSenderError>) -> ()
-    ) throws where Payload : Encodable, Response : Decodable {
+    ) where Payload : Encodable, Response : Decodable {
         if let result = result {
             callbackQueue.async { callback(Either.left(result as! Response)) }
         } else if let requestSenderError = requestSenderError {

diff --git a/Tests/RequestSenderTests/RequestSenderTests.swift b/Tests/RequestSenderTests/RequestSenderTests.swift
@@ -15,7 +15,7 @@ final class RequestSenderTests: XCTestCase {
         )
 
         let callbackCalled = expectation(description: "callback has been called")
-        try sender.sendRequestWithCallback(
+        sender.sendRequestWithCallback(
             pathWithSlash: "/",
             payload: ["foo": "bar"],
             callbackQueue: callbackQueue,
@@ -41,7 +41,7 @@ final class RequestSenderTests: XCTestCase {
         )
 
         let callbackCalled = expectation(description: "callback has been called")
-        try sender.sendRequestWithCallback(
+        sender.sendRequestWithCallback(
             pathWithSlash: "/",
             payload: ["foo": "bar"],
             callbackQueue: callbackQueue,