fix warning

swift-server · Aug 6, 2020 · 30a7286 · 30a7286
1 parent ae46004
commit 30a7286
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 22 deletions.
diff --git a/Sources/AsyncHTTPClient/HTTPHandler.swift b/Sources/AsyncHTTPClient/HTTPHandler.swift
@@ -46,7 +46,7 @@ extension HTTPClient {
             ///
             /// - parameters:
             ///     - data: `IOData` to write.
-            @available(*, deprecated, message: "")
+            @available(*, deprecated, message: "StreamWriter is deprecated, please use StreamWriter2")
             public func write(_ data: IOData) -> EventLoopFuture<Void> {
                 return self.closure(data)
             }
@@ -64,11 +64,11 @@ extension HTTPClient {
             }
 
             public func write(_ buffer: ByteBuffer) -> EventLoopFuture<Void> {
-                self.onChunk(.byteBuffer(buffer))
+                return self.onChunk(.byteBuffer(buffer))
             }
 
             public func write(_ data: IOData) -> EventLoopFuture<Void> {
-                self.onChunk(data)
+                return self.onChunk(data)
             }
 
             public func write(_ buffer: ByteBuffer, promise: EventLoopPromise<Void>?) {
@@ -95,7 +95,7 @@ extension HTTPClient {
         public var stream: (StreamWriter) -> EventLoopFuture<Void>
         var stream2: ((StreamWriter2) -> Void)?
 
-        @available(*, deprecated, message: "")
+        @available(*, deprecated, message: "StreamWriter is deprecated, please use StreamWriter2")
         init(length: Int?, stream: @escaping (StreamWriter) -> EventLoopFuture<Void>) {
             self.length = length
             self.stream = stream

diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests+XCTest.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests+XCTest.swift
@@ -56,7 +56,6 @@ extension HTTPClientTests {
             ("testProxyPlaintextWithCorrectlyAuthorization", testProxyPlaintextWithCorrectlyAuthorization),
             ("testProxyPlaintextWithIncorrectlyAuthorization", testProxyPlaintextWithIncorrectlyAuthorization),
             ("testUploadStreaming", testUploadStreaming),
-            ("testUploadStreaming2", testUploadStreaming2),
             ("testNoContentLengthForSSLUncleanShutdown", testNoContentLengthForSSLUncleanShutdown),
             ("testNoContentLengthWithIgnoreErrorForSSLUncleanShutdown", testNoContentLengthWithIgnoreErrorForSSLUncleanShutdown),
             ("testCorrectContentLengthForSSLUncleanShutdown", testCorrectContentLengthForSSLUncleanShutdown),

diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
@@ -643,23 +643,6 @@ class HTTPClientTests: XCTestCase {
     }
 
     func testUploadStreaming() throws {
-        let body: HTTPClient.Body = .stream(length: 8) { writer in
-            let buffer = ByteBuffer(string: "1234")
-            return writer.write(.byteBuffer(buffer)).flatMap {
-                let buffer = ByteBuffer(string: "4321")
-                return writer.write(.byteBuffer(buffer))
-            }
-        }
-
-        let response = try self.defaultClient.post(url: self.defaultHTTPBinURLPrefix + "post", body: body).wait()
-        let bytes = response.body.flatMap { $0.getData(at: 0, length: $0.readableBytes) }
-        let data = try JSONDecoder().decode(RequestInfo.self, from: bytes!)
-
-        XCTAssertEqual(.ok, response.status)
-        XCTAssertEqual("12344321", data.data)
-    }
-
-    func testUploadStreaming2() throws {
         let body: HTTPClient.Body = .stream2(length: 8) { writer in
             var buffer = ByteBuffer(string: "1234")
             writer.write(.byteBuffer(buffer), promise: nil)