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

RedisProperties prefix -> spring.redis

This commit is contained in:
Dave Syer 2013-11-28 15:12:55 +00:00
parent e74da3fa73
commit 259e6a6ec1
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java
View File

@ -82,7 +82,7 @@ public class RedisAutoConfiguration {
} }
@ConfigurationProperties(name = "spring.data.redis") @ConfigurationProperties(name = "spring.redis")
public static class RedisProperties { public static class RedisProperties {
private String host = "localhost"; private String host = "localhost";

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

@ -17,11 +17,14 @@
package org.springframework.boot.autoconfigure.redis; package org.springframework.boot.autoconfigure.redis;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.TestUtils;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisOperations;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
/** /**
@ -41,4 +44,15 @@ public class RedisAutoConfigurationTests {
assertNotNull(this.context.getBean(StringRedisTemplate.class)); assertNotNull(this.context.getBean(StringRedisTemplate.class));
} }
@Test
public void testOverrideRedisConfiguration() throws Exception {
this.context = new AnnotationConfigApplicationContext();
TestUtils.addEnviroment(this.context, "spring.redis.host:foo");
this.context.register(RedisAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
this.context.refresh();
assertEquals("foo", this.context.getBean(LettuceConnectionFactory.class)
.getHostName());
}
} }