Skip to content

Commit 4cfa70e

Browse files
committed
fix: skip setting message attributes when using BatchingSqsClientAdapter
1 parent aec877a commit 4cfa70e

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import java.util.concurrent.CompletableFuture;
3434
import java.util.stream.Collectors;
3535
import java.util.stream.IntStream;
36+
37+
import io.awspring.cloud.sqs.operations.BatchingSqsClientAdapter;
3638
import org.slf4j.Logger;
3739
import org.slf4j.LoggerFactory;
3840
import org.springframework.lang.Nullable;
@@ -61,6 +63,7 @@
6163
* @param <T> the {@link Message} payload type.
6264
*
6365
* @author Tomaz Fernandes
66+
* @author Heechul Kang
6467
* @since 3.0
6568
*/
6669
public abstract class AbstractSqsMessageSource<T> extends AbstractPollingMessageSource<T, Message>
@@ -177,13 +180,15 @@ private ReceiveMessageRequest createRequest(int maxNumberOfMessages) {
177180
.builder()
178181
.queueUrl(this.queueUrl)
179182
.maxNumberOfMessages(maxNumberOfMessages)
180-
.attributeNamesWithStrings(this.messageSystemAttributeNames)
181-
.messageAttributeNames(this.messageAttributeNames)
182183
.waitTimeSeconds(this.pollTimeout);
183184
customizeRequest(builder);
184185
if (this.messageVisibility >= 0) {
185186
builder.visibilityTimeout(this.messageVisibility);
186187
}
188+
if (!(this.sqsAsyncClient instanceof BatchingSqsClientAdapter)) {
189+
builder.messageAttributeNames(this.messageAttributeNames)
190+
.attributeNamesWithStrings(this.messageSystemAttributeNames);
191+
}
187192
return builder.build();
188193
}
189194
// @formatter:on

0 commit comments

Comments
 (0)