From ec5b5c8578f7ae0754068f400f9a3db6adfffcee Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 24 Mar 2017 17:42:37 -0400 Subject: [PATCH] Rename Http[Encoder|Decoder] to HttpMessage[Encoder|Decoder] --- .../http/codec/DecoderHttpMessageReader.java | 6 +++--- .../http/codec/EncoderHttpMessageWriter.java | 10 +++++----- .../{HttpDecoder.java => HttpMessageDecoder.java} | 4 ++-- .../{HttpEncoder.java => HttpMessageEncoder.java} | 4 ++-- .../http/codec/ServerSentEventHttpMessageWriter.java | 4 ++-- .../http/codec/json/Jackson2JsonDecoder.java | 6 +++--- .../http/codec/json/Jackson2JsonEncoder.java | 8 ++++---- 7 files changed, 21 insertions(+), 21 deletions(-) rename spring-web/src/main/java/org/springframework/http/codec/{HttpDecoder.java => HttpMessageDecoder.java} (94%) rename spring-web/src/main/java/org/springframework/http/codec/{HttpEncoder.java => HttpMessageEncoder.java} (95%) diff --git a/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java index b57b9ad66ac..159eb503af6 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java @@ -129,13 +129,13 @@ public class DecoderHttpMessageReader implements HttpMessageReader { /** * 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 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(); diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java index e3209b0c9c4..52258f4b1c5 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java @@ -130,8 +130,8 @@ public class EncoderHttpMessageWriter implements HttpMessageWriter { } 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 implements HttpMessageWriter { /** * 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 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(); diff --git a/spring-web/src/main/java/org/springframework/http/codec/HttpDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageDecoder.java similarity index 94% rename from spring-web/src/main/java/org/springframework/http/codec/HttpDecoder.java rename to spring-web/src/main/java/org/springframework/http/codec/HttpMessageDecoder.java index 146bd9ce94e..43542af5635 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/HttpDecoder.java +++ b/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 extends Decoder { +public interface HttpMessageDecoder extends Decoder { /** * Get decoding hints based on the server request or annotations on the diff --git a/spring-web/src/main/java/org/springframework/http/codec/HttpEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageEncoder.java similarity index 95% rename from spring-web/src/main/java/org/springframework/http/codec/HttpEncoder.java rename to spring-web/src/main/java/org/springframework/http/codec/HttpMessageEncoder.java index 98b3f94357a..bb292acda4d 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/HttpEncoder.java +++ b/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 extends Encoder { +public interface HttpMessageEncoder extends Encoder { /** * Return "streaming" media types for which flushing should be performed diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java index c280cb70f0c..1fad05f0a3c 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java @@ -172,8 +172,8 @@ public class ServerSentEventHttpMessageWriter implements HttpMessageWriter 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(); diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java index d3d2b940517..9beda0e8a78 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java +++ b/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 { +public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpMessageDecoder { private final JsonObjectDecoder fluxDecoder = new JsonObjectDecoder(true); @@ -120,7 +120,7 @@ public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpDec } - // HttpDecoder... + // HttpMessageDecoder... @Override public Map getDecodeHints(ResolvableType actualType, ResolvableType elementType, diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java index 26a712afc0c..0675ca09e29 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java +++ b/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 { +public class Jackson2JsonEncoder extends Jackson2CodecSupport implements HttpMessageEncoder { private final List streamingMediaTypes = new ArrayList<>(1); @@ -89,7 +89,7 @@ public class Jackson2JsonEncoder extends Jackson2CodecSupport implements HttpEnc * automatically vs at the end of the stream. *

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 mediaTypes) { this.streamingMediaTypes.clear(); @@ -169,7 +169,7 @@ public class Jackson2JsonEncoder extends Jackson2CodecSupport implements HttpEnc } - // HttpEncoder... + // HttpMessageEncoder... @Override public List getStreamingMediaTypes() {