Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
af0cb537
S
spring-framework
项目概览
sesemomo
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
af0cb537
编写于
5月 02, 2018
作者:
S
Sebastien Deleuze
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support decoding Mono in Jaxb2XmlDecoder
Issue: SPR-16759
上级
22edab85
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
2 deletion
+16
-2
spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
...a/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
+6
-0
spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
.../springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
+3
-2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
...tion/RequestMappingMessageConversionIntegrationTests.java
+7
-0
未找到文件。
spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
浏览文件 @
af0cb537
...
...
@@ -107,6 +107,12 @@ public class Jaxb2XmlDecoder extends AbstractDecoder<Object> {
return
splitEvents
.
map
(
events
->
unmarshal
(
events
,
outputClass
));
}
@Override
public
Mono
<
Object
>
decodeToMono
(
Publisher
<
DataBuffer
>
inputStream
,
ResolvableType
elementType
,
@Nullable
MimeType
mimeType
,
@Nullable
Map
<
String
,
Object
>
hints
)
{
return
decode
(
inputStream
,
elementType
,
mimeType
,
hints
).
singleOrEmpty
();
}
private
Object
unmarshal
(
List
<
XMLEvent
>
events
,
Class
<?>
outputClass
)
{
try
{
Unmarshaller
unmarshaller
=
this
.
jaxbContexts
.
createUnmarshaller
(
outputClass
);
...
...
spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
浏览文件 @
af0cb537
...
...
@@ -23,6 +23,7 @@ import javax.xml.stream.events.XMLEvent;
import
org.junit.Test
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
import
reactor.test.StepVerifier
;
import
org.springframework.core.ResolvableType
;
...
...
@@ -159,7 +160,7 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
@Test
public
void
decodeSingleXmlRootElement
()
throws
Exception
{
Flux
<
DataBuffer
>
source
=
Flux
.
just
(
stringBuffer
(
POJO_ROOT
));
Flux
<
Object
>
output
=
this
.
decoder
.
decode
(
source
,
ResolvableType
.
forClass
(
Pojo
.
class
),
Mono
<
Object
>
output
=
this
.
decoder
.
decodeToMono
(
source
,
ResolvableType
.
forClass
(
Pojo
.
class
),
null
,
Collections
.
emptyMap
());
StepVerifier
.
create
(
output
)
...
...
@@ -171,7 +172,7 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
@Test
public
void
decodeSingleXmlTypeElement
()
throws
Exception
{
Flux
<
DataBuffer
>
source
=
Flux
.
just
(
stringBuffer
(
POJO_ROOT
));
Flux
<
Object
>
output
=
this
.
decoder
.
decode
(
source
,
ResolvableType
.
forClass
(
TypePojo
.
class
),
Mono
<
Object
>
output
=
this
.
decoder
.
decodeToMono
(
source
,
ResolvableType
.
forClass
(
TypePojo
.
class
),
null
,
Collections
.
emptyMap
());
StepVerifier
.
create
(
output
)
...
...
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
浏览文件 @
af0cb537
...
...
@@ -227,6 +227,13 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq
JSON
,
Person
.
class
).
getBody
());
}
@Test
// SPR-16759
public
void
personTransformWithMonoAndXml
()
throws
Exception
{
assertEquals
(
new
Person
(
"ROBERT"
),
performPost
(
"/person-transform/mono"
,
MediaType
.
APPLICATION_XML
,
new
Person
(
"Robert"
),
MediaType
.
APPLICATION_XML
,
Person
.
class
).
getBody
());
}
@Test
public
void
personTransformWithSingle
()
throws
Exception
{
assertEquals
(
new
Person
(
"ROBERT"
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录