Move http.converter.reactive to http.codec

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;

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;

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;
 

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;
 

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;

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

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;
 
 /**

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.
+ *
+ * <p>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;

spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java

@@ -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;

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

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

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

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},

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;
 
 /**

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

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.

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

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.

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;