spring-projects#158 - Remove workaround for Redis cluster configuration.

christophstrobl · odrotbohm · commit b82460f33c88 · 2016-04-05T17:39:59.000+02:00
SpringBoot 1.4M1 ships with auto configuration for spring.redis.cluster so we removed the work around using ConfigurationProperties.
diff --git a/redis/cluster/readme.md b/redis/cluster/readme.md
@@ -6,48 +6,14 @@ To run the code in this sample a running cluster environment is required. Please
 
 ## Support for Cluster ##
 
-Cluster Support uses the same building blocks as the non clustered counterpart. We use `application.properties` to point to an initial set of known cluster nodes.
+Cluster Support uses the same building blocks as the non clustered counterpart. We use `application.properties` to point to an initial set of known cluster nodes which will be picked up by the auto configuration.
 
 ```properties
 spring.redis.cluster.nodes[0]=127.0.0.1:30001
 spring.redis.cluster.nodes[1]=127.0.0.1:30002
 spring.redis.cluster.nodes[2]=127.0.0.1:30003
 ```
 
-Additionally we need to have the `RedisConnectionFactory` set up with the according `RedisClusterConfiguration`.
-
-```java
-@Configuration
-@EnableConfigurationProperties(ClusterConfigurationProperties.class)
-public class AppConfig {
-
-    /**
-     * Type safe representation of application.properties
-     */
-	@Autowired ClusterConfigurationProperties clusterProperties;
-
-    /**
-     * The connection factory used for obtaining RedisConnection
-     * uses a RedisClusterConfiguration that points
-     * to the initial set of nodes.
-     */
-	@Bean
-	RedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(
-		  new RedisClusterConfiguration(clusterProperties.getNodes()));
-	}
-
-    /**
-     * RedisTemplate can be configured with RedisSerializer if needed.
-     * NOTE: be careful using JSON serializers for key serialization.
-     */
-	@Bean
-	RedisTemplate<String, String> redisTemplate() {
-		return new StringRedisTemplate(connectionFactory());
-	}
-}
-```
-
 **INFORMATION:** The tests flush the db of all known instances during the JUnit _setup_ phase to allow inspecting data directly on the cluster nodes after a test is run.
 
 ## Cluster Setup ##
diff --git a/redis/cluster/src/main/java/example/springdata/redis/cluster/AppConfig.java b/redis/cluster/src/main/java/example/springdata/redis/cluster/AppConfig.java
@@ -15,48 +15,17 @@
  */
 package example.springdata.redis.cluster;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisClusterConfiguration;
-import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.RedisSerializer;
 
 /**
  * Application context configuration setting up {@link RedisConnectionFactory} and {@link RedisTemplate} according to
  * {@link ClusterConfigurationProperties}.
  * 
  * @author Christoph Strobl
  */
-@Configuration
-@EnableConfigurationProperties(ClusterConfigurationProperties.class)
+@EnableAutoConfiguration
 public class AppConfig {
 
-	/**
-	 * Type safe representation of application.properties
-	 */
-	@Autowired ClusterConfigurationProperties clusterProperties;
-
-	/**
-	 * The connection factory used for obtaining {@link RedisConnection} uses a {@link RedisClusterConfiguration} that
-	 * points to the initial set of nodes.
-	 */
-	@Bean
-	RedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(new RedisClusterConfiguration(clusterProperties.getNodes()));
-	}
-
-	/**
-	 * {@link RedisTemplate} can be configured with {@link RedisSerializer} if needed. <br />
-	 * <b>NOTE:</b> be careful using JSON @link RedisSerializer} for key serialization.
-	 */
-	@Bean
-	RedisTemplate<String, String> redisTemplate() {
-		return new StringRedisTemplate(connectionFactory());
-	}
 }
diff --git a/redis/cluster/src/main/java/example/springdata/redis/cluster/ClusterConfigurationProperties.java b/redis/cluster/src/main/java/example/springdata/redis/cluster/ClusterConfigurationProperties.java
