From c0775122e15a35562c59088c8be60748f3174cc8 Mon Sep 17 00:00:00 2001 From: Artem Redkin Date: Wed, 3 Jul 2019 20:35:21 +0100 Subject: [PATCH] remove unused degate and make other one public+rename --- Sources/AsyncHTTPClient/Utils.swift | 44 ++----------------- .../HTTPClientInternalTests.swift | 4 +- 2 files changed, 5 insertions(+), 43 deletions(-) diff --git a/Sources/AsyncHTTPClient/Utils.swift b/Sources/AsyncHTTPClient/Utils.swift index b572f1b35..b5d36e6ef 100644 --- a/Sources/AsyncHTTPClient/Utils.swift +++ b/Sources/AsyncHTTPClient/Utils.swift @@ -15,45 +15,7 @@ import NIO import NIOHTTP1 -public class HandlingHTTPResponseDelegate: HTTPClientResponseDelegate { - struct EmptyEndHandlerError: Error {} - - public typealias Result = T - - var handleHead: ((HTTPResponseHead) -> Void)? - var handleBody: ((ByteBuffer) -> Void)? - var handleError: ((Error) -> Void)? - var handleEnd: (() throws -> T)? - - public func didReceiveHead(task: HTTPClient.Task, _ head: HTTPResponseHead) -> EventLoopFuture { - if let handler = handleHead { - handler(head) - } - return task.eventLoop.makeSucceededFuture(()) - } - - public func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { - if let handler = handleBody { - handler(buffer) - } - return task.eventLoop.makeSucceededFuture(()) - } - - public func didReceiveError(task: HTTPClient.Task, _ error: Error) { - if let handler = handleError { - handler(error) - } - } - - public func didFinishRequest(task: HTTPClient.Task) throws -> T { - if let handler = handleEnd { - return try handler() - } - throw EmptyEndHandlerError() - } -} - -final class CopyingDelegate: HTTPClientResponseDelegate { +public final class HTTPClientCopyingDelegate: HTTPClientResponseDelegate { public typealias Response = Void let chunkHandler: (ByteBuffer) -> EventLoopFuture @@ -62,11 +24,11 @@ final class CopyingDelegate: HTTPClientResponseDelegate { self.chunkHandler = chunkHandler } - func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { + public func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { return self.chunkHandler(buffer) } - func didFinishRequest(task: HTTPClient.Task) throws { + public func didFinishRequest(task: HTTPClient.Task) throws { return () } } diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift index ec7c5105b..486a4e249 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift @@ -86,7 +86,7 @@ class HTTPClientInternalTests: XCTestCase { var request = try Request(url: "http://localhost:\(httpBin.port)/events/10/1") request.headers.add(name: "Accept", value: "text/event-stream") - let delegate = CopyingDelegate { part in + let delegate = HTTPClientCopyingDelegate { part in writer.write(.byteBuffer(part)) } return httpClient.execute(request: request, delegate: delegate).futureResult @@ -122,7 +122,7 @@ class HTTPClientInternalTests: XCTestCase { var request = try Request(url: "http://localhost:\(httpBin.port)/events/10/1") request.headers.add(name: "Accept", value: "text/event-stream") - let delegate = CopyingDelegate { _ in + let delegate = HTTPClientCopyingDelegate { _ in httpClient.eventLoopGroup.next().makeFailedFuture(HTTPClientError.invalidProxyResponse) } return httpClient.execute(request: request, delegate: delegate).futureResult