root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Upgrade to R2DBC Bom Arabba-SR10 

Closes gh-26563
This commit is contained in:
Andy Wilkinson 2021-05-17 12:05:46 +01:00
parent b62a011643
commit d3e8d1533f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1389,7 +1389,7 @@ bom {
] ]
} }
} }
library("R2DBC Bom", "Arabba-SR9") { library("R2DBC Bom", "Arabba-SR10") {
group("io.r2dbc") { group("io.r2dbc") {
imports = [ imports = [
"r2dbc-bom" "r2dbc-bom"

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java
View File

@ -231,6 +231,8 @@ public final class ConnectionFactoryBuilder {
ConnectionFactory connectionFactory) { ConnectionFactory connectionFactory) {
ConnectionPoolConfiguration.Builder builder = ConnectionPoolConfiguration.builder(connectionFactory); ConnectionPoolConfiguration.Builder builder = ConnectionPoolConfiguration.builder(connectionFactory);
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
map.from((Object) options.getValue(PoolingConnectionFactoryProvider.BACKGROUND_EVICTION_INTERVAL))
.as(this::toDuration).to(builder::backgroundEvictionInterval);
map.from((Object) options.getValue(PoolingConnectionFactoryProvider.INITIAL_SIZE)).as(this::toInteger) map.from((Object) options.getValue(PoolingConnectionFactoryProvider.INITIAL_SIZE)).as(this::toInteger)
.to(builder::initialSize); .to(builder::initialSize);
map.from((Object) options.getValue(PoolingConnectionFactoryProvider.MAX_SIZE)).as(this::toInteger) map.from((Object) options.getValue(PoolingConnectionFactoryProvider.MAX_SIZE)).as(this::toInteger)

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java
View File

@ -232,6 +232,9 @@ class ConnectionFactoryBuilderTests {
ACQUIRE_RETRY(PoolingConnectionFactoryProvider.ACQUIRE_RETRY, 4, "acquireRetry"), ACQUIRE_RETRY(PoolingConnectionFactoryProvider.ACQUIRE_RETRY, 4, "acquireRetry"),
BACKGROUND_EVICTION_INTERVAL(PoolingConnectionFactoryProvider.BACKGROUND_EVICTION_INTERVAL,
Duration.ofSeconds(120), "backgroundEvictionInterval"),
INITIAL_SIZE(PoolingConnectionFactoryProvider.INITIAL_SIZE, 2, "initialSize"), INITIAL_SIZE(PoolingConnectionFactoryProvider.INITIAL_SIZE, 2, "initialSize"),
MAX_SIZE(PoolingConnectionFactoryProvider.MAX_SIZE, 8, "maxSize"), MAX_SIZE(PoolingConnectionFactoryProvider.MAX_SIZE, 8, "maxSize"),