From c0753ade531eadde54042e7d63cc9b625e4fa67e Mon Sep 17 00:00:00 2001 From: Artem Redkin Date: Sat, 17 Aug 2019 09:21:09 +0100 Subject: [PATCH] rename didReceivePart to didReceiveBodyPart --- README.md | 2 +- Sources/AsyncHTTPClient/HTTPHandler.swift | 8 ++++---- Sources/AsyncHTTPClient/Utils.swift | 2 +- Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift | 2 +- Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 53a74445e..0c10fa2c3 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ class CountingDelegate: HTTPClientResponseDelegate { return task.eventLoop.makeSucceededFuture(()) } - func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { + func didReceiveBodyPart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { // this is executed when we receive parts of the response body, could be called zero or more times count += buffer.readableBytes // in case backpressure is needed, all reads will be paused until returned future is resolved diff --git a/Sources/AsyncHTTPClient/HTTPHandler.swift b/Sources/AsyncHTTPClient/HTTPHandler.swift index c2c7b3439..088b7f562 100644 --- a/Sources/AsyncHTTPClient/HTTPHandler.swift +++ b/Sources/AsyncHTTPClient/HTTPHandler.swift @@ -230,7 +230,7 @@ internal class ResponseAccumulator: HTTPClientResponseDelegate { return task.eventLoop.makeSucceededFuture(()) } - func didReceivePart(task: HTTPClient.Task, _ part: ByteBuffer) -> EventLoopFuture { + func didReceiveBodyPart(task: HTTPClient.Task, _ part: ByteBuffer) -> EventLoopFuture { switch self.state { case .idle: preconditionFailure("no head received before body") @@ -319,7 +319,7 @@ public protocol HTTPClientResponseDelegate: AnyObject { /// - task: Current request context. /// - buffer: Received body `Part`. /// - returns: `EventLoopFuture` that will be used for backpressure. - func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture + func didReceiveBodyPart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture /// Called when error was thrown during request execution. Will be called zero or one time only. Request processing will be stopped after that. /// @@ -345,7 +345,7 @@ extension HTTPClientResponseDelegate { public func didReceiveHead(task: HTTPClient.Task, _: HTTPResponseHead) -> EventLoopFuture { return task.eventLoop.makeSucceededFuture(()) } - public func didReceivePart(task: HTTPClient.Task, _: ByteBuffer) -> EventLoopFuture { return task.eventLoop.makeSucceededFuture(()) } + public func didReceiveBodyPart(task: HTTPClient.Task, _: ByteBuffer) -> EventLoopFuture { return task.eventLoop.makeSucceededFuture(()) } public func didReceiveError(task: HTTPClient.Task, _: Error) {} } @@ -550,7 +550,7 @@ internal class TaskHandler: ChannelInboundHandler default: self.state = .body self.mayRead = false - self.delegate.didReceivePart(task: self.task, body).whenComplete { result in + self.delegate.didReceiveBodyPart(task: self.task, body).whenComplete { result in self.handleBackpressureResult(context: context, result: result) } } diff --git a/Sources/AsyncHTTPClient/Utils.swift b/Sources/AsyncHTTPClient/Utils.swift index b5d36e6ef..babcf1bed 100644 --- a/Sources/AsyncHTTPClient/Utils.swift +++ b/Sources/AsyncHTTPClient/Utils.swift @@ -24,7 +24,7 @@ public final class HTTPClientCopyingDelegate: HTTPClientResponseDelegate { self.chunkHandler = chunkHandler } - public func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { + public func didReceiveBodyPart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { return self.chunkHandler(buffer) } diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift index 42d324138..9ca4c26ed 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift @@ -153,7 +153,7 @@ class HTTPClientInternalTests: XCTestCase { } } - func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { + func didReceiveBodyPart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { self.lock.withLockVoid { self._reads += 1 } diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift b/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift index fee3a848e..9a158f9b1 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift @@ -36,7 +36,7 @@ class TestHTTPDelegate: HTTPClientResponseDelegate { return task.eventLoop.makeSucceededFuture(()) } - func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { + func didReceiveBodyPart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { switch self.state { case .head(let head): self.state = .body(head, buffer) @@ -58,7 +58,7 @@ class CountingDelegate: HTTPClientResponseDelegate { var count = 0 - func didReceivePart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { + func didReceiveBodyPart(task: HTTPClient.Task, _ buffer: ByteBuffer) -> EventLoopFuture { let str = buffer.getString(at: 0, length: buffer.readableBytes) if str?.starts(with: "id:") ?? false { self.count += 1