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

Rework Lettuce configuration to use new client pooling config API

Browse Source 
Closes gh-9538
This commit is contained in:
Andy Wilkinson
2017-09-12 11:00:23 +01:00
parent 02bc73b8e1
commit 6671a19cef
2 changed files with 30 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
View File

@@ -26,9 +26,9 @@ import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.lettuce.DefaultLettucePool;
import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.connection.lettuce.LettucePoolingClientConfiguration;
import org.springframework.data.redis.core.RedisOperations;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.test.util.ReflectionTestUtils;
@@ -121,11 +121,14 @@ public class RedisAutoConfigurationTests {
"spring.redis.lettuce.shutdown-timeout:1000");
LettuceConnectionFactory cf = this.context
.getBean(LettuceConnectionFactory.class);
assertThat(getDefaultLettucePool(cf).getHostName()).isEqualTo("foo");
assertThat(getDefaultLettucePool(cf).getPoolConfig().getMinIdle()).isEqualTo(1);
assertThat(getDefaultLettucePool(cf).getPoolConfig().getMaxIdle()).isEqualTo(4);
assertThat(getDefaultLettucePool(cf).getPoolConfig().getMaxTotal()).isEqualTo(16);
assertThat(getDefaultLettucePool(cf).getPoolConfig().getMaxWaitMillis())
assertThat(cf.getHostName()).isEqualTo("foo");
assertThat(getPoolingClientConfiguration(cf).getPoolConfig().getMinIdle())
.isEqualTo(1);
assertThat(getPoolingClientConfiguration(cf).getPoolConfig().getMaxIdle())
.isEqualTo(4);
assertThat(getPoolingClientConfiguration(cf).getPoolConfig().getMaxTotal())
.isEqualTo(16);
assertThat(getPoolingClientConfiguration(cf).getPoolConfig().getMaxWaitMillis())
.isEqualTo(2000);
assertThat(cf.getShutdownTimeout()).isEqualTo(1000);
}
@@ -177,8 +180,10 @@ public class RedisAutoConfigurationTests {
.isEqualTo("password");
}
private DefaultLettucePool getDefaultLettucePool(LettuceConnectionFactory factory) {
return (DefaultLettucePool) ReflectionTestUtils.getField(factory, "pool");
private LettucePoolingClientConfiguration getPoolingClientConfiguration(
LettuceConnectionFactory factory) {
return (LettucePoolingClientConfiguration) ReflectionTestUtils.getField(factory,
"clientConfiguration");
}
private void load(String... environment) {