Rename BackPressureHandlerFactory methods

Author: loicrouchon

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

@@ -109,11 +109,11 @@ static BatchAwareBackPressureHandler semaphoreBackPressureHandler(ContainerOptio
 	 *     obtained.
 	 * @return the created SemaphoreBackPressureHandler.
 	 */
-	static BatchAwareBackPressureHandler concurrencyLimiterBackPressureHandler(ContainerOptions<?, ?> options,
+	static BatchAwareBackPressureHandler adaptativeThroughputBackPressureHandler(ContainerOptions<?, ?> options,
 			Duration maxIdleWaitTime) {
 		BackPressureMode backPressureMode = options.getBackPressureMode();
 
-		var concurrencyLimiterBlockingBackPressureHandler = concurrencyLimiterBackPressureHandler2(options);
+		var concurrencyLimiterBlockingBackPressureHandler = concurrencyLimiterBackPressureHandler(options);
 		if (backPressureMode == BackPressureMode.FIXED_HIGH_THROUGHPUT) {
 			return concurrencyLimiterBlockingBackPressureHandler;
 		}
@@ -156,7 +156,7 @@ static CompositeBackPressureHandler compositeBackPressureHandler(ContainerOption
 	 * @param options the container options.
 	 * @return the created ConcurrencyLimiterBlockingBackPressureHandler.
 	 */
-	static ConcurrencyLimiterBlockingBackPressureHandler concurrencyLimiterBackPressureHandler2(
+	static ConcurrencyLimiterBlockingBackPressureHandler concurrencyLimiterBackPressureHandler(
 			ContainerOptions<?, ?> options) {
 		return ConcurrencyLimiterBlockingBackPressureHandler.builder().batchSize(options.getMaxMessagesPerPoll())
 				.totalPermits(options.getMaxConcurrentMessages()).throughputConfiguration(options.getBackPressureMode())

spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/SqsBackPressureIntegrationTests.java

@@ -135,7 +135,7 @@ void staticBackPressureLimitShouldCapQueueProcessingCapacity(int staticLimit, in
 								.backPressureHandlerFactory(containerOptions -> BackPressureHandlerFactory
 										.compositeBackPressureHandler(containerOptions, Duration.ofMillis(50L),
 												List.of(limiter, BackPressureHandlerFactory
-														.concurrencyLimiterBackPressureHandler2(containerOptions)))))
+														.concurrencyLimiterBackPressureHandler(containerOptions)))))
 				.messageListener(msg -> {
 					int concurrentRqs = concurrentRequest.incrementAndGet();
 					maxConcurrentRequest.updateAndGet(max -> Math.max(max, concurrentRqs));
@@ -173,7 +173,7 @@ void zeroBackPressureLimitShouldStopQueueProcessing() throws Exception {
 								.backPressureHandlerFactory(containerOptions -> BackPressureHandlerFactory
 										.compositeBackPressureHandler(containerOptions, Duration.ofMillis(50L),
 												List.of(limiter, BackPressureHandlerFactory
-														.concurrencyLimiterBackPressureHandler2(containerOptions)))))
+														.concurrencyLimiterBackPressureHandler(containerOptions)))))
 				.messageListener(msg -> {
 					int concurrentRqs = concurrentRequest.incrementAndGet();
 					maxConcurrentRequest.updateAndGet(max -> Math.max(max, concurrentRqs));
@@ -217,7 +217,7 @@ void changeInBackPressureLimitShouldAdaptQueueProcessingCapacity() throws Except
 								.backPressureHandlerFactory(containerOptions -> BackPressureHandlerFactory
 										.compositeBackPressureHandler(containerOptions, Duration.ofMillis(50L),
 												List.of(limiter, BackPressureHandlerFactory
-														.concurrencyLimiterBackPressureHandler2(containerOptions)))))
+														.concurrencyLimiterBackPressureHandler(containerOptions)))))
 				.messageListener(msg -> {
 					try {
 						if (!controlSemaphore.tryAcquire(5, TimeUnit.SECONDS) && !isDraining.get()) {
@@ -444,7 +444,7 @@ void unsynchronizedChangesInBackPressureLimitShouldAdaptQueueProcessingCapacity(
 										BackPressureHandlerFactory.compositeBackPressureHandler(containerOptions,
 												Duration.ofMillis(50L),
 												List.of(limiter, BackPressureHandlerFactory
-														.concurrencyLimiterBackPressureHandler2(containerOptions))),
+														.concurrencyLimiterBackPressureHandler(containerOptions))),
 										eventsCsvWriter)))
 				.messageListener(msg -> {
 					int currentConcurrentRq = concurrentRequest.incrementAndGet();

spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/listener/source/AbstractPollingMessageSourceTests.java

@@ -62,7 +62,7 @@ void shouldAcquireAndReleaseFullPermits() {
 				.backPressureMode(BackPressureMode.ALWAYS_POLL_MAX_MESSAGES)
 				.maxDelayBetweenPolls(Duration.ofMillis(200)).build();
 		BackPressureHandler backPressureHandler = BackPressureHandlerFactory
-				.concurrencyLimiterBackPressureHandler(options, Duration.ofMillis(100L));
+				.adaptativeThroughputBackPressureHandler(options, Duration.ofMillis(100L));
 
 		ExecutorService threadPool = Executors.newCachedThreadPool();
 		CountDownLatch pollingCounter = new CountDownLatch(3);
@@ -120,7 +120,7 @@ void shouldAdaptThroughputMode() {
 				.backPressureMode(BackPressureMode.ALWAYS_POLL_MAX_MESSAGES)
 				.maxDelayBetweenPolls(Duration.ofMillis(150)).build();
 		BackPressureHandler backPressureHandler = BackPressureHandlerFactory
-				.concurrencyLimiterBackPressureHandler(options, Duration.ofMillis(100L));
+				.adaptativeThroughputBackPressureHandler(options, Duration.ofMillis(100L));
 
 		ExecutorService threadPool = Executors.newCachedThreadPool();
 		CountDownLatch pollingCounter = new CountDownLatch(3);
@@ -206,7 +206,7 @@ void shouldAcquireAndReleasePartialPermits() {
 		SqsContainerOptions options = SqsContainerOptions.builder().maxMessagesPerPoll(10).maxConcurrentMessages(10)
 				.backPressureMode(BackPressureMode.AUTO).maxDelayBetweenPolls(Duration.ofMillis(150)).build();
 		BackPressureHandler backPressureHandler = BackPressureHandlerFactory
-				.concurrencyLimiterBackPressureHandler(options, Duration.ofMillis(200L));
+				.adaptativeThroughputBackPressureHandler(options, Duration.ofMillis(200L));
 
 		ExecutorService threadPool = Executors
 				.newCachedThreadPool(new MessageExecutionThreadFactory("test " + testCounter.incrementAndGet()));
@@ -297,7 +297,7 @@ public org.springframework.messaging.Message<?> toMessagingMessage(Message sourc
 				.backPressureMode(BackPressureMode.ALWAYS_POLL_MAX_MESSAGES)
 				.maxDelayBetweenPolls(Duration.ofMillis(150)).messageConverter(converter).build();
 		BackPressureHandler backPressureHandler = BackPressureHandlerFactory
-				.concurrencyLimiterBackPressureHandler(options, Duration.ofMillis(100L));
+				.adaptativeThroughputBackPressureHandler(options, Duration.ofMillis(100L));
 
 		AtomicInteger messagesInSink = new AtomicInteger(0);
 		AtomicBoolean hasFailed = new AtomicBoolean(false);
@@ -350,7 +350,7 @@ void shouldBackOffIfPollingThrowsAnError() {
 				.backPressureMode(BackPressureMode.ALWAYS_POLL_MAX_MESSAGES)
 				.maxDelayBetweenPolls(Duration.ofMillis(200)).pollBackOffPolicy(policy).build();
 		BackPressureHandler backPressureHandler = BackPressureHandlerFactory
-				.concurrencyLimiterBackPressureHandler(options, Duration.ofMillis(100L));
+				.adaptativeThroughputBackPressureHandler(options, Duration.ofMillis(100L));
 
 		var currentPoll = new AtomicInteger(0);
 		var waitThirdPollLatch = new CountDownLatch(4);