Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
8a57997d
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 搜索 >>
提交
8a57997d
编写于
5月 02, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid use of Objects.requireNonNull plus related polishing
上级
0be610b0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
27 addition
and
59 deletion
+27
-59
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
...rk/web/servlet/function/DefaultEntityResponseBuilder.java
+27
-59
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
浏览文件 @
8a57997d
...
...
@@ -24,7 +24,6 @@ import java.time.ZonedDateTime;
import
java.util.Arrays
;
import
java.util.LinkedHashSet
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Set
;
import
java.util.concurrent.CompletionStage
;
import
java.util.function.Consumer
;
...
...
@@ -67,7 +66,9 @@ import org.springframework.web.servlet.ModelAndView;
*/
final
class
DefaultEntityResponseBuilder
<
T
>
implements
EntityResponse
.
Builder
<
T
>
{
private
static
final
boolean
reactiveStreamsPresent
;
private
static
final
boolean
reactiveStreamsPresent
=
ClassUtils
.
isPresent
(
"org.reactivestreams.Publisher"
,
DefaultEntityResponseBuilder
.
class
.
getClassLoader
());
private
final
T
entity
;
...
...
@@ -79,11 +80,6 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
private
final
MultiValueMap
<
String
,
Cookie
>
cookies
=
new
LinkedMultiValueMap
<>();
static
{
ClassLoader
classLoader
=
DefaultEntityResponseBuilder
.
class
.
getClassLoader
();
reactiveStreamsPresent
=
ClassUtils
.
isPresent
(
"org.reactivestreams.Publisher"
,
classLoader
);
}
private
DefaultEntityResponseBuilder
(
T
entity
,
@Nullable
Type
entityType
)
{
this
.
entity
=
entity
;
...
...
@@ -205,15 +201,12 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
return
new
CompletionStageEntityResponse
(
this
.
status
,
this
.
headers
,
this
.
cookies
,
completionStage
,
this
.
entityType
);
}
else
if
(
reactiveStreamsPresent
&&
PublisherEntityResponse
.
isPublisher
(
this
.
entity
))
{
else
if
(
reactiveStreamsPresent
&&
PublisherEntityResponse
.
isPublisher
(
this
.
entity
))
{
Publisher
publisher
=
(
Publisher
)
this
.
entity
;
return
new
PublisherEntityResponse
(
this
.
status
,
this
.
headers
,
this
.
cookies
,
publisher
,
this
.
entityType
);
return
new
PublisherEntityResponse
(
this
.
status
,
this
.
headers
,
this
.
cookies
,
publisher
,
this
.
entityType
);
}
else
{
return
new
DefaultEntityResponse
<>(
this
.
status
,
this
.
headers
,
this
.
cookies
,
this
.
entity
,
this
.
entityType
);
return
new
DefaultEntityResponse
<>(
this
.
status
,
this
.
headers
,
this
.
cookies
,
this
.
entity
,
this
.
entityType
);
}
}
...
...
@@ -232,18 +225,17 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
return
new
DefaultEntityResponseBuilder
<>(
t
,
bodyType
.
getType
());
}
/**
* Default {@link EntityResponse} implementation for synchronous bodies.
*/
private
static
class
DefaultEntityResponse
<
T
>
extends
DefaultServerResponseBuilder
.
AbstractServerResponse
private
static
class
DefaultEntityResponse
<
T
>
extends
DefaultServerResponseBuilder
.
AbstractServerResponse
implements
EntityResponse
<
T
>
{
private
final
T
entity
;
private
final
Type
entityType
;
public
DefaultEntityResponse
(
int
statusCode
,
HttpHeaders
headers
,
MultiValueMap
<
String
,
Cookie
>
cookies
,
T
entity
,
Type
entityType
)
{
...
...
@@ -263,18 +255,15 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
throws
ServletException
,
IOException
{
writeEntityWithMessageConverters
(
this
.
entity
,
servletRequest
,
servletResponse
,
context
);
return
null
;
}
@SuppressWarnings
(
"unchecked"
)
protected
void
writeEntityWithMessageConverters
(
Object
entity
,
HttpServletRequest
request
,
HttpServletResponse
response
,
ServerResponse
.
Context
context
)
protected
void
writeEntityWithMessageConverters
(
Object
entity
,
HttpServletRequest
request
,
HttpServletResponse
response
,
ServerResponse
.
Context
context
)
throws
ServletException
,
IOException
{
ServletServerHttpResponse
serverResponse
=
new
ServletServerHttpResponse
(
response
);
MediaType
contentType
=
getContentType
(
response
);
Class
<?>
entityClass
=
entity
.
getClass
();
...
...
@@ -307,9 +296,8 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
}
}
protected
void
tryWriteEntityWithMessageConverters
(
Object
entity
,
HttpServletRequest
request
,
HttpServletResponse
response
,
ServerResponse
.
Context
context
)
{
protected
void
tryWriteEntityWithMessageConverters
(
Object
entity
,
HttpServletRequest
request
,
HttpServletResponse
response
,
ServerResponse
.
Context
context
)
{
try
{
writeEntityWithMessageConverters
(
entity
,
request
,
response
,
context
);
}
...
...
@@ -334,12 +322,11 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
/**
* {@link EntityResponse} implementation for asynchronous {@link CompletionStage} bodies.
*/
private
static
class
CompletionStageEntityResponse
<
T
>
extends
DefaultEntityResponse
<
CompletionStage
<
T
>>
{
private
static
class
CompletionStageEntityResponse
<
T
>
extends
DefaultEntityResponse
<
CompletionStage
<
T
>>
{
public
CompletionStageEntityResponse
(
int
statusCode
,
HttpHeaders
headers
,
MultiValueMap
<
String
,
Cookie
>
cookies
,
CompletionStage
<
T
>
entity
,
Type
entityType
)
{
MultiValueMap
<
String
,
Cookie
>
cookies
,
CompletionStage
<
T
>
entity
,
Type
entityType
)
{
super
(
statusCode
,
headers
,
cookies
,
entity
,
entityType
);
}
...
...
@@ -348,7 +335,6 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
HttpServletResponse
servletResponse
,
Context
context
)
{
AsyncContext
asyncContext
=
servletRequest
.
startAsync
(
servletRequest
,
servletResponse
);
entity
().
whenComplete
((
entity
,
throwable
)
->
{
try
{
if
(
entity
!=
null
)
{
...
...
@@ -370,11 +356,12 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
}
}
private
static
class
PublisherEntityResponse
<
T
>
extends
DefaultEntityResponse
<
Publisher
<
T
>>
{
public
PublisherEntityResponse
(
int
statusCode
,
HttpHeaders
headers
,
MultiValueMap
<
String
,
Cookie
>
cookies
,
Publisher
<
T
>
entity
,
Type
entityType
)
{
MultiValueMap
<
String
,
Cookie
>
cookies
,
Publisher
<
T
>
entity
,
Type
entityType
)
{
super
(
statusCode
,
headers
,
cookies
,
entity
,
entityType
);
}
...
...
@@ -384,14 +371,12 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
AsyncContext
asyncContext
=
servletRequest
.
startAsync
(
servletRequest
,
new
NoContentLengthResponseWrapper
(
servletResponse
));
entity
().
subscribe
(
new
ProducingSubscriber
(
asyncContext
,
context
));
return
null
;
}
public
static
boolean
isPublisher
(
Object
o
)
{
return
(
o
instanceof
Publisher
);
public
static
boolean
isPublisher
(
Object
entity
)
{
return
(
entity
instanceof
Publisher
);
}
...
...
@@ -405,16 +390,13 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
@Nullable
private
Subscription
subscription
;
public
ProducingSubscriber
(
AsyncContext
asyncContext
,
Context
context
)
{
public
ProducingSubscriber
(
AsyncContext
asyncContext
,
Context
context
)
{
this
.
asyncContext
=
asyncContext
;
this
.
context
=
context
;
}
@Override
public
void
onSubscribe
(
Subscription
s
)
{
Objects
.
requireNonNull
(
s
);
if
(
this
.
subscription
==
null
)
{
this
.
subscription
=
s
;
this
.
subscription
.
request
(
Long
.
MAX_VALUE
);
...
...
@@ -426,27 +408,15 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
@Override
public
void
onNext
(
T
element
)
{
Objects
.
requireNonNull
(
element
);
HttpServletRequest
servletRequest
=
(
HttpServletRequest
)
this
.
asyncContext
.
getRequest
();
HttpServletResponse
servletResponse
=
(
HttpServletResponse
)
this
.
asyncContext
.
getResponse
();
tryWriteEntityWithMessageConverters
(
element
,
servletRequest
,
servletResponse
,
this
.
context
);
HttpServletRequest
servletRequest
=
(
HttpServletRequest
)
this
.
asyncContext
.
getRequest
();
HttpServletResponse
servletResponse
=
(
HttpServletResponse
)
this
.
asyncContext
.
getResponse
();
tryWriteEntityWithMessageConverters
(
element
,
servletRequest
,
servletResponse
,
this
.
context
);
}
@Override
public
void
onError
(
Throwable
t
)
{
Objects
.
requireNonNull
(
t
);
handleError
(
t
,
(
HttpServletRequest
)
this
.
asyncContext
.
getRequest
(),
(
HttpServletResponse
)
this
.
asyncContext
.
getResponse
(),
this
.
context
);
handleError
(
t
,
(
HttpServletRequest
)
this
.
asyncContext
.
getRequest
(),
(
HttpServletResponse
)
this
.
asyncContext
.
getResponse
(),
this
.
context
);
this
.
asyncContext
.
complete
();
}
...
...
@@ -454,9 +424,9 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
public
void
onComplete
()
{
this
.
asyncContext
.
complete
();
}
}
private
static
class
NoContentLengthResponseWrapper
extends
HttpServletResponseWrapper
{
public
NoContentLengthResponseWrapper
(
HttpServletResponse
response
)
{
...
...
@@ -485,8 +455,6 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
public
void
setContentLengthLong
(
long
len
)
{
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录