DATAREDIS-425 - Fix index resolution single/multi mismatch.

Author: christophstrobl

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

@@ -80,12 +80,7 @@ private Set<IndexedData> doResolveIndexesFor(final String keyspace, final String
 		RedisPersistentEntity<?> entity = mappingContext.getPersistentEntity(typeInformation);
 
 		if (entity == null) {
-
-			IndexedData index = resolveIndex(keyspace, path, null, value);
-			if (index != null) {
-				return Collections.singleton(index);
-			}
-			return Collections.emptySet();
+			return resolveIndex(keyspace, path, null, value);
 		}
 
 		final PersistentPropertyAccessor accessor = entity.getPropertyAccessor(value);
@@ -105,11 +100,7 @@ public void doWithPersistentProperty(KeyValuePersistentProperty persistentProper
 					TypeInformation<?> typeHint = persistentProperty.isMap() ? persistentProperty.getTypeInformation()
 							.getMapValueType() : persistentProperty.getTypeInformation().getActualType();
 
-					IndexedData index = resolveIndex(keyspace, currentPath, persistentProperty, propertyValue);
-
-					if (index != null) {
-						indexes.add(index);
-					}
+					indexes.addAll(resolveIndex(keyspace, currentPath, persistentProperty, propertyValue));
 
 					if (persistentProperty.isMap()) {
 
@@ -157,20 +148,22 @@ private TypeInformation<?> updateTypeHintForActualValue(TypeInformation<?> typeH
 		return indexes;
 	}
 
-	protected IndexedData resolveIndex(String keyspace, String propertyPath, PersistentProperty<?> property, Object value) {
+	protected Set<IndexedData> resolveIndex(String keyspace, String propertyPath, PersistentProperty<?> property,
+			Object value) {
 
 		if (value == null) {
-			return null;
+			return Collections.emptySet();
 		}
 
 		String path = normalizeIndexPath(propertyPath, property);
 
+		Set<IndexedData> data = new LinkedHashSet<IndexedData>();
+
 		if (indexConfiguration.hasIndexFor(keyspace, path)) {
-			// FIXME it seems there is a mis-match between IndexConfiguration
-			// resolving many RedisIndexSetting objects to resolving a single
-			// IndexData in this method.
-			RedisIndexSetting indexSetting = indexConfiguration.getIndexDefinitionsFor(keyspace, path).iterator().next();
-			return new SimpleIndexedPropertyValue(keyspace, indexSetting.getIndexName(), value);
+			for (RedisIndexSetting indexSetting : indexConfiguration.getIndexDefinitionsFor(keyspace, path)) {
+				data.add(new SimpleIndexedPropertyValue(keyspace, indexSetting.getIndexName(), value));
+			}
+
 		}
 
 		else if (property != null && property.isAnnotationPresent(Indexed.class)) {
@@ -181,13 +174,14 @@ else if (property != null && property.isAnnotationPresent(Indexed.class)) {
 
 			switch (indexed.type()) {
 				case SIMPLE:
-					return new SimpleIndexedPropertyValue(keyspace, path, value);
+					data.add(new SimpleIndexedPropertyValue(keyspace, path, value));
+					break;
 				default:
 					throw new IllegalArgumentException(String.format("Unsupported index type '%s' for path '%s'.",
 							indexed.type(), path));
 			}
 		}
-		return null;
+		return data;
 	}
 
 	private String normalizeIndexPath(String path, PersistentProperty<?> property) {

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

@@ -427,7 +427,15 @@ public void resolveIndexAllowCustomIndexName() {
 	}
 
 	private IndexedData resolve(String path, Object value) {
-		return indexResolver.resolveIndex(KEYSPACE_PERSON, path, propertyMock, value);
+
+		Set<IndexedData> data = indexResolver.resolveIndex(KEYSPACE_PERSON, path, propertyMock, value);
+
+		if (data.isEmpty()) {
+			return null;
+		}
+
+		assertThat(data.size(), is(1));
+		return data.iterator().next();
 	}
 
 	private Indexed createIndexedInstance(final IndexType type) {