DATAREDIS-425 - Cleanup.

- Keyspace and id types are now consequently converted into String types as those build up the actual key 'keyspace:id'.
- Update test class name to reflect unit under tests name.

Author: christophstrobl

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

@@ -131,8 +131,8 @@ public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisMappingContext
 		Assert.notNull(redisOps, "RedisOperations must not be null!");
 		Assert.notNull(mappingContext, "RedisMappingContext must not be null!");
 
-		MappingRedisConverter mappingConverter = new MappingRedisConverter(mappingContext,
-				new PathIndexResolver(mappingContext), new ReferenceResolverImpl(this));
+		MappingRedisConverter mappingConverter = new MappingRedisConverter(mappingContext, new PathIndexResolver(
+				mappingContext), new ReferenceResolverImpl(this));
 		mappingConverter.setCustomConversions(customConversions == null ? new CustomConversions() : customConversions);
 		mappingConverter.afterPropertiesSet();
 
@@ -173,7 +173,7 @@ public Object put(final Serializable id, final Object item, final Serializable k
 
 		if (rdo.getId() == null) {
 
-			rdo.setId(id);
+			rdo.setId(converter.getConversionService().convert(id, String.class));
 
 			if (!(item instanceof RedisData)) {
 				KeyValuePersistentProperty idProperty = converter.getMappingContext().getPersistentEntity(item.getClass())
@@ -249,7 +249,10 @@ public Object get(Serializable id, Serializable keyspace) {
 	 */
 	public <T> T get(Serializable id, Serializable keyspace, Class<T> type) {
 
-		final byte[] binId = createKey(keyspace, id);
+		String stringId = asString(id);
+		String stringKeyspace = asString(keyspace);
+
+		final byte[] binId = createKey(stringKeyspace, stringId);
 
 		Map<byte[], byte[]> raw = redisOps.execute(new RedisCallback<Map<byte[], byte[]>>() {
 
@@ -260,8 +263,8 @@ public Map<byte[], byte[]> doInRedis(RedisConnection connection) throws DataAcce
 		});
 
 		RedisData data = new RedisData(raw);
-		data.setId(id);
-		data.setKeyspace(keyspace.toString());
+		data.setId(stringId);
+		data.setKeyspace(stringKeyspace);
 
 		return converter.read(type, data);
 	}
@@ -287,15 +290,17 @@ public <T> T delete(final Serializable id, final Serializable keyspace, final Cl
 
 		if (o != null) {
 
+			final byte[] keyToDelete = createKey(asString(keyspace), asString(id));
+
 			redisOps.execute(new RedisCallback<Void>() {
 
 				@Override
 				public Void doInRedis(RedisConnection connection) throws DataAccessException {
 
-					connection.del(createKey(keyspace, id));
+					connection.del(keyToDelete);
 					connection.sRem(binKeyspace, binId);
 
-					new IndexWriter(connection, converter).removeKeyFromIndexes(keyspace.toString(), binId);
+					new IndexWriter(connection, converter).removeKeyFromIndexes(asString(keyspace), binId);
 					return null;
 				}
 			});
@@ -322,7 +327,8 @@ public List<Map<byte[], byte[]>> doInRedis(RedisConnection connection) throws Da
 				Set<byte[]> members = connection.sMembers(binKeyspace);
 
 				for (byte[] id : members) {
-					rawData.add(connection.hGetAll(createKey(binKeyspace, id)));
+					rawData.add(connection.hGetAll(createKey(asString(keyspace),
+							getConverter().getConversionService().convert(id, String.class))));
 				}
 
 				return rawData;
@@ -349,7 +355,7 @@ public void deleteAllOf(final Serializable keyspace) {
 			public Void doInRedis(RedisConnection connection) throws DataAccessException {
 
 				connection.del(toBytes(keyspace));
-				new IndexWriter(connection, converter).removeAllIndexes(keyspace.toString());
+				new IndexWriter(connection, converter).removeAllIndexes(asString(keyspace));
 				return null;
 			}
 		});
@@ -404,7 +410,12 @@ public void clear() {
 		// nothing to do
 	}
 
-	public byte[] createKey(Serializable keyspace, Serializable id) {
+	private String asString(Serializable value) {
+		return value instanceof String ? (String) value : getConverter().getConversionService()
+				.convert(value, String.class);
+	}
+
+	public byte[] createKey(String keyspace, String id) {
 		return toBytes(keyspace + ":" + id);
 	}
 
@@ -600,7 +611,7 @@ public void setAdapter(RedisKeyValueAdapter adapter) {
 		 * @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) {
+		public <T> T resolveReference(Serializable id, String keyspace, Class<T> type) {
 			return (T) adapter.get(id, keyspace, type);
 		}
 	}

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.redis.core.convert;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -345,7 +344,7 @@ public void write(Object source, final RedisData sink) {
 		sink.setKeyspace(entity.getKeySpace());
 
 		writeInternal(entity.getKeySpace(), "", source, entity.getTypeInformation(), sink);
-		sink.setId((Serializable) entity.getIdentifierAccessor(source).getIdentifier());
+		sink.setId(getConversionService().convert(entity.getIdentifierAccessor(source).getIdentifier(), String.class));
 
 		Long ttl = entity.getTimeToLiveAccessor().getTimeToLive(source);
 		if (ttl != null && ttl > 0) {

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.redis.core.convert;
 
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -34,7 +33,7 @@
 public class RedisData {
 
 	private String keyspace;
-	private Serializable id;
+	private String id;
 
 	private Bucket bucket;
 	private Set<IndexedData> indexedData;
@@ -74,14 +73,14 @@ public RedisData(Bucket bucket) {
 	 * 
 	 * @param id
 	 */
-	public void setId(Serializable id) {
+	public void setId(String id) {
 		this.id = id;
 	}
 
 	/**
 	 * @return
 	 */
-	public Serializable getId() {
+	public String getId() {
 		return this.id;
 	}
 

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

@@ -33,5 +33,5 @@ public interface ReferenceResolver {
 	 * @param type must not be {@literal null}.
 	 * @return {@literal null} if referenced object does not exist.
 	 */
-	<T> T resolveReference(Serializable id, Serializable keyspace, Class<T> type);
+	<T> T resolveReference(Serializable id, String keyspace, Class<T> type);
 }

src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java

@@ -25,12 +25,12 @@
 import org.springframework.util.StringUtils;
 
 /**
- * {@link IndexDefinition} implementation.
+ * Base {@link IndexDefinition} implementation.
  * 
  * @author Christoph Strobl
  * @since 1.7
  */
-public class RedisIndexDefinition implements IndexDefinition {
+public abstract class RedisIndexDefinition implements IndexDefinition {
 
 	private final String keyspace;
 	private final String indexName;
@@ -45,7 +45,7 @@ public class RedisIndexDefinition implements IndexDefinition {
 	 * @param path
 	 * @param indexName
 	 */
-	public RedisIndexDefinition(String keyspace, String path, String indexName) {
+	protected RedisIndexDefinition(String keyspace, String path, String indexName) {
 
 		this.keyspace = keyspace;
 		this.indexName = indexName;

src/test/java/org/springframework/data/redis/core/convert/IndexResolverImplUnitTests.java renamed to src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.redis.core.convert;
 
+import static org.hamcrest.collection.IsEmptyCollection.*;
 import static org.hamcrest.core.Is.*;
 import static org.hamcrest.core.IsCollectionContaining.*;
 import static org.hamcrest.core.IsNull.*;
@@ -41,6 +42,7 @@
 import org.springframework.data.redis.core.convert.ConversionTestEntities.Location;
 import org.springframework.data.redis.core.convert.ConversionTestEntities.Person;
 import org.springframework.data.redis.core.convert.ConversionTestEntities.PersonWithAddressReference;
+import org.springframework.data.redis.core.convert.ConversionTestEntities.Size;
 import org.springframework.data.redis.core.convert.ConversionTestEntities.TaVeren;
 import org.springframework.data.redis.core.convert.ConversionTestEntities.TheWheelOfTime;
 import org.springframework.data.redis.core.index.IndexConfiguration;
@@ -53,7 +55,7 @@
  * @author Christoph Strobl
  */
 @RunWith(MockitoJUnitRunner.class)
-public class IndexResolverImplUnitTests {
+public class PathIndexResolverUnitTests {
 
 	IndexConfiguration indexConfig;
 	PathIndexResolver indexResolver;
@@ -409,6 +411,7 @@ public void resolveIndexShouldInspectObjectTypeValuesInListProperties() {
 	 */
 	@Test
 	public void resolveIndexAllowCustomIndexName() {
+
 		indexConfig.addIndexDefinition(new SimpleIndexDefinition(KEYSPACE_PERSON, "items.type", "itemsType"));
 
 		Item hat = new Item();
@@ -425,6 +428,21 @@ public void resolveIndexAllowCustomIndexName() {
 		assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "itemsType", "hat")));
 	}
 
+	/**
+	 * @see DATAREDIS-425
+	 */
+	@Test
+	public void resolveIndexForTypeThatHasNoIndexDefined() {
+
+		Size size = new Size();
+		size.height = 10;
+		size.length = 20;
+		size.width = 30;
+
+		Set<IndexedData> indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Size.class), size);
+		assertThat(indexes, is(empty()));
+	}
+
 	private IndexedData resolve(String path, Object value) {
 
 		Set<IndexedData> data = indexResolver.resolveIndex(KEYSPACE_PERSON, path, propertyMock, value);