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

Restore compatibility with Jackson 2.1

Browse Source 
Issue: SPR-12501
This commit is contained in:
Sebastien Deleuze
2015-06-26 02:18:29 +02:00
parent 3bff7bd895
commit 89cc8e0401
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
View File

@@ -208,13 +208,14 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
return readJavaType(javaType, inputMessage); return readJavaType(javaType, inputMessage);
} }
@SuppressWarnings("deprecation")
private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) { private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) {
try { try {
if (inputMessage instanceof MappingJacksonInputMessage) { if (inputMessage instanceof MappingJacksonInputMessage) {
Class<?> deserializationView = ((MappingJacksonInputMessage)inputMessage).getDeserializationView(); Class<?> deserializationView = ((MappingJacksonInputMessage)inputMessage).getDeserializationView();
if (deserializationView != null) { if (deserializationView != null) {
return this.objectMapper.readerWithView(deserializationView) return this.objectMapper.readerWithView(deserializationView)
.forType(javaType).readValue(inputMessage.getBody()); .withType(javaType).readValue(inputMessage.getBody());
} }
} }
return this.objectMapper.readValue(inputMessage.getBody(), javaType); return this.objectMapper.readValue(inputMessage.getBody(), javaType);