root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Serialize with type only with jackson 2.6+ 

Previous Jackson versions do not serialize polymorphic collections correctly
when the type is specified.

Issue: SPR-12811
This commit is contained in:
Sebastien Deleuze 2015-06-26 02:15:37 +02:00
parent b542b52775
commit 3bff7bd895
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicReference;
import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.PrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@ -65,6 +66,10 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
private static final boolean jackson23Available = ClassUtils.hasMethod(ObjectMapper.class, private static final boolean jackson23Available = ClassUtils.hasMethod(ObjectMapper.class,
"canDeserialize", JavaType.class, AtomicReference.class); "canDeserialize", JavaType.class, AtomicReference.class);
// Check for Jackson 2.6+ for support of generic type aware serialization of polymorphic collections
private static final boolean jackson26Available = ClassUtils.hasMethod(ObjectMapper.class,
"setDefaultPrettyPrinter", PrettyPrinter.class);
protected ObjectMapper objectMapper; protected ObjectMapper objectMapper;
@ -233,15 +238,16 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
FilterProvider filters = null; FilterProvider filters = null;
Object value = object; Object value = object;
JavaType javaType = null; JavaType javaType = null;
if (type != null) {
javaType = getJavaType(type, null);
}
if (object instanceof MappingJacksonValue) { if (object instanceof MappingJacksonValue) {
MappingJacksonValue container = (MappingJacksonValue) object; MappingJacksonValue container = (MappingJacksonValue) object;
value = container.getValue(); value = container.getValue();
serializationView = container.getSerializationView(); serializationView = container.getSerializationView();
filters = container.getFilters(); filters = container.getFilters();
} }
if (jackson26Available && type != null && value != null
&& TypeUtils.isAssignable(type, value.getClass())) {
javaType = getJavaType(type, null);
}
ObjectWriter objectWriter; ObjectWriter objectWriter;
if (serializationView != null) { if (serializationView != null) {
objectWriter = this.objectMapper.writerWithView(serializationView); objectWriter = this.objectMapper.writerWithView(serializationView);
@ -252,7 +258,7 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
else { else {
objectWriter = this.objectMapper.writer(); objectWriter = this.objectMapper.writer();
} }
if (javaType != null && value != null && TypeUtils.isAssignable(type, value.getClass())) { if (javaType != null) {
objectWriter = objectWriter.withType(javaType); objectWriter = objectWriter.withType(javaType);
} }
objectWriter.writeValue(generator, value); objectWriter.writeValue(generator, value);