Merge branch 'main' into 4.0.x

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractConnectionFactoryConfigurer.java

@@ -24,8 +24,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Configures {@link AbstractConnectionFactory Rabbit ConnectionFactory} with sensible
- * defaults.
+ * Base class for configurers of sub-classes of {@link AbstractConnectionFactory}.
  *
  * @param <T> the connection factory type.
  * @author Chris Bono

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java

@@ -22,7 +22,6 @@
 import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.config.RetryInterceptorBuilder;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.retry.MessageRecoverer;
 import org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer;
 import org.springframework.amqp.support.converter.MessageConverter;
@@ -31,7 +30,8 @@
 import org.springframework.util.Assert;
 
 /**
- * Configure {@link RabbitListenerContainerFactory} with sensible defaults.
+ * Base class for configurers of sub-classes of
+ * {@link AbstractRabbitListenerContainerFactory}.
  *
  * @param <T> the container factory type.
  * @author Gary Russell

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/CachingConnectionFactoryConfigurer.java

@@ -22,7 +22,12 @@
 import org.springframework.boot.context.properties.PropertyMapper;
 
 /**
- * Configures Rabbit {@link CachingConnectionFactory} with sensible defaults.
+ * Configures Rabbit {@link CachingConnectionFactory} with sensible defaults tuned using
+ * configuration properties.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code CachingConnectionFactory} whose configuration is based upon that produced by
+ * auto-configuration.
  *
  * @author Chris Bono
  * @author Moritz Halbritter

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,12 @@
 import org.springframework.boot.context.properties.PropertyMapper;
 
 /**
- * Configure {@link DirectRabbitListenerContainerFactoryConfigurer} with sensible
- * defaults.
+ * Configure {@link DirectRabbitListenerContainerFactory} with sensible defaults tuned
+ * using configuration properties.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code DirectRabbitListenerContainerFactory} whose configuration is based upon that
+ * produced by auto-configuration.
  *
  * @author Gary Russell
  * @author Stephane Nicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java

@@ -31,7 +31,12 @@
 import org.springframework.util.unit.DataSize;
 
 /**
- * Configures {@link RabbitConnectionFactoryBean} with sensible defaults.
+ * Configures {@link RabbitConnectionFactoryBean} with sensible defaults tuned using
+ * configuration properties.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code RabbitConnectionFactoryBean} whose configuration is based upon that produced by
+ * auto-configuration.
  *
  * @author Chris Bono
  * @author Moritz Halbritter

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamTemplateConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,10 @@
 
 /**
  * Configure {@link RabbitStreamTemplate} with sensible defaults.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code RabbitStreamTemplate} whose configuration is based upon that produced by
+ * auto-configuration.
  *
  * @author Eddú Meléndez
  * @since 2.7.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java

@@ -29,7 +29,12 @@
 import org.springframework.util.CollectionUtils;
 
 /**
- * Configure {@link RabbitTemplate} with sensible defaults.
+ * Configure {@link RabbitTemplate} with sensible defaults tuned using configuration
+ * properties.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code RabbitTemplateConfigurer} whose configuration is based upon that produced by
+ * auto-configuration.
  *
  * @author Stephane Nicoll
  * @author Yanming Zhou

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,12 @@
 import org.springframework.boot.context.properties.PropertyMapper;
 
 /**
- * Configure {@link SimpleRabbitListenerContainerFactoryConfigurer} with sensible
- * defaults.
+ * Configure {@link SimpleRabbitListenerContainerFactory} with sensible defaults tuned
+ * using configuration properties.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code SimpleRabbitListenerContainerFactory} whose configuration is based upon that
+ * produced by auto-configuration.
  *
  * @author Stephane Nicoll
  * @author Gary Russell

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java

@@ -31,7 +31,12 @@
 import org.springframework.util.Assert;
 
 /**
- * Configure {@link DefaultJmsListenerContainerFactory} with sensible defaults.
+ * Configure {@link DefaultJmsListenerContainerFactory} with sensible defaults tuned using
+ * configuration properties.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code DefaultJmsListenerContainerFactory} whose configuration is based upon that
+ * produced by auto-configuration.
  *
  * @author Stephane Nicoll
  * @author Eddú Meléndez

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java

@@ -38,7 +38,12 @@
 import org.springframework.kafka.transaction.KafkaAwareTransactionManager;
 
 /**
- * Configure {@link ConcurrentKafkaListenerContainerFactory} with sensible defaults.
+ * Configure {@link ConcurrentKafkaListenerContainerFactory} with sensible defaults tuned
+ * using configuration properties.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code ConcurrentKafkaListenerContainerFactory} whose configuration is based upon that
+ * produced by auto-configuration.
  *
  * @author Gary Russell
  * @author Eddú Meléndez

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientBuilderConfigurer.java

@@ -27,6 +27,10 @@
 
 /**
  * Configure {@link Builder RestClient.Builder} with sensible defaults.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code RestClient.Builder} whose configuration is based upon that produced by
+ * auto-configuration.
  *
  * @author Moritz Halbritter
  * @since 3.2.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateBuilderConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,10 @@
 
 /**
  * Configure {@link RestTemplateBuilder} with sensible defaults.
+ * <p>
+ * Can be injected into application code and used to define a custom
+ * {@code RestTemplateBuilder} whose configuration is based upon that produced by
+ * auto-configuration.
  *
  * @author Stephane Nicoll
  * @since 2.4.0