From d28919a6b2035570091a85643c5dd6d71be5d4c1 Mon Sep 17 00:00:00 2001 From: Maxime David Date: Wed, 28 Jun 2023 01:09:58 +0200 Subject: [PATCH 1/2] fix java --- s3-uploader/runtimes/java11/build.gradle | 9 --------- .../main/java/io/github/maxday/Handler.java | 18 ++++++++++++------ .../runtimes/java11_snapstart/build.gradle | 9 --------- .../main/java/io/github/maxday/Handler.java | 18 ++++++++++++------ .../main/java/io/github/maxday/Handler.java | 11 +++++++++-- .../runtimes/java17_snapstart/build.gradle | 9 --------- .../main/java/io/github/maxday/Handler.java | 18 ++++++++++++------ s3-uploader/runtimes/java8/build.gradle | 9 --------- .../main/java/io/github/maxday/Handler.java | 18 ++++++++++++------ 9 files changed, 57 insertions(+), 62 deletions(-) diff --git a/s3-uploader/runtimes/java11/build.gradle b/s3-uploader/runtimes/java11/build.gradle index 3cef16cb0c..50931e86b3 100644 --- a/s3-uploader/runtimes/java11/build.gradle +++ b/s3-uploader/runtimes/java11/build.gradle @@ -7,19 +7,10 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -dependencies { - implementation ( - 'com.amazonaws:aws-lambda-java-core:1.2.2', - ) -} - task buildZip(type: Zip) { baseName = "code" from compileJava from processResources - into('lib') { - from configurations.runtimeClasspath - } } build.dependsOn buildZip diff --git a/s3-uploader/runtimes/java11/src/main/java/io/github/maxday/Handler.java b/s3-uploader/runtimes/java11/src/main/java/io/github/maxday/Handler.java index b977dc03cd..35b7857c2b 100644 --- a/s3-uploader/runtimes/java11/src/main/java/io/github/maxday/Handler.java +++ b/s3-uploader/runtimes/java11/src/main/java/io/github/maxday/Handler.java @@ -1,12 +1,18 @@ package io.github.maxday; -import com.amazonaws.services.lambda.runtime.Context; -import com.amazonaws.services.lambda.runtime.RequestHandler; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; -public class Handler implements RequestHandler { +public class Handler { - @Override - public String handleRequest(Object request, Context context) { - return "ok"; + public void handleRequest(InputStream inputStream, OutputStream outputStream) throws IOException { + try { + outputStream.write("ok".getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } finally { + outputStream.close(); + } } } diff --git a/s3-uploader/runtimes/java11_snapstart/build.gradle b/s3-uploader/runtimes/java11_snapstart/build.gradle index 3cef16cb0c..50931e86b3 100644 --- a/s3-uploader/runtimes/java11_snapstart/build.gradle +++ b/s3-uploader/runtimes/java11_snapstart/build.gradle @@ -7,19 +7,10 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -dependencies { - implementation ( - 'com.amazonaws:aws-lambda-java-core:1.2.2', - ) -} - task buildZip(type: Zip) { baseName = "code" from compileJava from processResources - into('lib') { - from configurations.runtimeClasspath - } } build.dependsOn buildZip diff --git a/s3-uploader/runtimes/java11_snapstart/src/main/java/io/github/maxday/Handler.java b/s3-uploader/runtimes/java11_snapstart/src/main/java/io/github/maxday/Handler.java index b977dc03cd..35b7857c2b 100644 --- a/s3-uploader/runtimes/java11_snapstart/src/main/java/io/github/maxday/Handler.java +++ b/s3-uploader/runtimes/java11_snapstart/src/main/java/io/github/maxday/Handler.java @@ -1,12 +1,18 @@ package io.github.maxday; -import com.amazonaws.services.lambda.runtime.Context; -import com.amazonaws.services.lambda.runtime.RequestHandler; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; -public class Handler implements RequestHandler { +public class Handler { - @Override - public String handleRequest(Object request, Context context) { - return "ok"; + public void handleRequest(InputStream inputStream, OutputStream outputStream) throws IOException { + try { + outputStream.write("ok".getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } finally { + outputStream.close(); + } } } diff --git a/s3-uploader/runtimes/java17/src/main/java/io/github/maxday/Handler.java b/s3-uploader/runtimes/java17/src/main/java/io/github/maxday/Handler.java index 5fa9d9cd51..35b7857c2b 100644 --- a/s3-uploader/runtimes/java17/src/main/java/io/github/maxday/Handler.java +++ b/s3-uploader/runtimes/java17/src/main/java/io/github/maxday/Handler.java @@ -1,11 +1,18 @@ package io.github.maxday; import java.io.InputStream; +import java.io.IOException; import java.io.OutputStream; public class Handler { - public String handleRequest(InputStream inputStream, OutputStream outputStream) { - return "ok"; + public void handleRequest(InputStream inputStream, OutputStream outputStream) throws IOException { + try { + outputStream.write("ok".getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } finally { + outputStream.close(); + } } } diff --git a/s3-uploader/runtimes/java17_snapstart/build.gradle b/s3-uploader/runtimes/java17_snapstart/build.gradle index 3cef16cb0c..50931e86b3 100644 --- a/s3-uploader/runtimes/java17_snapstart/build.gradle +++ b/s3-uploader/runtimes/java17_snapstart/build.gradle @@ -7,19 +7,10 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -dependencies { - implementation ( - 'com.amazonaws:aws-lambda-java-core:1.2.2', - ) -} - task buildZip(type: Zip) { baseName = "code" from compileJava from processResources - into('lib') { - from configurations.runtimeClasspath - } } build.dependsOn buildZip diff --git a/s3-uploader/runtimes/java17_snapstart/src/main/java/io/github/maxday/Handler.java b/s3-uploader/runtimes/java17_snapstart/src/main/java/io/github/maxday/Handler.java index b977dc03cd..35b7857c2b 100644 --- a/s3-uploader/runtimes/java17_snapstart/src/main/java/io/github/maxday/Handler.java +++ b/s3-uploader/runtimes/java17_snapstart/src/main/java/io/github/maxday/Handler.java @@ -1,12 +1,18 @@ package io.github.maxday; -import com.amazonaws.services.lambda.runtime.Context; -import com.amazonaws.services.lambda.runtime.RequestHandler; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; -public class Handler implements RequestHandler { +public class Handler { - @Override - public String handleRequest(Object request, Context context) { - return "ok"; + public void handleRequest(InputStream inputStream, OutputStream outputStream) throws IOException { + try { + outputStream.write("ok".getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } finally { + outputStream.close(); + } } } diff --git a/s3-uploader/runtimes/java8/build.gradle b/s3-uploader/runtimes/java8/build.gradle index 3cef16cb0c..50931e86b3 100644 --- a/s3-uploader/runtimes/java8/build.gradle +++ b/s3-uploader/runtimes/java8/build.gradle @@ -7,19 +7,10 @@ repositories { sourceCompatibility = 1.8 targetCompatibility = 1.8 -dependencies { - implementation ( - 'com.amazonaws:aws-lambda-java-core:1.2.2', - ) -} - task buildZip(type: Zip) { baseName = "code" from compileJava from processResources - into('lib') { - from configurations.runtimeClasspath - } } build.dependsOn buildZip diff --git a/s3-uploader/runtimes/java8/src/main/java/io/github/maxday/Handler.java b/s3-uploader/runtimes/java8/src/main/java/io/github/maxday/Handler.java index b977dc03cd..35b7857c2b 100644 --- a/s3-uploader/runtimes/java8/src/main/java/io/github/maxday/Handler.java +++ b/s3-uploader/runtimes/java8/src/main/java/io/github/maxday/Handler.java @@ -1,12 +1,18 @@ package io.github.maxday; -import com.amazonaws.services.lambda.runtime.Context; -import com.amazonaws.services.lambda.runtime.RequestHandler; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; -public class Handler implements RequestHandler { +public class Handler { - @Override - public String handleRequest(Object request, Context context) { - return "ok"; + public void handleRequest(InputStream inputStream, OutputStream outputStream) throws IOException { + try { + outputStream.write("ok".getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } finally { + outputStream.close(); + } } } From 72dc6cadba2f8ec58d5d9d6ef991aada753ffca7 Mon Sep 17 00:00:00 2001 From: Maxime David Date: Wed, 28 Jun 2023 01:10:44 +0200 Subject: [PATCH 2/2] modify handler --- manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 978a3bebcc..ac177c1a2c 100644 --- a/manifest.json +++ b/manifest.json @@ -75,14 +75,14 @@ { "displayName": "java11", "runtime": "java11", - "handler": "io.github.maxday.Handler", + "handler": "io.github.maxday.Handler::handleRequest", "path": "java11", "architectures": ["x86_64", "arm64"] }, { "displayName": "java8", "runtime": "java8.al2", - "handler": "io.github.maxday.Handler", + "handler": "io.github.maxday.Handler::handleRequest", "path": "java8", "architectures": ["x86_64", "arm64"] }, @@ -124,7 +124,7 @@ { "displayName": "java11 snapstart", "runtime": "java11", - "handler": "io.github.maxday.Handler", + "handler": "io.github.maxday.Handler::handleRequest", "path": "java11_snapstart", "snapStart": { "SnapStart": { @@ -143,7 +143,7 @@ { "displayName": "java17 snapstart", "runtime": "java17", - "handler": "io.github.maxday.Handler", + "handler": "io.github.maxday.Handler::handleRequest", "path": "java17_snapstart", "snapStart": { "SnapStart": {