From ebc726a9154a72d49e34f345ec3461bb59f87681 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Thu, 14 Aug 2014 13:40:47 +0200 Subject: [PATCH] Allow null ObjectMapper in Jackson2ObjectMapperFactoryBean.getObjectType() Issue: SPR-11785 --- .../http/converter/json/Jackson2ObjectMapperFactoryBean.java | 3 +-- .../converter/json/Jackson2ObjectMapperFactoryBeanTests.java | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java index 3ef14ce92ce..1dbc8e810c2 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java @@ -486,8 +486,7 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean getObjectType() { - Assert.notNull(this.objectMapper, "ObjectMapper must not be null"); - return this.objectMapper.getClass(); + return (this.objectMapper != null) ? this.objectMapper.getClass() : null; } @Override diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java index 33361de4913..0fc48238b3f 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java @@ -182,6 +182,11 @@ public class Jackson2ObjectMapperFactoryBeanTests { assertEquals(ObjectMapper.class, this.factory.getObjectType()); } + @Test + public void undefinedObjectType() { + assertEquals(null, this.factory.getObjectType()); + } + private static SerializerFactoryConfig getSerializerFactoryConfig(ObjectMapper objectMapper) { return ((BasicSerializerFactory) objectMapper.getSerializerFactory()).getFactoryConfig(); }