Rename Http[Encoder|Decoder] to HttpMessage[Encoder|Decoder]

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

@@ -129,13 +129,13 @@ public class DecoderHttpMessageReader<T> implements HttpMessageReader<T> {
 	/**
 	 * Get additional hints for decoding for example based on the server request
 	 * or annotations from controller method parameters. By default, delegate to
-	 * the decoder if it is an instance of {@link HttpDecoder}.
+	 * the decoder if it is an instance of {@link HttpMessageDecoder}.
 	 */
 	protected Map<String, Object> getReadHints(ResolvableType streamType,
 			ResolvableType elementType, ServerHttpRequest request, ServerHttpResponse response) {
 
-		if (this.decoder instanceof HttpDecoder) {
-			HttpDecoder<?> httpDecoder = (HttpDecoder<?>) this.decoder;
+		if (this.decoder instanceof HttpMessageDecoder) {
+			HttpMessageDecoder<?> httpDecoder = (HttpMessageDecoder<?>) this.decoder;
 			return httpDecoder.getDecodeHints(streamType, elementType, request, response);
 		}
 		return Collections.emptyMap();

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

@@ -130,8 +130,8 @@ public class EncoderHttpMessageWriter<T> implements HttpMessageWriter<T> {
 	}
 
 	private boolean isStreamingMediaType(MediaType contentType) {
-		return this.encoder instanceof HttpEncoder &&
-				((HttpEncoder<?>) this.encoder).getStreamingMediaTypes().stream()
+		return this.encoder instanceof HttpMessageEncoder &&
+				((HttpMessageEncoder<?>) this.encoder).getStreamingMediaTypes().stream()
 						.anyMatch(contentType::isCompatibleWith);
 	}
 
@@ -153,13 +153,13 @@ public class EncoderHttpMessageWriter<T> implements HttpMessageWriter<T> {
 	/**
 	 * Get additional hints for encoding for example based on the server request
 	 * or annotations from controller method parameters. By default, delegate to
-	 * the encoder if it is an instance of {@link HttpEncoder}.
+	 * the encoder if it is an instance of {@link HttpMessageEncoder}.
 	 */
 	protected Map<String, Object> getWriteHints(ResolvableType streamType, ResolvableType elementType,
 			MediaType mediaType, ServerHttpRequest request, ServerHttpResponse response) {
 
-		if (this.encoder instanceof HttpEncoder) {
-			HttpEncoder<?> httpEncoder = (HttpEncoder<?>) this.encoder;
+		if (this.encoder instanceof HttpMessageEncoder) {
+			HttpMessageEncoder<?> httpEncoder = (HttpMessageEncoder<?>) this.encoder;
 			return httpEncoder.getEncodeHints(streamType, elementType, mediaType, request, response);
 		}
 		return Collections.emptyMap();

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

@@ -25,12 +25,12 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
 
 /**
  * Extension of {@code Decoder} exposing extra methods relevant in the context
- * of HTTP applications.
+ * of HTTP request or response body decoding.
  *
  * @author Rossen Stoyanchev
  * @since 5.0
  */
-public interface HttpDecoder<T> extends Decoder<T> {
+public interface HttpMessageDecoder<T> extends Decoder<T> {
 
 	/**
 	 * Get decoding hints based on the server request or annotations on the

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

@@ -29,12 +29,12 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
 
 /**
  * Extension of {@code Encoder} exposing extra methods relevant in the context
- * of HTTP applications.
+ * of HTTP request or response body encoding.
  *
  * @author Rossen Stoyanchev
  * @since 5.0
  */
-public interface HttpEncoder<T> extends Encoder<T> {
+public interface HttpMessageEncoder<T> extends Encoder<T> {
 
 	/**
 	 * Return "streaming" media types for which flushing should be performed

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

@@ -172,8 +172,8 @@ public class ServerSentEventHttpMessageWriter implements HttpMessageWriter<Objec
 	private Map<String, Object> getEncodeHints(ResolvableType actualType, ResolvableType elementType,
 			MediaType mediaType, ServerHttpRequest request, ServerHttpResponse response) {
 
-		if (this.encoder instanceof HttpEncoder) {
-			HttpEncoder<?> httpEncoder = (HttpEncoder<?>) this.encoder;
+		if (this.encoder instanceof HttpMessageEncoder) {
+			HttpMessageEncoder<?> httpEncoder = (HttpMessageEncoder<?>) this.encoder;
 			return httpEncoder.getEncodeHints(actualType, elementType, mediaType, request, response);
 		}
 		return Collections.emptyMap();

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

@@ -33,7 +33,7 @@ import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.CodecException;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.http.codec.HttpDecoder;
+import org.springframework.http.codec.HttpMessageDecoder;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
@@ -48,7 +48,7 @@ import org.springframework.util.MimeType;
  * @since 5.0
  * @see Jackson2JsonEncoder
  */
-public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpDecoder<Object> {
+public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpMessageDecoder<Object> {
 
 	private final JsonObjectDecoder fluxDecoder = new JsonObjectDecoder(true);
 
@@ -120,7 +120,7 @@ public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpDec
 	}
 
 
-	// HttpDecoder...
+	// HttpMessageDecoder...
 
 	@Override
 	public Map<String, Object> getDecodeHints(ResolvableType actualType, ResolvableType elementType,

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

@@ -42,7 +42,7 @@ import org.springframework.core.codec.CodecException;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.MediaType;
-import org.springframework.http.codec.HttpEncoder;
+import org.springframework.http.codec.HttpMessageEncoder;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
@@ -59,7 +59,7 @@ import org.springframework.util.MimeType;
  * @since 5.0
  * @see Jackson2JsonDecoder
  */
-public class Jackson2JsonEncoder extends Jackson2CodecSupport implements HttpEncoder<Object> {
+public class Jackson2JsonEncoder extends Jackson2CodecSupport implements HttpMessageEncoder<Object> {
 
 	private final List<MediaType> streamingMediaTypes = new ArrayList<>(1);
 
@@ -89,7 +89,7 @@ public class Jackson2JsonEncoder extends Jackson2CodecSupport implements HttpEnc
 	 * automatically vs at the end of the stream.
 	 * <p>By default this is set to {@link MediaType#APPLICATION_STREAM_JSON}.
 	 * @param mediaTypes one or more media types to add to the list
-	 * @see HttpEncoder#getStreamingMediaTypes()
+	 * @see HttpMessageEncoder#getStreamingMediaTypes()
 	 */
 	public void setStreamingMediaTypes(List<MediaType> mediaTypes) {
 		this.streamingMediaTypes.clear();
@@ -169,7 +169,7 @@ public class Jackson2JsonEncoder extends Jackson2CodecSupport implements HttpEnc
 	}
 
 
-	// HttpEncoder...
+	// HttpMessageEncoder...
 
 	@Override
 	public List<MediaType> getStreamingMediaTypes() {