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

Polishing

This commit is contained in:
Arjen Poutsma 2017-04-06 11:37:10 +02:00
parent 699064870f
commit aa3573b2bc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/main/java/org/springframework/http/codec/AbstractCodecConfigurer.java
View File

@ -32,7 +32,6 @@ import org.springframework.core.codec.DataBufferEncoder;
import org.springframework.core.codec.Decoder; import org.springframework.core.codec.Decoder;
import org.springframework.core.codec.Encoder; import org.springframework.core.codec.Encoder;
import org.springframework.core.codec.ResourceDecoder; 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.Jackson2JsonDecoder;
import org.springframework.http.codec.json.Jackson2JsonEncoder; import org.springframework.http.codec.json.Jackson2JsonEncoder;
import org.springframework.http.codec.xml.Jaxb2XmlDecoder; import org.springframework.http.codec.xml.Jaxb2XmlDecoder;
@ -50,12 +49,12 @@ public abstract class AbstractCodecConfigurer {
public static final boolean jackson2Present = public static final boolean jackson2Present =
ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper",
ServerCodecConfigurer.class.getClassLoader()) && AbstractCodecConfigurer.class.getClassLoader()) &&
ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator",
ServerCodecConfigurer.class.getClassLoader()); AbstractCodecConfigurer.class.getClassLoader());
public static final boolean jaxb2Present = 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; private final DefaultCodecConfigurer defaultCodecs;

4
spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java
View File

@ -49,12 +49,14 @@ public class ServerCodecConfigurer extends AbstractCodecConfigurer {
} }
@Override
protected void addDefaultTypedReaders(List<HttpMessageReader<?>> result) { protected void addDefaultTypedReaders(List<HttpMessageReader<?>> result) {
super.addDefaultTypedReaders(result); super.addDefaultTypedReaders(result);
defaultCodec().addReaderTo(result, FormHttpMessageReader::new); defaultCodec().addReaderTo(result, FormHttpMessageReader::new);
} }
@Override
protected void addDefaultObjectWriters(List<HttpMessageWriter<?>> result) { protected void addDefaultObjectWriters(List<HttpMessageWriter<?>> result) {
super.addDefaultObjectWriters(result); super.addDefaultObjectWriters(result);
defaultCodec().addServerSentEventWriterTo(result); defaultCodec().addServerSentEventWriterTo(result);
@ -79,10 +81,12 @@ public class ServerCodecConfigurer extends AbstractCodecConfigurer {
// Internal methods for building a list of default readers or writers... // Internal methods for building a list of default readers or writers...
@Override
protected void addStringReaderTextOnlyTo(List<HttpMessageReader<?>> result) { protected void addStringReaderTextOnlyTo(List<HttpMessageReader<?>> result) {
addReaderTo(result, () -> new DecoderHttpMessageReader<>(StringDecoder.textPlainOnly(true))); addReaderTo(result, () -> new DecoderHttpMessageReader<>(StringDecoder.textPlainOnly(true)));
} }
@Override
protected void addStringReaderTo(List<HttpMessageReader<?>> result) { protected void addStringReaderTo(List<HttpMessageReader<?>> result) {
addReaderTo(result, () -> new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes(true))); addReaderTo(result, () -> new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes(true)));
} }