rename byteBuffer to bytes and remove Collection overload

Author: dnadoba

Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest.swift

@@ -54,16 +54,16 @@ extension HTTPClientRequest {
 
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension HTTPClientRequest.Body {
-    public static func byteBuffer(_ byteBuffer: ByteBuffer) -> Self {
+    
+    public static func bytes(_ byteBuffer: ByteBuffer) -> Self {
         self.init(.byteBuffer(byteBuffer))
     }
 
     @inlinable
-    public static func bytes<Bytes: Sequence>(
-        length: Int?,
+    public static func bytes<Bytes: RandomAccessCollection>(
         _ bytes: Bytes
     ) -> Self where Bytes.Element == UInt8 {
-        self.init(.sequence(length: length, canBeConsumedMultipleTimes: false) { allocator in
+        self.init(.sequence(length: bytes.count, canBeConsumedMultipleTimes: true) { allocator in
             if let buffer = bytes.withContiguousStorageIfAvailable({ allocator.buffer(bytes: $0) }) {
                 // fastpath
                 return buffer
@@ -72,27 +72,13 @@ extension HTTPClientRequest.Body {
             return allocator.buffer(bytes: bytes)
         })
     }
-
+    
     @inlinable
-    public static func bytes<Bytes: Collection>(
+    public static func bytes<Bytes: Sequence>(
         length: Int?,
         _ bytes: Bytes
     ) -> Self where Bytes.Element == UInt8 {
-        self.init(.sequence(length: length, canBeConsumedMultipleTimes: true) { allocator in
-            if let buffer = bytes.withContiguousStorageIfAvailable({ allocator.buffer(bytes: $0) }) {
-                // fastpath
-                return buffer
-            }
-            // potentially really slow path
-            return allocator.buffer(bytes: bytes)
-        })
-    }
-
-    @inlinable
-    public static func bytes<Bytes: RandomAccessCollection>(
-        _ bytes: Bytes
-    ) -> Self where Bytes.Element == UInt8 {
-        self.init(.sequence(length: bytes.count, canBeConsumedMultipleTimes: true) { allocator in
+        self.init(.sequence(length: length, canBeConsumedMultipleTimes: bytes is Collection) { allocator in
             if let buffer = bytes.withContiguousStorageIfAvailable({ allocator.buffer(bytes: $0) }) {
                 // fastpath
                 return buffer

Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift

@@ -90,7 +90,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
             let logger = Logger(label: "HTTPClient", factory: StreamLogHandler.standardOutput(label:))
             var request = HTTPClientRequest(url: "https://localhost:\(bin.port)/")
             request.method = .POST
-            request.body = .byteBuffer(ByteBuffer(string: "1234"))
+            request.body = .bytes(ByteBuffer(string: "1234"))
 
             guard let response = await XCTAssertNoThrowWithResult(
                 try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)

Tests/AsyncHTTPClientTests/HTTPClientRequestTests.swift

@@ -225,7 +225,7 @@ class HTTPClientRequestTests: XCTestCase {
         XCTAsyncTest {
             var request = Request(url: "http://example.com/post")
             request.method = .POST
-            request.body = .byteBuffer(ByteBuffer())
+            request.body = .bytes(ByteBuffer())
             var preparedRequest: PreparedRequest?
             XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
             guard let preparedRequest = preparedRequest else { return }
@@ -261,7 +261,7 @@ class HTTPClientRequestTests: XCTestCase {
         XCTAsyncTest {
             var request = Request(url: "http://example.com/post")
             request.method = .POST
-            request.body = .byteBuffer(.init(string: "post body"))
+            request.body = .bytes(.init(string: "post body"))
             var preparedRequest: PreparedRequest?
             XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
             guard let preparedRequest = preparedRequest else { return }