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

DATAREDIS-875 - Omit MappingRedisConverter type hint for primitive type properties.

Browse Source 
We now additionally check if the target property is a primitive type and do no longer add the type hint if so.

Original pull request: #368.
This commit is contained in:
Christoph Strobl
2018-10-25 13:21:23 +02:00
committed by Mark Paluch
parent 598875df75
commit a547188fc3
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,6 +298,10 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
byte[] sourceBytes = source.getBucket().get(currentPath);
if(typeInformation.getType().isPrimitive() && sourceBytes == null) {
return null;
}
if (persistentProperty.isIdProperty() && StringUtils.isEmpty(path.isEmpty())) {
return sourceBytes == null ? fromBytes(sourceBytes, typeInformation.getActualType().getType()) : source.getId();
}
@@ -739,7 +743,7 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
Optional<Class<?>> targetType = customConversions.getCustomWriteTarget(value.getClass());
if (!targetType.filter(it -> ClassUtils.isAssignable(Map.class, it)).isPresent()
if (!propertyType.isPrimitive() && !targetType.filter(it -> ClassUtils.isAssignable(Map.class, it)).isPresent()
&& customConversions.isSimpleType(value.getClass()) && value.getClass() != propertyType) {
typeMapper.writeType(value.getClass(), sink.getBucket().getPropertyPath(path));
}

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

@@ -1814,6 +1814,24 @@ public class MappingRedisConverterUnitTests {
assertThat(write(update).getBucket().get("_class"), is(nullValue()));
}
@Test // DATAREDIS-875
public void shouldNotWriteTypeHintForPrimitveTypes() {
Size source = new Size();
source.height = 1;
assertThat(write(source).getBucket().get("height._class"), is(nullValue()));
}
@Test // DATAREDIS-875
public void shouldReadPrimitveTypes() {
Map<String, String> source = new LinkedHashMap<>();
source.put("height", "1000");
assertThat(read(Size.class, source).height, is(equalTo(1000)));
}
private RedisData write(Object source) {
RedisData rdo = new RedisData();