Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source
This commit is contained in:
Phillip Webb
2025-01-11 10:26:06 -08:00
parent 46a499bf1f 8c3e8605c2
commit 29baaf32e6
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java
View File

@@ -152,15 +152,16 @@ class RedisAutoConfigurationJedisTests {
@Test
void testRedisConfigurationWithPool() {
this.contextRunner
.withPropertyValues("spring.data.redis.host:foo", "spring.data.redis.jedis.pool.min-idle:0",
.withPropertyValues("spring.data.redis.host:foo", "spring.data.redis.jedis.pool.min-idle:1",
"spring.data.redis.jedis.pool.max-idle:4", "spring.data.redis.jedis.pool.max-active:16",
"spring.data.redis.jedis.pool.max-wait:2000",
"spring.data.redis.jedis.pool.time-between-eviction-runs:30000")
.withUserConfiguration(JedisDisableStartupConfiguration.class)
.run((context) -> {
JedisConnectionFactory cf = context.getBean(JedisConnectionFactory.class);
assertThat(cf.getHostName()).isEqualTo("foo");
assertThat(cf.getPoolConfig()).satisfies((poolConfig) -> {
assertThat(poolConfig.getMinIdle()).isEqualTo(0);
assertThat(poolConfig.getMinIdle()).isOne();
assertThat(poolConfig.getMaxIdle()).isEqualTo(4);
assertThat(poolConfig.getMaxTotal()).isEqualTo(16);
assertThat(poolConfig.getMaxWaitDuration()).isEqualTo(Duration.ofSeconds(2));
@@ -362,4 +363,25 @@ class RedisAutoConfigurationJedisTests {
}
@Configuration(proxyBeanMethods = false)
static class JedisDisableStartupConfiguration {
@Bean
static BeanPostProcessor jedisDisableStartup() {
return new BeanPostProcessor() {
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) {
if (bean instanceof JedisConnectionFactory jedisConnectionFactory) {
jedisConnectionFactory.setEarlyStartup(false);
jedisConnectionFactory.setAutoStartup(false);
}
return bean;
}
};
}
}
}