fix: remove local implementation of PayloadS3Pointer.java and use pay…

…loadoffloading-common (#851)
aws-powertools · Apr 28, 2022 · d829a14 · d829a14
1 parent 896cacd
commit d829a14
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 61 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <aspectj.version>1.9.7</aspectj.version>
         <aws.sdk.version>2.17.179</aws.sdk.version>
         <aws.xray.recorder.version>2.11.1</aws.xray.recorder.version>
-        <payloadoffloading-common.version>1.1.1</payloadoffloading-common.version>
+        <payloadoffloading-common.version>2.1.2</payloadoffloading-common.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lambda.core.version>1.2.1</lambda.core.version>
         <lambda.events.version>3.11.0</lambda.events.version>

diff --git a/powertools-sqs/pom.xml b/powertools-sqs/pom.xml
@@ -49,6 +49,10 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.payloadoffloading</groupId>
+            <artifactId>payloadoffloading-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>

diff --git a/...s/src/main/java/software/amazon/lambda/powertools/sqs/internal/SqsLargeMessageAspect.java b/...s/src/main/java/software/amazon/lambda/powertools/sqs/internal/SqsLargeMessageAspect.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 
 import com.amazonaws.services.lambda.runtime.Context;
@@ -68,7 +69,7 @@ public static List<PayloadS3Pointer> processMessages(final List<SQSMessage> reco
         for (SQSMessage sqsMessage : records) {
             if (isBodyLargeMessagePointer(sqsMessage.getBody())) {
 
-                PayloadS3Pointer s3Pointer = PayloadS3Pointer.fromJson(sqsMessage.getBody())
+                PayloadS3Pointer s3Pointer = Optional.ofNullable(PayloadS3Pointer.fromJson(sqsMessage.getBody()))
                         .orElseThrow(() -> new FailedProcessingLargePayloadException(format("Failed processing SQS body to extract S3 details. [ %s ].", sqsMessage.getBody())));
 
                 ResponseInputStream<GetObjectResponse> s3Object = callS3Gracefully(s3Pointer, pointer -> {

diff --git a/powertools-sqs/src/main/java/software/amazon/payloadoffloading/PayloadS3Pointer.java b/powertools-sqs/src/main/java/software/amazon/payloadoffloading/PayloadS3Pointer.java