diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java index 7cbe1199801..07984582068 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java @@ -43,12 +43,12 @@ import org.springframework.http.codec.json.JacksonJsonDecoder; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.xml.Jaxb2Decoder; import org.springframework.http.codec.xml.Jaxb2Encoder; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; -import org.springframework.http.converter.reactive.HttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageWriter; -import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; -import org.springframework.http.converter.reactive.SseEventHttpMessageWriter; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.EncoderHttpMessageWriter; +import org.springframework.http.codec.HttpMessageReader; +import org.springframework.http.codec.HttpMessageWriter; +import org.springframework.http.codec.ResourceHttpMessageWriter; +import org.springframework.http.codec.SseEventHttpMessageWriter; import org.springframework.util.ClassUtils; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java index eca6310ab37..9df7d8cf48e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java @@ -30,7 +30,7 @@ import org.springframework.core.ReactiveAdapterRegistry; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.http.MediaType; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java index e82af46631b..05797de536a 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java @@ -26,7 +26,7 @@ import org.springframework.core.ReactiveAdapter; import org.springframework.core.ReactiveAdapterRegistry; import org.springframework.core.ResolvableType; import org.springframework.http.MediaType; -import org.springframework.http.converter.reactive.HttpMessageWriter; +import org.springframework.http.codec.HttpMessageWriter; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.util.Assert; import org.springframework.web.reactive.accept.RequestedContentTypeResolver; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java index 625460c8f93..dea06a021be 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java @@ -25,7 +25,7 @@ import org.springframework.core.ResolvableType; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.RequestEntity; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.ui.ModelMap; import org.springframework.validation.Validator; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java index 3bca0935c85..2ea21eeb382 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java @@ -22,7 +22,7 @@ import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; import org.springframework.core.ReactiveAdapterRegistry; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.ui.ModelMap; import org.springframework.validation.Validator; import org.springframework.web.bind.annotation.RequestBody; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java index cae25da552d..72ca77047f1 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java @@ -36,8 +36,8 @@ import org.springframework.core.codec.ByteBufferDecoder; import org.springframework.core.codec.StringDecoder; import org.springframework.core.convert.ConversionService; import org.springframework.format.support.DefaultFormattingConversionService; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.ui.ExtendedModelMap; import org.springframework.ui.ModelMap; import org.springframework.validation.Validator; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java index 7a39aeafab9..4ff68303b69 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java @@ -25,7 +25,7 @@ import org.springframework.core.ReactiveAdapterRegistry; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.http.HttpEntity; -import org.springframework.http.converter.reactive.HttpMessageWriter; +import org.springframework.http.codec.HttpMessageWriter; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.reactive.HandlerResult; import org.springframework.web.reactive.HandlerResultHandler; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java index 3f8264a256b..202c02e0d52 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java @@ -28,7 +28,7 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; -import org.springframework.http.converter.reactive.HttpMessageWriter; +import org.springframework.http.codec.HttpMessageWriter; import org.springframework.util.Assert; import org.springframework.web.reactive.HandlerResult; import org.springframework.web.reactive.HandlerResultHandler; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java index f9fb267151d..4922c12702b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java @@ -27,8 +27,8 @@ import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; import org.springframework.core.codec.Encoder; import org.springframework.http.MediaType; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; -import org.springframework.http.converter.reactive.HttpMessageWriter; +import org.springframework.http.codec.EncoderHttpMessageWriter; +import org.springframework.http.codec.HttpMessageWriter; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.ui.ModelMap; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java index d26a84a9910..414c5023b2f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java @@ -35,7 +35,7 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; +import org.springframework.http.codec.EncoderHttpMessageWriter; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.stereotype.Controller; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java index 3a4ea9215c4..d5ac3c5bf7f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java @@ -44,10 +44,10 @@ import org.springframework.http.MediaType; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.xml.Jaxb2Decoder; import org.springframework.http.codec.xml.Jaxb2Encoder; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; -import org.springframework.http.converter.reactive.HttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageWriter; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.EncoderHttpMessageWriter; +import org.springframework.http.codec.HttpMessageReader; +import org.springframework.http.codec.HttpMessageWriter; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.util.MimeType; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java index 40de5da6836..d6d689daa02 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java @@ -41,8 +41,8 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.ui.ExtendedModelMap; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java index 539c3490aeb..c621e9c9ed2 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java @@ -47,8 +47,8 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.codec.json.JacksonJsonDecoder; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.validation.Errors; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java index 37f634f738d..d4b24aa5f91 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java @@ -46,9 +46,9 @@ import org.springframework.core.io.buffer.support.DataBufferTestUtils; import org.springframework.http.HttpMethod; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.xml.Jaxb2Encoder; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; -import org.springframework.http.converter.reactive.HttpMessageWriter; -import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; +import org.springframework.http.codec.EncoderHttpMessageWriter; +import org.springframework.http.codec.HttpMessageWriter; +import org.springframework.http.codec.ResourceHttpMessageWriter; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java index 1fd74451f9e..9d64e084136 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java @@ -40,8 +40,8 @@ import org.springframework.core.codec.StringDecoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DefaultDataBufferFactory; import org.springframework.http.HttpMethod; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.ui.ExtendedModelMap; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java index e8bfd613959..fc35506f984 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java @@ -31,9 +31,9 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.xml.Jaxb2Encoder; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; -import org.springframework.http.converter.reactive.HttpMessageWriter; -import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; +import org.springframework.http.codec.EncoderHttpMessageWriter; +import org.springframework.http.codec.HttpMessageWriter; +import org.springframework.http.codec.ResourceHttpMessageWriter; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java index 43198489dcf..b89f67e7de3 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java @@ -40,9 +40,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.xml.Jaxb2Encoder; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; -import org.springframework.http.converter.reactive.HttpMessageWriter; -import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; +import org.springframework.http.codec.EncoderHttpMessageWriter; +import org.springframework.http.codec.HttpMessageWriter; +import org.springframework.http.codec.ResourceHttpMessageWriter; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/DecoderHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java similarity index 98% rename from spring-web/src/main/java/org/springframework/http/converter/reactive/DecoderHttpMessageReader.java rename to spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java index ad2889dc676..102f7471a71 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/reactive/DecoderHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.converter.reactive; +package org.springframework.http.codec; import java.util.Collections; import java.util.List; diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java similarity index 98% rename from spring-web/src/main/java/org/springframework/http/converter/reactive/EncoderHttpMessageWriter.java rename to spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java index 77762843fea..2a57ce44bb0 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/reactive/EncoderHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.converter.reactive; +package org.springframework.http.codec; import java.util.Collections; import java.util.List; diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageReader.java similarity index 98% rename from spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageReader.java rename to spring-web/src/main/java/org/springframework/http/codec/HttpMessageReader.java index e4f89c26b5b..aa68c4ff1a5 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.converter.reactive; +package org.springframework.http.codec; import java.util.List; diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageWriter.java similarity index 97% rename from spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageWriter.java rename to spring-web/src/main/java/org/springframework/http/codec/HttpMessageWriter.java index a9c82fe7113..e5dad98b0c0 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.converter.reactive; +package org.springframework.http.codec; import java.util.List; diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java similarity index 98% rename from spring-web/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageWriter.java rename to spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java index f1b9db49ad0..9b2d8dd9e21 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.converter.reactive; +package org.springframework.http.codec; import java.io.File; import java.io.IOException; diff --git a/spring-web/src/main/java/org/springframework/http/codec/SseEvent.java b/spring-web/src/main/java/org/springframework/http/codec/SseEvent.java index 90dc5a23f6d..ddbc5ae7b0d 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/SseEvent.java +++ b/spring-web/src/main/java/org/springframework/http/codec/SseEvent.java @@ -17,7 +17,6 @@ package org.springframework.http.codec; import org.springframework.http.MediaType; -import org.springframework.http.converter.reactive.SseEventHttpMessageWriter; /** * Representation for a Server-Sent Event for use with Spring's reactive Web diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/SseEventHttpMessageWriter.java similarity index 98% rename from spring-web/src/main/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriter.java rename to spring-web/src/main/java/org/springframework/http/codec/SseEventHttpMessageWriter.java index b1458cc5a39..103a1f27e9b 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/SseEventHttpMessageWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.converter.reactive; +package org.springframework.http.codec; import java.nio.charset.StandardCharsets; import java.util.Collections; @@ -32,7 +32,6 @@ import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.http.MediaType; import org.springframework.http.ReactiveHttpOutputMessage; -import org.springframework.http.codec.SseEvent; import org.springframework.util.Assert; /** diff --git a/spring-web/src/main/java/org/springframework/http/codec/package-info.java b/spring-web/src/main/java/org/springframework/http/codec/package-info.java index 3495b8e903f..9670bcb49b0 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/package-info.java +++ b/spring-web/src/main/java/org/springframework/http/codec/package-info.java @@ -1,5 +1,10 @@ /** - * {@link org.springframework.core.codec.Encoder} and - * {@link org.springframework.core.codec.Decoder} implementations for web use. + * Provides implementations of {@link org.springframework.core.codec.Encoder} + * and {@link org.springframework.core.codec.Decoder} for web use. + * + *

Also declares a high-level + * {@link org.springframework.http.codec.HttpMessageReader} and + * {@link org.springframework.http.codec.HttpMessageWriter} for reading and + * writing the body of HTTP requests and responses. */ package org.springframework.http.codec; diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java deleted file mode 100644 index b9b674a3a94..00000000000 --- a/spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * {@link org.springframework.http.converter.reactive.HttpMessageReader}, - * {@link org.springframework.http.converter.reactive.HttpMessageWriter} - * and implementations for use with reactive - * {@link org.springframework.core.codec.Encoder} and - * {@link org.springframework.core.codec.Decoder} implementations. - */ -package org.springframework.http.converter.reactive; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/BodyExtractor.java b/spring-web/src/main/java/org/springframework/web/client/reactive/BodyExtractor.java index ce51b7d487f..00bb50d19c4 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/BodyExtractor.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/BodyExtractor.java @@ -19,7 +19,7 @@ package org.springframework.web.client.reactive; import java.util.List; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; /** * Contract to extract the content of a raw {@link ClientHttpResponse} decoding diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultResponseErrorHandler.java index 4651c115456..d220e772279 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultResponseErrorHandler.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultResponseErrorHandler.java @@ -20,7 +20,7 @@ import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; /** * Default implementation of the {@link ResponseErrorHandler} interface diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseErrorHandler.java index 93be8dba952..6af17c4408b 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseErrorHandler.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseErrorHandler.java @@ -19,7 +19,7 @@ package org.springframework.web.client.reactive; import java.util.List; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; /** * Strategy interface used by the {@link WebClient} to handle errors in diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java b/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java index 69c51c87e0e..ba5198465fc 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java @@ -26,7 +26,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; /** * Static factory methods for {@link ResponseExtractor} and {@link BodyExtractor}, diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java index 2e786cc356a..ed1c95c937d 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java @@ -42,11 +42,11 @@ import org.springframework.http.codec.json.JacksonJsonDecoder; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.xml.Jaxb2Decoder; import org.springframework.http.codec.xml.Jaxb2Encoder; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; -import org.springframework.http.converter.reactive.HttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageWriter; -import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.EncoderHttpMessageWriter; +import org.springframework.http.codec.HttpMessageReader; +import org.springframework.http.codec.HttpMessageWriter; +import org.springframework.http.codec.ResourceHttpMessageWriter; import org.springframework.util.ClassUtils; /** diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientConfig.java b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientConfig.java index a36452fdb39..16b05e4617c 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientConfig.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientConfig.java @@ -18,8 +18,8 @@ package org.springframework.web.client.reactive; import java.util.List; -import org.springframework.http.converter.reactive.HttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageWriter; +import org.springframework.http.codec.HttpMessageReader; +import org.springframework.http.codec.HttpMessageWriter; /** * Interface that makes the {@link WebClient} configuration information diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientErrorException.java b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientErrorException.java index 1b00e24d6dd..411aac2679d 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientErrorException.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientErrorException.java @@ -19,7 +19,7 @@ package org.springframework.web.client.reactive; import java.util.List; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; /** * Exception thrown when an HTTP 4xx is received. diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientResponseException.java b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientResponseException.java index 18e70a3d906..bd65eaab7a2 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientResponseException.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientResponseException.java @@ -21,7 +21,7 @@ import java.util.List; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; /** * Base class for exceptions associated with specific HTTP client response diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebServerErrorException.java b/spring-web/src/main/java/org/springframework/web/client/reactive/WebServerErrorException.java index d7d8d9617d1..26988f01193 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebServerErrorException.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/WebServerErrorException.java @@ -19,7 +19,7 @@ package org.springframework.web.client.reactive; import java.util.List; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; /** * Exception thrown when an HTTP 5xx is received. diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java b/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java index 5079c67cbb7..5def5e06c0c 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java +++ b/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java @@ -29,7 +29,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import org.springframework.web.client.reactive.BodyExtractor; import org.springframework.web.client.reactive.ResponseExtractor; import org.springframework.web.client.reactive.WebClientException; diff --git a/spring-web/src/test/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/SseEventHttpMessageWriterTests.java similarity index 98% rename from spring-web/src/test/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriterTests.java rename to spring-web/src/test/java/org/springframework/http/codec/SseEventHttpMessageWriterTests.java index 329e3b42f8f..c104804935d 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/SseEventHttpMessageWriterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.converter.reactive; +package org.springframework.http.codec; import java.util.Collections; @@ -30,6 +30,7 @@ import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; import org.springframework.http.codec.Pojo; import org.springframework.http.codec.SseEvent; +import org.springframework.http.codec.SseEventHttpMessageWriter; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.server.reactive.MockServerHttpResponse; diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultResponseErrorHandlerTests.java b/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultResponseErrorHandlerTests.java index 68cedd67258..f142f1ff1d9 100644 --- a/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultResponseErrorHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultResponseErrorHandlerTests.java @@ -15,8 +15,8 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.client.reactive.ClientHttpResponse; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/ResponseExtractorsTests.java b/spring-web/src/test/java/org/springframework/web/client/reactive/ResponseExtractorsTests.java index 62c9ec29117..8b2cb69d30d 100644 --- a/spring-web/src/test/java/org/springframework/web/client/reactive/ResponseExtractorsTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/reactive/ResponseExtractorsTests.java @@ -20,8 +20,8 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.reactive.ClientHttpResponse; import org.springframework.http.codec.json.JacksonJsonDecoder; -import org.springframework.http.converter.reactive.DecoderHttpMessageReader; -import org.springframework.http.converter.reactive.HttpMessageReader; +import org.springframework.http.codec.DecoderHttpMessageReader; +import org.springframework.http.codec.HttpMessageReader; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf;