Use add(middleware:) (#82)

* Use add(middleware:)

* swiftformat

* Update Package.swift to use 2.0.0-beta.8

* Update to use swift-openapi-hummingbird.git beta 2

auth-jwt/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.5"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-auth.git", from: "2.0.0-beta.2"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-fluent.git", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/vapor/jwt-kit.git", from: "4.0.0"),

auth-jwt/Sources/App/Application+build.swift

@@ -54,8 +54,8 @@ func buildApplication(_ args: AppArguments) async throws -> some ApplicationProt
     jwtAuthenticator.useSigner(.hs256(key: "my-secret-key"), kid: jwtLocalSignerKid)
 
     let router = Router(context: BasicAuthRequestContext.self)
-    router.middlewares.add(LogRequestsMiddleware(.debug))
-    router.middlewares.add(
+    router.add(middleware: LogRequestsMiddleware(.debug))
+    router.add(middleware:
         CORSMiddleware(
             allowOrigin: .originBased,
             allowHeaders: [.accept, .authorization, .contentType, .origin],

auth-srp/Package.swift

@@ -7,7 +7,7 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.5"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-auth.git", from: "2.0.0-beta.2"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-fluent.git", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.0.0"),

auth-srp/Sources/App/Application+build.swift

@@ -52,9 +52,9 @@ func buildApplication(_ args: some AppArguments) async throws -> some Applicatio
     }
 
     let router = Router(context: BasicAuthRequestContext.self)
-    router.middlewares.add(RedirectMiddleware())
-    router.middlewares.add(FileMiddleware(logger: logger))
-    router.middlewares.add(
+    router.add(middleware: RedirectMiddleware())
+    router.add(middleware: FileMiddleware(logger: logger))
+    router.add(middleware:
         LogRequestsMiddleware(
             .info,
             includeHeaders: .all(),

html-form/Package.swift

@@ -7,7 +7,7 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.7"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/swift-mustache.git", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
     ],

html-form/Sources/App/Application+build.swift

@@ -33,7 +33,7 @@ public func buildApplication(args: AppArguments) async throws -> some Applicatio
     assert(library.getTemplate(named: "page") != nil, "Set your working directory to the root folder of this example to get it to work")
 
     let router = Router(context: HTMLFormRequestContext.self)
-    router.middlewares.add(FileMiddleware())
+    router.add(middleware: FileMiddleware())
     WebController(mustacheLibrary: library).addRoutes(to: router)
     let app = Application(
         router: router,

multipart-form/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.7"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/swift-mustache.git", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
         .package(url: "https://github.com/swift-extras/swift-extras-base64.git", .upToNextMinor(from: "0.7.0")),

multipart-form/Sources/App/Application+build.swift

@@ -12,7 +12,7 @@ func buildApplication(_ args: AppArguments) async throws -> some ApplicationProt
     assert(library.getTemplate(named: "page") != nil, "Set your working directory to the root folder of this example to get it to work")
 
     let router = Router(context: MultipartRequestContext.self)
-    router.middlewares.add(FileMiddleware())
+    router.add(middleware: FileMiddleware())
     WebController(mustacheLibrary: library).addRoutes(to: router)
     return Application(router: router, configuration: .init(address: .hostname(args.hostname, port: args.port)))
 }

proxy-server/Package.swift

@@ -7,7 +7,7 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.7"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
         .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.22.0"),
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.6.0"),

proxy-server/Sources/App/Application+build.swift

@@ -29,7 +29,7 @@ func buildApplication(_ args: some AppArguments) -> some ApplicationProtocol {
     let eventLoopGroup = MultiThreadedEventLoopGroup.singleton
     let httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
     let router = Router(context: ProxyRequestContext.self)
-    router.middlewares.add(
+    router.add(middleware:
         ProxyServerMiddleware(
             httpClient: httpClient,
             proxy: .init(location: args.location, target: args.target)

sessions/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.5"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-auth.git", from: "2.0.0-beta.2"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-fluent.git", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.16.0"),

sessions/Sources/App/Application+build.swift

@@ -30,7 +30,7 @@ func buildApplication(_ arguments: AppArguments, configuration: ApplicationConfi
     let router = Router(context: BasicAuthRequestContext.self)
 
     // add logging middleware
-    router.middlewares.add(LogRequestsMiddleware(.debug))
+    router.add(middleware: LogRequestsMiddleware(.debug))
 
     // routes
     router.get("/") { _, _ in

todos-auth-fluent/Package.swift

@@ -7,7 +7,7 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.7"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-auth.git", from: "2.0.0-beta.3"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-fluent.git", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/hummingbird-project/swift-mustache.git", from: "2.0.0-beta.1"),

todos-auth-fluent/Sources/App/Application+build.swift

@@ -35,10 +35,10 @@ func buildApplication(_ arguments: some AppArguments) async throws -> some Appli
     let router = Router(context: TodosAuthRequestContext.self)
 
     // add logging middleware
-    router.middlewares.add(LogRequestsMiddleware(.info))
+    router.add(middleware: LogRequestsMiddleware(.info))
     // add file middleware to server css and js files
-    router.middlewares.add(FileMiddleware(logger: logger))
-    router.middlewares.add(CORSMiddleware(
+    router.add(middleware: FileMiddleware(logger: logger))
+    router.add(middleware: CORSMiddleware(
         allowOrigin: .originBased,
         allowHeaders: [.contentType],
         allowMethods: [.get, .options, .post, .delete, .patch]

todos-dynamodb/Sources/App/TodosApp.swift

@@ -18,8 +18,8 @@ struct TodosApp: ApplicationProtocol {
     var responder: some HTTPResponder<Context> {
         let router = Router(context: Context.self)
         // middleware
-        router.middlewares.add(LogRequestsMiddleware(.debug))
-        router.middlewares.add(CORSMiddleware(
+        router.add(middleware: LogRequestsMiddleware(.debug))
+        router.add(middleware: CORSMiddleware(
             allowOrigin: .originBased,
             allowHeaders: [.contentType],
             allowMethods: [.get, .options, .post, .delete, .patch]

todos-fluent/Sources/App/Application+build.swift

@@ -31,10 +31,10 @@ func buildApplication(_ arguments: some AppArguments) async throws -> some Appli
     let router = Router()
 
     // add logging middleware
-    router.middlewares.add(LogRequestsMiddleware(.info))
+    router.add(middleware: LogRequestsMiddleware(.info))
     // add file middleware to server css and js files
-    router.middlewares.add(FileMiddleware(logger: logger))
-    router.middlewares.add(CORSMiddleware(
+    router.add(middleware: FileMiddleware(logger: logger))
+    router.add(middleware: CORSMiddleware(
         allowOrigin: .originBased,
         allowHeaders: [.contentType],
         allowMethods: [.get, .options, .post, .delete, .patch]

todos-lambda/Package.swift

@@ -7,7 +7,7 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.5"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-lambda.git", from: "2.0.0-beta.3"),
         .package(url: "https://github.com/soto-project/soto.git", from: "7.0.0-rc.1"),
     ],

todos-lambda/Sources/App/lambda.swift

@@ -36,12 +36,12 @@ struct AppLambda: APIGatewayLambdaFunction {
 
         let router = Router(context: Context.self)
         // middleware
-        router.middlewares.add(ErrorMiddleware())
-        router.middlewares.add(LogRequestsMiddleware(.debug))
+        router.add(middleware: ErrorMiddleware())
+        router.add(middleware: LogRequestsMiddleware(.debug))
         router.get("/") { _, _ in
             return "Hello"
         }
-        router.middlewares.add(CORSMiddleware(
+        router.add(middleware: CORSMiddleware(
             allowOrigin: .originBased,
             allowHeaders: [.contentType],
             allowMethods: [.get, .options, .post, .delete, .patch]

todos-mongokitten-openapi/Package.swift

@@ -7,8 +7,8 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.5"),
-        .package(url: "https://github.com/swift-server/swift-openapi-hummingbird.git", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
+        .package(url: "https://github.com/swift-server/swift-openapi-hummingbird.git", from: "2.0.0-beta.2"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
         .package(url: "https://github.com/apple/swift-openapi-generator.git", from: "1.2.0"),
         .package(url: "https://github.com/apple/swift-openapi-runtime.git", from: "1.3.0"),

todos-mongokitten-openapi/Sources/todos-mongokitten-openapi/App.swift

@@ -24,7 +24,7 @@ struct HummingbirdArguments: AsyncParsableCommand {
         let mongo = try await MongoDatabase.connect(to: self.connectionString)
 
         let router = Router()
-        router.middlewares.add(LogRequestsMiddleware(.info))
+        router.add(middleware: LogRequestsMiddleware(.info))
         let api = API(mongo: mongo)
         try api.registerHandlers(on: router)
 

todos-postgres-tutorial/Sources/Todos.swift

@@ -37,7 +37,7 @@ func buildApplication(_ args: some AppArguments) async throws -> some Applicatio
     // create router
     let router = Router()
     // add logging middleware
-    router.middlewares.add(LogRequestsMiddleware(.info))
+    router.add(middleware: LogRequestsMiddleware(.info))
     // add hello route
     router.get("/") { request, context in
         "Hello\n"

upload-s3/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.5"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/soto-project/soto.git", from: "7.0.0-rc.1"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
     ],

upload-s3/Sources/App/Application+build.swift

@@ -39,7 +39,7 @@ func buildApplication(_ args: some AppArguments) -> some ApplicationProtocol {
     let s3 = S3(client: awsClient, region: .euwest1)
 
     let router = Router()
-    router.middlewares.add(LogRequestsMiddleware(.info))
+    router.add(middleware: LogRequestsMiddleware(.info))
 
     router.addRoutes(
         S3FileController(

upload/Package.swift

@@ -7,7 +7,7 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.5"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
     ],
     targets: [

upload/Tests/AppTests/AppTests.swift

@@ -8,10 +8,10 @@ final class AppTests: XCTestCase {
         var hostname: String { "127.0.0.1" }
         var port: Int { 0 }
     }
-    
+
     func testUploadDownload() async throws {
         let app = buildApplication(args: TestArguments())
-        
+
         try await app.test(.live) { client in
             let textString = "Hello, World!"
             let testFileName = "Hello.txt"
@@ -21,7 +21,7 @@ final class AppTests: XCTestCase {
                 try? FileManager.default.removeItem(at: uploadURL)
             }
             let buffer = ByteBuffer(string: textString)
-            
+
             try await client.execute(
                 uri: "/files",
                 method: .post,
@@ -32,14 +32,14 @@ final class AppTests: XCTestCase {
                 let bodyString = String(buffer: response.body)
                 XCTAssertTrue(bodyString.contains(testFileName))
             }
-            
+
             try await client.execute(uri: "/files/\(testFileName)", method: .get) { response in
                 let downloadString = String(buffer: response.body)
                 XCTAssertEqual(downloadString, textString, "Downloaded bytes should match uploaded bytes")
             }
         }
     }
-    
+
     func testUploadDownload2() async throws {
         let app = buildApplication(args: TestArguments())
 
@@ -55,7 +55,7 @@ final class AppTests: XCTestCase {
             }
         }
     }
-    
+
     func runUploadTest(
         _ client: any TestClientProtocol,
         _ i: Int,
@@ -82,15 +82,15 @@ final class AppTests: XCTestCase {
         ) { response in
             XCTAssertEqual(response.status, .ok)
         }
-        
+
         print("--download-- \(testFileName)")
         try await client.execute(uri: "/files/\(testFileName)", method: .get) { response in
             let dlBytes = response.body.getBytes(at: 0, length: response.body.readableBytes)
 
             let isOk = dlBytes == bytes
             XCTAssertTrue(isOk, "Downloaded bytes should match uploaded bytes")
         }
-        
+
         print("--downloaded-- \(testFileName)")
     }
 }

websocket-chat/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.7"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-websocket.git", from: "2.0.0-beta.4"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
     ],

websocket-chat/Sources/App/Application+build.swift

@@ -17,12 +17,12 @@ func buildApplication(_ arguments: some AppArguments) async throws -> some Appli
 
     // Router
     let router = Router()
-    router.middlewares.add(LogRequestsMiddleware(.debug))
-    router.middlewares.add(FileMiddleware(logger: logger))
+    router.add(middleware: LogRequestsMiddleware(.debug))
+    router.add(middleware: FileMiddleware(logger: logger))
 
     // Separate router for websocket upgrade
     let wsRouter = Router(context: BasicWebSocketRequestContext.self)
-    wsRouter.middlewares.add(LogRequestsMiddleware(.debug))
+    wsRouter.add(middleware: LogRequestsMiddleware(.debug))
     wsRouter.ws("chat") { request, _ in
         // only allow upgrade if username query parameter exists
         guard request.uri.queryParameters["username"] != nil else {

websocket-echo/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.7"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.8"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-websocket.git", from: "2.0.0-beta.4"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
     ],

websocket-echo/Sources/App/Application+build.swift

@@ -15,12 +15,12 @@ func buildApplication(_ arguments: some AppArguments) async throws -> some Appli
 
     // Router
     let router = Router()
-    router.middlewares.add(LogRequestsMiddleware(.debug))
-    router.middlewares.add(FileMiddleware(logger: logger))
+    router.add(middleware: LogRequestsMiddleware(.debug))
+    router.add(middleware: FileMiddleware(logger: logger))
 
     // Separate router for websocket upgrade
     let wsRouter = Router(context: BasicWebSocketRequestContext.self)
-    wsRouter.middlewares.add(LogRequestsMiddleware(.debug))
+    wsRouter.add(middleware: LogRequestsMiddleware(.debug))
     wsRouter.ws("echo") { _, _ in
         .upgrade([:])
     } onUpgrade: { inbound, outbound, _ in