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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2015-07-22 14:20:12 +02:00
parent 8196af4bc5
commit f06581f5b8
5 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonInputMessage.java
View File

@@ -49,14 +49,6 @@ public class MappingJacksonInputMessage implements HttpInputMessage {
}
public void setDeserializationView(Class<?> deserializationView) {
this.deserializationView = deserializationView;
}
public Class<?> getDeserializationView() {
return deserializationView;
}
@Override
public InputStream getBody() throws IOException {
return this.body;
@@ -67,4 +59,12 @@ public class MappingJacksonInputMessage implements HttpInputMessage {
return this.headers;
}
public void setDeserializationView(Class<?> deserializationView) {
this.deserializationView = deserializationView;
}
public Class<?> getDeserializationView() {
return this.deserializationView;
}
}