Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-595 - Adapt to API changes in Spring Data Commons.

Browse Source
This commit is contained in:
Christoph Strobl
2017-03-23 13:02:25 +01:00
parent 00b4009553
commit d772c9dac4
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,13 +232,14 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
if (persistentProperty.isMap()) {
Map<?, ?> targetValue = null;
Class<?> mapValueType = persistentProperty.getMapValueType().orElseThrow(()-> new IllegalArgumentException("Unable to retrieve MapValueType!"));
if (conversionService.canConvert(byte[].class, persistentProperty.getMapValueType())) {
if (conversionService.canConvert(byte[].class, mapValueType)) {
targetValue = readMapOfSimpleTypes(currentPath, persistentProperty.getType(),
persistentProperty.getComponentType(), persistentProperty.getMapValueType(), source);
persistentProperty.getComponentType().get(), mapValueType, source);
} else {
targetValue = readMapOfComplexTypes(currentPath, persistentProperty.getType(),
persistentProperty.getComponentType(), persistentProperty.getMapValueType(), source);
persistentProperty.getComponentType().get(), mapValueType, source);
}
if (targetValue != null) {
@@ -313,7 +314,7 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
Bucket bucket = source.getBucket().extract(currentPath + ".[");
Collection<Object> target = CollectionFactory.createCollection(association.getInverse().getType(),
association.getInverse().getComponentType(), bucket.size());
association.getInverse().getComponentType().orElse(Object.class), bucket.size());
for (Entry<String, byte[]> entry : bucket.entrySet()) {
@@ -501,7 +502,7 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
pUpdate.getPropertyPath(), pUpdate.getValue()));
}
writeMap(entity.getKeySpace(), pUpdate.getPropertyPath(), targetProperty.getMapValueType(), map, sink);
writeMap(entity.getKeySpace(), pUpdate.getPropertyPath(), targetProperty.getMapValueType().orElse(Object.class), map, sink);
} else {
writeInternal(entity.getKeySpace(), pUpdate.getPropertyPath(), pUpdate.getValue(),
@@ -589,7 +590,7 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
if (persistentProperty.isMap()) {
if (accessor.getProperty(persistentProperty).isPresent()) {
writeMap(keyspace, propertyStringPath, persistentProperty.getMapValueType(),
writeMap(keyspace, propertyStringPath, persistentProperty.getMapValueType().orElse(Object.class),
(Map<?, ?>) accessor.getProperty(persistentProperty).get(), sink);
}
} else if (persistentProperty.isCollectionLike()) {