DATAREDIS-471 - Hacking.

Do not return the updated entity by default.

Author: christophstrobl

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

@@ -394,11 +394,9 @@ public Long doInRedis(RedisConnection connection) throws DataAccessException {
 		return count != null ? count.longValue() : 0;
 	}
 
-	@SuppressWarnings("unchecked")
-	public <T> T update(final PartialUpdate<T> update) {
+	public void update(final PartialUpdate<?> update) {
 
-		final RedisPersistentEntity<T> entity = (RedisPersistentEntity<T>) this.converter.getMappingContext()
-				.getPersistentEntity(update.getTarget());
+		final RedisPersistentEntity<?> entity = this.converter.getMappingContext().getPersistentEntity(update.getTarget());
 
 		final String keyspace = entity.getKeySpace();
 		final Object id = update.getId();
@@ -471,8 +469,6 @@ public Void doInRedis(RedisConnection connection) throws DataAccessException {
 			}
 
 		});
-
-		return get(toBytes(id), keyspace, update.getTarget());
 	}
 
 	/**

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

@@ -70,6 +70,7 @@ public RedisMappingContext getMappingContext() {
 	 * </code>
 	 * 
 	 * <pre>
+	 * 
 	 * @param callback provides the to retrieve entity ids. Must not be {@literal null}.
 	 * @param type must not be {@literal null}.
 	 * @return empty list if not elements found.
@@ -89,15 +90,14 @@ public List<T> doInRedis(RedisKeyValueAdapter adapter) {
 					return Collections.emptyList();
 				}
 
-				Iterable<?> ids = ClassUtils.isAssignable(Iterable.class, callbackResult.getClass()) ? (Iterable<?>) callbackResult
-						: Collections.singleton(callbackResult);
+				Iterable<?> ids = ClassUtils.isAssignable(Iterable.class, callbackResult.getClass())
+						? (Iterable<?>) callbackResult : Collections.singleton(callbackResult);
 
 				List<T> result = new ArrayList<T>();
 				for (Object id : ids) {
 
-					String idToUse = adapter.getConverter().getConversionService().canConvert(id.getClass(), String.class) ? adapter
-							.getConverter().getConversionService().convert(id, String.class)
-							: id.toString();
+					String idToUse = adapter.getConverter().getConversionService().canConvert(id.getClass(), String.class)
+							? adapter.getConverter().getConversionService().convert(id, String.class) : id.toString();
 
 					T candidate = findById(idToUse, type);
 					if (candidate != null) {
@@ -118,20 +118,21 @@ public List<T> doInRedis(RedisKeyValueAdapter adapter) {
 	public void update(Object objectToUpdate) {
 
 		if (objectToUpdate instanceof PartialUpdate) {
-			doPartialUpdate((PartialUpdate<Object>) objectToUpdate);
+			doPartialUpdate((PartialUpdate<?>) objectToUpdate);
 		}
 
 		super.update(objectToUpdate);
 	}
 
-	protected <T> T doPartialUpdate(final PartialUpdate<T> update) {
+	protected void doPartialUpdate(final PartialUpdate<?> update) {
 
-		return execute(new RedisKeyValueCallback<T>() {
+		execute(new RedisKeyValueCallback<Void>() {
 
 			@Override
-			public T doInRedis(RedisKeyValueAdapter adapter) {
+			public Void doInRedis(RedisKeyValueAdapter adapter) {
 
-				return adapter.update(update);
+				adapter.update(update);
+				return null;
 			}
 		});
 	}

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

@@ -18,6 +18,7 @@
 import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentEntity;
 import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentProperty;
+import org.springframework.data.redis.core.mapping.RedisMappingContext;
 
 /**
  * Redis specific {@link EntityConverter}.
@@ -28,4 +29,10 @@
 public interface RedisConverter
 		extends EntityConverter<KeyValuePersistentEntity<?>, KeyValuePersistentProperty, Object, RedisData> {
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.convert.EntityConverter#getMappingContext()
+	 */
+	@Override
+	RedisMappingContext getMappingContext();
 }

src/test/java/org/springframework/data/redis/core/RedisKeyValueTemplateTests.java

@@ -17,6 +17,7 @@
 
 import static org.hamcrest.core.Is.*;
 import static org.hamcrest.core.IsCollectionContaining.*;
+import static org.hamcrest.core.IsEqual.*;
 import static org.junit.Assert.*;
 
 import java.util.Arrays;
@@ -202,6 +203,9 @@ public List<byte[]> doInRedis(RedisConnection connection) throws DataAccessExcep
 		assertThat(result.size(), is(0));
 	}
 
+	/**
+	 * @see DATAREDIS-471
+	 */
 	@Test
 	public void partialUpdate() {
 
@@ -213,16 +217,19 @@ public void partialUpdate() {
 		/*
 		 * Set the lastname and make sure we've an index on it afterwards
 		 */
-		Person update1 = new Person(rand.id, "Rand-Update", "al-thor");
+		Person update1 = new Person(rand.id, null, "al-thor");
 		PartialUpdate<Person> update = new PartialUpdate<Person>(rand.id, update1);
 
-		assertThat(template.doPartialUpdate(update), is(update1));
+		template.doPartialUpdate(update);
 
+		assertThat(template.findById(rand.id, Person.class), is(equalTo(new Person(rand.id, "rand", "al-thor"))));
 		nativeTemplate.execute(new RedisCallback<Void>() {
 
 			@Override
 			public Void doInRedis(RedisConnection connection) throws DataAccessException {
 
+				assertThat(connection.hGet(("template-test-person:" + rand.id).getBytes(), "firstname".getBytes()),
+						is(equalTo("rand".getBytes())));
 				assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes()), is(true));
 				assertThat(connection.sIsMember("template-test-person:lastname:al-thor".getBytes(), rand.id.getBytes()),
 						is(true));
@@ -235,8 +242,9 @@ public Void doInRedis(RedisConnection connection) throws DataAccessException {
 		 */
 		update = new PartialUpdate<Person>(rand.id, Person.class).set("firstname", "frodo");
 
-		assertThat(template.doPartialUpdate(update), is(new Person(rand.id, "frodo", "al-thor")));
+		template.doPartialUpdate(update);
 
+		assertThat(template.findById(rand.id, Person.class), is(equalTo(new Person(rand.id, "frodo", "al-thor"))));
 		nativeTemplate.execute(new RedisCallback<Void>() {
 
 			@Override
@@ -256,8 +264,9 @@ public Void doInRedis(RedisConnection connection) throws DataAccessException {
 		update.del("firstname");
 		update.set("lastname", "baggins");
 
-		assertThat(template.doPartialUpdate(update), is(new Person(rand.id, null, "baggins")));
+		template.doPartialUpdate(update);
 
+		assertThat(template.findById(rand.id, Person.class), is(equalTo(new Person(rand.id, null, "baggins"))));
 		nativeTemplate.execute(new RedisCallback<Void>() {
 
 			@Override
@@ -277,8 +286,9 @@ public Void doInRedis(RedisConnection connection) throws DataAccessException {
 		update = new PartialUpdate<Person>(rand.id, Person.class);
 		update.del("lastname");
 
-		assertThat(template.doPartialUpdate(update), is(new Person(rand.id, null, null)));
+		template.doPartialUpdate(update);
 
+		assertThat(template.findById(rand.id, Person.class), is(equalTo(new Person(rand.id, null, null))));
 		nativeTemplate.execute(new RedisCallback<Void>() {
 
 			@Override