Changes after merge of HummingbirdFoundation (#15)

hummingbird-project · Jan 21, 2024 · 05cc7ea · 05cc7ea
1 parent e261e5a
commit 05cc7ea
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/Package.swift b/Package.swift
@@ -24,11 +24,9 @@ let package = Package(
             .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-events"),
             .product(name: "ExtrasBase64", package: "swift-extras-base64"),
             .product(name: "Hummingbird", package: "hummingbird"),
-            .product(name: "HummingbirdFoundation", package: "hummingbird"),
         ]),
         .executableTarget(name: "HBLambdaTest", dependencies: [
             .byName(name: "HummingbirdLambda"),
-            .product(name: "HummingbirdFoundation", package: "hummingbird"),
         ]),
         .testTarget(name: "HummingbirdLambdaTests", dependencies: [
             .byName(name: "HummingbirdLambda"),

diff --git a/Sources/HBLambdaTest/maths.swift b/Sources/HBLambdaTest/maths.swift
@@ -15,7 +15,6 @@
 import AWSLambdaEvents
 import AWSLambdaRuntime
 import Hummingbird
-import HummingbirdFoundation
 import HummingbirdLambda
 import Logging
 
@@ -35,11 +34,7 @@ struct DebugMiddleware: HBMiddlewareProtocol {
 }
 
 @main
-struct MathsHandler: HBLambda {
-    typealias Event = APIGatewayRequest
-    typealias Output = APIGatewayResponse
-    typealias Context = HBBasicLambdaRequestContext<Event>
-
+struct MathsHandler: HBAPIGatewayLambda {
     struct Operands: Decodable {
         let lhs: Double
         let rhs: Double

diff --git a/Sources/HummingbirdLambda/HBBasicLambdaRequestContext.swift b/Sources/HummingbirdLambda/HBBasicLambdaRequestContext.swift
@@ -15,7 +15,6 @@
 import AWSLambdaRuntimeCore
 import Foundation
 import Hummingbird
-import HummingbirdFoundation
 import Logging
 import NIOCore
 
@@ -27,8 +26,6 @@ public struct HBBasicLambdaRequestContext<Event: Sendable>: HBLambdaRequestConte
     public let event: Event
 
     public var coreContext: HBCoreRequestContext
-    public var requestDecoder: JSONDecoder { .init() }
-    public var responseEncoder: JSONEncoder { .init() }
 
     /// Initialize Lambda request context
     public init(_ event: Event, lambdaContext: LambdaContext) {

diff --git a/Sources/HummingbirdLambda/Lambda.swift b/Sources/HummingbirdLambda/Lambda.swift
@@ -15,7 +15,6 @@
 import AWSLambdaEvents
 import AWSLambdaRuntimeCore
 import Hummingbird
-import HummingbirdFoundation
 import Logging
 import NIOCore
 import NIOPosix