Merge pull request #146 from hgosansn/master

[sc90134] [SNS] Fix for SNS topic message
agorapulse · Feb 3, 2023 · 387d276 · 387d276
2 parents af5ad8d + cb57d55
commit 387d276
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 21 deletions.
diff --git a/.../main/java/com/agorapulse/micronaut/amazon/awssdk/sns/NotificationClientIntroduction.java b/.../main/java/com/agorapulse/micronaut/amazon/awssdk/sns/NotificationClientIntroduction.java
@@ -207,9 +207,11 @@ private PublishingArguments findArguments(Argument[] arguments) {
             }
             if (argument.getName().equalsIgnoreCase(MESSAGE_GROUP_ID) || argument.isAnnotationPresent(MessageGroupId.class)) {
                 names.messageGroupId = argument;
+                continue;
             }
             if (argument.getName().equalsIgnoreCase(MESSAGE_DEDUPLICATION_ID) || argument.isAnnotationPresent(MessageDeduplicationId.class)) {
                 names.messageDeduplicationId = argument;
+                continue;
             }
             names.message = argument;
         }

diff --git a/...-awssdk-sns/src/test/groovy/com/agorapulse/micronaut/amazon/awssdk/sns/DefaultClient.java b/...-awssdk-sns/src/test/groovy/com/agorapulse/micronaut/amazon/awssdk/sns/DefaultClient.java
@@ -24,22 +24,22 @@
 
 import java.util.Map;
 
-@NotificationClient // <1>
+@NotificationClient                                                                             // <1>
 interface DefaultClient {
 
     String OTHER_TOPIC = "OtherTopic";
 
-    @Topic("OtherTopic") String publishMessageToDifferentTopic(Pogo pogo); // <2>
+    @Topic("OtherTopic") String publishMessageToDifferentTopic(Pogo pogo);                      // <2>
 
-    String publishMessage(Pogo message); // <3>
+    String publishMessage(Pogo message);                                                        // <3>
     String publishMessage(Pogo message, @MessageGroupId String groupId, @MessageDeduplicationId String deduplicationId); // <4>
-    String publishMessage(String subject, Pogo message); // <5>
+    String publishMessage(String subject, Pogo message);                                        // <5>
     String publishMessage(String subject, Pogo message, Map<String, String> attributes);
-    String publishMessage(String message); // <6>
+    String publishMessage(String message);                                                      // <6>
     String publishMessage(String subject, String message);
     String publishMessage(String subject, String message, Map<String, String> attributes);
 
-    String sendSMS(String phoneNumber, String message); // <7>
-    String sendSms(String phoneNumber, String message, Map attributes); // <8>
+    String sendSMS(String phoneNumber, String message);                                         // <7>
+    String sendSms(String phoneNumber, String message, Map attributes);                         // <8>
 
 }
diff --git a/.../src/test/groovy/com/agorapulse/micronaut/amazon/awssdk/sns/NotificationClientSpec.groovy b/.../src/test/groovy/com/agorapulse/micronaut/amazon/awssdk/sns/NotificationClientSpec.groovy
@@ -196,11 +196,12 @@ class NotificationClientSpec extends Specification {
 
         then:
             1 * testService.publishRequest(TestFifoClient.TOPIC_NAME, EMPTY_MAP, _) >> { String topicArn,
-                Map<String, String> attributes,
-                PublishRequest.Builder publishRequestBuilder ->
-                    PublishRequest publishRequest = publishRequestBuilder.build()
+                                                                                         Map<String, String> attributes,
+                                                                                         PublishRequest.Builder publishRequestBuilder ->
+                    PublishRequest publishRequest = publishRequestBuilder.build() as PublishRequest
                     assert publishRequest.messageGroupId() == MESSAGE_GROUP_ID
                     assert publishRequest.messageDeduplicationId() == MESSAGE_DEDUPLICATION_ID
+                    assert publishRequest.message() == POGO_AS_JSON
                     return MESSAGE_ID
             }
             messageId == MESSAGE_ID

diff --git a/...-sns/src/main/groovy/com/agorapulse/micronaut/aws/sns/NotificationClientIntroduction.java b/...-sns/src/main/groovy/com/agorapulse/micronaut/aws/sns/NotificationClientIntroduction.java
@@ -211,9 +211,11 @@ private PublishingArguments findArguments(Argument[] arguments) {
             }
             if (argument.getName().equalsIgnoreCase(MESSAGE_GROUP_ID) || argument.isAnnotationPresent(MessageGroupId.class)) {
                 names.messageGroupId = argument;
+                continue;
             }
             if (argument.getName().equalsIgnoreCase(MESSAGE_DEDUPLICATION_ID) || argument.isAnnotationPresent(MessageDeduplicationId.class)) {
                 names.messageDeduplicationId = argument;
+                continue;
             }
             names.message = argument;
         }

diff --git a/...micronaut-aws-sdk-sns/src/test/groovy/com/agorapulse/micronaut/aws/sns/DefaultClient.java b/...micronaut-aws-sdk-sns/src/test/groovy/com/agorapulse/micronaut/aws/sns/DefaultClient.java
@@ -17,26 +17,29 @@
  */
 package com.agorapulse.micronaut.aws.sns;
 
+import com.agorapulse.micronaut.aws.sns.annotation.MessageDeduplicationId;
+import com.agorapulse.micronaut.aws.sns.annotation.MessageGroupId;
 import com.agorapulse.micronaut.aws.sns.annotation.NotificationClient;
 import com.agorapulse.micronaut.aws.sns.annotation.Topic;
-
 import java.util.Map;
 
-@NotificationClient                                                                     // <1>
+@NotificationClient                                                                             // <1>
 interface DefaultClient {
 
     String OTHER_TOPIC = "OtherTopic";
 
-    @Topic("OtherTopic") String publishMessageToDifferentTopic(Pogo pogo);              // <2>
+    @Topic("OtherTopic") String publishMessageToDifferentTopic(Pogo pogo);                      // <2>
 
-    String publishMessage(Pogo message);                                                // <3>
-    String publishMessage(String subject, Pogo message);                                // <4>
+    String publishMessage(Pogo message);                                                        // <3>
+    String publishMessage(Pogo message, @MessageGroupId String groupId, @MessageDeduplicationId String deduplicationId); // <4>
+    String publishMessage(String subject, Pogo message);                                        // <5>
     String publishMessage(String subject, Pogo message, Map<String, String> attributes);
-    String publishMessage(String message);                                              // <5>
+    String publishMessage(String message);                                                      // <6>
     String publishMessage(String subject, String message);
     String publishMessage(String subject, String message, Map<String, String> attributes);
 
-    String sendSMS(String phoneNumber, String message);                                 // <6>
-    String sendSms(String phoneNumber, String message, Map attributes);                 // <7>
+    String sendSMS(String phoneNumber, String message);                                         // <7>
+    String sendSms(String phoneNumber, String message, Map attributes);                         // <8>
 
 }
+
diff --git a/...ws-sdk-sns/src/test/groovy/com/agorapulse/micronaut/aws/sns/NotificationClientSpec.groovy b/...ws-sdk-sns/src/test/groovy/com/agorapulse/micronaut/aws/sns/NotificationClientSpec.groovy
@@ -170,7 +170,7 @@ class NotificationClientSpec extends Specification {
             1 * defaultService.publishMessageToTopic(StreamClient.SOME_STREAM, null, POGO_AS_JSON, EMPTY_MAP) >> MESSAGE_ID
     }
 
-    void 'can publish to fifo topic'() {
+    void 'can publish pojo to fifo topic'() {
         given:
         TestFifoClient client = context.getBean(TestFifoClient)
 
@@ -179,10 +179,11 @@ class NotificationClientSpec extends Specification {
 
         then:
         1 * testService.publishRequest(TestFifoClient.TOPIC_NAME, EMPTY_MAP, _) >> { String topicArn,
-                                                                                    Map<String, String> attributes,
-                                                                                    PublishRequest publishRequest ->
+                                                                                     Map<String, String> attributes,
+                                                                                     PublishRequest publishRequest ->
             assert publishRequest.messageGroupId == MESSAGE_GROUP_ID
             assert publishRequest.messageDeduplicationId ==  MESSAGE_DEDUPLICATION_ID
+            assert publishRequest.message == POGO_AS_JSON
             return MESSAGE_ID
         }
         messageId == MESSAGE_ID