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

Allow null ObjectMapper in Jackson2ObjectMapperFactoryBean.getObjectType() 

Issue: SPR-11785
This commit is contained in:
Sebastien Deleuze 2014-08-14 13:40:47 +02:00
parent 181299cc6c
commit ebc726a915
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,8 +486,7 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
@Override @Override
public Class<?> getObjectType() { public Class<?> getObjectType() {
Assert.notNull(this.objectMapper, "ObjectMapper must not be null"); return (this.objectMapper != null) ? this.objectMapper.getClass() : null;
return this.objectMapper.getClass();
} }
@Override @Override

5
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
View File

@ -182,6 +182,11 @@ public class Jackson2ObjectMapperFactoryBeanTests {
assertEquals(ObjectMapper.class, this.factory.getObjectType()); assertEquals(ObjectMapper.class, this.factory.getObjectType());
} }
@Test
public void undefinedObjectType() {
assertEquals(null, this.factory.getObjectType());
}
private static SerializerFactoryConfig getSerializerFactoryConfig(ObjectMapper objectMapper) { private static SerializerFactoryConfig getSerializerFactoryConfig(ObjectMapper objectMapper) {
return ((BasicSerializerFactory) objectMapper.getSerializerFactory()).getFactoryConfig(); return ((BasicSerializerFactory) objectMapper.getSerializerFactory()).getFactoryConfig();
} }