Merge branch '3.4.x' into 3.5.x

Closes gh-46942

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpGrpcSpanExporterBuilderCustomizer.java

@@ -20,7 +20,7 @@ import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link OtlpGrpcSpanExporterBuilder} whilst retaining default auto-configuration.
+ * {@link OtlpGrpcSpanExporterBuilder} to fine-tune its auto-configuration.
  *
  * @author Dmytro Nosan
  * @since 3.5.0

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpHttpSpanExporterBuilderCustomizer.java

@@ -20,7 +20,7 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link OtlpHttpSpanExporterBuilder} whilst retaining default auto-configuration.
+ * {@link OtlpHttpSpanExporterBuilder} to fine-tune its auto-configuration.
  *
  * @author Dmytro Nosan
  * @since 3.5.0

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

@@ -19,8 +19,8 @@ package org.springframework.boot.autoconfigure.amqp;
 import com.rabbitmq.client.ConnectionFactory;
 
 /**
- * Callback interface that can be implemented by beans wishing to customize the
+ * Callback interface that can be implemented by beans wishing to customize the RabbitMQ
- * auto-configured RabbitMQ {@link ConnectionFactory}.
+ * {@link ConnectionFactory} to fine-tune its auto-configuration.
  *
  * @author Andy Wilkinson
  * @since 2.5.0

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

@@ -21,7 +21,8 @@ import com.rabbitmq.stream.EnvironmentBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * auto-configured {@link Environment} that is created by an {@link EnvironmentBuilder}.
+ * {@link EnvironmentBuilder} to fine-tune its auto-configuration before it creates an
+ * {@link Environment}.
  *
  * @author Andy Wilkinson
  * @since 3.0.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConversionServiceCustomizer.java

@@ -21,9 +21,9 @@ import org.springframework.core.convert.support.ConfigurableConversionService;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ConfigurableConversionService} that is
+ * {@link ConfigurableConversionService} to fine-tune its auto-configuration. The
- * {@link DefaultBatchConfiguration#getConversionService provided by
+ * conversion service is {@link DefaultBatchConfiguration#getConversionService provided by
- * DefaultBatchConfiguration} while retaining its default auto-configuration.
+ * DefaultBatchConfiguration}.
  *
  * @author Claudio Nave
  * @since 3.1.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheManagerBuilderCustomizer.java

@@ -21,8 +21,8 @@ import org.springframework.data.couchbase.cache.CouchbaseCacheManager.CouchbaseC
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link CouchbaseCacheManagerBuilder} before it is used to build the auto-configured
+ * {@link CouchbaseCacheManagerBuilder} to fine-tune its auto-configuration before it is
- * {@link CouchbaseCacheManager}.
+ * used to build the auto-configured {@link CouchbaseCacheManager}.
  *
  * @author Stephane Nicoll
  * @since 2.3.3

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CqlSessionBuilderCustomizer.java

@@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.CqlSessionBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link CqlSession} through a {@link CqlSessionBuilder} whilst retaining default
+ * {@link CqlSessionBuilder} to fine-tune its auto-configuration before it creates a
- * auto-configuration.
+ * {@link CqlSession}.
  *
  * @author Stephane Nicoll
  * @since 2.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java

@@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBui
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link DriverConfigLoader} through a {@link DriverConfigLoaderBuilderCustomizer} whilst
+ * {@link DriverConfigLoaderBuilderCustomizer} to fine-tune its auto-configuration before
- * retaining default auto-configuration.
+ * it creates a {@link DriverConfigLoader}.
  *
  * @author Stephane Nicoll
  * @since 2.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/ClusterEnvironmentBuilderCustomizer.java

@@ -21,8 +21,8 @@ import com.couchbase.client.java.env.ClusterEnvironment.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ClusterEnvironment} through a {@link Builder ClusterEnvironment.Builder} whilst
+ * {@link Builder ClusterEnvironment.Builder} to fine-tune its auto-configuration before
- * retaining default auto-configuration.
+ * it creates the {@link ClusterEnvironment}.
  *
  * @author Stephane Nicoll
  * @since 2.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java

@@ -21,8 +21,8 @@ import io.lettuce.core.resource.ClientResources.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ClientResources} through a {@link Builder} whilst retaining default
+ * {@link Builder} to fine-tune its auto-configuration before it creates the
- * auto-configuration.
+ * {@link ClientResources}.
  *
  * @author Stephane Nicoll
  * @since 2.6.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisClientConfigurationBuilderCustomizer.java

@@ -21,9 +21,8 @@ import org.springframework.data.redis.connection.jedis.JedisClientConfiguration.
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link JedisClientConfiguration} through a {@link JedisClientConfigurationBuilder
+ * {@link JedisClientConfigurationBuilder} to fine-tune its auto-configuration before it
- * JedisClientConfiguration.JedisClientConfigurationBuilder} whilst retaining default
+ * creates the {@link JedisClientConfiguration}.
- * auto-configuration.
  *
  * @author Mark Paluch
  * @since 2.0.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceClientConfigurationBuilderCustomizer.java

@@ -21,9 +21,8 @@ import org.springframework.data.redis.connection.lettuce.LettuceClientConfigurat
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link LettuceClientConfiguration} through a {@link LettuceClientConfigurationBuilder
+ * {@link LettuceClientConfigurationBuilder} to fine-tune its auto-configuration before it
- * LettuceClientConfiguration.LettuceClientConfigurationBuilder} whilst retaining default
+ * creates the {@link LettuceClientConfiguration}. To customize only the
- * auto-configuration. To customize only the
  * {@link LettuceClientConfiguration#getClientOptions() client options} of the
  * configuration, use {@link LettuceClientOptionsBuilderCustomizer} instead.
  *

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceClientOptionsBuilderCustomizer.java

@@ -23,9 +23,9 @@ import org.springframework.data.redis.connection.lettuce.LettuceClientConfigurat
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ClientOptions} of the {@link LettuceClientConfiguration} through a
+ * {@link Builder} to fine-tune its auto-configuration before it creates the
- * {@link Builder} whilst retaining default auto-configuration. To customize the entire
+ * {@link ClientOptions} of the {@link LettuceClientConfiguration}. To customize the
- * configuration, use {@link LettuceClientConfigurationBuilderCustomizer} instead.
+ * entire configuration, use {@link LettuceClientConfigurationBuilderCustomizer} instead.
  *
  * @author Soohyun Lim
  * @since 3.4.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java

@@ -23,8 +23,8 @@ import org.elasticsearch.client.RestClientBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to further customize the
- * {@link org.elasticsearch.client.RestClient} through a {@link RestClientBuilder} whilst
+ * {@link RestClientBuilder} to fine-tune its auto-configuration before it creates the
- * retaining default auto-configuration.
+ * {@link org.elasticsearch.client.RestClient}.
  *
  * @author Brian Clozel
  * @author Vedran Pavic

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerVariablesCustomizer.java

@@ -24,8 +24,9 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactory;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the FreeMarker
- * variables used as {@link Configuration#getSharedVariableNames() shared variables}
+ * {@link Configuration#getSharedVariableNames() shared variables} to fine-tune their
- * before it is used by an auto-configured {@link FreeMarkerConfigurationFactory}.
+ * auto-configuration before they are used by an auto-configured
+ * {@link FreeMarkerConfigurationFactory}.
  *
  * @author Stephane Nicoll
  * @since 3.4.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlSourceBuilderCustomizer.java

@@ -21,7 +21,7 @@ import org.springframework.graphql.execution.GraphQlSource;
 /**
  * Callback interface that can be implemented by beans wishing to customize properties of
  * {@link org.springframework.graphql.execution.GraphQlSource.SchemaResourceBuilder
- * Builder} whilst retaining default auto-configuration.
+ * Builder} to fine-tune its auto-configuration.
  *
  * @author Rossen Stoyanchev
  * @since 2.7.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonBuilderCustomizer.java

@@ -20,8 +20,9 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 /**
- * Callback interface that can be implemented by beans wishing to further customize the
+ * Callback interface that can be implemented by beans wishing to customize the
- * {@link Gson} through {@link GsonBuilder} retaining its default auto-configuration.
+ * {@link GsonBuilder} to fine-tune its auto-configuration before it creates a
+ * {@link Gson} instance.
  *
  * @author Ivan Golovko
  * @since 2.0.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/PollerMetadataCustomizer.java

@@ -20,7 +20,7 @@ import org.springframework.integration.scheduling.PollerMetadata;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link PollerMetadata} whilst retaining default auto-configuration.
+ * {@link PollerMetadata} to fine-tune its auto-configuration.
  *
  * @author Yanming Zhou
  * @since 3.5.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java

@@ -22,7 +22,7 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to further customize the
- * {@link ObjectMapper} through {@link Jackson2ObjectMapperBuilder} retaining its default
+ * {@link ObjectMapper} through {@link Jackson2ObjectMapperBuilder} to fine-tune its
  * auto-configuration.
  *
  * @author Grzegorz Poznachowski

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

@@ -20,7 +20,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ActiveMQConnectionFactory} whilst retaining default auto-configuration.
+ * {@link ActiveMQConnectionFactory} to fine-tune its auto-configuration.
  *
  * @author Stephane Nicoll
  * @since 3.1.0

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

@@ -21,8 +21,8 @@ import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the Artemis
- * JMS server {@link Configuration} before it is used by an auto-configured
+ * JMS server {@link Configuration} to fine-tune its auto-configuration before it is used
- * {@link EmbeddedActiveMQ} instance.
+ * by the auto-configured {@link EmbeddedActiveMQ} instance.
  *
  * @author Eddú Meléndez
  * @author Phillip Webb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/DefaultConfigurationCustomizer.java

@@ -20,7 +20,7 @@ import org.jooq.impl.DefaultConfiguration;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link DefaultConfiguration} whilst retaining default auto-configuration.
+ * {@link DefaultConfiguration} to fine-tune its auto-configuration.
  *
  * @author Stephane Nicoll
  * @since 2.5.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientSettingsBuilderCustomizer.java

@@ -20,8 +20,8 @@ import com.mongodb.MongoClientSettings.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link com.mongodb.MongoClientSettings} through a {@link Builder
+ * {@link Builder MongoClientSettings.Builder} to fine-tune its auto-configuration. before
- * MongoClientSettings.Builder} whilst retaining default auto-configuration.
+ * it creates a {@link com.mongodb.MongoClientSettings}.
  *
  * @author Mark Paluch
  * @since 2.0.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/ConfigBuilderCustomizer.java

@@ -20,9 +20,9 @@ import org.neo4j.driver.Config;
 import org.neo4j.driver.Config.ConfigBuilder;
 
 /**
- * Callback interface that can be implemented by beans wishing to customize the
+ * Callback interface that can be implemented by beans wishing to customize the a
- * {@link Config} through a {@link ConfigBuilder} whilst retaining default
+ * {@link ConfigBuilder} to fine-tune its auto-configuration before it creates a
- * auto-configuration.
+ * {@link Config} instance.
  *
  * @author Stephane Nicoll
  * @since 2.4.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilderCustomizer.java

@@ -19,8 +19,8 @@ package org.springframework.boot.autoconfigure.orm.jpa;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 
 /**
- * Callback interface that can be used to customize the auto-configured
+ * Callback interface that can be used to customize the
- * {@link EntityManagerFactoryBuilder}.
+ * {@link EntityManagerFactoryBuilder} to fine-tune its auto-configuration.
  *
  * @author Andy Wilkinson
  * @since 2.1.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesCustomizer.java

@@ -20,7 +20,8 @@ import java.util.Map;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the Hibernate
- * properties before it is used by an auto-configured {@code EntityManagerFactory}.
+ * properties to customize their auto-configuration prior to use by the auto-configured
+ * {@code EntityManagerFactory}.
  *
  * @author Stephane Nicoll
  * @since 2.0.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarContainerFactoryCustomizer.java

@@ -20,8 +20,7 @@ import org.springframework.pulsar.config.PulsarContainerFactory;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize a
- * {@link PulsarContainerFactory} before it is fully initialized, in particular to tune
+ * {@link PulsarContainerFactory} to fine-tune its auto-configuration.
- * its configuration.
  *
  * @param <T> the type of the {@link PulsarContainerFactory}
  * @author Chris Bono

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/SchedulerFactoryBeanCustomizer.java

@@ -22,8 +22,7 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the Quartz
- * {@link SchedulerFactoryBean} before it is fully initialized, in particular to tune its
+ * {@link SchedulerFactoryBean} to fine-tune its auto-configuration.
- * configuration.
  * <p>
  * For customization of the {@link DataSource} used by Quartz, use of
  * {@link QuartzDataSource @QuartzDataSource} is preferred. It will ensure consistent

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsBuilderCustomizer.java

@@ -21,8 +21,8 @@ import io.r2dbc.spi.ConnectionFactoryOptions.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ConnectionFactoryOptions} through a {@link Builder} whilst retaining default
+ * {@link Builder} to fine-tune its auto-configuration before it creates a
- * auto-configuration.
+ * {@link ConnectionFactoryOptions}.
  *
  * @author Mark Paluch
  * @since 2.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizer.java

@@ -19,9 +19,8 @@ package org.springframework.boot.autoconfigure.transaction;
 import org.springframework.transaction.TransactionManager;
 
 /**
- * Callback interface that can be implemented by beans wishing to customize
+ * Callback interface that can be implemented by beans wishing to customize a
- * {@link TransactionManager TransactionManagers} while retaining default
+ * {@link TransactionManager} to fine-tune its auto-configuration.
- * auto-configuration.
  *
  * @param <T> the transaction manager type
  * @author Andy Wilkinson

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientBuilderCustomizer.java

@@ -16,12 +16,12 @@
 
 package org.springframework.boot.test.web.reactive.server;
 
+import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.test.web.reactive.server.WebTestClient.Builder;
 
 /**
- * A customizer for a {@link Builder}. Any {@code WebTestClientBuilderCustomizer} beans
+ * A customizer that can be implemented by beans wishing to customize the {@link Builder}
- * found in the application context will be {@link #customize called} to customize the
+ * to fine-tine its auto-configuration before a {@link WebTestClient} is created.
- * auto-configured {@link Builder}.
  *
  * @author Andy Wilkinson
  * @since 2.2.0