From 95d30053da359640eacdc68c8383ef2fa8f99420 Mon Sep 17 00:00:00 2001
From: Anna Smirnova <132938234+smirnovaae@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:11:52 -0800
Subject: [PATCH] Ab2d/spring boot events exception (#424)

* Added message converter to SqsMessageListenerContainerFactory
---
 .../gov/cms/ab2d/eventclient/clients/SQSConfig.java | 13 +++++++++++--
 build.gradle                                        |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/clients/SQSConfig.java b/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/clients/SQSConfig.java
index 766beed..089b9ba 100644
--- a/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/clients/SQSConfig.java
+++ b/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/clients/SQSConfig.java
@@ -11,6 +11,7 @@
 import gov.cms.ab2d.eventclient.config.Ab2dEnvironment;
 import io.awspring.cloud.sqs.config.SqsBootstrapConfiguration;
 import io.awspring.cloud.sqs.config.SqsMessageListenerContainerFactory;
+import io.awspring.cloud.sqs.support.converter.SqsMessagingMessageConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -54,10 +55,12 @@ public SQSConfig(@Value("${cloud.aws.region.static}") String region,
     }
 
     @Bean
-    public SqsMessageListenerContainerFactory<Object> defaultSqsListenerContainerFactory() {
+    public SqsMessageListenerContainerFactory<Object> defaultSqsListenerContainerFactory(SqsAsyncClient sqsAsyncClient) {
         return SqsMessageListenerContainerFactory
                 .builder()
-                .sqsAsyncClient(amazonSQSAsync())
+                .configure(options -> options
+                        .messageConverter(sqsMessagingMessageConverter()))
+                .sqsAsyncClient(sqsAsyncClient)
                 .build();
     }
 
@@ -105,6 +108,12 @@ protected MessageConverter messageConverter() {
         return jacksonMessageConverter;
     }
 
+    private SqsMessagingMessageConverter sqsMessagingMessageConverter() {
+        SqsMessagingMessageConverter converter = new SqsMessagingMessageConverter();
+        converter.setPayloadMessageConverter(messageConverter());
+        return converter;
+    }
+
     public SqsAsyncClient createQueue(SqsAsyncClient sqsClient) {
         try {
             CreateQueueRequest createQueueRequest = CreateQueueRequest.builder()
diff --git a/build.gradle b/build.gradle
index 60a64e9..a7f5cd7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,10 @@ ext {
 
     // AB2D libraries
     fhirVersion='2.1.0'
-    bfdVersion='2.6.0'
+    bfdVersion='3.2.0'
     aggregatorVersion='2.0.1'
     filtersVersion='2.1.0'
-    eventClientVersion='3.2.1'
+    eventClientVersion='3.2.2'
     propertiesClientVersion='2.0.0'
     contractClientVersion='2.0.0'
     snsClientVersion='1.0.0'