From 0143bec83189b3318e118592a46776a235fe8dab Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 28 Aug 2014 16:58:37 -0700 Subject: [PATCH] Polish --- .../redis/RedisAutoConfiguration.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java index ed33cf1bc7c..01e12f071e2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java @@ -49,6 +49,12 @@ import redis.clients.jedis.JedisPoolConfig; @EnableConfigurationProperties public class RedisAutoConfiguration { + @Bean(name = "org.springframework.autoconfigure.redis.RedisProperties") + @ConditionalOnMissingBean + public RedisProperties redisProperties() { + return new RedisProperties(); + } + @Configuration @ConditionalOnMissingClass(name = "org.apache.commons.pool2.impl.GenericObjectPool") protected static class RedisConnectionConfiguration { @@ -60,12 +66,7 @@ public class RedisAutoConfiguration { @ConditionalOnMissingBean RedisConnectionFactory redisConnectionFactory() throws UnknownHostException { JedisConnectionFactory factory = new JedisConnectionFactory(); - factory.setHostName(this.properties.getHost()); - factory.setPort(this.properties.getPort()); - if (this.properties.getPassword() != null) { - factory.setPassword(this.properties.getPassword()); - } - factory.setDatabase(this.properties.getDatabase()); + applyConnectionFactoryProperties(factory, this.properties); return factory; } @@ -82,12 +83,7 @@ public class RedisAutoConfiguration { @ConditionalOnMissingBean RedisConnectionFactory redisConnectionFactory() throws UnknownHostException { JedisConnectionFactory factory = createJedisConnectionFactory(); - factory.setHostName(this.properties.getHost()); - factory.setPort(this.properties.getPort()); - if (this.properties.getPassword() != null) { - factory.setPassword(this.properties.getPassword()); - } - factory.setDatabase(this.properties.getDatabase()); + applyConnectionFactoryProperties(factory, this.properties); return factory; } @@ -110,14 +106,6 @@ public class RedisAutoConfiguration { } - @Bean(name = "org.springframework.autoconfigure.redis.RedisProperties") - @ConditionalOnMissingBean - public RedisProperties redisProperties() { - - return new RedisProperties(); - - } - @Configuration protected static class RedisConfiguration { @@ -146,4 +134,14 @@ public class RedisAutoConfiguration { } + static void applyConnectionFactoryProperties(JedisConnectionFactory factory, + RedisProperties properties) { + factory.setHostName(properties.getHost()); + factory.setPort(properties.getPort()); + if (properties.getPassword() != null) { + factory.setPassword(properties.getPassword()); + } + factory.setDatabase(properties.getDatabase()); + } + }