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

Fix HashMapper issue flattening java.math types.

Browse Source 
We now make sure to include types from the java.math namespace.

Closes: #2365
This commit is contained in:
Christoph Strobl
2022-07-14 16:18:44 +02:00
parent 7f368c48ed
commit abf40297dd
2 changed files with 86 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java
View File

@@ -34,7 +34,9 @@ import java.util.Set;
import org.springframework.data.mapping.MappingException;
import org.springframework.data.util.DirectFieldAccessFallbackBeanWrapper;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.NumberUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -150,6 +152,8 @@ import com.fasterxml.jackson.databind.ser.std.DateSerializer;
*/
public class Jackson2HashMapper implements HashMapper<Object, String, Object> {
private static final boolean SOURCE_VERSION_PRESENT = ClassUtils.isPresent("javax.lang.model.SourceVersion", Jackson2HashMapper.class.getClassLoader());
private final HashMapperModule HASH_MAPPER_MODULE = new HashMapperModule();
private final ObjectMapper typingMapper;
@@ -336,10 +340,42 @@ public class Jackson2HashMapper implements HashMapper<Object, String, Object> {
if (cur.isArray()) {
this.flattenCollection(propertyPrefix, cur.elements(), resultMap);
} else {
if (nodes.hasNext() && mightBeJavaType(cur)) {
JsonNode next = nodes.next();
if (next.isArray()) {
this.flattenCollection(propertyPrefix, next.elements(), resultMap);
}
if (cur.asText().equals("java.util.Date")) {
resultMap.put(propertyPrefix, next.asText());
break;
}
if (next.isNumber()) {
resultMap.put(propertyPrefix, next.numberValue());
break;
}
if (next.isTextual()) {
resultMap.put(propertyPrefix, next.textValue());
break;
}
if (next.isBoolean()) {
resultMap.put(propertyPrefix, next.booleanValue());
break;
}
if (next.isBinary()) {
try {
resultMap.put(propertyPrefix, next.binaryValue());
} catch (IOException e) {
throw new IllegalStateException(String.format("Cannot read binary value of '%s'", propertyPrefix), e);
}
break;
}
if (cur.asText().equals("java.util.Date")) {
resultMap.put(propertyPrefix, nodes.next().asText());
break;
}
}
}
@@ -351,6 +387,27 @@ public class Jackson2HashMapper implements HashMapper<Object, String, Object> {
}
}
private boolean mightBeJavaType(JsonNode node) {
String textValue = node.asText();
if (!SOURCE_VERSION_PRESENT) {
if (ObjectUtils.nullSafeEquals(textValue, "java.util.Date")) {
return true;
}
if (ObjectUtils.nullSafeEquals(textValue, "java.math.BigInteger")) {
return true;
}
if (ObjectUtils.nullSafeEquals(textValue, "java.math.BigDecimal")) {
return true;
}
return false;
}
return javax.lang.model.SourceVersion.isName(textValue);
}
private void flattenCollection(String propertyPrefix, Iterator<JsonNode> list, Map<String, Object> resultMap) {
int counter = 0;