Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
95239519
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
95239519
编写于
6月 30, 2016
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Collapse core.codec and core.codec.support into one
上级
2f2546c8
变更
36
隐藏空白更改
内联
并排
Showing
36 changed file
with
58 addition
and
53 deletion
+58
-53
spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractDecoder.java
.../java/org/springframework/core/codec/AbstractDecoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java
.../java/org/springframework/core/codec/AbstractEncoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java
...pringframework/core/codec/AbstractSingleValueEncoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferDecoder.java
...ava/org/springframework/core/codec/ByteBufferDecoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java
...ava/org/springframework/core/codec/ByteBufferEncoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java
.../java/org/springframework/core/codec/ResourceDecoder.java
+2
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java
.../java/org/springframework/core/codec/ResourceEncoder.java
+2
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/StringDecoder.java
...in/java/org/springframework/core/codec/StringDecoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/StringEncoder.java
...in/java/org/springframework/core/codec/StringEncoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/core/codec/package-info.java
...ain/java/org/springframework/core/codec/package-info.java
+3
-2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/package-info.java
.../org/springframework/core/codec/support/package-info.java
+0
-4
spring-web-reactive/src/main/java/org/springframework/http/codec/SseEventEncoder.java
.../java/org/springframework/http/codec/SseEventEncoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java
...g/springframework/http/codec/json/JacksonJsonDecoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java
...g/springframework/http/codec/json/JacksonJsonEncoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/http/codec/json/JsonObjectDecoder.java
...rg/springframework/http/codec/json/JsonObjectDecoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Decoder.java
...java/org/springframework/http/codec/xml/Jaxb2Decoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Encoder.java
...java/org/springframework/http/codec/xml/Jaxb2Encoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
...a/org/springframework/http/codec/xml/XmlEventDecoder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageConverter.java
...http/converter/reactive/ResourceHttpMessageConverter.java
+2
-2
spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebClient.java
...va/org/springframework/web/client/reactive/WebClient.java
+4
-4
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
...amework/web/reactive/config/WebReactiveConfiguration.java
+4
-4
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
...esult/method/annotation/RequestMappingHandlerAdapter.java
+2
-2
spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java
...rg/springframework/core/codec/ByteBufferDecoderTests.java
+2
-1
spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java
...rg/springframework/core/codec/ByteBufferEncoderTests.java
+2
-1
spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java
.../org/springframework/core/codec/ResourceDecoderTests.java
+2
-1
spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java
.../org/springframework/core/codec/ResourceEncoderTests.java
+2
-1
spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java
...va/org/springframework/core/codec/StringDecoderTests.java
+2
-1
spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java
...va/org/springframework/core/codec/StringEncoderTests.java
+2
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java
...ngframework/web/reactive/DispatcherHandlerErrorTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
...rk/web/reactive/config/WebReactiveConfigurationTests.java
+2
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageConverterResultHandlerTests.java
...method/annotation/MessageConverterResultHandlerTests.java
+2
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java
...t/method/annotation/RequestBodyArgumentResolverTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
...ult/method/annotation/ResponseBodyResultHandlerTests.java
+2
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java
...t/method/annotation/ResponseEntityResultHandlerTests.java
+2
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
...eactive/result/method/annotation/SseIntegrationTests.java
+2
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageConverterViewTests.java
...b/reactive/result/view/HttpMessageConverterViewTests.java
+1
-1
未找到文件。
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
AbstractDecoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractDecoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
AbstractEncoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
AbstractSingleValueEncoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
ByteBufferDecoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferDecoder.java
浏览文件 @
95239519
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.core.codec
.support
;
package
org.springframework.core.codec
;
import
java.nio.ByteBuffer
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
ByteBufferEncoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java
浏览文件 @
95239519
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.core.codec
.support
;
package
org.springframework.core.codec
;
import
java.nio.ByteBuffer
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
ResourceDecoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
ResourceEncoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
StringDecoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/StringDecoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/
support/
StringEncoder.java
→
spring-web-reactive/src/main/java/org/springframework/core/codec/StringEncoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/core/codec/package-info.java
浏览文件 @
95239519
/**
* 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
;
spring-web-reactive/src/main/java/org/springframework/core/codec/support/package-info.java
已删除
100644 → 0
浏览文件 @
2f2546c8
/**
* This package contains codec implementations.
*/
package
org.springframework.core.codec.support
;
spring-web-reactive/src/main/java/org/springframework/http/codec/SseEventEncoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/http/codec/json/JsonObjectDecoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Decoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/http/codec/xml/Jaxb2Encoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/ResourceHttpMessageConverter.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/client/reactive/WebClient.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/core/codec/
support/
ByteBufferDecoderTests.java
→
spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/core/codec/
support/
ByteBufferEncoderTests.java
→
spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/core/codec/
support/
ResourceDecoderTests.java
→
spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/core/codec/
support/
ResourceEncoderTests.java
→
spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/core/codec/
support/
StringDecoderTests.java
→
spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/core/codec/
support/
StringEncoderTests.java
→
spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageConverterResultHandlerTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageConverterViewTests.java
浏览文件 @
95239519
...
...
@@ -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
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录