Skip to content

Commit b42a060

Browse files
committed
Merge branch '3.5.x'
Closes gh-46943
2 parents 72befaf + 2fa20f3 commit b42a060

File tree

31 files changed

+59
-60
lines changed

31 files changed

+59
-60
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
/**
2222
* Callback interface that can be implemented by beans wishing to customize the
23-
* {@link ActiveMQConnectionFactory} whilst retaining default auto-configuration.
23+
* {@link ActiveMQConnectionFactory} to fine-tune its auto-configuration.
2424
*
2525
* @author Stephane Nicoll
2626
* @since 4.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import com.rabbitmq.client.ConnectionFactory;
2020

2121
/**
22-
* Callback interface that can be implemented by beans wishing to customize the
23-
* auto-configured RabbitMQ {@link ConnectionFactory}.
22+
* Callback interface that can be implemented by beans wishing to customize the RabbitMQ
23+
* {@link ConnectionFactory} to fine-tune its auto-configuration.
2424
*
2525
* @author Andy Wilkinson
2626
* @since 4.0.0

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
24-
* auto-configured {@link Environment} that is created by an {@link EnvironmentBuilder}.
24+
* {@link EnvironmentBuilder} to fine-tune its auto-configuration before it creates an
25+
* {@link Environment}.
2526
*
2627
* @author Andy Wilkinson
2728
* @since 4.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the Artemis
24-
* JMS server {@link Configuration} before it is used by an auto-configured
25-
* {@link EmbeddedActiveMQ} instance.
24+
* JMS server {@link Configuration} to fine-tune its auto-configuration before it is used
25+
* by the auto-configured {@link EmbeddedActiveMQ} instance.
2626
*
2727
* @author Eddú Meléndez
2828
* @author Phillip Webb

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
/**
2222
* Callback interface that can be implemented by beans wishing to customize the
23-
* {@link ConfigurableConversionService} that is used by the batch infrastructure while
24-
* retaining its default auto-configuration.
23+
* {@link ConfigurableConversionService} to fine-tune its auto-configuration. The
24+
* conversion service is used by the Spring Batch infrastructure.
2525
*
2626
* @author Claudio Nave
2727
* @since 4.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
24-
* {@link CouchbaseCacheManagerBuilder} before it is used to build the auto-configured
25-
* {@link CouchbaseCacheManager}.
24+
* {@link CouchbaseCacheManagerBuilder} to fine-tune its auto-configuration before it is
25+
* used to build the auto-configured {@link CouchbaseCacheManager}.
2626
*
2727
* @author Stephane Nicoll
2828
* @since 4.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
24-
* {@link CqlSession} through a {@link CqlSessionBuilder} whilst retaining default
25-
* auto-configuration.
24+
* {@link CqlSessionBuilder} to fine-tune its auto-configuration before it creates a
25+
* {@link CqlSession}.
2626
*
2727
* @author Stephane Nicoll
2828
* @since 4.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
24-
* {@link DriverConfigLoader} through a {@link DriverConfigLoaderBuilderCustomizer} whilst
25-
* retaining default auto-configuration.
24+
* {@link DriverConfigLoaderBuilderCustomizer} to fine-tune its auto-configuration before
25+
* it creates a {@link DriverConfigLoader}.
2626
*
2727
* @author Stephane Nicoll
2828
* @since 4.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
24-
* {@link ClusterEnvironment} through a {@link Builder ClusterEnvironment.Builder} whilst
25-
* retaining default auto-configuration.
24+
* {@link Builder ClusterEnvironment.Builder} to fine-tune its auto-configuration before
25+
* it creates the {@link ClusterEnvironment}.
2626
*
2727
* @author Stephane Nicoll
2828
* @since 4.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
24-
* {@link ClientResources} through a {@link Builder} whilst retaining default
25-
* auto-configuration.
24+
* {@link Builder} to fine-tune its auto-configuration before it creates the
25+
* {@link ClientResources}.
2626
*
2727
* @author Stephane Nicoll
2828
* @since 4.0.0

0 commit comments

Comments
 (0)