Skip to content

Commit a42fe83

Browse files
authored
remove unused degate and make other one public+rename (#61)
1 parent d058f0f commit a42fe83

File tree

2 files changed

+5
-43
lines changed

2 files changed

+5
-43
lines changed

Sources/AsyncHTTPClient/Utils.swift

+3-41
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,7 @@
1515
import NIO
1616
import NIOHTTP1
1717

18-
public class HandlingHTTPResponseDelegate<T>: HTTPClientResponseDelegate {
19-
struct EmptyEndHandlerError: Error {}
20-
21-
public typealias Result = T
22-
23-
var handleHead: ((HTTPResponseHead) -> Void)?
24-
var handleBody: ((ByteBuffer) -> Void)?
25-
var handleError: ((Error) -> Void)?
26-
var handleEnd: (() throws -> T)?
27-
28-
public func didReceiveHead(task: HTTPClient.Task<T>, _ head: HTTPResponseHead) -> EventLoopFuture<Void> {
29-
if let handler = handleHead {
30-
handler(head)
31-
}
32-
return task.eventLoop.makeSucceededFuture(())
33-
}
34-
35-
public func didReceivePart(task: HTTPClient.Task<T>, _ buffer: ByteBuffer) -> EventLoopFuture<Void> {
36-
if let handler = handleBody {
37-
handler(buffer)
38-
}
39-
return task.eventLoop.makeSucceededFuture(())
40-
}
41-
42-
public func didReceiveError(task: HTTPClient.Task<T>, _ error: Error) {
43-
if let handler = handleError {
44-
handler(error)
45-
}
46-
}
47-
48-
public func didFinishRequest(task: HTTPClient.Task<T>) throws -> T {
49-
if let handler = handleEnd {
50-
return try handler()
51-
}
52-
throw EmptyEndHandlerError()
53-
}
54-
}
55-
56-
final class CopyingDelegate: HTTPClientResponseDelegate {
18+
public final class HTTPClientCopyingDelegate: HTTPClientResponseDelegate {
5719
public typealias Response = Void
5820

5921
let chunkHandler: (ByteBuffer) -> EventLoopFuture<Void>
@@ -62,11 +24,11 @@ final class CopyingDelegate: HTTPClientResponseDelegate {
6224
self.chunkHandler = chunkHandler
6325
}
6426

65-
func didReceivePart(task: HTTPClient.Task<Void>, _ buffer: ByteBuffer) -> EventLoopFuture<Void> {
27+
public func didReceivePart(task: HTTPClient.Task<Void>, _ buffer: ByteBuffer) -> EventLoopFuture<Void> {
6628
return self.chunkHandler(buffer)
6729
}
6830

69-
func didFinishRequest(task: HTTPClient.Task<Void>) throws {
31+
public func didFinishRequest(task: HTTPClient.Task<Void>) throws {
7032
return ()
7133
}
7234
}

Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class HTTPClientInternalTests: XCTestCase {
8686
var request = try Request(url: "http://localhost:\(httpBin.port)/events/10/1")
8787
request.headers.add(name: "Accept", value: "text/event-stream")
8888

89-
let delegate = CopyingDelegate { part in
89+
let delegate = HTTPClientCopyingDelegate { part in
9090
writer.write(.byteBuffer(part))
9191
}
9292
return httpClient.execute(request: request, delegate: delegate).futureResult
@@ -122,7 +122,7 @@ class HTTPClientInternalTests: XCTestCase {
122122
var request = try Request(url: "http://localhost:\(httpBin.port)/events/10/1")
123123
request.headers.add(name: "Accept", value: "text/event-stream")
124124

125-
let delegate = CopyingDelegate { _ in
125+
let delegate = HTTPClientCopyingDelegate { _ in
126126
httpClient.eventLoopGroup.next().makeFailedFuture(HTTPClientError.invalidProxyResponse)
127127
}
128128
return httpClient.execute(request: request, delegate: delegate).futureResult

0 commit comments

Comments
 (0)