Skip to content

Commit ebc726a

Browse files
committed
Allow null ObjectMapper in Jackson2ObjectMapperFactoryBean.getObjectType()
Issue: SPR-11785
1 parent 181299c commit ebc726a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,7 @@ public ObjectMapper getObject() {
486486

487487
@Override
488488
public Class<?> getObjectType() {
489-
Assert.notNull(this.objectMapper, "ObjectMapper must not be null");
490-
return this.objectMapper.getClass();
489+
return (this.objectMapper != null) ? this.objectMapper.getClass() : null;
491490
}
492491

493492
@Override

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ public void simpleSetup() {
182182
assertEquals(ObjectMapper.class, this.factory.getObjectType());
183183
}
184184

185+
@Test
186+
public void undefinedObjectType() {
187+
assertEquals(null, this.factory.getObjectType());
188+
}
189+
185190
private static SerializerFactoryConfig getSerializerFactoryConfig(ObjectMapper objectMapper) {
186191
return ((BasicSerializerFactory) objectMapper.getSerializerFactory()).getFactoryConfig();
187192
}

0 commit comments

Comments
 (0)