Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
268657b6
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,发现更多精彩内容 >>
提交
268657b6
编写于
2月 17, 2014
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add PropertyNamingStrategy field to ObjectMapperFB
Issue: SPR-11431
上级
1dedb67f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
3 deletion
+35
-3
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
.../http/converter/json/Jackson2ObjectMapperFactoryBean.java
+17
-1
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
.../converter/json/Jackson2ObjectMapperFactoryBeanTests.java
+18
-2
未找到文件。
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
浏览文件 @
268657b6
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
4
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.
...
...
@@ -34,6 +34,7 @@ import com.fasterxml.jackson.databind.JsonSerializer;
import
com.fasterxml.jackson.databind.MapperFeature
;
import
com.fasterxml.jackson.databind.Module
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategy
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.module.SimpleModule
;
...
...
@@ -143,6 +144,8 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
private
boolean
findModulesViaServiceLoader
;
private
PropertyNamingStrategy
propertyNamingStrategy
;
private
ClassLoader
beanClassLoader
;
...
...
@@ -328,6 +331,15 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
this
.
findModulesViaServiceLoader
=
findModules
;
}
/**
* Specify a {@link com.fasterxml.jackson.databind.PropertyNamingStrategy} to
* configure the {@link ObjectMapper} with.
* @@since 4.0.2
*/
public
void
setPropertyNamingStrategy
(
PropertyNamingStrategy
propertyNamingStrategy
)
{
this
.
propertyNamingStrategy
=
propertyNamingStrategy
;
}
@Override
public
void
setBeanClassLoader
(
ClassLoader
beanClassLoader
)
{
this
.
beanClassLoader
=
beanClassLoader
;
...
...
@@ -385,6 +397,10 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
registerWellKnownModulesIfAvailable
();
}
}
if
(
this
.
propertyNamingStrategy
!=
null
)
{
this
.
objectMapper
.
setPropertyNamingStrategy
(
this
.
propertyNamingStrategy
);
}
}
@SuppressWarnings
(
"unchecked"
)
...
...
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
浏览文件 @
268657b6
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
4
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.
...
...
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.JsonSerializer;
import
com.fasterxml.jackson.databind.MapperFeature
;
import
com.fasterxml.jackson.databind.Module
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategy
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.cfg.DeserializerFactoryConfig
;
import
com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig
;
...
...
@@ -49,7 +50,12 @@ import org.junit.Test;
import
org.springframework.beans.FatalBeanException
;
import
static
org
.
junit
.
Assert
.*;
import
static
junit
.
framework
.
Assert
.
assertTrue
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertNull
;
import
static
org
.
junit
.
Assert
.
assertSame
;
/**
* Test cases for {@link Jackson2ObjectMapperFactoryBean} class.
...
...
@@ -186,6 +192,16 @@ public class Jackson2ObjectMapperFactoryBeanTests {
return
((
BasicDeserializerFactory
)
objectMapper
.
getDeserializationContext
().
getFactory
()).
getFactoryConfig
();
}
@Test
public
void
testPropertyNamingStrategy
()
{
PropertyNamingStrategy
strategy
=
new
PropertyNamingStrategy
.
LowerCaseWithUnderscoresStrategy
();
this
.
factory
.
setPropertyNamingStrategy
(
strategy
);
this
.
factory
.
afterPropertiesSet
();
assertSame
(
strategy
,
this
.
factory
.
getObject
().
getSerializationConfig
().
getPropertyNamingStrategy
());
assertSame
(
strategy
,
this
.
factory
.
getObject
().
getDeserializationConfig
().
getPropertyNamingStrategy
());
}
@Test
public
void
testCompleteSetup
()
{
NopAnnotationIntrospector
annotationIntrospector
=
NopAnnotationIntrospector
.
instance
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录