DATAREDIS-634 - Adapt to moved CustomConversions to Spring Data Commons.

Introduce RedisCustomConversions extending o.s.d.convert.CustomConversions. Remove o.s.d.mongo.core.convert.CustomConversions implementation code and utility classes and let it extend RedisCustomConversions. Replace references to o.s.d.r.c.c.CustomConversions with o.s.d.convert.CustomConversions. Adapt tests. Introduce constructors for ObjectHashMapper and RedisKeyValueAdapter requiring o.s.d.convert.CustomConversions and deprecate constructors accepting o.s.d.r.c.c.CustomConversions. Related ticket: DATACMNS-1035.

Author: mp911de

src/main/asciidoc/reference/redis-repositories.adoc

@@ -158,7 +158,7 @@ of Complex Type
 addresses.[work].city = "...
 |===
 
-Mapping behavior can be customized by registering the according `Converter` in `CustomConversions`. Those converters can take care of converting from/to a single `byte[]` as well as `Map<String,byte[]>` whereas the first one is suitable for eg. converting one complex type to eg. a binary JSON representation that still uses the default mappings hash structure. The second option offers full control over the resulting hash. Writing objects to a Redis hash will delete the content from the hash and re-create the whole hash, so not mapped data will be lost.
+Mapping behavior can be customized by registering the according `Converter` in `RedisCustomConversions`. Those converters can take care of converting from/to a single `byte[]` as well as `Map<String,byte[]>` whereas the first one is suitable for eg. converting one complex type to eg. a binary JSON representation that still uses the default mappings hash structure. The second option offers full control over the resulting hash. Writing objects to a Redis hash will delete the content from the hash and re-create the whole hash, so not mapped data will be lost.
 
 .Sample byte[] Converters
 ====

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

@@ -28,8 +28,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
@@ -42,7 +40,6 @@
 import org.springframework.data.keyvalue.core.AbstractKeyValueAdapter;
 import org.springframework.data.keyvalue.core.KeyValueAdapter;
 import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentProperty;
-import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.redis.connection.DataType;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
@@ -55,6 +52,7 @@
 import org.springframework.data.redis.core.convert.MappingRedisConverter;
 import org.springframework.data.redis.core.convert.PathIndexResolver;
 import org.springframework.data.redis.core.convert.RedisConverter;
+import org.springframework.data.redis.core.convert.RedisCustomConversions;
 import org.springframework.data.redis.core.convert.RedisData;
 import org.springframework.data.redis.core.convert.ReferenceResolverImpl;
 import org.springframework.data.redis.core.mapping.RedisMappingContext;
@@ -66,7 +64,6 @@
 import org.springframework.data.util.CloseableIterator;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * Redis specific {@link KeyValueAdapter} implementation. Uses binary codec to read/write data from/to Redis. Objects
@@ -117,7 +114,7 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 
 /**
  * Creates new {@link RedisKeyValueAdapter} with default {@link RedisMappingContext} and default
- * {@link CustomConversions}.
+ * {@link RedisCustomConversions}.
  *
  * @param redisOps must not be {@literal null}.
  */
@@ -126,13 +123,13 @@ public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps) {
 }
 
 /**
- * Creates new {@link RedisKeyValueAdapter} with default {@link CustomConversions}.
+ * Creates new {@link RedisKeyValueAdapter} with default {@link RedisCustomConversions}.
  *
  * @param redisOps must not be {@literal null}.
  * @param mappingContext must not be {@literal null}.
  */
 public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisMappingContext mappingContext) {
-this(redisOps, mappingContext, new CustomConversions());
+this(redisOps, mappingContext, new RedisCustomConversions());
 }
 
 /**
@@ -141,9 +138,25 @@ public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisMappingContext
  * @param redisOps must not be {@literal null}.
  * @param mappingContext must not be {@literal null}.
  * @param customConversions can be {@literal null}.
+ * @deprecated since 2.0, use
+ * {@link #RedisKeyValueAdapter(RedisOperations, RedisMappingContext, org.springframework.data.convert.CustomConversions)}.
  */
+@Deprecated
 public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisMappingContext mappingContext,
 CustomConversions customConversions) {
+this(redisOps, mappingContext, (org.springframework.data.convert.CustomConversions) customConversions);
+}
+
+/**
+ * Creates new {@link RedisKeyValueAdapter}.
+ *
+ * @param redisOps must not be {@literal null}.
+ * @param mappingContext must not be {@literal null}.
+ * @param customConversions can be {@literal null}.
+ * @since 2.0
+ */
+public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisMappingContext mappingContext,
+org.springframework.data.convert.CustomConversions customConversions) {
 
 super(new RedisQueryEngine());
 
@@ -152,7 +165,7 @@ public RedisKeyValueAdapter(RedisOperations<?, ?> redisOps, RedisMappingContext
 
 MappingRedisConverter mappingConverter = new MappingRedisConverter(mappingContext,
 new PathIndexResolver(mappingContext), new ReferenceResolverImpl(redisOps));
-mappingConverter.setCustomConversions(customConversions == null ? new CustomConversions() : customConversions);
+mappingConverter.setCustomConversions(customConversions == null ? new RedisCustomConversions() : customConversions);
 mappingConverter.afterPropertiesSet();
 
 this.converter = mappingConverter;
@@ -374,7 +387,7 @@ public Set<byte[]> doInRedis(RedisConnection connection) throws DataAccessExcept
 
 offset = Math.max(0, offset);
 if (offset >= 0 && rows > 0) {
-keys = keys.subList((int)offset, Math.min((int)offset + rows, keys.size()));
+keys = keys.subList((int) offset, Math.min((int) offset + rows, keys.size()));
 }
 
 for (byte[] key : keys) {
@@ -428,7 +441,8 @@ public Long doInRedis(RedisConnection connection) throws DataAccessException {
 
 public void update(final PartialUpdate<?> update) {
 
-final RedisPersistentEntity<?> entity = this.converter.getMappingContext().getPersistentEntity(update.getTarget()).get();
+final RedisPersistentEntity<?> entity = this.converter.getMappingContext().getPersistentEntity(update.getTarget())
+.get();
 
 final String keyspace = entity.getKeySpace();
 final Object id = update.getId();
@@ -622,11 +636,10 @@ private <T> T readBackTimeToLiveIfSet(final byte[] key, T target) {
 if (entity.hasExplictTimeToLiveProperty()) {
 
 Optional<RedisPersistentProperty> ttlProperty = entity.getExplicitTimeToLiveProperty();
-if(!ttlProperty.isPresent()) {
+if (!ttlProperty.isPresent()) {
 return target;
 }
 
-
 final Optional<TimeToLive> ttl = ttlProperty.get().findAnnotation(TimeToLive.class);
 
 Long timeout = redisOps.execute(new RedisCallback<Long>() {