From 952395192fb9c878272487a0d487a5fe177f7dbd Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 30 Jun 2016 16:12:36 -0400 Subject: [PATCH] Collapse core.codec and core.codec.support into one --- .../core/codec/{support => }/AbstractDecoder.java | 2 +- .../core/codec/{support => }/AbstractEncoder.java | 2 +- .../codec/{support => }/AbstractSingleValueEncoder.java | 2 +- .../core/codec/{support => }/ByteBufferDecoder.java | 2 +- .../core/codec/{support => }/ByteBufferEncoder.java | 2 +- .../core/codec/{support => }/ResourceDecoder.java | 3 ++- .../core/codec/{support => }/ResourceEncoder.java | 3 ++- .../core/codec/{support => }/StringDecoder.java | 2 +- .../core/codec/{support => }/StringEncoder.java | 2 +- .../java/org/springframework/core/codec/package-info.java | 5 +++-- .../springframework/core/codec/support/package-info.java | 4 ---- .../org/springframework/http/codec/SseEventEncoder.java | 2 +- .../http/codec/json/JacksonJsonDecoder.java | 2 +- .../http/codec/json/JacksonJsonEncoder.java | 2 +- .../http/codec/json/JsonObjectDecoder.java | 2 +- .../org/springframework/http/codec/xml/Jaxb2Decoder.java | 2 +- .../org/springframework/http/codec/xml/Jaxb2Encoder.java | 2 +- .../springframework/http/codec/xml/XmlEventDecoder.java | 2 +- .../converter/reactive/ResourceHttpMessageConverter.java | 4 ++-- .../springframework/web/client/reactive/WebClient.java | 8 ++++---- .../web/reactive/config/WebReactiveConfiguration.java | 8 ++++---- .../method/annotation/RequestMappingHandlerAdapter.java | 4 ++-- .../core/codec/{support => }/ByteBufferDecoderTests.java | 3 ++- .../core/codec/{support => }/ByteBufferEncoderTests.java | 3 ++- .../core/codec/{support => }/ResourceDecoderTests.java | 3 ++- .../core/codec/{support => }/ResourceEncoderTests.java | 3 ++- .../core/codec/{support => }/StringDecoderTests.java | 3 ++- .../core/codec/{support => }/StringEncoderTests.java | 3 ++- .../web/reactive/DispatcherHandlerErrorTests.java | 2 +- .../reactive/config/WebReactiveConfigurationTests.java | 4 ++-- .../annotation/MessageConverterResultHandlerTests.java | 4 ++-- .../annotation/RequestBodyArgumentResolverTests.java | 2 +- .../method/annotation/ResponseBodyResultHandlerTests.java | 4 ++-- .../annotation/ResponseEntityResultHandlerTests.java | 4 ++-- .../result/method/annotation/SseIntegrationTests.java | 4 ++-- .../result/view/HttpMessageConverterViewTests.java | 2 +- 36 files changed, 58 insertions(+), 53 deletions(-) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/AbstractDecoder.java (96%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/AbstractEncoder.java (96%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/AbstractSingleValueEncoder.java (97%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/ByteBufferDecoder.java (97%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/ByteBufferEncoder.java (97%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/ResourceDecoder.java (96%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/ResourceEncoder.java (95%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/StringDecoder.java (98%) rename spring-web-reactive/src/main/java/org/springframework/core/codec/{support => }/StringEncoder.java (97%) delete mode 100644 spring-web-reactive/src/main/java/org/springframework/core/codec/support/package-info.java rename spring-web-reactive/src/test/java/org/springframework/core/codec/{support => }/ByteBufferDecoderTests.java (95%) rename spring-web-reactive/src/test/java/org/springframework/core/codec/{support => }/ByteBufferEncoderTests.java (96%) rename spring-web-reactive/src/test/java/org/springframework/core/codec/{support => }/ResourceDecoderTests.java (96%) rename spring-web-reactive/src/test/java/org/springframework/core/codec/{support => }/ResourceEncoderTests.java (96%) rename spring-web-reactive/src/test/java/org/springframework/core/codec/{support => }/StringDecoderTests.java (97%) rename spring-web-reactive/src/test/java/org/springframework/core/codec/{support => }/StringEncoderTests.java (96%) diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractDecoder.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractDecoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractDecoder.java index dde5ee7d6f..5e925c5ca3 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractDecoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.util.Arrays; import java.util.Collections; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractEncoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java index 9bb7cfd315..10a60be070 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.util.Arrays; import java.util.Collections; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractSingleValueEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractSingleValueEncoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java index c023670d8b..ca83b76c79 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractSingleValueEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferDecoder.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferDecoder.java index 3f9ead7694..7f9c8ea6db 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferDecoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java index c6e69a494e..b3a1cc2f0d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceDecoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java index d36aba1854..5694887b4b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.io.ByteArrayInputStream; @@ -23,6 +23,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.AbstractDecoder; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceEncoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java index 5498ac153e..8c9d0bd362 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ResourceEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.io.IOException; import java.io.InputStream; @@ -22,6 +22,7 @@ import java.io.InputStream; import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.AbstractSingleValueEncoder; import org.springframework.core.io.Resource; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/StringDecoder.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/StringDecoder.java index 6ef47d1184..b5936aabca 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/StringDecoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.CharBuffer; import java.nio.charset.Charset; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/StringEncoder.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java rename to spring-web-reactive/src/main/java/org/springframework/core/codec/StringEncoder.java index 97094910a0..915980f492 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/StringEncoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/package-info.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/package-info.java index 9509c9b2f2..5a7d3df6f9 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/package-info.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/package-info.java @@ -1,5 +1,6 @@ /** - * Root-package for codecs used to transform streams of bytes. - * Used for example for serialization/deserialization. + * Provides {@link org.springframework.core.codec.Encoder} and + * {@link org.springframework.core.codec.Decoder} abstractions for converting + * to and from between a stream of bytes and a stream of Java objects. */ package org.springframework.core.codec; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/package-info.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/package-info.java deleted file mode 100644 index e915f2a1a2..0000000000 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains codec implementations. - */ -package org.springframework.core.codec.support; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/codec/SseEventEncoder.java b/spring-web-reactive/src/main/java/org/springframework/http/codec/SseEventEncoder.java index 5cbac76600..f5dfa2f9b1 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/codec/SseEventEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/codec/SseEventEncoder.java @@ -27,7 +27,7 @@ import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; import org.springframework.core.codec.CodecException; import org.springframework.core.codec.Encoder; -import org.springframework.core.codec.support.AbstractEncoder; +import org.springframework.core.codec.AbstractEncoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.core.io.buffer.FlushingDataBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java b/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java index e5d51005ef..39bae68c96 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java @@ -29,7 +29,7 @@ import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.core.codec.CodecException; import org.springframework.core.codec.Decoder; -import org.springframework.core.codec.support.AbstractDecoder; +import org.springframework.core.codec.AbstractDecoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.support.DataBufferUtils; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java b/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java index 69cabc1c0e..862edd712a 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java @@ -31,7 +31,7 @@ import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; import org.springframework.core.codec.CodecException; -import org.springframework.core.codec.support.AbstractEncoder; +import org.springframework.core.codec.AbstractEncoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JsonObjectDecoder.java b/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JsonObjectDecoder.java index 82b298e847..1f8caf1cd9 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JsonObjectDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/codec/json/JsonObjectDecoder.java @@ -28,7 +28,7 @@ import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.AbstractDecoder; +import org.springframework.core.codec.AbstractDecoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.core.io.buffer.support.DataBufferUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Decoder.java b/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Decoder.java index 4054f3b2e1..d0dfe8ae6d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Decoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Decoder.java @@ -36,7 +36,7 @@ import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; import org.springframework.core.codec.CodecException; -import org.springframework.core.codec.support.AbstractDecoder; +import org.springframework.core.codec.AbstractDecoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.util.ClassUtils; import org.springframework.util.MimeType; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Encoder.java b/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Encoder.java index b7eb53f895..b80bb2a324 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Encoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Encoder.java @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType; import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.AbstractSingleValueEncoder; +import org.springframework.core.codec.AbstractSingleValueEncoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.util.ClassUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java b/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java index 7bac139387..7009a00b12 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java @@ -35,7 +35,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.AbstractDecoder; +import org.springframework.core.codec.AbstractDecoder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.support.DataBufferUtils; import org.springframework.util.ClassUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageConverter.java b/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageConverter.java index 158ef29847..d98e7c1a35 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageConverter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageConverter.java @@ -25,8 +25,8 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.ResourceDecoder; -import org.springframework.core.codec.support.ResourceEncoder; +import org.springframework.core.codec.ResourceDecoder; +import org.springframework.core.codec.ResourceEncoder; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourceUtils2; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebClient.java b/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebClient.java index af50d86d77..270eeb53aa 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebClient.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebClient.java @@ -24,12 +24,12 @@ import reactor.core.publisher.Mono; import org.springframework.core.codec.Decoder; import org.springframework.core.codec.Encoder; -import org.springframework.core.codec.support.ByteBufferDecoder; -import org.springframework.core.codec.support.ByteBufferEncoder; +import org.springframework.core.codec.ByteBufferDecoder; +import org.springframework.core.codec.ByteBufferEncoder; import org.springframework.http.codec.json.JacksonJsonDecoder; import org.springframework.http.codec.json.JacksonJsonEncoder; -import org.springframework.core.codec.support.StringDecoder; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.StringDecoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.http.HttpStatus; import org.springframework.http.client.reactive.ClientHttpRequest; import org.springframework.http.client.reactive.ClientHttpRequestFactory; 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 a7b1011722..51eb9234c4 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 @@ -30,14 +30,14 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.codec.Decoder; import org.springframework.core.codec.Encoder; -import org.springframework.core.codec.support.ByteBufferDecoder; -import org.springframework.core.codec.support.ByteBufferEncoder; +import org.springframework.core.codec.ByteBufferDecoder; +import org.springframework.core.codec.ByteBufferEncoder; 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.core.codec.support.StringDecoder; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.StringDecoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterRegistry; import org.springframework.core.convert.support.GenericConversionService; 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 dba37ad1f8..7da5694419 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 @@ -31,8 +31,8 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.core.codec.support.ByteBufferDecoder; -import org.springframework.core.codec.support.StringDecoder; +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.CodecHttpMessageConverter; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java similarity index 95% rename from spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferDecoderTests.java rename to spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java index cc59004367..d44f7cb544 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.ByteBuffer; @@ -24,6 +24,7 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.ByteBufferDecoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java similarity index 96% rename from spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferEncoderTests.java rename to spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java index 60458231c6..5160395698 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ByteBufferEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -26,6 +26,7 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.ByteBufferEncoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java similarity index 96% rename from spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceDecoderTests.java rename to spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java index d9372f2163..22b8e5a426 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.io.IOException; @@ -23,6 +23,7 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.ResourceDecoder; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java similarity index 96% rename from spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceEncoderTests.java rename to spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java index 9e28305c87..fb747bb3a0 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/ResourceEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.charset.StandardCharsets; @@ -24,6 +24,7 @@ import reactor.core.publisher.Mono; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.ResourceEncoder; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringDecoderTests.java rename to spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java index 62187a69aa..505dca462f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import org.junit.Before; import org.junit.Test; @@ -22,6 +22,7 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.StringDecoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java similarity index 96% rename from spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringEncoderTests.java rename to spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java index 296b562e75..850775311f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.codec.support; +package org.springframework.core.codec; import java.nio.charset.StandardCharsets; @@ -26,6 +26,7 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.support.DataBufferUtils; import org.springframework.http.MediaType; 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 993c992882..e6ba0b2163 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 @@ -29,7 +29,7 @@ import reactor.core.util.SignalKind; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.io.buffer.DataBuffer; 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 870ae3ac79..25b75c0680 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 @@ -34,8 +34,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.StringDecoder; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.StringDecoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.convert.ConversionService; import org.springframework.core.io.Resource; import org.springframework.http.HttpMethod; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageConverterResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageConverterResultHandlerTests.java index c00e02fab3..b0f15af7d0 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageConverterResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageConverterResultHandlerTests.java @@ -37,8 +37,8 @@ import reactor.core.test.TestSubscriber; import rx.Observable; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.ByteBufferEncoder; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.ByteBufferEncoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.core.convert.support.ReactiveStreamsToCompletableFutureConverter; import org.springframework.core.convert.support.ReactiveStreamsToRxJava1Converter; 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 142d9ed3de..b462d2f114 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 @@ -44,7 +44,7 @@ import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.annotation.SynthesizingMethodParameter; import org.springframework.core.codec.Decoder; import org.springframework.http.codec.json.JacksonJsonDecoder; -import org.springframework.core.codec.support.StringDecoder; +import org.springframework.core.codec.StringDecoder; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.core.convert.support.ReactiveStreamsToCompletableFutureConverter; import org.springframework.core.convert.support.ReactiveStreamsToRxJava1Converter; 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 c259e9e915..3d3ac4f3aa 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 @@ -26,8 +26,8 @@ import org.junit.Test; import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.ByteBufferEncoder; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.ByteBufferEncoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.core.convert.support.ReactiveStreamsToCompletableFutureConverter; 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 48585447fa..7d01f3c9f8 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 @@ -30,8 +30,8 @@ import reactor.core.test.TestSubscriber; import rx.Single; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.support.ByteBufferEncoder; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.ByteBufferEncoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.core.convert.support.ReactiveStreamsToCompletableFutureConverter; import org.springframework.core.convert.support.ReactiveStreamsToRxJava1Converter; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java index 74bc385ca8..79beae54ef 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java @@ -30,10 +30,10 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.codec.Encoder; -import org.springframework.core.codec.support.ByteBufferDecoder; +import org.springframework.core.codec.ByteBufferDecoder; import org.springframework.http.codec.json.JacksonJsonDecoder; import org.springframework.http.codec.json.JacksonJsonEncoder; -import org.springframework.core.codec.support.StringDecoder; +import org.springframework.core.codec.StringDecoder; import org.springframework.http.MediaType; import org.springframework.http.client.reactive.ReactorHttpClientRequestFactory; import org.springframework.http.codec.SseEventEncoder; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageConverterViewTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageConverterViewTests.java index a6a24ac4f9..0f6cc3a3a0 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageConverterViewTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageConverterViewTests.java @@ -34,7 +34,7 @@ import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; import org.springframework.http.codec.json.JacksonJsonEncoder; import org.springframework.http.codec.xml.Jaxb2Encoder; -import org.springframework.core.codec.support.StringEncoder; +import org.springframework.core.codec.StringEncoder; import org.springframework.core.io.buffer.support.DataBufferTestUtils; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -- GitLab