[camel] 01/02: Camel-AWS2-SNS: Guard check for Message Group Id Stategy and Message Deduplication Id Strategy

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c67b009801bac2a260137f045a64d3db6c703fa0
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Nov 27 13:50:39 2020 +0100

    Camel-AWS2-SNS: Guard check for Message Group Id Stategy and Message 
Deduplication Id Strategy
---
 .../apache/camel/component/aws2/sns/Sns2Producer.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git 
a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
 
b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
index 69b0142..af04570 100644
--- 
a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
+++ 
b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java
@@ -30,6 +30,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -136,14 +137,18 @@ public class Sns2Producer extends DefaultProducer {
     private void configureFifoAttributes(PublishRequest.Builder request, 
Exchange exchange) {
         if (getEndpoint().getConfiguration().isFifoTopic()) {
             // use strategies
-            MessageGroupIdStrategy messageGroupIdStrategy = 
getEndpoint().getConfiguration().getMessageGroupIdStrategy();
-            String messageGroupId = 
messageGroupIdStrategy.getMessageGroupId(exchange);
-            request.messageGroupId(messageGroupId);
-
-            MessageDeduplicationIdStrategy messageDeduplicationIdStrategy
+               if 
(ObjectHelper.isNotEmpty(getEndpoint().getConfiguration().getMessageGroupIdStrategy()))
 {
+                MessageGroupIdStrategy messageGroupIdStrategy = 
getEndpoint().getConfiguration().getMessageGroupIdStrategy();
+                String messageGroupId = 
messageGroupIdStrategy.getMessageGroupId(exchange);
+                request.messageGroupId(messageGroupId);
+               }
+
+               if 
(ObjectHelper.isNotEmpty(getEndpoint().getConfiguration().getMessageDeduplicationIdStrategy()))
 {
+                MessageDeduplicationIdStrategy messageDeduplicationIdStrategy
                     = 
getEndpoint().getConfiguration().getMessageDeduplicationIdStrategy();
-            String messageDeduplicationId = 
messageDeduplicationIdStrategy.getMessageDeduplicationId(exchange);
-            request.messageDeduplicationId(messageDeduplicationId);
+                String messageDeduplicationId = 
messageDeduplicationIdStrategy.getMessageDeduplicationId(exchange);
+                request.messageDeduplicationId(messageDeduplicationId);
+               }
 
         }
     }