From fe17be16e9177e7ff38cb0b5de1369d0358130ae Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 Aug 2021 13:08:19 +0100 Subject: [PATCH] Upgrade to Commons Pool2 2.11.0 Closes gh-27642 --- .../data/redis/JedisConnectionConfiguration.java | 2 +- .../data/redis/LettuceConnectionConfiguration.java | 2 +- .../data/redis/RedisAutoConfigurationJedisTests.java | 4 ++-- .../data/redis/RedisAutoConfigurationTests.java | 6 +++--- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java index e4619f4c5c..86ec6d18d6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java @@ -109,7 +109,7 @@ class JedisConnectionConfiguration extends RedisConnectionConfiguration { config.setTimeBetweenEvictionRuns(pool.getTimeBetweenEvictionRuns()); } if (pool.getMaxWait() != null) { - config.setMaxWaitMillis(pool.getMaxWait().toMillis()); + config.setMaxWait(pool.getMaxWait()); } return config; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java index 44cda68b0e..a84055432e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java @@ -183,7 +183,7 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration { config.setTimeBetweenEvictionRuns(properties.getTimeBetweenEvictionRuns()); } if (properties.getMaxWait() != null) { - config.setMaxWaitMillis(properties.getMaxWait().toMillis()); + config.setMaxWait(properties.getMaxWait()); } return config; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java index 8c555819d8..4a834b40bb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java @@ -140,8 +140,8 @@ class RedisAutoConfigurationJedisTests { assertThat(cf.getPoolConfig().getMinIdle()).isEqualTo(1); assertThat(cf.getPoolConfig().getMaxIdle()).isEqualTo(4); assertThat(cf.getPoolConfig().getMaxTotal()).isEqualTo(16); - assertThat(cf.getPoolConfig().getMaxWaitMillis()).isEqualTo(2000); - assertThat(cf.getPoolConfig().getTimeBetweenEvictionRuns()).isEqualTo(Duration.ofSeconds(30)); + assertThat(cf.getPoolConfig().getMaxWaitDuration()).isEqualTo(Duration.ofSeconds(2)); + assertThat(cf.getPoolConfig().getDurationBetweenEvictionRuns()).isEqualTo(Duration.ofSeconds(30)); }); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java index d8ed30b372..0247c322c3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java @@ -180,7 +180,7 @@ class RedisAutoConfigurationTests { assertThat(poolConfig.getMinIdle()).isEqualTo(defaultPool.getMinIdle()); assertThat(poolConfig.getMaxIdle()).isEqualTo(defaultPool.getMaxIdle()); assertThat(poolConfig.getMaxTotal()).isEqualTo(defaultPool.getMaxActive()); - assertThat(poolConfig.getMaxWaitMillis()).isEqualTo(defaultPool.getMaxWait().toMillis()); + assertThat(poolConfig.getMaxWaitDuration()).isEqualTo(defaultPool.getMaxWait()); }); } @@ -196,8 +196,8 @@ class RedisAutoConfigurationTests { assertThat(poolConfig.getMinIdle()).isEqualTo(1); assertThat(poolConfig.getMaxIdle()).isEqualTo(4); assertThat(poolConfig.getMaxTotal()).isEqualTo(16); - assertThat(poolConfig.getMaxWaitMillis()).isEqualTo(2000); - assertThat(poolConfig.getTimeBetweenEvictionRuns()).isEqualTo(Duration.ofSeconds(30)); + assertThat(poolConfig.getMaxWaitDuration()).isEqualTo(Duration.ofSeconds(2)); + assertThat(poolConfig.getDurationBetweenEvictionRuns()).isEqualTo(Duration.ofSeconds(30)); assertThat(cf.getShutdownTimeout()).isEqualTo(1000); }); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 4b011bac12..b986801af3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -211,7 +211,7 @@ bom { ] } } - library("Commons Pool2", "2.10.0") { + library("Commons Pool2", "2.11.0") { group("org.apache.commons") { modules = [ "commons-pool2"