DATAREDIS-425 - Provide config option to pick up redisTemplate from context.

Added "redisTemplateRef" to @EnableRedisRepositories. The default points to "redisTemplate".

Author: christophstrobl

src/main/java/org/springframework/data/redis/repository/configuration/EnableRedisRepositories.java

@@ -27,6 +27,7 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.data.keyvalue.core.KeyValueOperations;
 import org.springframework.data.keyvalue.repository.config.QueryCreatorType;
+import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.index.IndexConfiguration;
 import org.springframework.data.redis.repository.query.RedisQueryCreator;
 import org.springframework.data.redis.repository.support.RedisRepositoryFactoryBean;
@@ -127,6 +128,13 @@
 	 */
 	boolean considerNestedRepositories() default false;
 
+	/**
+	 * Configures the bean name of the {@link RedisOperations} to be used. Defaulted to {@literal redisTemplate}.
+	 * 
+	 * @return
+	 */
+	String redisTemplateRef() default "redisTemplate";
+
 	/**
 	 * TODO: explain configuration options
 	 * 

src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtension.java

@@ -17,6 +17,7 @@
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -25,6 +26,7 @@
 import org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension;
 import org.springframework.data.redis.core.RedisKeyValueAdapter;
 import org.springframework.data.repository.config.RepositoryConfigurationSource;
+import org.springframework.util.StringUtils;
 
 /**
  * @author Christoph Strobl
@@ -75,6 +77,14 @@ protected AbstractBeanDefinition getDefaultKeyValueTemplateBeanDefinition(
 		indexConfiguration.setBeanClass(aa.getClass("indexConfiguration"));
 
 		ConstructorArgumentValues constructorArgumentValuesForRedisKeyValueAdapter = new ConstructorArgumentValues();
+
+		String redisTemplateRef = configurationSource.getAttribute("redisTemplateRef");
+		if (StringUtils.hasText(redisTemplateRef)) {
+
+			constructorArgumentValuesForRedisKeyValueAdapter.addGenericArgumentValue(new RuntimeBeanReference(
+					redisTemplateRef));
+		}
+
 		constructorArgumentValuesForRedisKeyValueAdapter.addGenericArgumentValue(indexConfiguration);
 		redisKeyValueAdapterDefinition.setConstructorArgumentValues(constructorArgumentValuesForRedisKeyValueAdapter);
 

src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java

@@ -29,11 +29,14 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.keyvalue.annotation.KeySpace;
 import org.springframework.data.keyvalue.core.KeyValueTemplate;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.index.IndexConfiguration;
 import org.springframework.data.redis.core.index.Indexed;
 import org.springframework.data.redis.core.index.RedisIndexDefinition;
@@ -53,6 +56,18 @@ public class RedisRepositoryIntegrationTests {
 	@EnableRedisRepositories(considerNestedRepositories = true, indexConfiguration = MyIndexConfiguration.class)
 	static class Config {
 
+		@Bean
+		RedisTemplate<?, ?> redisTemplate() {
+
+			JedisConnectionFactory connectionFactory = new JedisConnectionFactory();
+			connectionFactory.afterPropertiesSet();
+
+			RedisTemplate<byte[], byte[]> template = new RedisTemplate<byte[], byte[]>();
+			template.setConnectionFactory(connectionFactory);
+
+			return template;
+		}
+
 	}
 
 	@Autowired PersonRepository repo;