From aa3573b2bc7f5d9dae887beebe455d4afb0b81f8 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 6 Apr 2017 11:37:10 +0200 Subject: [PATCH] Polishing --- .../http/codec/AbstractCodecConfigurer.java | 7 +++---- .../springframework/http/codec/ServerCodecConfigurer.java | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/codec/AbstractCodecConfigurer.java b/spring-web/src/main/java/org/springframework/http/codec/AbstractCodecConfigurer.java index c5e4d3d32b..7737456c55 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/AbstractCodecConfigurer.java +++ b/spring-web/src/main/java/org/springframework/http/codec/AbstractCodecConfigurer.java @@ -32,7 +32,6 @@ import org.springframework.core.codec.DataBufferEncoder; import org.springframework.core.codec.Decoder; import org.springframework.core.codec.Encoder; import org.springframework.core.codec.ResourceDecoder; -import org.springframework.core.codec.StringDecoder; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.http.codec.json.Jackson2JsonEncoder; import org.springframework.http.codec.xml.Jaxb2XmlDecoder; @@ -50,12 +49,12 @@ public abstract class AbstractCodecConfigurer { public static final boolean jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", - ServerCodecConfigurer.class.getClassLoader()) && + AbstractCodecConfigurer.class.getClassLoader()) && ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", - ServerCodecConfigurer.class.getClassLoader()); + AbstractCodecConfigurer.class.getClassLoader()); public static final boolean jaxb2Present = - ClassUtils.isPresent("javax.xml.bind.Binder", ServerCodecConfigurer.class.getClassLoader()); + ClassUtils.isPresent("javax.xml.bind.Binder", AbstractCodecConfigurer.class.getClassLoader()); private final DefaultCodecConfigurer defaultCodecs; diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java b/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java index f0356d4304..cf568e82c9 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java +++ b/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java @@ -49,12 +49,14 @@ public class ServerCodecConfigurer extends AbstractCodecConfigurer { } + @Override protected void addDefaultTypedReaders(List> result) { super.addDefaultTypedReaders(result); defaultCodec().addReaderTo(result, FormHttpMessageReader::new); } + @Override protected void addDefaultObjectWriters(List> result) { super.addDefaultObjectWriters(result); defaultCodec().addServerSentEventWriterTo(result); @@ -79,10 +81,12 @@ public class ServerCodecConfigurer extends AbstractCodecConfigurer { // Internal methods for building a list of default readers or writers... + @Override protected void addStringReaderTextOnlyTo(List> result) { addReaderTo(result, () -> new DecoderHttpMessageReader<>(StringDecoder.textPlainOnly(true))); } + @Override protected void addStringReaderTo(List> result) { addReaderTo(result, () -> new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes(true))); }