Polishing

Author: poutsma

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

@@ -32,7 +32,6 @@
 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;

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

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