From 31a4dc67f4261bc6c02afe5877cba0c9f9a84cd0 Mon Sep 17 00:00:00 2001
From: abilan <abilan@vmware.com>
Date: Mon, 5 Jun 2023 11:59:55 -0400
Subject: [PATCH] GH-224: Fix `SnsBodyBuilder` usage in the Doc

Fixes https://github.com/spring-projects/spring-integration-aws/issues/224

* Fix `SnsMessageBuilder` -> `SnsBodyBuilder` in the `SnsMessageHandler.onInit()` comment
for SpEL import registration
* Upgrade to Localstack `2.1.0`
* Rename `SnsMessageBuilderTests` -> `SnsBodyBuilderTests` for consistency of its purpose
---
 README.md                                                   | 2 +-
 .../integration/aws/outbound/SnsMessageHandler.java         | 2 +-
 .../integration/aws/LocalstackContainerTest.java            | 2 +-
 ...SnsMessageBuilderTests.java => SnsBodyBuilderTests.java} | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename src/test/java/org/springframework/integration/aws/outbound/{SnsMessageBuilderTests.java => SnsBodyBuilderTests.java} (93%)

diff --git a/README.md b/README.md
index 74ac3b7..b0e7c20 100644
--- a/README.md
+++ b/README.md
@@ -333,7 +333,7 @@ The Java Config looks like:
 public MessageHandler snsMessageHandler() {
     SnsMessageHandler handler = new SnsMessageHandler(amazonSns());
     adapter.setTopicArn("arn:aws:sns:eu-west:123456789012:test");
-    String bodyExpression = "SnsBodyBuilder.withDefault(payload).forProtocols(payload.substring(0, 140), 'sms')";
+    String bodyExpression = "T(SnsBodyBuilder).withDefault(payload).forProtocols(payload.substring(0, 140), 'sms')";
     handler.setBodyExpression(spelExpressionParser.parseExpression(bodyExpression));
 
     // message-group ID and deduplication ID are used for FIFO topics
diff --git a/src/main/java/org/springframework/integration/aws/outbound/SnsMessageHandler.java b/src/main/java/org/springframework/integration/aws/outbound/SnsMessageHandler.java
index efaa617..0a3b005 100644
--- a/src/main/java/org/springframework/integration/aws/outbound/SnsMessageHandler.java
+++ b/src/main/java/org/springframework/integration/aws/outbound/SnsMessageHandler.java
@@ -192,7 +192,7 @@ public class SnsMessageHandler extends AbstractAwsMessageHandler<Map<String, Mes
 		if (typeLocator instanceof StandardTypeLocator) {
 			/*
 			 * Register the 'org.springframework.integration.aws.support' package you
-			 * don't need a FQCN for the 'SnsMessageBuilder'.
+			 * don't need a FQCN for the 'SnsBodyBuilder'.
 			 */
 			((StandardTypeLocator) typeLocator).registerImport("org.springframework.integration.aws.support");
 		}
diff --git a/src/test/java/org/springframework/integration/aws/LocalstackContainerTest.java b/src/test/java/org/springframework/integration/aws/LocalstackContainerTest.java
index 534fea2..2189b8b 100644
--- a/src/test/java/org/springframework/integration/aws/LocalstackContainerTest.java
+++ b/src/test/java/org/springframework/integration/aws/LocalstackContainerTest.java
@@ -48,7 +48,7 @@ import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 public interface LocalstackContainerTest {
 
 	LocalStackContainer LOCAL_STACK_CONTAINER =
-			new LocalStackContainer(DockerImageName.parse("localstack/localstack:2.0.0"));
+			new LocalStackContainer(DockerImageName.parse("localstack/localstack:2.1.0"));
 
 	@BeforeAll
 	static void startContainer() {
diff --git a/src/test/java/org/springframework/integration/aws/outbound/SnsMessageBuilderTests.java b/src/test/java/org/springframework/integration/aws/outbound/SnsBodyBuilderTests.java
similarity index 93%
rename from src/test/java/org/springframework/integration/aws/outbound/SnsMessageBuilderTests.java
rename to src/test/java/org/springframework/integration/aws/outbound/SnsBodyBuilderTests.java
index f14ac22..383f87a 100644
--- a/src/test/java/org/springframework/integration/aws/outbound/SnsMessageBuilderTests.java
+++ b/src/test/java/org/springframework/integration/aws/outbound/SnsBodyBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 the original author or authors.
+ * Copyright 2016-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 /**
  * @author Artem Bilan
  */
-class SnsMessageBuilderTests {
+class SnsBodyBuilderTests {
 
 	@Test
-	void testSnsMessageBuilder() {
+	void testSnsBodyBuilder() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> SnsBodyBuilder.withDefault(""))
 				.withMessageContaining("defaultMessage must not be empty.");