refactor: clean up code formatting and improve readability in SqsTemplate, SqsProperties, and BatchingSqsClientAdapter

Author: khc41

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

@@ -34,6 +34,7 @@
 import io.awspring.cloud.sqs.support.observation.SqsListenerObservation;
 import io.awspring.cloud.sqs.support.observation.SqsTemplateObservation;
 import io.micrometer.observation.ObservationRegistry;
+import java.util.concurrent.Executors;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -52,8 +53,6 @@
 import software.amazon.awssdk.services.sqs.batchmanager.SqsAsyncBatchManager;
 import software.amazon.awssdk.services.sqs.model.Message;
 
-import java.util.concurrent.Executors;
-
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for SQS integration.
  *
@@ -84,10 +83,10 @@ public SqsAsyncClient sqsAsyncClient(AwsClientBuilderConfigurer awsClientBuilder
 			ObjectProvider<AwsConnectionDetails> connectionDetails,
 			ObjectProvider<SqsAsyncClientCustomizer> sqsAsyncClientCustomizers,
 			ObjectProvider<AwsAsyncClientCustomizer> awsAsyncClientCustomizers) {
-        return awsClientBuilderConfigurer.configureAsyncClient(SqsAsyncClient.builder(), this.sqsProperties,
-                connectionDetails.getIfAvailable(), configurer.getIfAvailable(),
-                sqsAsyncClientCustomizers.orderedStream(), awsAsyncClientCustomizers.orderedStream()).build();
-    }
+		return awsClientBuilderConfigurer.configureAsyncClient(SqsAsyncClient.builder(), this.sqsProperties,
+				connectionDetails.getIfAvailable(), configurer.getIfAvailable(),
+				sqsAsyncClientCustomizers.orderedStream(), awsAsyncClientCustomizers.orderedStream()).build();
+	}
 
 	@ConditionalOnProperty(name = "spring.cloud.aws.sqs.batch.enabled", havingValue = "true")
 	@Bean
@@ -98,11 +97,9 @@ public SqsAsyncClient batchSqsAsyncClient(SqsAsyncClient sqsAsyncClient) {
 	}
 
 	private SqsAsyncBatchManager createBatchManager(SqsAsyncClient sqsAsyncClient) {
-		return SqsAsyncBatchManager.builder()
-			.client(sqsAsyncClient)
-            .scheduledExecutor(Executors.newScheduledThreadPool(5))
-			.overrideConfiguration(this::configurationProperties)
-			.build();
+		return SqsAsyncBatchManager.builder().client(sqsAsyncClient)
+				.scheduledExecutor(Executors.newScheduledThreadPool(5))
+				.overrideConfiguration(this::configurationProperties).build();
 	}
 
 	private void configurationProperties(BatchOverrideConfiguration.Builder options) {
@@ -112,7 +109,7 @@ private void configurationProperties(BatchOverrideConfiguration.Builder options)
 		mapper.from(this.sqsProperties.getBatch().getWaitTimeSeconds()).to(options::receiveMessageMinWaitDuration);
 		mapper.from(this.sqsProperties.getBatch().getVisibilityTimeout()).to(options::receiveMessageVisibilityTimeout);
 		mapper.from(this.sqsProperties.getBatch().getSystemAttributeNames())
-			.to(options::receiveMessageSystemAttributeNames);
+				.to(options::receiveMessageSystemAttributeNames);
 		mapper.from(this.sqsProperties.getBatch().getAttributeNames()).to(options::receiveMessageAttributeNames);
 	}
 
@@ -122,15 +119,15 @@ public SqsTemplate sqsTemplate(SqsAsyncClient sqsAsyncClient, ObjectProvider<Obj
 			ObjectProvider<ObservationRegistry> observationRegistryProvider,
 			ObjectProvider<SqsTemplateObservation.Convention> observationConventionProvider,
 			MessagingMessageConverter<Message> messageConverter) {
-        SqsTemplateBuilder builder = SqsTemplate.builder().sqsAsyncClient(sqsAsyncClient)
-                .messageConverter(messageConverter);
+		SqsTemplateBuilder builder = SqsTemplate.builder().sqsAsyncClient(sqsAsyncClient)
+				.messageConverter(messageConverter);
 		objectMapperProvider.ifAvailable(om -> setMapperToConverter(messageConverter, om));
-        if (this.sqsProperties.isObservationEnabled()) {
-            observationRegistryProvider
-                    .ifAvailable(registry -> builder.configure(options -> options.observationRegistry(registry)));
-            observationConventionProvider
-                    .ifAvailable(convention -> builder.configure(options -> options.observationConvention(convention)));
-        }
+		if (this.sqsProperties.isObservationEnabled()) {
+			observationRegistryProvider
+					.ifAvailable(registry -> builder.configure(options -> options.observationRegistry(registry)));
+			observationConventionProvider
+					.ifAvailable(convention -> builder.configure(options -> options.observationConvention(convention)));
+		}
 		if (sqsProperties.getQueueNotFoundStrategy() != null) {
 			builder.configure((options) -> options.queueNotFoundStrategy(sqsProperties.getQueueNotFoundStrategy()));
 		}
@@ -156,12 +153,12 @@ public SqsMessageListenerContainerFactory<Object> defaultSqsListenerContainerFac
 		interceptors.forEach(factory::addMessageInterceptor);
 		asyncInterceptors.forEach(factory::addMessageInterceptor);
 		objectMapperProvider.ifAvailable(om -> setMapperToConverter(messagingMessageConverter, om));
-        if (this.sqsProperties.isObservationEnabled()) {
-            observationRegistry
-                    .ifAvailable(registry -> factory.configure(options -> options.observationRegistry(registry)));
-            observationConventionProvider
-                    .ifAvailable(convention -> factory.configure(options -> options.observationConvention(convention)));
-        }
+		if (this.sqsProperties.isObservationEnabled()) {
+			observationRegistry
+					.ifAvailable(registry -> factory.configure(options -> options.observationRegistry(registry)));
+			observationConventionProvider
+					.ifAvailable(convention -> factory.configure(options -> options.observationConvention(convention)));
+		}
 		factory.configure(options -> options.messageConverter(messagingMessageConverter));
 		return factory;
 	}

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

@@ -17,13 +17,12 @@
 
 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;
 
-import java.time.Duration;
-import java.util.List;
-
 /**
  * Properties related to AWS SQS.
  *
@@ -92,9 +91,8 @@ public void setObservationEnabled(Boolean observationEnabled) {
 	public static class Listener {
 
 		/**
-		 * 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.
+		 * 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.
 		 */
 		@Nullable
 		private Integer maxConcurrentMessages;
@@ -158,14 +156,15 @@ public void setMaxDelayBetweenPolls(Duration maxDelayBetweenPolls) {
 	/**
 	 * 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>
+	 * 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.
+	 * <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
 	 */
@@ -174,38 +173,37 @@ 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>
+		 * 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}.
+		 * <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.
+		 * 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.
+		 * 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.
+		 * 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.
+		 * 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;
@@ -226,9 +224,9 @@ public boolean isEnabled() {
 			return enabled;
 		}
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+		public void setEnabled(boolean enabled) {
+			this.enabled = enabled;
+		}
 
 		@Nullable
 		public Integer getMaxNumberOfMessages() {