DATAREDIS-425 - Move default ReferenceResolver to RedisKeyValueAdapter.

Change visibility and add as default in setup.

Author: christophstrobl

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java

@@ -137,7 +137,7 @@ public List<byte[]> convert(KeyValue<byte[], byte[]> source) {
 			public Map<byte[], byte[]> convert(final List<byte[]> source) {
 
 				if (CollectionUtils.isEmpty(source)) {
-					Collections.emptyMap();
+					return Collections.emptyMap();
 				}
 
 				Map<byte[], byte[]> target = new LinkedHashMap<byte[], byte[]>();

src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java

@@ -38,8 +38,12 @@
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.convert.IndexResolverImpl;
+import org.springframework.data.redis.core.convert.MappingRedisConverter;
 import org.springframework.data.redis.core.convert.RedisConverter;
 import org.springframework.data.redis.core.convert.RedisData;
+import org.springframework.data.redis.core.convert.ReferenceResolver;
+import org.springframework.data.redis.core.mapping.RedisMappingContext;
 import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.util.ByteUtils;
@@ -61,21 +65,35 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter implements App
 	private RedisMessageListenerContainer messageListenerContainer;
 	private KeyExpirationEventMessageListener expirationListener;
 
+	public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps) {
+		this(redisOps, new RedisMappingContext());
+	}
+
+	public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisMappingContext mappingContext) {
+
+		super(new RedisQueryEngine());
+
+		Assert.notNull(redisOps, "RedisOperations must not be null!");
+
+		MappingRedisConverter mappingConverter = new MappingRedisConverter(mappingContext, new IndexResolverImpl(
+				mappingContext.getMappingConfiguration().getIndexConfiguration()), new ReferenceResolverImpl(this));
+		mappingConverter.afterPropertiesSet();
+
+		converter = mappingConverter;
+		this.redisOps = redisOps;
+
+		initKeyExpirationListener();
+	}
+
 	/**
 	 * @param redisOps must not be {@literal null}.
 	 * @param mappingContext must not be {@literal null}.
 	 */
-	// TODO: change context to RedisConverter
 	public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisConverter redisConverter) {
 
 		super(new RedisQueryEngine());
 
 		Assert.notNull(redisOps, "RedisOperations must not be null!");
-		// Assert.notNull(mappingContext, "RedisMappingContext must not be null!");
-		//
-		// MappingRedisConverter mappingConverter = new MappingRedisConverter(mappingContext, new IndexResolverImpl(
-		// mappingContext.getMappingConfiguration().getIndexConfiguration()), new ReferenceResolverImpl(this));
-		// mappingConverter.afterPropertiesSet();
 
 		converter = redisConverter;
 		this.redisOps = redisOps;
@@ -454,4 +472,33 @@ private boolean isKeyExpirationMessage(Message message) {
 		}
 	}
 
+	static class ReferenceResolverImpl implements ReferenceResolver {
+
+		private RedisKeyValueAdapter adapter;
+
+		ReferenceResolverImpl() {
+
+		}
+
+		/**
+		 * @param adapter must not be {@literal null}.
+		 */
+		public ReferenceResolverImpl(RedisKeyValueAdapter adapter) {
+			this.adapter = adapter;
+		}
+
+		public void setAdapter(RedisKeyValueAdapter adapter) {
+			this.adapter = adapter;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.redis.core.convert.ReferenceResolver#resolveReference(java.io.Serializable, java.io.Serializable, java.lang.Class)
+		 */
+		@Override
+		public <T> T resolveReference(Serializable id, Serializable keyspace, Class<T> type) {
+			return (T) adapter.get(id, keyspace);
+		}
+	}
+
 }

src/main/java/org/springframework/data/redis/core/convert/ReferenceResolverImpl.java

@@ -66,8 +66,9 @@ public RedisMappingContext(MappingConfiguration mappingConfiguration) {
 		this.mappingConfiguration = mappingConfiguration != null ? mappingConfiguration : new MappingConfiguration(
 				new IndexConfiguration(), new KeyspaceConfiguration());
 
-		setFallbackKeySpaceResolver(new ConfigAwareKeySpaceResolver(mappingConfiguration.getKeyspaceConfiguration()));
-		this.timeToLiveAccessor = new ConfigAwareTimeToLiveAccessor(mappingConfiguration.getKeyspaceConfiguration(), this);
+		setFallbackKeySpaceResolver(new ConfigAwareKeySpaceResolver(this.mappingConfiguration.getKeyspaceConfiguration()));
+		this.timeToLiveAccessor = new ConfigAwareTimeToLiveAccessor(this.mappingConfiguration.getKeyspaceConfiguration(),
+				this);
 	}
 
 	/**
@@ -207,7 +208,7 @@ static class ConfigAwareTimeToLiveAccessor implements TimeToLiveAccessor {
 		 * @param keyspaceConfig must not be {@literal null}.
 		 * @param mappingContext must not be {@literal null}.
 		 */
-		public ConfigAwareTimeToLiveAccessor(KeyspaceConfiguration keyspaceConfig, RedisMappingContext mappingContext) {
+		ConfigAwareTimeToLiveAccessor(KeyspaceConfiguration keyspaceConfig, RedisMappingContext mappingContext) {
 
 			Assert.notNull(keyspaceConfig, "KeyspaceConfiguration must not be null!");
 			Assert.notNull(mappingContext, "MappingContext must not be null!");

src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java

@@ -31,7 +31,6 @@
 import org.springframework.data.redis.core.convert.CustomConversions;
 import org.springframework.data.redis.core.convert.MappingConfiguration;
 import org.springframework.data.redis.core.convert.MappingRedisConverter;
-import org.springframework.data.redis.core.convert.ReferenceResolverImpl;
 import org.springframework.data.redis.core.mapping.RedisMappingContext;
 import org.springframework.data.repository.config.RepositoryConfigurationSource;
 import org.springframework.util.StringUtils;
@@ -122,7 +121,7 @@ public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConf
 	private RootBeanDefinition createRedisReferenceResolverDefinition() {
 
 		RootBeanDefinition beanDef = new RootBeanDefinition();
-		beanDef.setBeanClass(ReferenceResolverImpl.class);
+		beanDef.setBeanClassName("org.springframework.data.redis.core.RedisKeyValueAdapter.ReferenceResolverImpl");
 
 		MutablePropertyValues props = new MutablePropertyValues();
 		props.add("adapter", new RuntimeBeanReference(REDIS_ADAPTER_BEAN_NAME));

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

@@ -37,11 +37,8 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.convert.Bucket;
-import org.springframework.data.redis.core.convert.IndexResolverImpl;
 import org.springframework.data.redis.core.convert.KeyspaceConfiguration;
 import org.springframework.data.redis.core.convert.MappingConfiguration;
-import org.springframework.data.redis.core.convert.MappingRedisConverter;
-import org.springframework.data.redis.core.convert.ReferenceResolverImpl;
 import org.springframework.data.redis.core.index.IndexConfiguration;
 import org.springframework.data.redis.core.index.Indexed;
 import org.springframework.data.redis.core.mapping.RedisMappingContext;
@@ -69,11 +66,7 @@ public void setUp() {
 				new KeyspaceConfiguration()));
 		mappingContext.afterPropertiesSet();
 
-		MappingRedisConverter converter = new MappingRedisConverter(mappingContext, new IndexResolverImpl(), null);
-
-		adapter = new RedisKeyValueAdapter(template, converter);
-		converter.setReferenceResolver(new ReferenceResolverImpl(adapter));
-		converter.afterPropertiesSet();
+		adapter = new RedisKeyValueAdapter(template, mappingContext);
 
 		template.execute(new RedisCallback<Void>() {