Move closure initializers not using Foundation to NewLambdaHandlers.swift in AWSLambdaRuntimeCore

Author: aryan-25

Sources/AWSLambdaRuntime/Lambda+Codable.swift

@@ -67,63 +67,6 @@ extension LambdaCodableAdapter {
 }
 
 extension NewLambdaRuntime {
-    /// Initialize an instance with a ``NewLambdaHandler`` defined in the form of a closure **with a non-`Void` return type**, an encoder, and a decoder.
-    /// - Parameter body: The handler in the form of a closure.
-    /// - Parameter encoder: The encoder object that will be used to encode the generic ``Output`` into a ``ByteBuffer``.
-    /// - Parameter decoder: The decoder object that will be used to decode the incoming ``ByteBuffer`` event into the generic ``Event`` type.
-    package convenience init<
-        Event: Decodable,
-        Output: Encodable,
-        Encoder: LambdaOutputEncoder,
-        Decoder: LambdaEventDecoder
-    >(
-        encoder: Encoder,
-        decoder: Decoder,
-        body: @escaping (Event, NewLambdaContext) async throws -> Output
-    )
-    where
-        Handler == LambdaCodableAdapter<
-            LambdaHandlerAdapter<Event, Output, ClosureHandler<Event, Output>>,
-            Event,
-            Output,
-            Decoder,
-            Encoder
-        >
-    {
-        let handler = LambdaCodableAdapter(
-            encoder: encoder,
-            decoder: decoder,
-            handler: LambdaHandlerAdapter(handler: ClosureHandler(body: body))
-        )
-
-        self.init(handler: handler)
-    }
-
-    /// Initialize an instance with a ``NewLambdaHandler`` defined in the form of a closure **with a `Void` return type**, an encoder, and a decoder.
-    /// - Parameter body: The handler in the form of a closure.
-    /// - Parameter encoder: The encoder object that will be used to encode the generic ``Output`` into a ``ByteBuffer``.
-    /// - Parameter decoder: The decoder object that will be used to decode the incoming ``ByteBuffer`` event into the generic ``Event`` type.
-    package convenience init<Event: Decodable, Decoder: LambdaEventDecoder>(
-        decoder: Decoder,
-        body: @escaping (Event, NewLambdaContext) async throws -> Void
-    )
-    where
-        Handler == LambdaCodableAdapter<
-            LambdaHandlerAdapter<Event, Void, ClosureHandler<Event, Void>>,
-            Event,
-            Void,
-            Decoder,
-            VoidEncoder
-        >
-    {
-        let handler = LambdaCodableAdapter(
-            decoder: decoder,
-            handler: LambdaHandlerAdapter(handler: ClosureHandler(body: body))
-        )
-
-        self.init(handler: handler)
-    }
-
     /// Initialize an instance with a ``NewLambdaHandler`` defined in the form of a closure **with a non-`Void` return type**.
     /// - Parameter body: The handler in the form of a closure.
     /// - Parameter encoder: The encoder object that will be used to encode the generic ``Output`` into a ``ByteBuffer``. ``JSONEncoder()`` used as default.

Sources/AWSLambdaRuntimeCore/NewLambda+JSON.swift

@@ -159,13 +159,3 @@ where Output == Encoder.Output {
         try await self.underlyingStreamWriter.writeAndFinish(outputBuffer)
     }
 }
-
-extension NewLambdaRuntime {
-    /// Initialize an instance with a ``StreamingLambdaHandler`` in the form of a closure.
-    /// - Parameter body: The handler in the form of a closure.
-    package convenience init(
-        body: @Sendable @escaping (ByteBuffer, LambdaResponseStreamWriter, NewLambdaContext) async throws -> Void
-    ) where Handler == StreamingClosureHandler {
-        self.init(handler: StreamingClosureHandler(body: body))
-    }
-}

Sources/AWSLambdaRuntimeCore/NewLambdaHandlers.swift

@@ -171,3 +171,70 @@ package struct ClosureHandler<Event: Decodable, Output>: NewLambdaHandler {
         try await self.body(event, context)
     }
 }
+
+extension NewLambdaRuntime {
+    /// Initialize an instance with a ``StreamingLambdaHandler`` in the form of a closure.
+    /// - Parameter body: The handler in the form of a closure.
+    package convenience init(
+        body: @Sendable @escaping (ByteBuffer, LambdaResponseStreamWriter, NewLambdaContext) async throws -> Void
+    ) where Handler == StreamingClosureHandler {
+        self.init(handler: StreamingClosureHandler(body: body))
+    }
+
+    /// Initialize an instance with a ``NewLambdaHandler`` defined in the form of a closure **with a non-`Void` return type**, an encoder, and a decoder.
+    /// - Parameter body: The handler in the form of a closure.
+    /// - Parameter encoder: The encoder object that will be used to encode the generic ``Output`` into a ``ByteBuffer``.
+    /// - Parameter decoder: The decoder object that will be used to decode the incoming ``ByteBuffer`` event into the generic ``Event`` type.
+    package convenience init<
+        Event: Decodable,
+        Output: Encodable,
+        Encoder: LambdaOutputEncoder,
+        Decoder: LambdaEventDecoder
+    >(
+        encoder: Encoder,
+        decoder: Decoder,
+        body: @escaping (Event, NewLambdaContext) async throws -> Output
+    )
+    where
+        Handler == LambdaCodableAdapter<
+            LambdaHandlerAdapter<Event, Output, ClosureHandler<Event, Output>>,
+            Event,
+            Output,
+            Decoder,
+            Encoder
+        >
+    {
+        let handler = LambdaCodableAdapter(
+            encoder: encoder,
+            decoder: decoder,
+            handler: LambdaHandlerAdapter(handler: ClosureHandler(body: body))
+        )
+
+        self.init(handler: handler)
+    }
+
+    /// Initialize an instance with a ``NewLambdaHandler`` defined in the form of a closure **with a `Void` return type**, an encoder, and a decoder.
+    /// - Parameter body: The handler in the form of a closure.
+    /// - Parameter encoder: The encoder object that will be used to encode the generic ``Output`` into a ``ByteBuffer``.
+    /// - Parameter decoder: The decoder object that will be used to decode the incoming ``ByteBuffer`` event into the generic ``Event`` type.
+    package convenience init<Event: Decodable, Decoder: LambdaEventDecoder>(
+        decoder: Decoder,
+        body: @escaping (Event, NewLambdaContext) async throws -> Void
+    )
+    where
+        Handler == LambdaCodableAdapter<
+            LambdaHandlerAdapter<Event, Void, ClosureHandler<Event, Void>>,
+            Event,
+            Void,
+            Decoder,
+            VoidEncoder
+        >
+    {
+        let handler = LambdaCodableAdapter(
+            decoder: decoder,
+            handler: LambdaHandlerAdapter(handler: ClosureHandler(body: body))
+        )
+
+        self.init(handler: handler)
+    }
+}