Remove SQS batch configuration support and simplify ReceiveMessageRequest handling.

Author: khc41

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

@@ -18,10 +18,8 @@
 import io.awspring.cloud.autoconfigure.AwsClientProperties;
 import io.awspring.cloud.sqs.listener.QueueNotFoundStrategy;
 import java.time.Duration;
-import java.util.List;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.lang.Nullable;
-import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
 
 /**
  * Properties related to AWS SQS.
@@ -40,8 +38,6 @@ public class SqsProperties extends AwsClientProperties {
 
 	private Listener listener = new Listener();
 
-	private Batch batch = new Batch();
-
 	public Listener getListener() {
 		return this.listener;
 	}
@@ -50,14 +46,6 @@ public void setListener(Listener listener) {
 		this.listener = listener;
 	}
 
-	public Batch getBatch() {
-		return batch;
-	}
-
-	public void setBatch(Batch batch) {
-		this.batch = batch;
-	}
-
 	@Nullable
 	private QueueNotFoundStrategy queueNotFoundStrategy;
 
@@ -165,155 +153,6 @@ public Boolean getAutoStartup() {
 		public void setAutoStartup(Boolean autoStartup) {
 			this.autoStartup = autoStartup;
 		}
-
-	}
-
-	/**
-	 * Configuration properties for SQS automatic batching using AWS SDK's {@code SqsAsyncBatchManager}.
-	 * 
-	 * <p>
-	 * Automatic batching improves performance and reduces costs by combining multiple SQS requests into fewer AWS API
-	 * calls. When enabled, Spring Cloud AWS will use a {@code BatchingSqsClientAdapter} that wraps the standard
-	 * {@code SqsAsyncClient} with batching capabilities.
-	 * 
-	 * <p>
-	 * <strong>Important:</strong> Batched operations are processed asynchronously, which may result in false positives
-	 * where method calls appear to succeed locally but fail during actual transmission to AWS. Applications should
-	 * handle the returned {@code CompletableFuture} objects to detect actual transmission errors.
-	 * 
-	 * @since 3.2
-	 */
-	public static class Batch {
-
-		/**
-		 * Enables SQS automatic batching using AWS SDK's SqsAsyncBatchManager.
-		 * 
-		 * <p>
-		 * When set to {@code true}, the {@code SqsAsyncClient} bean will be wrapped with a
-		 * {@code BatchingSqsClientAdapter} that automatically batches requests to improve performance and reduce AWS
-		 * API calls.
-		 * 
-		 * <p>
-		 * Default is {@code false}.
-		 */
-		private boolean enabled = false;
-
-		/**
-		 * The maximum number of messages that can be processed in a single batch. The maximum is 10.
-		 */
-		@Nullable
-		private Integer maxNumberOfMessages;
-
-		/**
-		 * The frequency at which requests are sent to SQS when processing messages in a batch.
-		 */
-		@Nullable
-		private Duration sendBatchFrequency;
-
-		/**
-		 * The visibility timeout to set for messages received in a batch. If unset, the queue default is used.
-		 */
-		@Nullable
-		private Duration visibilityTimeout;
-
-		/**
-		 * The minimum wait duration for a receiveMessage request in a batch. To avoid unnecessary CPU usage, do not set
-		 * this value to 0.
-		 */
-		@Nullable
-		private Duration waitTimeSeconds;
-
-		/**
-		 * The list of system attribute names to request for receiveMessage calls.
-		 */
-		@Nullable
-		private List<MessageSystemAttributeName> systemAttributeNames;
-
-		/**
-		 * The list of attribute names to request for receiveMessage calls.
-		 */
-		@Nullable
-		private List<String> attributeNames;
-
-		/**
-		 * The size of the scheduled thread pool used for batching operations. This thread pool handles periodic batch
-		 * sending and other scheduled tasks.
-		 * 
-		 * <p>
-		 * Default is {@code 5}.
-		 */
-		private int scheduledExecutorPoolSize = 5;
-
-		public boolean isEnabled() {
-			return enabled;
-		}
-
-		public void setEnabled(boolean enabled) {
-			this.enabled = enabled;
-		}
-
-		@Nullable
-		public Integer getMaxNumberOfMessages() {
-			return maxNumberOfMessages;
-		}
-
-		public void setMaxNumberOfMessages(Integer maxNumberOfMessages) {
-			this.maxNumberOfMessages = maxNumberOfMessages;
-		}
-
-		@Nullable
-		public Duration getSendBatchFrequency() {
-			return sendBatchFrequency;
-		}
-
-		public void setSendBatchFrequency(Duration sendBatchFrequency) {
-			this.sendBatchFrequency = sendBatchFrequency;
-		}
-
-		@Nullable
-		public Duration getVisibilityTimeout() {
-			return visibilityTimeout;
-		}
-
-		public void setVisibilityTimeout(Duration visibilityTimeout) {
-			this.visibilityTimeout = visibilityTimeout;
-		}
-
-		@Nullable
-		public Duration getWaitTimeSeconds() {
-			return waitTimeSeconds;
-		}
-
-		public void setWaitTimeSeconds(Duration waitTimeSeconds) {
-			this.waitTimeSeconds = waitTimeSeconds;
-		}
-
-		@Nullable
-		public List<MessageSystemAttributeName> getSystemAttributeNames() {
-			return systemAttributeNames;
-		}
-
-		public void setSystemAttributeNames(List<MessageSystemAttributeName> systemAttributeNames) {
-			this.systemAttributeNames = systemAttributeNames;
-		}
-
-		@Nullable
-		public List<String> getAttributeNames() {
-			return attributeNames;
-		}
-
-		public void setAttributeNames(List<String> attributeNames) {
-			this.attributeNames = attributeNames;
-		}
-
-		public int getScheduledExecutorPoolSize() {
-			return scheduledExecutorPoolSize;
-		}
-
-		public void setScheduledExecutorPoolSize(int scheduledExecutorPoolSize) {
-			this.scheduledExecutorPoolSize = scheduledExecutorPoolSize;
-		}
-
 	}
 
 }

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

@@ -33,7 +33,6 @@
 import io.awspring.cloud.sqs.listener.QueueNotFoundStrategy;
 import io.awspring.cloud.sqs.listener.errorhandler.AsyncErrorHandler;
 import io.awspring.cloud.sqs.listener.interceptor.AsyncMessageInterceptor;
-import io.awspring.cloud.sqs.operations.BatchingSqsClientAdapter;
 import io.awspring.cloud.sqs.operations.SqsTemplate;
 import io.awspring.cloud.sqs.support.converter.MessagingMessageConverter;
 import io.awspring.cloud.sqs.support.converter.SqsMessagingMessageConverter;
@@ -61,7 +60,6 @@
  *
  * @author Tomaz Fernandes
  * @author Wei Jiang
- * @author Heechul Kang
  */
 class SqsAutoConfigurationTest {
 
@@ -305,166 +303,6 @@ void configuresMessageConverter() {
 				});
 	}
 
-	@Test
-	void sqsBatchAutoConfigurationIsDisabledByDefault() {
-		this.contextRunner.run(context -> {
-			assertThat(context).hasSingleBean(SqsAsyncClient.class);
-			SqsAsyncClient client = context.getBean(SqsAsyncClient.class);
-			assertThat(client).isNotInstanceOf(BatchingSqsClientAdapter.class);
-		});
-	}
-
-	@Test
-	void sqsBatchAutoConfigurationIsEnabled() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true").run(context -> {
-			assertThat(context.getBeansOfType(SqsAsyncClient.class)).hasSize(2);
-
-			SqsAsyncClient primary = context.getBean(SqsAsyncClient.class);
-			assertThat(primary).isInstanceOf(BatchingSqsClientAdapter.class);
-
-			assertThat(context).hasBean("sqsAsyncClient");
-			assertThat(context).hasBean("batchSqsAsyncClient");
-		});
-	}
-
-	@Test
-	void sqsBatchConfigurationProperties() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true",
-				"spring.cloud.aws.sqs.batch.max-number-of-messages:5",
-				"spring.cloud.aws.sqs.batch.send-batch-frequency:PT0.5S").run(context -> {
-					SqsAsyncClient client = context.getBean(SqsAsyncClient.class);
-					assertThat(client).isInstanceOf(BatchingSqsClientAdapter.class);
-				});
-	}
-
-	@Test
-	void sqsBatchConfigurationPropertiesWithAllSettings() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true",
-				"spring.cloud.aws.sqs.batch.max-number-of-messages:8",
-				"spring.cloud.aws.sqs.batch.send-batch-frequency:PT1S",
-				"spring.cloud.aws.sqs.batch.visibility-timeout:PT30S",
-				"spring.cloud.aws.sqs.batch.wait-time-seconds:PT5S",
-				"spring.cloud.aws.sqs.batch.system-attribute-names:SentTimestamp,ApproximateReceiveCount",
-				"spring.cloud.aws.sqs.batch.attribute-names:attr1,attr2").run(context -> {
-					assertThat(context).hasSingleBean(SqsProperties.class);
-					SqsProperties sqsProperties = context.getBean(SqsProperties.class);
-					SqsProperties.Batch batchConfig = sqsProperties.getBatch();
-
-					assertThat(batchConfig.isEnabled()).isTrue();
-					assertThat(batchConfig.getMaxNumberOfMessages()).isEqualTo(8);
-					assertThat(batchConfig.getSendBatchFrequency()).isEqualTo(Duration.ofSeconds(1));
-					assertThat(batchConfig.getVisibilityTimeout()).isEqualTo(Duration.ofSeconds(30));
-					assertThat(batchConfig.getWaitTimeSeconds()).isEqualTo(Duration.ofSeconds(5));
-					assertThat(batchConfig.getSystemAttributeNames()).containsExactly(
-							software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName.SENT_TIMESTAMP,
-							software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName.APPROXIMATE_RECEIVE_COUNT);
-					assertThat(batchConfig.getAttributeNames()).containsExactly("attr1", "attr2");
-
-					SqsAsyncClient client = context.getBean(SqsAsyncClient.class);
-					assertThat(client).isInstanceOf(BatchingSqsClientAdapter.class);
-				});
-	}
-
-	@Test
-	void sqsBatchConfigurationPropertiesWithDefaults() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:false").run(context -> {
-			assertThat(context).hasSingleBean(SqsProperties.class);
-			SqsProperties sqsProperties = context.getBean(SqsProperties.class);
-			SqsProperties.Batch batchConfig = sqsProperties.getBatch();
-
-			assertThat(batchConfig.isEnabled()).isFalse();
-			assertThat(batchConfig.getMaxNumberOfMessages()).isNull();
-			assertThat(batchConfig.getSendBatchFrequency()).isNull();
-			assertThat(batchConfig.getVisibilityTimeout()).isNull();
-			assertThat(batchConfig.getWaitTimeSeconds()).isNull();
-			assertThat(batchConfig.getSystemAttributeNames()).isNull();
-			assertThat(batchConfig.getAttributeNames()).isNull();
-			assertThat(batchConfig.getScheduledExecutorPoolSize()).isEqualTo(5);
-
-			assertThat(context).hasSingleBean(SqsAsyncClient.class);
-			SqsAsyncClient client = context.getBean(SqsAsyncClient.class);
-			assertThat(client).isNotInstanceOf(BatchingSqsClientAdapter.class);
-		});
-	}
-
-	@Test
-	void sqsBatchConfigurationWithVisibilityTimeout() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true",
-				"spring.cloud.aws.sqs.batch.visibility-timeout:PT60S").run(context -> {
-					assertThat(context).hasSingleBean(SqsProperties.class);
-					SqsProperties sqsProperties = context.getBean(SqsProperties.class);
-					SqsProperties.Batch batchConfig = sqsProperties.getBatch();
-
-					assertThat(batchConfig.isEnabled()).isTrue();
-					assertThat(batchConfig.getVisibilityTimeout()).isEqualTo(Duration.ofSeconds(60));
-				});
-	}
-
-	@Test
-	void sqsBatchConfigurationWithWaitTimeSeconds() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true",
-				"spring.cloud.aws.sqs.batch.wait-time-seconds:PT20S").run(context -> {
-					assertThat(context).hasSingleBean(SqsProperties.class);
-					SqsProperties sqsProperties = context.getBean(SqsProperties.class);
-					SqsProperties.Batch batchConfig = sqsProperties.getBatch();
-
-					assertThat(batchConfig.isEnabled()).isTrue();
-					assertThat(batchConfig.getWaitTimeSeconds()).isEqualTo(Duration.ofSeconds(20));
-				});
-	}
-
-	@Test
-	void sqsBatchConfigurationWithAttributeNames() {
-		this.contextRunner
-				.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true",
-						"spring.cloud.aws.sqs.batch.attribute-names:MessageGroupId,MessageDeduplicationId")
-				.run(context -> {
-					assertThat(context).hasSingleBean(SqsProperties.class);
-					SqsProperties sqsProperties = context.getBean(SqsProperties.class);
-					SqsProperties.Batch batchConfig = sqsProperties.getBatch();
-
-					assertThat(batchConfig.isEnabled()).isTrue();
-					assertThat(batchConfig.getAttributeNames()).containsExactly("MessageGroupId",
-							"MessageDeduplicationId");
-				});
-	}
-
-	@Test
-	void sqsBatchConfigurationWithDefaultScheduledExecutorPoolSize() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true").run(context -> {
-			assertThat(context).hasSingleBean(SqsProperties.class);
-			SqsProperties sqsProperties = context.getBean(SqsProperties.class);
-			SqsProperties.Batch batchConfig = sqsProperties.getBatch();
-
-			assertThat(batchConfig.isEnabled()).isTrue();
-			assertThat(batchConfig.getScheduledExecutorPoolSize()).isEqualTo(5);
-
-			assertThat(context).hasBean("sqsBatchingScheduledExecutor");
-		});
-	}
-
-	@Test
-	void sqsBatchConfigurationWithCustomScheduledExecutorPoolSize() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:true",
-				"spring.cloud.aws.sqs.batch.scheduled-executor-pool-size:10").run(context -> {
-					assertThat(context).hasSingleBean(SqsProperties.class);
-					SqsProperties sqsProperties = context.getBean(SqsProperties.class);
-					SqsProperties.Batch batchConfig = sqsProperties.getBatch();
-
-					assertThat(batchConfig.isEnabled()).isTrue();
-					assertThat(batchConfig.getScheduledExecutorPoolSize()).isEqualTo(10);
-
-					assertThat(context).hasBean("sqsBatchingScheduledExecutor");
-				});
-	}
-
-	@Test
-	void sqsBatchConfigurationWithBatchDisabledDoesNotCreateScheduledExecutor() {
-		this.contextRunner.withPropertyValues("spring.cloud.aws.sqs.batch.enabled:false").run(context -> {
-			assertThat(context).doesNotHaveBean("sqsBatchingScheduledExecutor");
-		});
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	static class CustomComponentsConfiguration {