Skip to content

Commit 2fa20f3

Browse files
committed
Merge branch '3.4.x' into 3.5.x
Closes gh-46942
2 parents f655db3 + b7282c0 commit 2fa20f3

File tree

31 files changed

+59
-60
lines changed

31 files changed

+59
-60
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpGrpcSpanExporterBuilderCustomizer.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 OtlpGrpcSpanExporterBuilder} whilst retaining default auto-configuration.
23+
* {@link OtlpGrpcSpanExporterBuilder} to fine-tune its auto-configuration.
2424
*
2525
* @author Dmytro Nosan
2626
* @since 3.5.0

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpHttpSpanExporterBuilderCustomizer.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 OtlpHttpSpanExporterBuilder} whilst retaining default auto-configuration.
23+
* {@link OtlpHttpSpanExporterBuilder} to fine-tune its auto-configuration.
2424
*
2525
* @author Dmytro Nosan
2626
* @since 3.5.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/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 2.5.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/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 3.0.0

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

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

2222
/**
2323
* Callback interface that can be implemented by beans wishing to customize the
24-
* {@link ConfigurableConversionService} that is
25-
* {@link DefaultBatchConfiguration#getConversionService provided by
26-
* DefaultBatchConfiguration} while retaining its default auto-configuration.
24+
* {@link ConfigurableConversionService} to fine-tune its auto-configuration. The
25+
* conversion service is {@link DefaultBatchConfiguration#getConversionService provided by
26+
* DefaultBatchConfiguration}.
2727
*
2828
* @author Claudio Nave
2929
* @since 3.1.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/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 2.3.3

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/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 2.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/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 2.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/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 2.3.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/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 2.6.0

0 commit comments

Comments
 (0)