feat: optimize message request creation in SqsTemplate for batching support

Author: khc41

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

@@ -605,8 +605,7 @@ private CompletableFuture<ReceiveMessageRequest> createReceiveMessageRequest(Str
 	private ReceiveMessageRequest doCreateReceiveMessageRequest(Duration pollTimeout, Integer maxNumberOfMessages,
 			QueueAttributes attributes, Map<String, Object> additionalHeaders) {
 		ReceiveMessageRequest.Builder builder = ReceiveMessageRequest.builder().queueUrl(attributes.getQueueUrl())
-				.maxNumberOfMessages(maxNumberOfMessages).messageAttributeNames(this.messageAttributeNames)
-				.attributeNamesWithStrings(this.messageSystemAttributeNames)
+				.maxNumberOfMessages(maxNumberOfMessages)
 				.waitTimeSeconds(toInt(pollTimeout.toSeconds()));
 		if (additionalHeaders.containsKey(SqsHeaders.SQS_VISIBILITY_TIMEOUT_HEADER)) {
 			builder.visibilityTimeout(
@@ -618,6 +617,10 @@ private ReceiveMessageRequest doCreateReceiveMessageRequest(Duration pollTimeout
 					getValueAs(additionalHeaders, SqsHeaders.SQS_RECEIVE_REQUEST_ATTEMPT_ID_HEADER, UUID.class)
 							.toString());
 		}
+        if (!(this.sqsAsyncClient instanceof BatchingSqsClientAdapter)) {
+            builder.messageAttributeNames(this.messageAttributeNames)
+                .attributeNamesWithStrings(this.messageSystemAttributeNames);
+        }
 		return builder.build();
 	}