Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
f0ae8bc3
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 搜索 >>
提交
f0ae8bc3
编写于
3月 07, 2019
作者:
S
Sebastien Deleuze
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support custom XmlFactory in Jackson2ObjectMapperBuilder
Closes gh-22428
上级
ca24fd50
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
6 deletion
+28
-6
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
...work/http/converter/json/Jackson2ObjectMapperBuilder.java
+16
-6
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
...http/converter/json/Jackson2ObjectMapperBuilderTests.java
+12
-0
未找到文件。
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
浏览文件 @
f0ae8bc3
...
...
@@ -614,8 +614,8 @@ public class Jackson2ObjectMapperBuilder {
ObjectMapper
mapper
;
if
(
this
.
createXmlMapper
)
{
mapper
=
(
this
.
defaultUseWrapper
!=
null
?
new
XmlObjectMapperInitializer
().
create
(
this
.
defaultUseWrapper
)
:
new
XmlObjectMapperInitializer
().
create
());
new
XmlObjectMapperInitializer
().
create
(
this
.
defaultUseWrapper
,
this
.
factory
)
:
new
XmlObjectMapperInitializer
().
create
(
this
.
factory
));
}
else
{
mapper
=
(
this
.
factory
!=
null
?
new
ObjectMapper
(
this
.
factory
)
:
new
ObjectMapper
());
...
...
@@ -839,14 +839,24 @@ public class Jackson2ObjectMapperBuilder {
private
static
class
XmlObjectMapperInitializer
{
public
ObjectMapper
create
()
{
return
new
XmlMapper
(
StaxUtils
.
createDefensiveInputFactory
());
public
ObjectMapper
create
(
@Nullable
JsonFactory
factory
)
{
if
(
factory
!=
null
)
{
return
new
XmlMapper
((
XmlFactory
)
factory
);
}
else
{
return
new
XmlMapper
(
StaxUtils
.
createDefensiveInputFactory
());
}
}
public
ObjectMapper
create
(
boolean
defaultUseWrapper
)
{
public
ObjectMapper
create
(
boolean
defaultUseWrapper
,
@Nullable
JsonFactory
factory
)
{
JacksonXmlModule
module
=
new
JacksonXmlModule
();
module
.
setDefaultUseWrapper
(
defaultUseWrapper
);
return
new
XmlMapper
(
new
XmlFactory
(
StaxUtils
.
createDefensiveInputFactory
()),
module
);
if
(
factory
!=
null
)
{
return
new
XmlMapper
((
XmlFactory
)
factory
,
module
);
}
else
{
return
new
XmlMapper
(
new
XmlFactory
(
StaxUtils
.
createDefensiveInputFactory
()),
module
);
}
}
}
...
...
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
浏览文件 @
f0ae8bc3
...
...
@@ -71,6 +71,7 @@ import com.fasterxml.jackson.databind.ser.std.NumberSerializer;
import
com.fasterxml.jackson.databind.type.SimpleType
;
import
com.fasterxml.jackson.dataformat.cbor.CBORFactory
;
import
com.fasterxml.jackson.dataformat.smile.SmileFactory
;
import
com.fasterxml.jackson.dataformat.xml.XmlFactory
;
import
com.fasterxml.jackson.dataformat.xml.XmlMapper
;
import
com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
;
import
kotlin.ranges.IntRange
;
...
...
@@ -480,6 +481,14 @@ public class Jackson2ObjectMapperBuilderTests {
assertEquals
(
XmlMapper
.
class
,
objectMapper
.
getClass
());
}
@Test
// gh-22428
public
void
xmlMapperAndCustomFactory
()
{
ObjectMapper
objectMapper
=
Jackson2ObjectMapperBuilder
.
xml
().
factory
(
new
MyXmlFactory
()).
build
();
assertNotNull
(
objectMapper
);
assertEquals
(
XmlMapper
.
class
,
objectMapper
.
getClass
());
assertEquals
(
MyXmlFactory
.
class
,
objectMapper
.
getFactory
().
getClass
());
}
@Test
public
void
createXmlMapper
()
{
Jackson2ObjectMapperBuilder
builder
=
Jackson2ObjectMapperBuilder
.
json
().
indentOutput
(
true
);
...
...
@@ -667,4 +676,7 @@ public class Jackson2ObjectMapperBuilderTests {
}
public
static
class
MyXmlFactory
extends
XmlFactory
{
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录