diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java index 7f93963692..9bba9b244c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java @@ -146,9 +146,6 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter { return false; } JavaType javaType = this.objectMapper.constructType(targetClass); - if (!logger.isWarnEnabled()) { - return this.objectMapper.canDeserialize(javaType); - } AtomicReference causeRef = new AtomicReference<>(); if (this.objectMapper.canDeserialize(javaType, causeRef)) { return true; @@ -162,9 +159,6 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter { if (!supportsMimeType(headers)) { return false; } - if (!logger.isWarnEnabled()) { - return this.objectMapper.canSerialize(payload.getClass()); - } AtomicReference causeRef = new AtomicReference<>(); if (this.objectMapper.canSerialize(payload.getClass(), causeRef)) { return true; diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java index 2871ca3584..a895340ffc 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java @@ -20,6 +20,8 @@ import java.io.IOException; import java.lang.reflect.Type; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Collections; import java.util.concurrent.atomic.AtomicReference; import com.fasterxml.jackson.core.JsonEncoding; @@ -79,25 +81,21 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper) { - init(objectMapper); + this.objectMapper = objectMapper; + setDefaultCharset(DEFAULT_CHARSET); + DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter(); + prettyPrinter.indentObjectsWith(new DefaultIndenter(" ", "\ndata:")); + this.ssePrettyPrinter = prettyPrinter; } protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper, MediaType supportedMediaType) { - super(supportedMediaType); - init(objectMapper); + this(objectMapper); + setSupportedMediaTypes(Collections.singletonList(supportedMediaType)); } protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper, MediaType... supportedMediaTypes) { - super(supportedMediaTypes); - init(objectMapper); - } - - protected void init(ObjectMapper objectMapper) { - this.objectMapper = objectMapper; - setDefaultCharset(DEFAULT_CHARSET); - DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter(); - prettyPrinter.indentObjectsWith(new DefaultIndenter(" ", "\ndata:")); - this.ssePrettyPrinter = prettyPrinter; + this(objectMapper); + setSupportedMediaTypes(Arrays.asList(supportedMediaTypes)); } @@ -158,9 +156,6 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener return false; } JavaType javaType = getJavaType(type, contextClass); - if (!logger.isWarnEnabled()) { - return this.objectMapper.canDeserialize(javaType); - } AtomicReference causeRef = new AtomicReference<>(); if (this.objectMapper.canDeserialize(javaType, causeRef)) { return true; @@ -174,9 +169,6 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener if (!canWrite(mediaType)) { return false; } - if (!logger.isWarnEnabled()) { - return this.objectMapper.canSerialize(clazz); - } AtomicReference causeRef = new AtomicReference<>(); if (this.objectMapper.canSerialize(clazz, causeRef)) { return true;