Address review comments

Author: loicrouchon

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

@@ -48,8 +48,6 @@ public abstract class AbstractContainerOptions<O extends ContainerOptions<O, B>,
 
 	private final Duration maxDelayBetweenPolls;
 
-	private final Duration standbyLimitPollingInterval;
-
 	private final Duration listenerShutdownTimeout;
 
 	private final Duration acknowledgementShutdownTimeout;
@@ -85,7 +83,6 @@ protected AbstractContainerOptions(Builder<?, ?> builder) {
 		this.autoStartup = builder.autoStartup;
 		this.pollTimeout = builder.pollTimeout;
 		this.pollBackOffPolicy = builder.pollBackOffPolicy;
-		this.standbyLimitPollingInterval = builder.standbyLimitPollingInterval;
 		this.maxDelayBetweenPolls = builder.maxDelayBetweenPolls;
 		this.listenerShutdownTimeout = builder.listenerShutdownTimeout;
 		this.acknowledgementShutdownTimeout = builder.acknowledgementShutdownTimeout;
@@ -129,11 +126,6 @@ public BackOffPolicy getPollBackOffPolicy() {
 		return this.pollBackOffPolicy;
 	}
 
-	@Override
-	public Duration getStandbyLimitPollingInterval() {
-		return this.standbyLimitPollingInterval;
-	}
-
 	@Override
 	public Duration getMaxDelayBetweenPolls() {
 		return this.maxDelayBetweenPolls;
@@ -223,8 +215,6 @@ protected abstract static class Builder<B extends ContainerOptionsBuilder<B, O>,
 
 		private static final BackOffPolicy DEFAULT_POLL_BACK_OFF_POLICY = buildDefaultBackOffPolicy();
 
-		private static final Duration DEFAULT_STANDBY_LIMIT_POLLING_INTERVAL = Duration.ofMillis(100);
-
 		private static final Duration DEFAULT_SEMAPHORE_TIMEOUT = Duration.ofSeconds(10);
 
 		private static final Duration DEFAULT_LISTENER_SHUTDOWN_TIMEOUT = Duration.ofSeconds(20);
@@ -251,8 +241,6 @@ protected abstract static class Builder<B extends ContainerOptionsBuilder<B, O>,
 
 		private BackOffPolicy pollBackOffPolicy = DEFAULT_POLL_BACK_OFF_POLICY;
 
-		private Duration standbyLimitPollingInterval = DEFAULT_STANDBY_LIMIT_POLLING_INTERVAL;
-
 		private Duration maxDelayBetweenPolls = DEFAULT_SEMAPHORE_TIMEOUT;
 
 		private BackPressureMode backPressureMode = DEFAULT_THROUGHPUT_CONFIGURATION;
@@ -341,13 +329,6 @@ public B pollBackOffPolicy(BackOffPolicy pollBackOffPolicy) {
 			return self();
 		}
 
-		@Override
-		public B standbyLimitPollingInterval(Duration standbyLimitPollingInterval) {
-			Assert.notNull(standbyLimitPollingInterval, "standbyLimitPollingInterval cannot be null");
-			this.standbyLimitPollingInterval = standbyLimitPollingInterval;
-			return self();
-		}
-
 		@Override
 		public B maxDelayBetweenPolls(Duration maxDelayBetweenPolls) {
 			Assert.notNull(maxDelayBetweenPolls, "semaphoreAcquireTimeout cannot be null");

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

@@ -43,20 +43,20 @@ public class ConcurrencyLimiterBlockingBackPressureHandler
 
 	private final Duration acquireTimeout;
 
-	private final boolean alwaysPollMasMessages;
+	private final boolean alwaysPollMaxMessages;
 
 	private String id = getClass().getSimpleName();
 
 	private ConcurrencyLimiterBlockingBackPressureHandler(Builder builder) {
 		this.batchSize = builder.batchSize;
 		this.totalPermits = builder.totalPermits;
 		this.acquireTimeout = builder.acquireTimeout;
-		this.alwaysPollMasMessages = BackPressureMode.ALWAYS_POLL_MAX_MESSAGES.equals(builder.backPressureMode);
+		this.alwaysPollMaxMessages = BackPressureMode.ALWAYS_POLL_MAX_MESSAGES.equals(builder.backPressureMode);
 		this.semaphore = new Semaphore(totalPermits);
 		logger.debug(
 				"ConcurrencyLimiterBlockingBackPressureHandler created with configuration "
-						+ "totalPermits: {}, batchSize: {}, acquireTimeout: {}, an alwaysPollMasMessages: {}",
-				this.totalPermits, this.batchSize, this.acquireTimeout, this.alwaysPollMasMessages);
+						+ "totalPermits: {}, batchSize: {}, acquireTimeout: {}, an alwaysPollMaxMessages: {}",
+				this.totalPermits, this.batchSize, this.acquireTimeout, this.alwaysPollMaxMessages);
 	}
 
 	public static Builder builder() {
@@ -81,7 +81,7 @@ public int requestBatch() throws InterruptedException {
 	@Override
 	public int request(int amount) throws InterruptedException {
 		int acquiredPermits = tryAcquire(amount, this.acquireTimeout);
-		if (alwaysPollMasMessages || acquiredPermits > 0) {
+		if (alwaysPollMaxMessages || acquiredPermits > 0) {
 			return acquiredPermits;
 		}
 		int availablePermits = Math.min(this.semaphore.availablePermits(), amount);

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

@@ -59,12 +59,6 @@ public interface ContainerOptions<O extends ContainerOptions<O, B>, B extends Co
 	 */
 	boolean isAutoStartup();
 
-	/**
-	 * {@return the amount of time to wait before checking again for the current limit when the queue processing is on
-	 * standby} Default is 100 milliseconds.
-	 */
-	Duration getStandbyLimitPollingInterval();
-
 	/**
 	 * Sets the maximum time the polling thread should wait for a full batch of permits to be available before trying to
 	 * acquire a partial batch if so configured. A poll is only actually executed if at least one permit is available.

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

@@ -57,15 +57,6 @@ public interface ContainerOptionsBuilder<B extends ContainerOptionsBuilder<B, O>
 	 */
 	B autoStartup(boolean autoStartup);
 
-	/**
-	 * Sets the amount of time to wait before checking again for the current limit when the queue processing is on
-	 * standby.
-	 *
-	 * @param standbyLimitPollingInterval the limit polling interval when the queue processing is on standby.
-	 * @return this instance.
-	 */
-	B standbyLimitPollingInterval(Duration standbyLimitPollingInterval);
-
 	/**
 	 * Set the maximum time the polling thread should wait for a full batch of permits to be available before trying to
 	 * acquire a partial batch if so configured. A poll is only actually executed if at least one permit is available.

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

@@ -17,7 +17,6 @@
 
 import io.awspring.cloud.sqs.listener.source.PollingMessageSource;
 import java.time.Duration;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -146,7 +145,7 @@ public Builder batchSize(int batchSize) {
 		}
 
 		public ThroughputBackPressureHandler build() {
-			Assert.noNullElements(List.of(this.batchSize), "Missing configuration");
+			Assert.notNull(this.batchSize, "Missing configuration");
 			Assert.isTrue(this.batchSize > 0, "batch size must be greater than 0");
 			return new ThroughputBackPressureHandler(this);
 		}