DATAREDIS-471 - Hacking (References in Lists).

Fix handling of references in lists.

Author: christophstrobl

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

@@ -405,35 +405,53 @@ protected void writePartialUpdate(PartialUpdate<?> update, RedisData sink) {
 							ClassTypeInformation.OBJECT, sink);
 					continue;
 				}
-				if (targetProperty.isCollectionLike()) {
 
-					Collection<Object> c = pUpdate.getValue() instanceof Collection ? (Collection<Object>) pUpdate.getValue()
+				if (targetProperty.isAssociation()) {
+
+					if (targetProperty.isCollectionLike()) {
+
+						KeyValuePersistentEntity<?> ref = mappingContext.getPersistentEntity(
+								targetProperty.getAssociation().getInverse().getTypeInformation().getComponentType().getActualType());
+
+						int i = 0;
+						for (Object o : (Collection<?>) pUpdate.getValue()) {
+
+							Object refId = ref.getPropertyAccessor(o).getProperty(ref.getIdProperty());
+							sink.getBucket().put(pUpdate.getPropertyPath() + ".[" + i + "]",
+									toBytes(ref.getKeySpace() + ":" + refId));
+							i++;
+						}
+					} else {
+
+						KeyValuePersistentEntity<?> ref = mappingContext
+								.getPersistentEntity(targetProperty.getAssociation().getInverse().getTypeInformation());
+
+						Object refId = ref.getPropertyAccessor(pUpdate.getValue()).getProperty(ref.getIdProperty());
+						sink.getBucket().put(pUpdate.getPropertyPath(), toBytes(ref.getKeySpace() + ":" + refId));
+					}
+				}
+
+				else if (targetProperty.isCollectionLike()) {
+
+					Collection<?> collection = pUpdate.getValue() instanceof Collection ? (Collection<?>) pUpdate.getValue()
 							: Collections.<Object> singleton(pUpdate.getValue());
-					writeCollection(entity.getKeySpace(), pUpdate.getPropertyPath(), c, targetProperty.getTypeInformation(),
-							sink);
+					writeCollection(entity.getKeySpace(), pUpdate.getPropertyPath(), collection,
+							targetProperty.getTypeInformation(), sink);
 				} else if (targetProperty.isMap()) {
 
 					Map<Object, Object> map = new HashMap<Object, Object>();
 
 					if (pUpdate.getValue() instanceof Map) {
-						map.putAll((Map) pUpdate.getValue());
+						map.putAll((Map<?, ?>) pUpdate.getValue());
 					} else if (pUpdate.getValue() instanceof Map.Entry) {
-						map.put(((Map.Entry) pUpdate.getValue()).getKey(), ((Map.Entry) pUpdate.getValue()).getValue());
+						map.put(((Map.Entry<?, ?>) pUpdate.getValue()).getKey(), ((Map.Entry<?, ?>) pUpdate.getValue()).getValue());
 					} else {
 						throw new MappingException(
 								String.format("Cannot set update value for map property '%s' to '%s'. Please use a Map or Map.Entry.",
 										pUpdate.getPropertyPath(), pUpdate.getValue()));
 					}
 
 					writeMap(entity.getKeySpace(), pUpdate.getPropertyPath(), targetProperty.getMapValueType(), map, sink);
-				} else if (targetProperty.isAssociation()) {
-
-					KeyValuePersistentEntity<?> ref = mappingContext
-							.getPersistentEntity(targetProperty.getAssociation().getInverse().getTypeInformation());
-
-					Object refId = ref.getPropertyAccessor(pUpdate.getValue()).getProperty(ref.getIdProperty());
-
-					sink.getBucket().put(pUpdate.getPropertyPath(), toBytes(ref.getKeySpace() + ":" + refId));
 				} else {
 
 					writeInternal(entity.getKeySpace(), pUpdate.getPropertyPath(), pUpdate.getValue(),

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

@@ -1605,6 +1605,29 @@ public void writeShouldWritePartialUpdatePathWithRegisteredCustomConversionCorre
 	@Test
 	public void writeShouldWritePartialUpdatePathWithReferenceCorrectly() {
 
+		Location tar = new Location();
+		tar.id = "1";
+		tar.name = "tar valon";
+
+		Location tear = new Location();
+		tear.id = "2";
+		tear.name = "city of tear";
+
+		PartialUpdate<Person> update = new PartialUpdate<Person>("123", Person.class).set("visited",
+				Arrays.asList(tar, tear));
+
+		assertThat(write(update).getBucket(),
+				isBucket().containingUtf8String("visited.[0]", "locations:1").containingUtf8String("visited.[1]", "locations:2") //
+						.without("visited.id") //
+						.without("visited.name"));
+	}
+
+	/**
+	 * @see DATAREDIS-425
+	 */
+	@Test
+	public void writeShouldWritePartialUpdatePathWithListOfReferencesCorrectly() {
+
 		Location location = new Location();
 		location.id = "1";
 		location.name = "tar valon";