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

Polishing.

Browse Source 
Move off deprecated StringUtils.isEmpty method. Fix type reference using the component type and not the component's component type. Add early return for null values.

Original Pull Request: #2015
This commit is contained in:
Mark Paluch
2021-03-23 15:04:18 +01:00
committed by Christoph Strobl
parent d5ba93cc25
commit 4e9f4bc4ad
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.util.comparator.NullSafeComparator;
@@ -289,22 +290,22 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
if (!source.getBucket().hasValue(currentPath) && isByteArray(typeInformation)) {
return readCollectionOrArray(currentPath, typeInformation.getType(),
typeInformation.getRequiredComponentType().getActualType().getType(), source.getBucket());
typeInformation.getRequiredComponentType().getType(), source.getBucket());
}
} else {
return readCollectionOrArray(currentPath, typeInformation.getType(),
typeInformation.getRequiredComponentType().getActualType().getType(), source.getBucket());
typeInformation.getRequiredComponentType().getType(), source.getBucket());
}
}
if (persistentProperty.isEntity()
&& !conversionService.canConvert(byte[].class, typeInformation.getActualType().getType())) {
&& !conversionService.canConvert(byte[].class, typeInformation.getRequiredActualType().getType())) {
Bucket bucket = source.getBucket().extract(currentPath + ".");
RedisData newBucket = new RedisData(bucket);
TypeInformation<?> typeToRead = typeMapper.readType(bucket.getPropertyPath(currentPath),
typeInformation.getActualType());
typeInformation);
return readInternal(currentPath, typeToRead.getType(), newBucket);
}
@@ -315,8 +316,12 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
return null;
}
if (persistentProperty.isIdProperty() && StringUtils.isEmpty(path.isEmpty())) {
return sourceBytes == null ? fromBytes(sourceBytes, typeInformation.getActualType().getType()) : source.getId();
if (persistentProperty.isIdProperty() && ObjectUtils.isEmpty(path.isEmpty())) {
return sourceBytes != null ? fromBytes(sourceBytes, typeInformation.getType()) : source.getId();
}
if (sourceBytes == null) {
return null;
}
Class<?> typeToUse = getTypeHint(currentPath, source.getBucket(), persistentProperty.getType());