Commit 259e6a6e authored by Dave Syer's avatar Dave Syer

RedisProperties prefix -> spring.redis

parent e74da3fa
...@@ -82,7 +82,7 @@ public class RedisAutoConfiguration { ...@@ -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";
......
...@@ -17,11 +17,14 @@ ...@@ -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 { ...@@ -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());
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment