Merge pull request #770 from jGauravGupta/FISH-8292-P6

FISH-8292 Release AWS SQS Cloud Connector v2.1.0 (Payara6+AWS SDK 2.x)
payara · Mar 12, 2024 · 1765896 · 1765896
2 parents 9a7e1ba + 496ffd8
commit 1765896
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/AmazonSQS/AmazonSQSExample/pom.xml b/AmazonSQS/AmazonSQSExample/pom.xml
@@ -48,7 +48,7 @@ holder.
     </parent>
     <groupId>fish.payara.cloud.connectors.amazonsqs</groupId>
     <artifactId>amazon-sqs-example</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>ejb</packaging>
 
     <name>Amazon SQS Example</name>

diff --git a/...ple/src/main/java/fish/payara/cloud/connectors/amazonsqs/example/NewTimerSessionBean.java b/...ple/src/main/java/fish/payara/cloud/connectors/amazonsqs/example/NewTimerSessionBean.java
@@ -55,7 +55,7 @@
 @ConnectionFactoryDefinition(name = "java:comp/env/SQSConnectionFactory",
         description = "SQS Conn Factory",
         interfaceName = "fish.payara.cloud.connectors.amazonsqs.api.AmazonSQSConnectionFactory",
-        resourceAdapter = "amazon-sqs-rar-2.0.0",
+        resourceAdapter = "amazon-sqs-rar-2.1.0",
         minPoolSize = 2, maxPoolSize = 2,
         transactionSupport = TransactionSupportLevel.NoTransaction,
         properties = {"region=${ENV=region}"})

diff --git a/AmazonSQS/AmazonSQSJCAAPI/pom.xml b/AmazonSQS/AmazonSQSJCAAPI/pom.xml
@@ -48,7 +48,7 @@ holder.
     </parent>
     <groupId>fish.payara.cloud.connectors.amazonsqs</groupId>
     <artifactId>amazon-sqs-jca-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
     <name>Amazon SQS JCA Adapter API</name>
     <description>API classes for the Amazon SQS JCA Adapter</description>

diff --git a/...SQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java b/...SQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java
@@ -110,8 +110,10 @@ public void run() {
                 Class<?> mdbClass = factory.getEndpointClass();
                 for (Message message : messages) {
                     for (Method m : mdbClass.getMethods()) {
-                        if (isOnSQSMessageMethod(m) && shouldFetchS3Message(message)) {
-                            message = fetchS3MessageContent(message);
+                        if (isOnSQSMessageMethod(m)) {
+                            if (shouldFetchS3Message(message)) {
+                                message = fetchS3MessageContent(message);
+                            }
                             scheduleSQSWork(m, message);
                         }
                     }

diff --git a/AmazonSQS/AmazonSQSRAR/pom.xml b/AmazonSQS/AmazonSQSRAR/pom.xml
@@ -48,7 +48,7 @@ holder.
     </parent>
     <groupId>fish.payara.cloud.connectors.amazonsqs</groupId>
     <artifactId>amazon-sqs-rar</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>rar</packaging>
     <name>Amazon SQS JCA Adapter RAR</name>
     <description>RAR for the Amazon SQS JCA Adapter</description>