Add autoconfiguration for maxDelayBetweenPolls (#1365)

* SQS: Add autoconfiguration for maxDelayBetweenPolls (#1354)

- Added configuration property to SqsProperties
- Added mapping for SqsContainerOptions.maxDelayBetweenPolls in SqsAutoConfiguration for configuring properties in SqsMessageListenerContainerFactory
- Included the test for new property in SqsAutoConfigurationTest
- Added docs for the new property max-delay-between-polls

Closes #1354

* SQS: Add test assertion for default maxDelayBetweenPolls

Author: krutip7

docs/src/main/asciidoc/_configprops.adoc

@@ -95,7 +95,8 @@
 |spring.cloud.aws.sqs.listener.max-concurrent-messages |  | The maximum concurrent messages that can be processed simultaneously for each queue. Note that if acknowledgement batching is being used, the actual maximum number of messages inflight might be higher.
 |spring.cloud.aws.sqs.listener.max-messages-per-poll |  | The maximum number of messages to be retrieved in a single poll to SQS.
 |spring.cloud.aws.sqs.listener.poll-timeout |  | The maximum amount of time for a poll to SQS.
-|spring.cloud.aws.sqs.queue-not-found-strategy |  | 
+|spring.cloud.aws.sqs.listener.max-delay-between-polls |  | The maximum amount of time to wait between consecutive polls to SQS.
+|spring.cloud.aws.sqs.queue-not-found-strategy |  |
 |spring.cloud.aws.sqs.region |  | Overrides the default region.
 
 |===

docs/src/main/asciidoc/sqs.adoc

@@ -816,6 +816,7 @@ The Spring Boot Starter for SQS provides the following auto-configuration proper
 | <<maxConcurrentMessages, `spring.cloud.aws.sqs.listener.max-inflight-messages-per-queue`>> | Maximum number of inflight messages per queue. | No | 10
 | <<maxMessagesPerPoll, `spring.cloud.aws.sqs.listener.max-messages-per-poll`>> | Maximum number of messages to be received per poll. | No | 10
 | <<pollTimeout, `spring.cloud.aws.sqs.listener.poll-timeout`>> | Maximum amount of time to wait for messages in a poll. | No | 10 seconds
+| <<maxDelayBetweenPolls, `spring.cloud.aws.sqs.listener.max-delay-between-polls`>> | Maximum amount of time to wait between polls. | No | 10 seconds
 | `spring.cloud.aws.sqs.queue-not-found-strategy`  | The strategy to be used by SqsTemplate and SqsListeners when a queue does not exist. | No | CREATE
 |===
 

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

@@ -136,6 +136,7 @@ private void configureProperties(SqsContainerOptionsBuilder options) {
 		mapper.from(this.sqsProperties.getListener().getMaxConcurrentMessages()).to(options::maxConcurrentMessages);
 		mapper.from(this.sqsProperties.getListener().getMaxMessagesPerPoll()).to(options::maxMessagesPerPoll);
 		mapper.from(this.sqsProperties.getListener().getPollTimeout()).to(options::pollTimeout);
+		mapper.from(this.sqsProperties.getListener().getMaxDelayBetweenPolls()).to(options::maxDelayBetweenPolls);
 	}
 
 	@Bean

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

@@ -87,6 +87,12 @@ public static class Listener {
 		@Nullable
 		private Duration pollTimeout;
 
+		/**
+		 * The maximum amount of time to wait between consecutive polls to SQS.
+		 */
+		@Nullable
+		private Duration maxDelayBetweenPolls;
+
 		@Nullable
 		public Integer getMaxConcurrentMessages() {
 			return this.maxConcurrentMessages;
@@ -113,6 +119,15 @@ public Duration getPollTimeout() {
 		public void setPollTimeout(Duration pollTimeout) {
 			this.pollTimeout = pollTimeout;
 		}
+
+		@Nullable
+		public Duration getMaxDelayBetweenPolls() {
+			return maxDelayBetweenPolls;
+		}
+
+		public void setMaxDelayBetweenPolls(Duration maxDelayBetweenPolls) {
+			this.maxDelayBetweenPolls = maxDelayBetweenPolls;
+		}
 	}
 
 }

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

@@ -152,7 +152,8 @@ void configuresFactoryComponentsAndOptions() {
 				.withPropertyValues("spring.cloud.aws.sqs.enabled:true",
 						"spring.cloud.aws.sqs.listener.max-concurrent-messages:19",
 						"spring.cloud.aws.sqs.listener.max-messages-per-poll:8",
-						"spring.cloud.aws.sqs.listener.poll-timeout:6s")
+						"spring.cloud.aws.sqs.listener.poll-timeout:6s",
+						"spring.cloud.aws.sqs.listener.max-delay-between-polls:15s")
 				.withUserConfiguration(CustomComponentsConfiguration.class, ObjectMapperConfiguration.class).run(context -> {
 					assertThat(context).hasSingleBean(SqsMessageListenerContainerFactory.class);
 					SqsMessageListenerContainerFactory<?> factory = context
@@ -168,6 +169,7 @@ void configuresFactoryComponentsAndOptions() {
 						assertThat(options.getMaxConcurrentMessages()).isEqualTo(19);
 						assertThat(options.getMaxMessagesPerPoll()).isEqualTo(8);
 						assertThat(options.getPollTimeout()).isEqualTo(Duration.ofSeconds(6));
+						assertThat(options.getMaxDelayBetweenPolls()).isEqualTo(Duration.ofSeconds(15));
 					})
 					.extracting("messageConverter")
 					.asInstanceOf(type(SqsMessagingMessageConverter.class))
@@ -195,6 +197,7 @@ void configuresFactoryComponentsAndOptionsWithDefaults() {
 					assertThat(options.getMaxConcurrentMessages()).isEqualTo(10);
 					assertThat(options.getMaxMessagesPerPoll()).isEqualTo(10);
 					assertThat(options.getPollTimeout()).isEqualTo(Duration.ofSeconds(10));
+					assertThat(options.getMaxDelayBetweenPolls()).isEqualTo(Duration.ofSeconds(10));
 				})
 				.extracting("messageConverter")
 				.asInstanceOf(type(SqsMessagingMessageConverter.class))