root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move http.converter.reactive to http.codec

This commit is contained in:
Rossen Stoyanchev 2016-07-22 14:14:46 -04:00
parent b0d7625e3e
commit 10c90a677c
39 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
View File

@ -43,12 +43,12 @@ import org.springframework.http.codec.json.JacksonJsonDecoder;
import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.json.JacksonJsonEncoder;
import org.springframework.http.codec.xml.Jaxb2Decoder; import org.springframework.http.codec.xml.Jaxb2Decoder;
import org.springframework.http.codec.xml.Jaxb2Encoder; import org.springframework.http.codec.xml.Jaxb2Encoder;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; import org.springframework.http.codec.EncoderHttpMessageWriter;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; import org.springframework.http.codec.ResourceHttpMessageWriter;
import org.springframework.http.converter.reactive.SseEventHttpMessageWriter; import org.springframework.http.codec.SseEventHttpMessageWriter;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
View File

@ -30,7 +30,7 @@ import org.springframework.core.ReactiveAdapterRegistry;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.http.MediaType; 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.http.server.reactive.ServerHttpRequest;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
View File

@ -26,7 +26,7 @@ import org.springframework.core.ReactiveAdapter;
import org.springframework.core.ReactiveAdapterRegistry; import org.springframework.core.ReactiveAdapterRegistry;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.http.MediaType; 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.http.server.reactive.ServerHttpResponse;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.web.reactive.accept.RequestedContentTypeResolver; import org.springframework.web.reactive.accept.RequestedContentTypeResolver;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java
View File

@ -25,7 +25,7 @@ import org.springframework.core.ResolvableType;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.RequestEntity; 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.http.server.reactive.ServerHttpRequest;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java
View File

@ -22,7 +22,7 @@ import reactor.core.publisher.Mono;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
import org.springframework.core.ReactiveAdapterRegistry; 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.ui.ModelMap;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
View File

@ -36,8 +36,8 @@ import org.springframework.core.codec.ByteBufferDecoder;
import org.springframework.core.codec.StringDecoder; import org.springframework.core.codec.StringDecoder;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
import org.springframework.format.support.DefaultFormattingConversionService; import org.springframework.format.support.DefaultFormattingConversionService;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.ui.ExtendedModelMap; import org.springframework.ui.ExtendedModelMap;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
View File

@ -25,7 +25,7 @@ import org.springframework.core.ReactiveAdapterRegistry;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.http.HttpEntity; 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.bind.annotation.ResponseBody;
import org.springframework.web.reactive.HandlerResult; import org.springframework.web.reactive.HandlerResult;
import org.springframework.web.reactive.HandlerResultHandler; import org.springframework.web.reactive.HandlerResultHandler;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
View File

@ -28,7 +28,7 @@ import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; 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.util.Assert;
import org.springframework.web.reactive.HandlerResult; import org.springframework.web.reactive.HandlerResult;
import org.springframework.web.reactive.HandlerResultHandler; import org.springframework.web.reactive.HandlerResultHandler;

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java
View File

@ -27,8 +27,8 @@ import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.codec.Encoder; import org.springframework.core.codec.Encoder;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; import org.springframework.http.codec.EncoderHttpMessageWriter;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.util.Assert; import org.springframework.util.Assert;

2
spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java
View File

@ -35,7 +35,7 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; 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.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
View File

@ -44,10 +44,10 @@ import org.springframework.http.MediaType;
import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.json.JacksonJsonEncoder;
import org.springframework.http.codec.xml.Jaxb2Decoder; import org.springframework.http.codec.xml.Jaxb2Decoder;
import org.springframework.http.codec.xml.Jaxb2Encoder; import org.springframework.http.codec.xml.Jaxb2Encoder;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; import org.springframework.http.codec.EncoderHttpMessageWriter;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.util.MimeType; import org.springframework.util.MimeType;

4
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java
View File

@ -41,8 +41,8 @@ import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.ui.ExtendedModelMap; import org.springframework.ui.ExtendedModelMap;

4
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
View File

@ -47,8 +47,8 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.codec.json.JacksonJsonDecoder; import org.springframework.http.codec.json.JacksonJsonDecoder;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;

6
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java
View File

@ -46,9 +46,9 @@ import org.springframework.core.io.buffer.support.DataBufferTestUtils;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.json.JacksonJsonEncoder;
import org.springframework.http.codec.xml.Jaxb2Encoder; import org.springframework.http.codec.xml.Jaxb2Encoder;
import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; import org.springframework.http.codec.EncoderHttpMessageWriter;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; import org.springframework.http.codec.ResourceHttpMessageWriter;
import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpRequest;

4
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java
View File

@ -40,8 +40,8 @@ import org.springframework.core.codec.StringDecoder;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DefaultDataBufferFactory; import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.ui.ExtendedModelMap; import org.springframework.ui.ExtendedModelMap;

6
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
View File

@ -31,9 +31,9 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.json.JacksonJsonEncoder;
import org.springframework.http.codec.xml.Jaxb2Encoder; import org.springframework.http.codec.xml.Jaxb2Encoder;
import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; import org.springframework.http.codec.EncoderHttpMessageWriter;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; import org.springframework.http.codec.ResourceHttpMessageWriter;
import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpRequest;

6
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java
View File

@ -40,9 +40,9 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.json.JacksonJsonEncoder;
import org.springframework.http.codec.xml.Jaxb2Encoder; import org.springframework.http.codec.xml.Jaxb2Encoder;
import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; import org.springframework.http.codec.EncoderHttpMessageWriter;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; import org.springframework.http.codec.ResourceHttpMessageWriter;
import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpRequest;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpRequest;

2
spring-web/src/main/java/org/springframework/http/converter/reactive/DecoderHttpMessageReader.java → spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.http.converter.reactive; package org.springframework.http.codec;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

2
spring-web/src/main/java/org/springframework/http/converter/reactive/EncoderHttpMessageWriter.java → spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.http.converter.reactive; package org.springframework.http.codec;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

2
spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageReader.java → spring-web/src/main/java/org/springframework/http/codec/HttpMessageReader.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.http.converter.reactive; package org.springframework.http.codec;
import java.util.List; import java.util.List;

2
spring-web/src/main/java/org/springframework/http/converter/reactive/HttpMessageWriter.java → spring-web/src/main/java/org/springframework/http/codec/HttpMessageWriter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.http.converter.reactive; package org.springframework.http.codec;
import java.util.List; import java.util.List;

2
spring-web/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageWriter.java → spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.http.converter.reactive; package org.springframework.http.codec;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

1
spring-web/src/main/java/org/springframework/http/codec/SseEvent.java
View File

@ -17,7 +17,6 @@
package org.springframework.http.codec; package org.springframework.http.codec;
import org.springframework.http.MediaType; 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 * Representation for a Server-Sent Event for use with Spring's reactive Web

3
spring-web/src/main/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriter.java → spring-web/src/main/java/org/springframework/http/codec/SseEventHttpMessageWriter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.http.converter.reactive; package org.springframework.http.codec;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Collections; 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.core.io.buffer.DataBufferFactory;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ReactiveHttpOutputMessage; import org.springframework.http.ReactiveHttpOutputMessage;
import org.springframework.http.codec.SseEvent;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**

9
spring-web/src/main/java/org/springframework/http/codec/package-info.java
View File

@ -1,5 +1,10 @@
/** /**
* {@link org.springframework.core.codec.Encoder} and * Provides implementations of {@link org.springframework.core.codec.Encoder}
* {@link org.springframework.core.codec.Decoder} implementations for web use. * 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; package org.springframework.http.codec;

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

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

2
spring-web/src/main/java/org/springframework/web/client/reactive/BodyExtractor.java
View File

@ -19,7 +19,7 @@ package org.springframework.web.client.reactive;
import java.util.List; import java.util.List;
import org.springframework.http.client.reactive.ClientHttpResponse; 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 * Contract to extract the content of a raw {@link ClientHttpResponse} decoding

2
spring-web/src/main/java/org/springframework/web/client/reactive/DefaultResponseErrorHandler.java
View File

@ -20,7 +20,7 @@ import java.util.List;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.client.reactive.ClientHttpResponse; 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 * Default implementation of the {@link ResponseErrorHandler} interface

2
spring-web/src/main/java/org/springframework/web/client/reactive/ResponseErrorHandler.java
View File

@ -19,7 +19,7 @@ package org.springframework.web.client.reactive;
import java.util.List; import java.util.List;
import org.springframework.http.client.reactive.ClientHttpResponse; 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 * Strategy interface used by the {@link WebClient} to handle errors in

2
spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java
View File

@ -26,7 +26,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.client.reactive.ClientHttpResponse; 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}, * Static factory methods for {@link ResponseExtractor} and {@link BodyExtractor},

10
spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java
View File

@ -42,11 +42,11 @@ import org.springframework.http.codec.json.JacksonJsonDecoder;
import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.json.JacksonJsonEncoder;
import org.springframework.http.codec.xml.Jaxb2Decoder; import org.springframework.http.codec.xml.Jaxb2Decoder;
import org.springframework.http.codec.xml.Jaxb2Encoder; import org.springframework.http.codec.xml.Jaxb2Encoder;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.EncoderHttpMessageWriter; import org.springframework.http.codec.EncoderHttpMessageWriter;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.converter.reactive.ResourceHttpMessageWriter; import org.springframework.http.codec.ResourceHttpMessageWriter;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
/** /**

4
spring-web/src/main/java/org/springframework/web/client/reactive/WebClientConfig.java
View File

@ -18,8 +18,8 @@ package org.springframework.web.client.reactive;
import java.util.List; import java.util.List;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageWriter; import org.springframework.http.codec.HttpMessageWriter;
/** /**
* Interface that makes the {@link WebClient} configuration information * Interface that makes the {@link WebClient} configuration information

2
spring-web/src/main/java/org/springframework/web/client/reactive/WebClientErrorException.java
View File

@ -19,7 +19,7 @@ package org.springframework.web.client.reactive;
import java.util.List; import java.util.List;
import org.springframework.http.client.reactive.ClientHttpResponse; 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. * Exception thrown when an HTTP 4xx is received.

2
spring-web/src/main/java/org/springframework/web/client/reactive/WebClientResponseException.java
View File

@ -21,7 +21,7 @@ import java.util.List;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.client.reactive.ClientHttpResponse; 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 * Base class for exceptions associated with specific HTTP client response

2
spring-web/src/main/java/org/springframework/web/client/reactive/WebServerErrorException.java
View File

@ -19,7 +19,7 @@ package org.springframework.web.client.reactive;
import java.util.List; import java.util.List;
import org.springframework.http.client.reactive.ClientHttpResponse; 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. * Exception thrown when an HTTP 5xx is received.

2
spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java
View File

@ -29,7 +29,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.client.reactive.ClientHttpResponse; 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.BodyExtractor;
import org.springframework.web.client.reactive.ResponseExtractor; import org.springframework.web.client.reactive.ResponseExtractor;
import org.springframework.web.client.reactive.WebClientException; import org.springframework.web.client.reactive.WebClientException;

3
spring-web/src/test/java/org/springframework/http/converter/reactive/SseEventHttpMessageWriterTests.java → spring-web/src/test/java/org/springframework/http/codec/SseEventHttpMessageWriterTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.http.converter.reactive; package org.springframework.http.codec;
import java.util.Collections; import java.util.Collections;
@ -30,6 +30,7 @@ import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.codec.Pojo; import org.springframework.http.codec.Pojo;
import org.springframework.http.codec.SseEvent; import org.springframework.http.codec.SseEvent;
import org.springframework.http.codec.SseEventHttpMessageWriter;
import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.json.JacksonJsonEncoder;
import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.http.server.reactive.MockServerHttpResponse;

4
spring-web/src/test/java/org/springframework/web/client/reactive/DefaultResponseErrorHandlerTests.java
View File

@ -15,8 +15,8 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.client.reactive.ClientHttpResponse; import org.springframework.http.client.reactive.ClientHttpResponse;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

4
spring-web/src/test/java/org/springframework/web/client/reactive/ResponseExtractorsTests.java
View File

@ -20,8 +20,8 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.client.reactive.ClientHttpResponse; import org.springframework.http.client.reactive.ClientHttpResponse;
import org.springframework.http.codec.json.JacksonJsonDecoder; import org.springframework.http.codec.json.JacksonJsonDecoder;
import org.springframework.http.converter.reactive.DecoderHttpMessageReader; import org.springframework.http.codec.DecoderHttpMessageReader;
import org.springframework.http.converter.reactive.HttpMessageReader; import org.springframework.http.codec.HttpMessageReader;
import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.instanceOf;