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

DATAREST-935 - Prepare 3.0 development.

Browse Source 
Upgraded version numbers and dependencies to Spring Data build parent, Commons and store modules. Fixed a compiler issue in DomainObjectReader.
This commit is contained in:
Oliver Gierke
2016-11-16 15:59:38 +01:00
parent f4705c8197
commit 8327b6f4ab
14 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java
View File

@@ -285,8 +285,9 @@ public class DomainObjectReader {
} else if (child instanceof ArrayNode && sourceValue != null) {
handleArrayNode((ArrayNode) child, asCollection(sourceValue), mapper);
} else {
source.put(entry.getKey(),
mapper.treeToValue(child, sourceValue == null ? Object.class : sourceValue.getClass()));
Class<?> target = sourceValue == null ? Object.class : sourceValue.getClass();
source.put(entry.getKey(), mapper.treeToValue(child, target));
}
fields.remove();