Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
da1fafa9
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,发现更多精彩内容 >>
提交
da1fafa9
编写于
7月 19, 2013
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue in MappingJacksonJsonView
Issue: SPR-10752
上级
90c4712d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
22 deletion
+38
-22
spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
...mework/web/servlet/view/json/MappingJackson2JsonView.java
+7
-6
spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
...amework/web/servlet/view/json/MappingJacksonJsonView.java
+2
-2
spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
...k/web/servlet/view/json/MappingJackson2JsonViewTests.java
+20
-12
spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTests.java
...rk/web/servlet/view/json/MappingJacksonJsonViewTests.java
+9
-2
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
浏览文件 @
da1fafa9
...
...
@@ -23,20 +23,21 @@ import java.util.Collections;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Set
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
com.fasterxml.jackson.core.JsonEncoding
;
import
com.fasterxml.jackson.core.JsonGenerator
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
org.springframework.util.Assert
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.web.servlet.View
;
import
org.springframework.web.servlet.view.AbstractView
;
import
com.fasterxml.jackson.core.JsonEncoding
;
import
com.fasterxml.jackson.core.JsonGenerator
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
/**
* Spring MVC {@link View} that renders JSON content by serializing the model for the current request
* using <a href="http://jackson.codehaus.org/">Jackson 2.x's</a> {@link ObjectMapper}.
...
...
@@ -141,7 +142,7 @@ public class MappingJackson2JsonView extends AbstractView {
* @see #setJsonPrefix
*/
public
void
setPrefixJson
(
boolean
prefixJson
)
{
this
.
jsonPrefix
=
"{} &&
"
;
this
.
jsonPrefix
=
prefixJson
?
"{} && "
:
"
"
;
}
/**
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
浏览文件 @
da1fafa9
...
...
@@ -23,6 +23,7 @@ import java.util.Collections;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Set
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -30,7 +31,6 @@ import org.codehaus.jackson.JsonEncoding;
import
org.codehaus.jackson.JsonGenerator
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
org.codehaus.jackson.map.SerializationConfig
;
import
org.springframework.util.Assert
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.validation.BindingResult
;
...
...
@@ -141,7 +141,7 @@ public class MappingJacksonJsonView extends AbstractView {
* @see #setJsonPrefix
*/
public
void
setPrefixJson
(
boolean
prefixJson
)
{
this
.
jsonPrefix
=
"{} &&
"
;
this
.
jsonPrefix
=
prefixJson
?
"{} && "
:
"
"
;
}
/**
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
浏览文件 @
da1fafa9
...
...
@@ -23,22 +23,11 @@ import java.util.HashSet;
import
java.util.Map
;
import
java.util.Set
;
import
com.fasterxml.jackson.core.JsonGenerator
;
import
com.fasterxml.jackson.databind.JavaType
;
import
com.fasterxml.jackson.databind.JsonMappingException
;
import
com.fasterxml.jackson.databind.JsonSerializer
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.SerializerProvider
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig
;
import
com.fasterxml.jackson.databind.ser.BeanSerializerFactory
;
import
com.fasterxml.jackson.databind.ser.SerializerFactory
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.mozilla.javascript.Context
;
import
org.mozilla.javascript.ContextFactory
;
import
org.mozilla.javascript.ScriptableObject
;
import
org.springframework.http.MediaType
;
import
org.springframework.mock.web.test.MockHttpServletRequest
;
import
org.springframework.mock.web.test.MockHttpServletResponse
;
...
...
@@ -46,8 +35,19 @@ import org.springframework.ui.ModelMap;
import
org.springframework.validation.BindingResult
;
import
org.springframework.web.servlet.View
;
import
com.fasterxml.jackson.core.JsonGenerator
;
import
com.fasterxml.jackson.databind.JavaType
;
import
com.fasterxml.jackson.databind.JsonMappingException
;
import
com.fasterxml.jackson.databind.JsonSerializer
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.SerializerProvider
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig
;
import
com.fasterxml.jackson.databind.ser.BeanSerializerFactory
;
import
com.fasterxml.jackson.databind.ser.SerializerFactory
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDD
Mockito
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
* @author Jeremy Grelle
...
...
@@ -174,6 +174,14 @@ public class MappingJackson2JsonViewTests {
public
void
renderSimpleBeanPrefixed
()
throws
Exception
{
view
.
setPrefixJson
(
true
);
renderSimpleBean
();
assertTrue
(
response
.
getContentAsString
().
startsWith
(
"{} && "
));
}
@Test
public
void
renderSimpleBeanNotPrefixed
()
throws
Exception
{
view
.
setPrefixJson
(
false
);
renderSimpleBean
();
assertFalse
(
response
.
getContentAsString
().
startsWith
(
"{} && "
));
}
@Test
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTests.java
浏览文件 @
da1fafa9
...
...
@@ -39,14 +39,13 @@ import org.junit.Test;
import
org.mozilla.javascript.Context
;
import
org.mozilla.javascript.ContextFactory
;
import
org.mozilla.javascript.ScriptableObject
;
import
org.springframework.mock.web.test.MockHttpServletRequest
;
import
org.springframework.mock.web.test.MockHttpServletResponse
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.validation.BindingResult
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDD
Mockito
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
* @author Jeremy Grelle
...
...
@@ -158,6 +157,14 @@ public class MappingJacksonJsonViewTests {
public
void
renderSimpleBeanPrefixed
()
throws
Exception
{
view
.
setPrefixJson
(
true
);
renderSimpleBean
();
assertTrue
(
response
.
getContentAsString
().
startsWith
(
"{} && "
));
}
@Test
public
void
renderSimpleBeanNotPrefixed
()
throws
Exception
{
view
.
setPrefixJson
(
false
);
renderSimpleBean
();
assertFalse
(
response
.
getContentAsString
().
startsWith
(
"{} && "
));
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录