Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
b67039d1
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 搜索 >>
提交
b67039d1
编写于
3月 20, 2019
作者:
A
Arjen Poutsma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix checkstyle issue
上级
2e7f98d7
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
22 addition
and
45 deletion
+22
-45
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java
...gframework/web/reactive/function/server/package-info.java
+0
-16
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
...rk/web/servlet/function/DefaultEntityResponseBuilder.java
+2
-1
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
...gframework/web/servlet/function/DefaultServerRequest.java
+7
-4
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
...ork/web/servlet/function/DefaultServerRequestBuilder.java
+2
-1
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java
...rk/web/servlet/function/DefaultServerResponseBuilder.java
+3
-2
spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java
.../springframework/web/servlet/function/EntityResponse.java
+1
-0
spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
...springframework/web/servlet/function/RouterFunctions.java
+4
-3
spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
...g/springframework/web/servlet/function/ServerRequest.java
+1
-1
spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
.../springframework/web/servlet/function/ServerResponse.java
+2
-1
spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/package-info.java
...gframework/web/servlet/function/support/package-info.java
+0
-16
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java
浏览文件 @
b67039d1
/*
* Copyright 2002-2019 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.
*/
/**
* Provides the types that make up Spring's functional web framework for Reactive environments.
*/
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
浏览文件 @
b67039d1
...
...
@@ -62,8 +62,9 @@ import org.springframework.web.servlet.ModelAndView;
*
* @author Arjen Poutsma
* @since 5.2
* @param <T> the entity type
*/
class
DefaultEntityResponseBuilder
<
T
>
implements
EntityResponse
.
Builder
<
T
>
{
final
class
DefaultEntityResponseBuilder
<
T
>
implements
EntityResponse
.
Builder
<
T
>
{
private
final
T
entity
;
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
浏览文件 @
b67039d1
...
...
@@ -220,7 +220,8 @@ class DefaultServerRequest implements ServerRequest {
.
getAttribute
(
RouterFunctions
.
URI_TEMPLATE_VARIABLES_ATTRIBUTE
);
if
(
pathVariables
!=
null
)
{
return
pathVariables
;
}
else
{
}
else
{
return
Collections
.
emptyMap
();
}
}
...
...
@@ -235,7 +236,9 @@ class DefaultServerRequest implements ServerRequest {
return
Optional
.
ofNullable
(
this
.
serverHttpRequest
.
getPrincipal
());
}
/**
* Default implementation of {@link Headers}.
*/
static
class
DefaultRequestHeaders
implements
Headers
{
private
final
HttpHeaders
delegate
;
...
...
@@ -298,7 +301,7 @@ class DefaultServerRequest implements ServerRequest {
}
}
private
static
class
ServletParametersMap
extends
AbstractMap
<
String
,
List
<
String
>>
{
private
static
final
class
ServletParametersMap
extends
AbstractMap
<
String
,
List
<
String
>>
{
private
final
HttpServletRequest
servletRequest
;
...
...
@@ -353,7 +356,7 @@ class DefaultServerRequest implements ServerRequest {
}
private
static
class
ServletAttributesMap
extends
AbstractMap
<
String
,
Object
>
{
private
static
final
class
ServletAttributesMap
extends
AbstractMap
<
String
,
Object
>
{
private
final
HttpServletRequest
servletRequest
;
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
浏览文件 @
b67039d1
...
...
@@ -283,7 +283,8 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
.
get
(
RouterFunctions
.
URI_TEMPLATE_VARIABLES_ATTRIBUTE
);
if
(
pathVariables
!=
null
)
{
return
pathVariables
;
}
else
{
}
else
{
return
Collections
.
emptyMap
();
}
}
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java
浏览文件 @
b67039d1
...
...
@@ -286,8 +286,9 @@ class DefaultServerResponseBuilder implements ServerResponse.BodyBuilder {
else
{
return
writeToInternal
(
request
,
response
,
context
);
}
}
catch
(
Throwable
t
)
{
return
handleError
(
t
,
request
,
response
,
context
);
}
catch
(
Throwable
throwable
)
{
return
handleError
(
throwable
,
request
,
response
,
context
);
}
}
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java
浏览文件 @
b67039d1
...
...
@@ -72,6 +72,7 @@ public interface EntityResponse<T> extends ServerResponse {
/**
* Defines a builder for {@code EntityResponse}.
* @param <T> the entity type
*/
interface
Builder
<
T
>
{
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
浏览文件 @
b67039d1
...
...
@@ -830,10 +830,11 @@ public abstract class RouterFunctions {
"Nested predicate \"%s\" matches against \"%s\""
,
this
.
predicate
,
serverRequest
));
}
Optional
<
HandlerFunction
<
T
>>
result
=
this
.
routerFunction
.
route
(
nestedRequest
);
Optional
<
HandlerFunction
<
T
>>
result
=
this
.
routerFunction
.
route
(
nestedRequest
);
if
(
result
.
isPresent
()
&&
nestedRequest
!=
serverRequest
)
{
serverRequest
.
attributes
().
clear
();
serverRequest
.
attributes
().
putAll
(
nestedRequest
.
attributes
());
serverRequest
.
attributes
().
clear
();
serverRequest
.
attributes
().
putAll
(
nestedRequest
.
attributes
());
}
return
result
;
}
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
浏览文件 @
b67039d1
...
...
@@ -223,7 +223,7 @@ public interface ServerRequest {
// Static methods
/**
* Create a new {@code ServerRequest} based on the given {@code
{@link
HttpServletRequest} and
* Create a new {@code ServerRequest} based on the given {@code HttpServletRequest} and
* message converters.
* @param servletRequest the request
* @param messageReaders the message readers
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
浏览文件 @
b67039d1
...
...
@@ -71,7 +71,8 @@ public interface ServerResponse {
MultiValueMap
<
String
,
Cookie
>
cookies
();
/**
* Write this response to the servlet response (and return {@code null}, or return a
* Write this response to the servlet response (and return {@code null}, or return a model and
* view.
* @param request the current request
* @param response the response to write to
* @param context the context to use when writing
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/package-info.java
浏览文件 @
b67039d1
/*
* Copyright 2002-2019 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.servlet.function} package.
* Contains a {@code HandlerAdapter} that supports {@code HandlerFunction}s,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录