Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
b2b02ad7
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 搜索 >>
提交
b2b02ad7
编写于
11月 08, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
801cca8c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
25 deletion
+25
-25
spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java
...org/springframework/messaging/support/MessageBuilder.java
+19
-18
spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java
...pringframework/messaging/support/MessageBuilderTests.java
+6
-7
未找到文件。
spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java
浏览文件 @
b2b02ad7
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -41,23 +41,23 @@ public final class MessageBuilder<T> {
private
final
T
payload
;
@Nullable
private
final
Message
<
T
>
original
Message
;
private
final
Message
<
T
>
provided
Message
;
private
MessageHeaderAccessor
headerAccessor
;
private
MessageBuilder
(
Message
<
T
>
original
Message
)
{
Assert
.
notNull
(
original
Message
,
"Message must not be null"
);
this
.
payload
=
original
Message
.
getPayload
();
this
.
originalMessage
=
original
Message
;
this
.
headerAccessor
=
new
MessageHeaderAccessor
(
original
Message
);
private
MessageBuilder
(
Message
<
T
>
provided
Message
)
{
Assert
.
notNull
(
provided
Message
,
"Message must not be null"
);
this
.
payload
=
provided
Message
.
getPayload
();
this
.
providedMessage
=
provided
Message
;
this
.
headerAccessor
=
new
MessageHeaderAccessor
(
provided
Message
);
}
private
MessageBuilder
(
T
payload
,
MessageHeaderAccessor
accessor
)
{
Assert
.
notNull
(
payload
,
"Payload must not be null"
);
Assert
.
notNull
(
accessor
,
"MessageHeaderAccessor must not be null"
);
this
.
payload
=
payload
;
this
.
original
Message
=
null
;
this
.
provided
Message
=
null
;
this
.
headerAccessor
=
accessor
;
}
...
...
@@ -149,16 +149,18 @@ public final class MessageBuilder<T> {
@SuppressWarnings
(
"unchecked"
)
public
Message
<
T
>
build
()
{
if
(
this
.
original
Message
!=
null
&&
!
this
.
headerAccessor
.
isModified
())
{
return
this
.
original
Message
;
if
(
this
.
provided
Message
!=
null
&&
!
this
.
headerAccessor
.
isModified
())
{
return
this
.
provided
Message
;
}
MessageHeaders
headersToUse
=
this
.
headerAccessor
.
toMessageHeaders
();
if
(
this
.
payload
instanceof
Throwable
)
{
Message
<?>
originalMessage
=
null
;
if
(
this
.
originalMessage
!=
null
&&
this
.
originalMessage
instanceof
ErrorMessage
)
{
originalMessage
=
((
ErrorMessage
)
this
.
originalMessage
).
getOriginalMessage
();
if
(
this
.
providedMessage
!=
null
&&
this
.
providedMessage
instanceof
ErrorMessage
)
{
Message
<?>
message
=
((
ErrorMessage
)
this
.
providedMessage
).
getOriginalMessage
();
if
(
message
!=
null
)
{
return
(
Message
<
T
>)
new
ErrorMessage
((
Throwable
)
this
.
payload
,
headersToUse
,
message
);
}
}
return
(
Message
<
T
>)
new
ErrorMessage
((
Throwable
)
this
.
payload
,
headersToUse
,
originalMessage
);
return
(
Message
<
T
>)
new
ErrorMessage
((
Throwable
)
this
.
payload
,
headersToUse
);
}
else
{
return
new
GenericMessage
<>(
this
.
payload
,
headersToUse
);
...
...
@@ -170,10 +172,9 @@ public final class MessageBuilder<T> {
* Create a builder for a new {@link Message} instance pre-populated with all of the
* headers copied from the provided message. The payload of the provided Message will
* also be used as the payload for the new message.
*
* If the provided message is an {@link ErrorMessage} - the
* {@link ErrorMessage#originalMessage} link will be provided to the new instance.
*
* <p>If the provided message is an {@link ErrorMessage}, the
* {@link ErrorMessage#getOriginalMessage() originalMessage} it contains, will be
* passed on to new instance.
* @param message the Message from which the payload and all headers will be copied
*/
public
static
<
T
>
MessageBuilder
<
T
>
fromMessage
(
Message
<
T
>
message
)
{
...
...
spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java
浏览文件 @
b2b02ad7
...
...
@@ -108,18 +108,17 @@ public class MessageBuilderTests {
assertThat
(
message2
.
getHeaders
().
get
(
"foo"
)).
isEqualTo
(
"bar"
);
}
@Test
@Test
// gh-23417
public
void
createErrorMessageFromErrorMessage
()
{
Message
<
String
>
originalMessage
=
MessageBuilder
.
withPayload
(
"test"
)
.
setHeader
(
"foo"
,
"bar"
).
build
();
RuntimeException
errorPayload
=
new
RuntimeException
();
ErrorMessage
errorMessage1
=
new
ErrorMessage
(
errorPayload
,
Collections
.
singletonMap
(
"baz"
,
"42"
),
originalMessage
);
Message
<
String
>
source
=
MessageBuilder
.
withPayload
(
"test"
).
setHeader
(
"foo"
,
"bar"
).
build
();
RuntimeException
ex
=
new
RuntimeException
();
ErrorMessage
errorMessage1
=
new
ErrorMessage
(
ex
,
Collections
.
singletonMap
(
"baz"
,
"42"
),
source
);
Message
<
Throwable
>
errorMessage2
=
MessageBuilder
.
fromMessage
(
errorMessage1
).
build
();
assertThat
(
errorMessage2
).
isExactlyInstanceOf
(
ErrorMessage
.
class
);
ErrorMessage
actual
=
(
ErrorMessage
)
errorMessage2
;
assertThat
(
actual
.
getPayload
()).
isSameAs
(
e
rrorPayload
);
assertThat
(
actual
.
getPayload
()).
isSameAs
(
e
x
);
assertThat
(
actual
.
getHeaders
().
get
(
"baz"
)).
isEqualTo
(
"42"
);
assertThat
(
actual
.
getOriginalMessage
()).
isSameAs
(
originalMessag
e
);
assertThat
(
actual
.
getOriginalMessage
()).
isSameAs
(
sourc
e
);
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录