cleanup

Remove NIOCore exports
Use async/await versions of functions

Sources/Hummingbird/AsyncAwaitSupport/ResponseGenerator+async.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Hummingbird server framework project
 //
-// Copyright (c) 2021-2021 the Hummingbird authors
+// Copyright (c) 2021-2023 the Hummingbird authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -11,7 +11,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+
 import HummingbirdCore
+import NIOCore
 
 /// Response body streamer which uses an AsyncSequence as its input.
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)

Sources/Hummingbird/Configuration.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Hummingbird server framework project
 //
-// Copyright (c) 2021-2021 the Hummingbird authors
+// Copyright (c) 2021-2023 the Hummingbird authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -14,6 +14,7 @@
 
 import HummingbirdCore
 import Logging
+import NIOCore
 #if canImport(Network)
 import Network
 #endif

Sources/Hummingbird/Exports.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Hummingbird server framework project
 //
-// Copyright (c) 2021-2021 the Hummingbird authors
+// Copyright (c) 2021-2023 the Hummingbird authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -26,11 +26,7 @@
 
 @_exported import struct NIOCore.ByteBuffer
 @_exported import struct NIOCore.ByteBufferAllocator
-@_exported import protocol NIOCore.EventLoop
-@_exported import class NIOCore.EventLoopFuture
-@_exported import protocol NIOCore.EventLoopGroup
 @_exported import enum NIOCore.SocketAddress
-@_exported import struct NIOCore.TimeAmount
 
 @_exported import struct NIOHTTP1.HTTPHeaders
 @_exported import enum NIOHTTP1.HTTPMethod

Sources/Hummingbird/Router/RouterMethods.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Hummingbird server framework project
 //
-// Copyright (c) 2021-2021 the Hummingbird authors
+// Copyright (c) 2021-2023 the Hummingbird authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -44,7 +44,7 @@ public protocol HBRouterMethods {
 }
 
 extension HBRouterMethods {
-        /// GET path for async closure returning type conforming to ResponseEncodable
+    /// GET path for async closure returning type conforming to ResponseEncodable
     @discardableResult public func get<Output: HBResponseGenerator>(
         _ path: String = "",
         options: HBRouterMethodOptions = [],
@@ -118,9 +118,8 @@ extension HBRouterMethods {
                     return try await _respond(request: request, context: context)
                 } else {
                     let buffer = try await request.body.consumeBody(
-                        maxSize: context.applicationContext.configuration.maxUploadSize,
-                        on: context.eventLoop
-                    ).get()
+                        maxSize: context.applicationContext.configuration.maxUploadSize
+                    )
                     var request = request
                     request.body = .byteBuffer(buffer)
                     return try await _respond(request: request, context: context)

Sources/Hummingbird/Server/RequestContext.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Hummingbird server framework project
 //
-// Copyright (c) 2021-2022 the Hummingbird authors
+// Copyright (c) 2021-2023 the Hummingbird authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -14,8 +14,8 @@
 
 import Atomics
 import Logging
-import NIOCore
 import NIOConcurrencyHelpers
+import NIOCore
 import Tracing
 
 /// Endpoint path storage
@@ -26,7 +26,7 @@ public struct EndpointPath: Sendable {
 
     /// Endpoint path
     public internal(set) var value: String? {
-        get { self._value.withLockedValue{ $0 } }
+        get { self._value.withLockedValue { $0 } }
         nonmutating set { self._value.withLockedValue { $0 = newValue } }
     }
 

Sources/Hummingbird/Storage/MemoryPersistDriver.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Hummingbird server framework project
 //
-// Copyright (c) 2021-2021 the Hummingbird authors
+// Copyright (c) 2021-2023 the Hummingbird authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -69,7 +69,6 @@ public actor HBMemoryPersistDriver<C: Clock>: HBPersistDriver where C.Duration =
     }
 
     public func run() async throws {
-        let cancelled = ManagedAtomic(false)
         let timerSequence = AsyncTimerSequence(interval: .seconds(600), clock: .suspending)
             .cancelOnGracefulShutdown()
         for try await _ in timerSequence {

Tests/HummingbirdTests/ApplicationTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Hummingbird server framework project
 //
-// Copyright (c) 2021-2021 the Hummingbird authors
+// Copyright (c) 2021-2023 the Hummingbird authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -15,6 +15,7 @@
 import Atomics
 import Hummingbird
 import HummingbirdXCT
+import NIOCore
 import NIOHTTP1
 import XCTest
 
@@ -194,7 +195,7 @@ final class ApplicationTests: XCTestCase {
 
     func testEventLoopFutureArray() async throws {
         let router = HBRouterBuilder(context: HBTestRouterContext.self)
-        router.patch("array") { _, context -> [String] in
+        router.patch("array") { _, _ -> [String] in
             return ["yes", "no"]
         }
         let app = HBApplication(responder: router.buildResponder())
@@ -245,16 +246,15 @@ final class ApplicationTests: XCTestCase {
             }
             return HBResponse(status: .ok, headers: [:], body: .stream(RequestStreamer(stream: stream)))
         }
-        router.post("size", options: .streamBody) { request, context -> String in
+        router.post("size", options: .streamBody) { request, _ -> String in
             guard let stream = request.body.stream else {
                 throw HBHTTPError(.badRequest)
             }
-            let size = ManagedAtomic(0)
-            _ = try await stream.consumeAll(on: context.eventLoop) { buffer in
-                size.wrappingIncrement(by: buffer.readableBytes, ordering: .relaxed)
-                return context.success(())
-            }.get()
-            return size.load(ordering: .relaxed).description
+            var size = 0
+            for try await buffer in stream.sequence {
+                size += buffer.readableBytes
+            }
+            return size.description
         }
         let app = HBApplication(responder: router.buildResponder())
 
@@ -358,7 +358,7 @@ final class ApplicationTests: XCTestCase {
         let router = HBRouterBuilder(context: HBTestRouterContext.self)
         router
             .group("/echo-body")
-            .post { request, context -> ByteBuffer? in
+            .post { request, _ -> ByteBuffer? in
                 return request.body.buffer
             }
         let app = HBApplication(responder: router.buildResponder())
@@ -450,7 +450,7 @@ final class ApplicationTests: XCTestCase {
 
     func testTypedResponseFuture() async throws {
         let router = HBRouterBuilder(context: HBTestRouterContext.self)
-        router.delete("/hello") { _, context in
+        router.delete("/hello") { _, _ in
             HBEditedResponse(
                 status: .imATeapot,
                 headers: ["test": "value", "content-type": "application/json"],

Tests/HummingbirdTests/RouterTests.swift

@@ -16,6 +16,7 @@ import Atomics
 @testable import Hummingbird
 import HummingbirdXCT
 import Logging
+import NIOCore
 import Tracing
 import XCTest
 
@@ -218,7 +219,7 @@ final class RouterTests: XCTestCase {
             .group("/test")
             .add(middleware: TestMiddleware())
             .group("/group")
-            .get { _, context in
+            .get { _, _ in
                 return "hello"
             }
         let app = HBApplication(responder: router.buildResponder())