Rename AWSMessageId to RawMessageId for consistency

Author: jm0514

spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/MessageHeaderUtils.java

@@ -153,21 +153,21 @@ public static <T> Message<T> removeHeaderIfPresent(Message<T> message, String ke
 	}
 
 	/**
-	 * Return the AWS message ID, falling back to Spring message ID if not present.
+	 * Return the raw provider message ID, falling back to Spring message ID if not present.
 	 * @param message the message.
-	 * @return the AWS ID or Spring ID.
+	 * @return the raw provider ID or Spring ID.
 	 */
-	public static String getAwsMessageId(Message<?> message) {
-		String awsMessageId = message.getHeaders().get(SqsHeaders.SQS_AWS_MESSAGE_ID_HEADER, String.class);
-		return awsMessageId != null ? awsMessageId : getId(message);
+	public static String getRawMessageId(Message<?> message) {
+		String rawMessageId = message.getHeaders().get(SqsHeaders.SQS_RAW_MESSAGE_ID_HEADER, String.class);
+		return rawMessageId != null ? rawMessageId : getId(message);
 	}
 
 	/**
-	 * Return the messages' AWS ID as a concatenated {@link String}.
+	 * Return the messages' raw provider IDs as a concatenated {@link String}.
 	 * @param messages the messages.
-	 * @return the AWS IDs.
+	 * @return the raw provider IDs.
 	 */
-	public static <T> String getAwsMessageId(Collection<Message<T>> messages) {
-		return messages.stream().map(MessageHeaderUtils::getAwsMessageId).collect(Collectors.joining("; "));
+	public static <T> String getRawMessageId(Collection<Message<T>> messages) {
+		return messages.stream().map(MessageHeaderUtils::getRawMessageId).collect(Collectors.joining("; "));
 	}
 }

spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/SqsHeaders.java

@@ -90,9 +90,9 @@ private SqsHeaders() {
 	public static final String SQS_DEFAULT_TYPE_HEADER = "JavaType";
 
 	/**
-	 * Header for the original AWS MessageId when not using UUID conversion.
+	 * Header for the raw provider message ID when not using UUID conversion.
 	 */
-	public static final String SQS_AWS_MESSAGE_ID_HEADER = SQS_HEADER_PREFIX + "AWSMessageId";
+	public static final String SQS_RAW_MESSAGE_ID_HEADER = SQS_HEADER_PREFIX + "RawMessageId";
 
 	public static class MessageSystemAttributes {
 

spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/MessageHeaderUtilsTest.java

@@ -18,13 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.awspring.cloud.sqs.listener.SqsHeaders;
+import java.util.Collection;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Tests for {@link MessageHeaderUtils}.
  *
@@ -100,52 +99,49 @@ void shouldPreserveOtherHeaders() {
 	}
 
 	@Test
-	void shouldReturnAwsMessageIdWhenHeaderPresent() {
+	void shouldReturnRawMessageIdWhenHeaderPresent() {
 		// given
-		String awsMessageId = "92898073-7bd6a160-5797b060-54a7e539";
+		String rawMessageId = "92898073-7bd6a160-5797b060-54a7e539";
 		Message<String> message = MessageBuilder.withPayload("test-payload")
-			.setHeader(SqsHeaders.SQS_AWS_MESSAGE_ID_HEADER, awsMessageId)
-			.build();
+				.setHeader(SqsHeaders.SQS_RAW_MESSAGE_ID_HEADER, rawMessageId).build();
 
 		// when
-		String result = MessageHeaderUtils.getAwsMessageId(message);
+		String result = MessageHeaderUtils.getRawMessageId(message);
 
 		// then
-		assertThat(result).isEqualTo(awsMessageId);
+		assertThat(result).isEqualTo(rawMessageId);
 	}
 
 	@Test
-	void shouldFallbackToSpringMessageIdWhenAwsHeaderNotPresent() {
+	void shouldFallbackToSpringMessageIdWhenRawHeaderNotPresent() {
 		// given
 		Message<String> message = MessageBuilder.withPayload("test-payload").build();
 		String expectedId = message.getHeaders().getId().toString();
 
 		// when
-		String result = MessageHeaderUtils.getAwsMessageId(message);
+		String result = MessageHeaderUtils.getRawMessageId(message);
 
 		// then
 		assertThat(result).isEqualTo(expectedId);
 	}
 
 	@Test
-	void shouldConcatenateAwsMessageIdsFromCollection() {
+	void shouldConcatenateRawMessageIdsFromCollection() {
 		// given
-		String awsMessageId1 = "aws-id-1";
-		String awsMessageId2 = "aws-id-2";
+		String rawMessageId1 = "raw-id-1";
+		String rawMessageId2 = "raw-id-2";
 
 		Message<String> message1 = MessageBuilder.withPayload("payload1")
-			.setHeader(SqsHeaders.SQS_AWS_MESSAGE_ID_HEADER, awsMessageId1)
-			.build();
+				.setHeader(SqsHeaders.SQS_RAW_MESSAGE_ID_HEADER, rawMessageId1).build();
 		Message<String> message2 = MessageBuilder.withPayload("payload2")
-			.setHeader(SqsHeaders.SQS_AWS_MESSAGE_ID_HEADER, awsMessageId2)
-			.build();
+				.setHeader(SqsHeaders.SQS_RAW_MESSAGE_ID_HEADER, rawMessageId2).build();
 
 		Collection<Message<String>> messages = List.of(message1, message2);
 
 		// when
-		String result = MessageHeaderUtils.getAwsMessageId(messages);
+		String result = MessageHeaderUtils.getRawMessageId(messages);
 
 		// then
-		assertThat(result).isEqualTo("aws-id-1; aws-id-2");
+		assertThat(result).isEqualTo("raw-id-1; raw-id-2");
 	}
 }