Use collate(maxSize:) instead of collect(upTo:)

hummingbird-project · Jan 5, 2024 · e5472cf · e5472cf
1 parent 8c38c5e
commit e5472cf
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/Benchmarks/Benchmarks/HTTP1/HTTP1ChannelBenchmarks.swift b/Benchmarks/Benchmarks/HTTP1/HTTP1ChannelBenchmarks.swift
@@ -12,23 +12,23 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Benchmark
 import HTTPTypes
-import NIOHTTPTypes
 import Hummingbird
 import HummingbirdCore
 import Logging
 import NIOCore
 import NIOEmbedded
-import Benchmark
+import NIOHTTPTypes
 
 extension Benchmark {
     @discardableResult
     convenience init?(
         name: String,
-        configuration: Benchmark.Configuration = Benchmark.defaultConfiguration, 
+        configuration: Benchmark.Configuration = Benchmark.defaultConfiguration,
         write: @escaping @Sendable (Benchmark, NIOAsyncTestingChannel) async throws -> Void,
         responder: @escaping @Sendable (HBRequest, Channel) async throws -> HBResponse
-     ) {
+    ) {
         let http1 = HTTP1Channel(responder: responder)
         let channel = NIOAsyncTestingChannel()
         var task: Task<Void, Never>!
@@ -69,42 +69,42 @@ let benchmarks = {
         ],
         warmupIterations: 10
     )
-    let buffer = ByteBufferAllocator().buffer(repeating: 0xff, count: 10000)
+    let buffer = ByteBufferAllocator().buffer(repeating: 0xFF, count: 10000)
     Benchmark(
         name: "HTTP1:GET",
         configuration: .init(warmupIterations: 10)
-    ) { benchmark, channel in
+    ) { _, channel in
         let head = HTTPRequest(method: .get, scheme: "http", authority: "localhost", path: "/")
         try await channel.writeInbound(HTTPRequestPart.head(head))
         try await channel.writeInbound(HTTPRequestPart.end(nil))
-    } responder: { request, channel in
+    } responder: { _, _ in
         return .init(status: .ok, body: .init(byteBuffer: buffer))
     }
 
     Benchmark(
         name: "HTTP1:PUT",
         configuration: .init(warmupIterations: 10)
-    ) { benchmark, channel in
+    ) { _, channel in
         let head = HTTPRequest(method: .put, scheme: "http", authority: "localhost", path: "/")
         try await channel.writeInbound(HTTPRequestPart.head(head))
         try await channel.writeInbound(HTTPRequestPart.body(buffer))
         try await channel.writeInbound(HTTPRequestPart.body(buffer))
         try await channel.writeInbound(HTTPRequestPart.end(nil))
-    } responder: { request, channel in
+    } responder: { _, _ in
         return .init(status: .ok, body: .init(byteBuffer: buffer))
     }
 
     Benchmark(
         name: "HTTP1:Echo",
         configuration: .init(warmupIterations: 10)
-    ) { benchmark, channel in
+    ) { _, channel in
         let head = HTTPRequest(method: .post, scheme: "http", authority: "localhost", path: "/")
         try await channel.writeInbound(HTTPRequestPart.head(head))
         try await channel.writeInbound(HTTPRequestPart.body(buffer))
         try await channel.writeInbound(HTTPRequestPart.body(buffer))
         try await channel.writeInbound(HTTPRequestPart.end(nil))
-    } responder: { request, channel in
-        let buffer = try await request.body.collect(upTo: .max)
+    } responder: { request, _ in
+        let buffer = try await request.body.collate(maxSize: .max)
         return .init(status: .ok, body: .init(byteBuffer: buffer))
     }
-}
+}
diff --git a/Benchmarks/Benchmarks/Router/RouterBenchmarks.swift b/Benchmarks/Benchmarks/Router/RouterBenchmarks.swift
@@ -106,7 +106,7 @@ func routerBenchmarks() {
         await bodyStream.send(buffer)
     } setupRouter: { router in
         router.put { request, _ in
-            let body = try await request.body.collect(upTo: .max)
+            let body = try await request.body.collate(maxSize: .max)
             return body.readableBytes.description
         }
     }

diff --git a/Sources/HummingbirdFoundation/Codable/JSON/JSONCoding.swift b/Sources/HummingbirdFoundation/Codable/JSON/JSONCoding.swift
@@ -41,7 +41,7 @@ extension JSONDecoder: HBRequestDecoder {
     ///   - type: Type to decode
     ///   - request: Request to decode from
     public func decode<T: Decodable>(_ type: T.Type, from request: HBRequest, context: some HBBaseRequestContext) async throws -> T {
-        let buffer = try await request.body.collect(upTo: context.maxUploadSize)
+        let buffer = try await request.body.collate(maxSize: context.maxUploadSize)
         return try self.decode(T.self, from: buffer)
     }
 }

diff --git a/Sources/HummingbirdFoundation/Codable/URLEncodedForm/URLEncodedForm+Request.swift b/Sources/HummingbirdFoundation/Codable/URLEncodedForm/URLEncodedForm+Request.swift
@@ -37,7 +37,7 @@ extension URLEncodedFormDecoder: HBRequestDecoder {
     ///   - type: Type to decode
     ///   - request: Request to decode from
     public func decode<T: Decodable>(_ type: T.Type, from request: HBRequest, context: some HBBaseRequestContext) async throws -> T {
-        let buffer = try await request.body.collect(upTo: context.maxUploadSize)
+        let buffer = try await request.body.collate(maxSize: context.maxUploadSize)
         let string = String(buffer: buffer)
         return try self.decode(T.self, from: string)
     }

diff --git a/Tests/HummingbirdCoreTests/CoreTests.swift b/Tests/HummingbirdCoreTests/CoreTests.swift
@@ -93,7 +93,7 @@ class HummingBirdCoreTests: XCTestCase {
     func testConsumeBody() async throws {
         try await testServer(
             responder: { request, _ in
-                let buffer = try await request.body.collect(upTo: .max)
+                let buffer = try await request.body.collate(maxSize: .max)
                 return HBResponse(status: .ok, body: .init(byteBuffer: buffer))
             },
             configuration: .init(address: .hostname(port: 0)),
@@ -198,7 +198,7 @@ class HummingBirdCoreTests: XCTestCase {
         }
         try await testServer(
             responder: { request, _ in
-                _ = try await request.body.collect(upTo: .max)
+                _ = try await request.body.collate(maxSize: .max)
                 return HBResponse(status: .ok)
             },
             httpChannelSetup: .http1(additionalChannelHandlers: [CreateErrorHandler()]),
@@ -264,7 +264,7 @@ class HummingBirdCoreTests: XCTestCase {
         }
         try await testServer(
             responder: { request, _ in
-                _ = try await request.body.collect(upTo: .max)
+                _ = try await request.body.collate(maxSize: .max)
                 return .init(status: .ok)
             },
             httpChannelSetup: .http1(additionalChannelHandlers: [HTTPServerIncompleteRequest(), IdleStateHandler(readTimeout: .seconds(1))]),
@@ -287,7 +287,7 @@ class HummingBirdCoreTests: XCTestCase {
     func testWriteIdleTimeout() async throws {
         try await testServer(
             responder: { request, _ in
-                _ = try await request.body.collect(upTo: .max)
+                _ = try await request.body.collate(maxSize: .max)
                 return .init(status: .ok)
             },
             httpChannelSetup: .http1(additionalChannelHandlers: [IdleStateHandler(writeTimeout: .seconds(1))]),

diff --git a/Tests/HummingbirdTests/ApplicationTests.swift b/Tests/HummingbirdTests/ApplicationTests.swift
@@ -204,7 +204,7 @@ final class ApplicationTests: XCTestCase {
         router
             .group("/echo-body")
             .post { request, _ -> HBResponse in
-                let buffer = try await request.body.collect(upTo: .max)
+                let buffer = try await request.body.collate(maxSize: .max)
                 return .init(status: .ok, headers: [:], body: .init(byteBuffer: buffer))
             }
         let app = HBApplication(responder: router.buildResponder())
@@ -301,7 +301,7 @@ final class ApplicationTests: XCTestCase {
         router
             .group("/echo-body")
             .post { request, _ -> ByteBuffer? in
-                let buffer = try await request.body.collect(upTo: .max)
+                let buffer = try await request.body.collate(maxSize: .max)
                 return buffer.readableBytes > 0 ? buffer : nil
             }
         let app = HBApplication(responder: router.buildResponder())

diff --git a/Tests/HummingbirdTests/PersistTests.swift b/Tests/HummingbirdTests/PersistTests.swift
@@ -24,14 +24,14 @@ final class PersistTests: XCTestCase {
         let persist = HBMemoryPersistDriver()
 
         router.put("/persist/:tag") { request, context -> HTTPResponse.Status in
-            let buffer = try await request.body.collect(upTo: .max)
+            let buffer = try await request.body.collate(maxSize: .max)
             let tag = try context.parameters.require("tag")
             try await persist.set(key: tag, value: String(buffer: buffer))
             return .ok
         }
         router.put("/persist/:tag/:time") { request, context -> HTTPResponse.Status in
             guard let time = context.parameters.get("time", as: Int.self) else { throw HBHTTPError(.badRequest) }
-            let buffer = try await request.body.collect(upTo: .max)
+            let buffer = try await request.body.collate(maxSize: .max)
             let tag = try context.parameters.require("tag")
             try await persist.set(key: tag, value: String(buffer: buffer), expires: .seconds(time))
             return .ok
@@ -65,7 +65,7 @@ final class PersistTests: XCTestCase {
         let (router, persist) = try createRouter()
 
         router.put("/create/:tag") { request, context -> HTTPResponse.Status in
-            let buffer = try await request.body.collect(upTo: .max)
+            let buffer = try await request.body.collate(maxSize: .max)
             let tag = try context.parameters.require("tag")
             try await persist.create(key: tag, value: String(buffer: buffer))
             return .ok
@@ -84,7 +84,7 @@ final class PersistTests: XCTestCase {
     func testDoubleCreateFail() async throws {
         let (router, persist) = try createRouter()
         router.put("/create/:tag") { request, context -> HTTPResponse.Status in
-            let buffer = try await request.body.collect(upTo: .max)
+            let buffer = try await request.body.collate(maxSize: .max)
             let tag = try context.parameters.require("tag")
             do {
                 try await persist.create(key: tag, value: String(buffer: buffer))
@@ -154,7 +154,7 @@ final class PersistTests: XCTestCase {
         let (router, persist) = try createRouter()
         router.put("/codable/:tag") { request, context -> HTTPResponse.Status in
             guard let tag = context.parameters.get("tag") else { throw HBHTTPError(.badRequest) }
-            let buffer = try await request.body.collect(upTo: .max)
+            let buffer = try await request.body.collate(maxSize: .max)
             try await persist.set(key: tag, value: TestCodable(buffer: String(buffer: buffer)))
             return .ok
         }