Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
5b29555d
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 搜索 >>
提交
5b29555d
编写于
8月 16, 2017
作者:
R
rlindooren
提交者:
Rossen Stoyanchev
8月 16, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Jackson encoder and decoder should use provided mime types
Instead of always using the default JSON mime types
上级
645e3492
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
43 addition
and
4 deletion
+43
-4
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java
...springframework/http/codec/json/Jackson2CodecSupport.java
+5
-1
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java
.../springframework/http/codec/json/Jackson2JsonDecoder.java
+1
-1
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
.../springframework/http/codec/json/Jackson2JsonEncoder.java
+1
-1
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
...ngframework/http/codec/json/Jackson2JsonDecoderTests.java
+17
-1
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java
...ngframework/http/codec/json/Jackson2JsonEncoderTests.java
+19
-0
未找到文件。
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java
浏览文件 @
5b29555d
...
...
@@ -72,7 +72,8 @@ public abstract class Jackson2CodecSupport {
protected
Jackson2CodecSupport
(
ObjectMapper
objectMapper
,
MimeType
...
mimeTypes
)
{
Assert
.
notNull
(
objectMapper
,
"ObjectMapper must not be null"
);
this
.
objectMapper
=
objectMapper
;
this
.
mimeTypes
=
!
ObjectUtils
.
isEmpty
(
mimeTypes
)
?
Arrays
.
asList
(
mimeTypes
)
:
JSON_MIME_TYPES
;
this
.
mimeTypes
=
Collections
.
unmodifiableList
(
!
ObjectUtils
.
isEmpty
(
mimeTypes
)
?
Arrays
.
asList
(
mimeTypes
)
:
JSON_MIME_TYPES
);
}
...
...
@@ -110,4 +111,7 @@ public abstract class Jackson2CodecSupport {
@Nullable
protected
abstract
<
A
extends
Annotation
>
A
getAnnotation
(
MethodParameter
parameter
,
Class
<
A
>
annotType
);
protected
List
<
MimeType
>
getMimeTypes
()
{
return
mimeTypes
;
}
}
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java
浏览文件 @
5b29555d
...
...
@@ -42,6 +42,6 @@ public class Jackson2JsonDecoder extends AbstractJackson2Decoder {
@Override
public
List
<
MimeType
>
getDecodableMimeTypes
()
{
return
JSON_MIME_TYPES
;
return
getMimeTypes
()
;
}
}
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
浏览文件 @
5b29555d
...
...
@@ -73,6 +73,6 @@ public class Jackson2JsonEncoder extends AbstractJackson2Encoder {
@Override
public
List
<
MimeType
>
getEncodableMimeTypes
()
{
return
JSON_MIME_TYPES
;
return
getMimeTypes
()
;
}
}
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
浏览文件 @
5b29555d
...
...
@@ -16,12 +16,13 @@
package
org.springframework.http.codec.json
;
import
java.nio.charset.StandardCharsets
;
import
java.util.List
;
import
java.util.Map
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.springframework.util.MimeType
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
import
reactor.test.StepVerifier
;
...
...
@@ -63,6 +64,21 @@ public class Jackson2JsonDecoderTests extends AbstractDataBufferAllocatingTestCa
assertFalse
(
decoder
.
canDecode
(
forClass
(
Pojo
.
class
),
APPLICATION_XML
));
}
@Test
(
expected
=
UnsupportedOperationException
.
class
)
public
void
canDecodeWithProvidedMimeType
()
{
MimeType
textJavascript
=
new
MimeType
(
"text"
,
"javascript"
,
StandardCharsets
.
UTF_8
);
Jackson2JsonDecoder
decoder
=
new
Jackson2JsonDecoder
(
new
ObjectMapper
(),
textJavascript
);
assertEquals
(
1
,
decoder
.
getDecodableMimeTypes
().
size
());
assertTrue
(
decoder
.
getDecodableMimeTypes
().
contains
(
textJavascript
));
assertTrue
(
decoder
.
canDecode
(
forClass
(
Pojo
.
class
),
textJavascript
));
assertFalse
(
decoder
.
canDecode
(
forClass
(
Pojo
.
class
),
APPLICATION_JSON
));
// Validate immutability of mime types list
decoder
.
getMimeTypes
().
add
(
new
MimeType
(
"text"
,
"ecmascript"
));
assertEquals
(
1
,
decoder
.
getDecodableMimeTypes
().
size
());
}
@Test
public
void
decodePojo
()
throws
Exception
{
Flux
<
DataBuffer
>
source
=
Flux
.
just
(
stringBuffer
(
"{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"
));
...
...
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java
浏览文件 @
5b29555d
...
...
@@ -16,16 +16,20 @@
package
org.springframework.http.codec.json
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Arrays
;
import
java.util.Map
;
import
com.fasterxml.jackson.annotation.JsonTypeInfo
;
import
com.fasterxml.jackson.annotation.JsonTypeName
;
import
static
java
.
util
.
Collections
.*;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
springframework
.
http
.
MediaType
.*;
import
static
org
.
springframework
.
http
.
codec
.
json
.
Jackson2JsonEncoder
.*;
import
static
org
.
springframework
.
http
.
codec
.
json
.
JacksonViewBean
.*;
import
org.springframework.util.MimeType
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
import
reactor.test.StepVerifier
;
...
...
@@ -58,6 +62,21 @@ public class Jackson2JsonEncoderTests extends AbstractDataBufferAllocatingTestCa
assertTrue
(
this
.
encoder
.
canEncode
(
ResolvableType
.
NONE
,
null
));
}
@Test
(
expected
=
UnsupportedOperationException
.
class
)
public
void
canEncodeWithCustomMimeType
()
{
ResolvableType
pojoType
=
ResolvableType
.
forClass
(
Pojo
.
class
);
MimeType
textJavascript
=
new
MimeType
(
"text"
,
"javascript"
,
StandardCharsets
.
UTF_8
);
Jackson2JsonEncoder
encoder
=
new
Jackson2JsonEncoder
(
new
ObjectMapper
(),
textJavascript
);
assertEquals
(
1
,
encoder
.
getEncodableMimeTypes
().
size
());
assertTrue
(
encoder
.
getEncodableMimeTypes
().
contains
(
textJavascript
));
assertTrue
(
encoder
.
canEncode
(
pojoType
,
textJavascript
));
// Validate immutability of mime types list
encoder
.
getMimeTypes
().
add
(
new
MimeType
(
"text"
,
"ecmascript"
));
assertEquals
(
1
,
encoder
.
getEncodableMimeTypes
().
size
());
}
@Test
public
void
canNotEncode
()
{
assertFalse
(
this
.
encoder
.
canEncode
(
ResolvableType
.
forClass
(
String
.
class
),
null
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录