Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
aac20b3f
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,发现更多精彩内容 >>
提交
aac20b3f
编写于
12月 15, 2016
作者:
A
Arjen Poutsma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move functional web framework to web.reactive.function.server
上级
aa8f5315
变更
38
隐藏空白更改
内联
并排
Showing
38 changed file
with
115 addition
and
69 deletion
+115
-69
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/package-info.java
...g/springframework/web/reactive/function/package-info.java
+0
-4
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultHandlerStrategiesBuilder.java
...tive/function/server/DefaultHandlerStrategiesBuilder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
...rk/web/reactive/function/server/DefaultServerRequest.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
...eactive/function/server/DefaultServerResponseBuilder.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFilterFunction.java
...k/web/reactive/function/server/HandlerFilterFunction.java
+2
-2
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFunction.java
...amework/web/reactive/function/server/HandlerFunction.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerStrategies.java
...ework/web/reactive/function/server/HandlerStrategies.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
.../reactive/function/server/PathResourceLookupFunction.java
+2
-2
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
...mework/web/reactive/function/server/RequestPredicate.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
...ework/web/reactive/function/server/RequestPredicates.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java
...web/reactive/function/server/ResourceHandlerFunction.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java
...ramework/web/reactive/function/server/RouterFunction.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
...amework/web/reactive/function/server/RouterFunctions.java
+7
-5
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
...framework/web/reactive/function/server/ServerRequest.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
...ramework/web/reactive/function/server/ServerResponse.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/package-info.java
...gframework/web/reactive/function/server/package-info.java
+20
-0
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/HandlerFunctionAdapter.java
...ctive/function/server/support/HandlerFunctionAdapter.java
+4
-4
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
...eactive/function/server/support/ServerRequestWrapper.java
+3
-3
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java
.../function/server/support/ServerResponseResultHandler.java
+3
-3
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java
...rk/web/reactive/function/server/support/package-info.java
+23
-0
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/AbstractRouterFunctionIntegrationTests.java
...nction/server/AbstractRouterFunctionIntegrationTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java
...b/reactive/function/server/DefaultServerRequestTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
...ve/function/server/DefaultServerResponseBuilderTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
...ve/function/server/DispatcherHandlerIntegrationTests.java
+4
-4
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HandlerStrategiesTests.java
.../web/reactive/function/server/HandlerStrategiesTests.java
+3
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTest.java
...work/web/reactive/function/server/HeadersWrapperTest.java
+2
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java
...ework/web/reactive/function/server/MockServerRequest.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java
...tive/function/server/PathResourceLookupFunctionTests.java
+7
-6
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
...tion/server/PublisherHandlerFunctionIntegrationTests.java
+4
-4
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicateTests.java
...k/web/reactive/function/server/RequestPredicateTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicatesTests.java
.../web/reactive/function/server/RequestPredicatesTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java
...eactive/function/server/ResourceHandlerFunctionTests.java
+4
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java
...ork/web/reactive/function/server/RouterFunctionTests.java
+1
-1
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
...rk/web/reactive/function/server/RouterFunctionsTests.java
+3
-2
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java
...e/function/server/SseHandlerFunctionIntegrationTests.java
+4
-4
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java
...ve/function/server/support/ServerRequestWrapperTests.java
+2
-2
spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/server/child/response.txt
...framework/web/reactive/function/server/child/response.txt
+0
-0
spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/server/response.txt
...springframework/web/reactive/function/server/response.txt
+0
-0
未找到文件。
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/package-info.java
已删除
100644 → 0
浏览文件 @
aa8f5315
/**
* Types that make up Spring's functional web framework.
*/
package
org.springframework.web.reactive.function
;
\ No newline at end of file
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultHandlerStrategiesBuilder.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
DefaultHandlerStrategiesBuilder.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.ArrayList
;
import
java.util.Collections
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultServerRequest.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
DefaultServerRequest.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.InetSocketAddress
;
import
java.net.URI
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultServerResponseBuilder.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
DefaultServerResponseBuilder.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.URI
;
import
java.time.ZoneId
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/HandlerFilterFunction.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
HandlerFilterFunction.java
浏览文件 @
aac20b3f
...
...
@@ -14,14 +14,14 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.function.Function
;
import
reactor.core.publisher.Mono
;
import
org.springframework.util.Assert
;
import
org.springframework.web.reactive.function.support.ServerRequestWrapper
;
import
org.springframework.web.reactive.function.s
erver.s
upport.ServerRequestWrapper
;
/**
* Represents a function that filters a {@linkplain HandlerFunction handler function}.
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/HandlerFunction.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
HandlerFunction.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
reactor.core.publisher.Mono
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/HandlerStrategies.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
HandlerStrategies.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.function.Supplier
;
import
java.util.stream.Stream
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/PathResourceLookupFunction.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
PathResourceLookupFunction.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.io.IOException
;
import
java.io.UncheckedIOException
;
...
...
@@ -107,7 +107,7 @@ class PathResourceLookupFunction implements Function<ServerRequest, Mono<Resourc
return
true
;
}
}
if
(
path
.
contains
(
"
..
"
))
{
if
(
path
.
contains
(
""
))
{
path
=
StringUtils
.
cleanPath
(
path
);
if
(
path
.
contains
(
"../"
))
{
return
true
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RequestPredicate.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
RequestPredicate.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
org.springframework.util.Assert
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RequestPredicates.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
RequestPredicates.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.URI
;
import
java.util.Arrays
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/ResourceHandlerFunction.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
ResourceHandlerFunction.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.io.ByteArrayInputStream
;
import
java.io.File
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RouterFunction.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
RouterFunction.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.Optional
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RouterFunctions.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
RouterFunctions.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.Map
;
import
java.util.function.Function
;
...
...
@@ -25,6 +25,8 @@ import org.springframework.core.io.Resource;
import
org.springframework.http.server.reactive.HttpHandler
;
import
org.springframework.util.Assert
;
import
org.springframework.web.reactive.HandlerMapping
;
import
org.springframework.web.reactive.function.server.support.HandlerFunctionAdapter
;
import
org.springframework.web.reactive.function.server.support.ServerResponseResultHandler
;
import
org.springframework.web.server.ServerWebExchange
;
import
org.springframework.web.server.WebHandler
;
import
org.springframework.web.server.adapter.HttpWebHandlerAdapter
;
...
...
@@ -205,8 +207,8 @@ public abstract class RouterFunctions {
* {@link org.springframework.web.reactive.DispatcherHandler}.
* @param routerFunction the router function to convert
* @return an handler mapping that maps HTTP request to a handler using the given router function
* @see
org.springframework.web.reactive.function.support.
HandlerFunctionAdapter
* @see
org.springframework.web.reactive.function.support.
ServerResponseResultHandler
* @see HandlerFunctionAdapter
* @see ServerResponseResultHandler
*/
public
static
HandlerMapping
toHandlerMapping
(
RouterFunction
<?>
routerFunction
)
{
return
toHandlerMapping
(
routerFunction
,
HandlerStrategies
.
withDefaults
());
...
...
@@ -220,8 +222,8 @@ public abstract class RouterFunctions {
* @param routerFunction the router function to convert
* @param strategies the strategies to use
* @return an handler mapping that maps HTTP request to a handler using the given router function
* @see
org.springframework.web.reactive.function.support.
HandlerFunctionAdapter
* @see
org.springframework.web.reactive.function.support.
ServerResponseResultHandler
* @see HandlerFunctionAdapter
* @see ServerResponseResultHandler
*/
public
static
HandlerMapping
toHandlerMapping
(
RouterFunction
<?>
routerFunction
,
HandlerStrategies
strategies
)
{
Assert
.
notNull
(
routerFunction
,
"RouterFunction must not be null"
);
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/ServerRequest.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
ServerRequest.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.InetSocketAddress
;
import
java.net.URI
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/ServerResponse.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/
server/
ServerResponse.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.URI
;
import
java.time.ZonedDateTime
;
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/package-info.java
0 → 100644
浏览文件 @
aac20b3f
/*
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Types that make up Spring's functional web framework.
*/
package
org.springframework.web.reactive.function.server
;
\ No newline at end of file
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/HandlerFunctionAdapter.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/s
erver/s
upport/HandlerFunctionAdapter.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function.support
;
package
org.springframework.web.reactive.function.s
erver.s
upport
;
import
java.lang.reflect.Method
;
...
...
@@ -23,9 +23,9 @@ import reactor.core.publisher.Mono;
import
org.springframework.core.MethodParameter
;
import
org.springframework.web.reactive.HandlerAdapter
;
import
org.springframework.web.reactive.HandlerResult
;
import
org.springframework.web.reactive.function.HandlerFunction
;
import
org.springframework.web.reactive.function.RouterFunctions
;
import
org.springframework.web.reactive.function.ServerRequest
;
import
org.springframework.web.reactive.function.
server.
HandlerFunction
;
import
org.springframework.web.reactive.function.
server.
RouterFunctions
;
import
org.springframework.web.reactive.function.
server.
ServerRequest
;
import
org.springframework.web.server.ServerWebExchange
;
/**
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/ServerRequestWrapper.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/s
erver/s
upport/ServerRequestWrapper.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function.support
;
package
org.springframework.web.reactive.function.s
erver.s
upport
;
import
java.net.InetSocketAddress
;
import
java.net.URI
;
...
...
@@ -34,8 +34,8 @@ import org.springframework.http.MediaType;
import
org.springframework.http.codec.BodyExtractor
;
import
org.springframework.http.server.reactive.ServerHttpRequest
;
import
org.springframework.util.Assert
;
import
org.springframework.web.reactive.function.HandlerFunction
;
import
org.springframework.web.reactive.function.ServerRequest
;
import
org.springframework.web.reactive.function.
server.
HandlerFunction
;
import
org.springframework.web.reactive.function.
server.
ServerRequest
;
/**
* Implementation of the {@link ServerRequest} interface that can be subclassed to adapt the request to a
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/ServerResponseResultHandler.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/s
erver/s
upport/ServerResponseResultHandler.java
浏览文件 @
aac20b3f
...
...
@@ -14,15 +14,15 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function.support
;
package
org.springframework.web.reactive.function.s
erver.s
upport
;
import
reactor.core.publisher.Mono
;
import
org.springframework.util.Assert
;
import
org.springframework.web.reactive.HandlerResult
;
import
org.springframework.web.reactive.HandlerResultHandler
;
import
org.springframework.web.reactive.function.HandlerStrategies
;
import
org.springframework.web.reactive.function.ServerResponse
;
import
org.springframework.web.reactive.function.
server.
HandlerStrategies
;
import
org.springframework.web.reactive.function.
server.
ServerResponse
;
import
org.springframework.web.server.ServerWebExchange
;
/**
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/package-info.java
→
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/s
erver/s
upport/package-info.java
浏览文件 @
aac20b3f
/*
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Classes supporting the {@code org.springframework.web.reactive.function} package.
* Contains a {@code HandlerAdapter} that supports {@code HandlerFunction}s,
* a {@code HandlerResultHandler} that supports {@code ServerResponse}s, and
* a {@code ServerRequest} wrapper to adapt a request.
*/
package
org.springframework.web.reactive.function.support
;
\ No newline at end of file
package
org.springframework.web.reactive.function.server.support
;
\ No newline at end of file
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/AbstractRouterFunctionIntegrationTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
AbstractRouterFunctionIntegrationTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests
;
import
org.springframework.http.server.reactive.HttpHandler
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/DefaultServerRequestTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
DefaultServerRequestTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.InetSocketAddress
;
import
java.net.URI
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/DefaultServerResponseBuilderTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
DefaultServerResponseBuilderTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.URI
;
import
java.time.ZonedDateTime
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/DispatcherHandlerIntegrationTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
DispatcherHandlerIntegrationTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.List
;
import
java.util.function.Supplier
;
...
...
@@ -42,15 +42,15 @@ import org.springframework.web.reactive.DispatcherHandler;
import
org.springframework.web.reactive.HandlerAdapter
;
import
org.springframework.web.reactive.HandlerMapping
;
import
org.springframework.web.reactive.config.WebReactiveConfigurationSupport
;
import
org.springframework.web.reactive.function.support.HandlerFunctionAdapter
;
import
org.springframework.web.reactive.function.support.ServerResponseResultHandler
;
import
org.springframework.web.reactive.function.s
erver.s
upport.HandlerFunctionAdapter
;
import
org.springframework.web.reactive.function.s
erver.s
upport.ServerResponseResultHandler
;
import
org.springframework.web.reactive.result.view.ViewResolver
;
import
org.springframework.web.server.adapter.WebHttpHandlerBuilder
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
springframework
.
http
.
codec
.
BodyInserters
.
fromObject
;
import
static
org
.
springframework
.
http
.
codec
.
BodyInserters
.
fromPublisher
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
RouterFunctions
.
route
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
server
.
RouterFunctions
.
route
;
/**
* Tests the use of {@link HandlerFunction} and {@link RouterFunction} in a
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/HandlerStrategiesTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
HandlerStrategiesTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.Collections
;
import
java.util.List
;
...
...
@@ -36,7 +36,8 @@ import org.springframework.http.ReactiveHttpOutputMessage;
import
org.springframework.http.codec.HttpMessageReader
;
import
org.springframework.http.codec.HttpMessageWriter
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
/**
* @author Arjen Poutsma
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/HeadersWrapperTest.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
HeadersWrapperTest.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.InetSocketAddress
;
import
java.nio.charset.Charset
;
...
...
@@ -30,7 +30,7 @@ import org.junit.Test;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpRange
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.reactive.function.support.ServerRequestWrapper
;
import
org.springframework.web.reactive.function.s
erver.s
upport.ServerRequestWrapper
;
import
static
org
.
junit
.
Assert
.
assertSame
;
import
static
org
.
mockito
.
Mockito
.
mock
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/MockServerRequest.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
MockServerRequest.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.InetSocketAddress
;
import
java.net.URI
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/PathResourceLookupFunctionTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
PathResourceLookupFunctionTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.io.File
;
import
java.io.IOException
;
...
...
@@ -34,9 +34,10 @@ public class PathResourceLookupFunctionTests {
@Test
public
void
normal
()
throws
Exception
{
ClassPathResource
location
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/"
);
ClassPathResource
location
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/
server/
"
);
PathResourceLookupFunction
function
=
new
PathResourceLookupFunction
(
"/resources/**"
,
location
);
PathResourceLookupFunction
function
=
new
PathResourceLookupFunction
(
"/resources/**"
,
location
);
MockServerRequest
request
=
MockServerRequest
.
builder
()
.
uri
(
new
URI
(
"http://localhost/resources/response.txt"
))
.
build
();
...
...
@@ -58,14 +59,14 @@ public class PathResourceLookupFunctionTests {
@Test
public
void
subPath
()
throws
Exception
{
ClassPathResource
location
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/"
);
ClassPathResource
location
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/
server/
"
);
PathResourceLookupFunction
function
=
new
PathResourceLookupFunction
(
"/resources/**"
,
location
);
MockServerRequest
request
=
MockServerRequest
.
builder
()
.
uri
(
new
URI
(
"http://localhost/resources/child/response.txt"
))
.
build
();
Mono
<
Resource
>
result
=
function
.
apply
(
request
);
File
expected
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/child/response.txt"
).
getFile
();
File
expected
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/
server/
child/response.txt"
).
getFile
();
StepVerifier
.
create
(
result
)
.
expectNextMatches
(
resource
->
{
try
{
...
...
@@ -81,7 +82,7 @@ public class PathResourceLookupFunctionTests {
@Test
public
void
notFound
()
throws
Exception
{
ClassPathResource
location
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/"
);
ClassPathResource
location
=
new
ClassPathResource
(
"org/springframework/web/reactive/function/
server/
"
);
PathResourceLookupFunction
function
=
new
PathResourceLookupFunction
(
"/resources/**"
,
location
);
MockServerRequest
request
=
MockServerRequest
.
builder
()
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/PublisherHandlerFunctionIntegrationTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
PublisherHandlerFunctionIntegrationTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.URI
;
import
java.util.List
;
...
...
@@ -34,9 +34,9 @@ import org.springframework.web.client.RestTemplate;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
springframework
.
http
.
codec
.
BodyExtractors
.
toMono
;
import
static
org
.
springframework
.
http
.
codec
.
BodyInserters
.
fromPublisher
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
RequestPredicates
.
GET
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
RequestPredicates
.
POST
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
RouterFunctions
.
route
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
server
.
RequestPredicates
.
GET
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
server
.
RequestPredicates
.
POST
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
server
.
RouterFunctions
.
route
;
/**
* @author Arjen Poutsma
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RequestPredicateTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
RequestPredicateTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
org.junit.Test
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RequestPredicatesTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
RequestPredicatesTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.net.URI
;
import
java.util.Collections
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/ResourceHandlerFunctionTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
ResourceHandlerFunctionTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.io.IOException
;
import
java.nio.file.Files
;
...
...
@@ -35,7 +35,9 @@ import org.springframework.web.server.ServerWebExchange;
import
org.springframework.web.server.adapter.DefaultServerWebExchange
;
import
org.springframework.web.server.session.MockWebSessionManager
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
junit
.
Assert
.
assertArrayEquals
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertNull
;
/**
* @author Arjen Poutsma
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RouterFunctionTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
RouterFunctionTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
org.junit.Test
;
import
reactor.core.publisher.Mono
;
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RouterFunctionsTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
RouterFunctionsTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.util.stream.Stream
;
...
...
@@ -51,7 +51,8 @@ public class RouterFunctionsTests {
RequestPredicate
requestPredicate
=
mock
(
RequestPredicate
.
class
);
when
(
requestPredicate
.
test
(
request
)).
thenReturn
(
true
);
RouterFunction
<
ServerResponse
>
result
=
RouterFunctions
.
route
(
requestPredicate
,
handlerFunction
);
RouterFunction
<
ServerResponse
>
result
=
RouterFunctions
.
route
(
requestPredicate
,
handlerFunction
);
assertNotNull
(
result
);
Mono
<
HandlerFunction
<
ServerResponse
>>
resultHandlerFunction
=
result
.
route
(
request
);
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/SseHandlerFunctionIntegrationTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/
server/
SseHandlerFunctionIntegrationTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function
;
package
org.springframework.web.reactive.function
.server
;
import
java.time.Duration
;
...
...
@@ -28,11 +28,11 @@ import org.springframework.http.MediaType;
import
org.springframework.http.client.reactive.ReactorClientHttpConnector
;
import
org.springframework.http.codec.BodyExtractors
;
import
org.springframework.http.codec.ServerSentEvent
;
import
org.springframework.web.
client.reactive
.ClientRequest
;
import
org.springframework.web.
client.reactive
.WebClient
;
import
org.springframework.web.
reactive.function.client
.ClientRequest
;
import
org.springframework.web.
reactive.function.client
.WebClient
;
import
static
org
.
springframework
.
http
.
codec
.
BodyInserters
.
fromServerSentEvents
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
RouterFunctions
.
route
;
import
static
org
.
springframework
.
web
.
reactive
.
function
.
server
.
RouterFunctions
.
route
;
/**
* @author Arjen Poutsma
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/support/ServerRequestWrapperTests.java
→
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/s
erver/s
upport/ServerRequestWrapperTests.java
浏览文件 @
aac20b3f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.web.reactive.function.support
;
package
org.springframework.web.reactive.function.s
erver.s
upport
;
import
java.net.URI
;
import
java.util.Collections
;
...
...
@@ -26,7 +26,7 @@ import org.junit.Before;
import
org.junit.Test
;
import
org.springframework.http.HttpMethod
;
import
org.springframework.web.reactive.function.ServerRequest
;
import
org.springframework.web.reactive.function.
server.
ServerRequest
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertSame
;
...
...
spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/child/response.txt
→
spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/
server/
child/response.txt
浏览文件 @
aac20b3f
文件已移动
spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/response.txt
→
spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/
server/
response.txt
浏览文件 @
aac20b3f
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录