Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
f07014ad
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,发现更多精彩内容 >>
提交
f07014ad
编写于
2月 25, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MappingJackson2MessageConverter delegates default encoding to Jackson
Closes gh-22444
上级
4be41e9e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
17 deletion
+33
-17
spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
...ms/support/converter/MappingJackson2MessageConverter.java
+25
-10
spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
...pport/converter/MappingJackson2MessageConverterTests.java
+8
-7
未找到文件。
spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
浏览文件 @
f07014ad
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -74,7 +74,8 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
private
MessageType
targetType
=
MessageType
.
BYTES
;
private
String
encoding
=
DEFAULT_ENCODING
;
@Nullable
private
String
encoding
;
@Nullable
private
String
encodingPropertyName
;
...
...
@@ -293,13 +294,21 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
throws
JMSException
,
IOException
{
ByteArrayOutputStream
bos
=
new
ByteArrayOutputStream
(
1024
);
OutputStreamWriter
writer
=
new
OutputStreamWriter
(
bos
,
this
.
encoding
);
objectWriter
.
writeValue
(
writer
,
object
);
if
(
this
.
encoding
!=
null
)
{
OutputStreamWriter
writer
=
new
OutputStreamWriter
(
bos
,
this
.
encoding
);
objectWriter
.
writeValue
(
writer
,
object
);
}
else
{
// Jackson usually defaults to UTF-8 but can also go straight to bytes, e.g. for Smile.
// We use a direct byte array argument for the latter case to work as well.
objectWriter
.
writeValue
(
bos
,
object
);
}
BytesMessage
message
=
session
.
createBytesMessage
();
message
.
writeBytes
(
bos
.
toByteArray
());
if
(
this
.
encodingPropertyName
!=
null
)
{
message
.
setStringProperty
(
this
.
encodingPropertyName
,
this
.
encoding
);
message
.
setStringProperty
(
this
.
encodingPropertyName
,
(
this
.
encoding
!=
null
?
this
.
encoding
:
DEFAULT_ENCODING
));
}
return
message
;
}
...
...
@@ -393,12 +402,18 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
}
byte
[]
bytes
=
new
byte
[(
int
)
message
.
getBodyLength
()];
message
.
readBytes
(
bytes
);
try
{
String
body
=
new
String
(
bytes
,
encoding
);
return
this
.
objectMapper
.
readValue
(
body
,
targetJavaType
);
if
(
encoding
!=
null
)
{
try
{
String
body
=
new
String
(
bytes
,
encoding
);
return
this
.
objectMapper
.
readValue
(
body
,
targetJavaType
);
}
catch
(
UnsupportedEncodingException
ex
)
{
throw
new
MessageConversionException
(
"Cannot convert bytes to String"
,
ex
);
}
}
catch
(
UnsupportedEncodingException
ex
)
{
throw
new
MessageConversionException
(
"Cannot convert bytes to String"
,
ex
);
else
{
// Jackson internally performs encoding detection, falling back to UTF-8.
return
this
.
objectMapper
.
readValue
(
bytes
,
targetJavaType
);
}
}
...
...
spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
浏览文件 @
f07014ad
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -56,7 +56,7 @@ public class MappingJackson2MessageConverterTests {
@Before
public
void
set
Up
()
throws
Exception
{
public
void
set
up
()
{
sessionMock
=
mock
(
Session
.
class
);
converter
=
new
MappingJackson2MessageConverter
();
converter
.
setEncodingPropertyName
(
"__encoding__"
);
...
...
@@ -263,8 +263,11 @@ public class MappingJackson2MessageConverterTests {
return
new
MyAnotherBean
();
}
public
static
class
MyBean
{
private
String
foo
;
public
MyBean
()
{
}
...
...
@@ -272,8 +275,6 @@ public class MappingJackson2MessageConverterTests {
this
.
foo
=
foo
;
}
private
String
foo
;
public
String
getFoo
()
{
return
foo
;
}
...
...
@@ -290,13 +291,10 @@ public class MappingJackson2MessageConverterTests {
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
{
return
false
;
}
MyBean
bean
=
(
MyBean
)
o
;
if
(
foo
!=
null
?
!
foo
.
equals
(
bean
.
foo
)
:
bean
.
foo
!=
null
)
{
return
false
;
}
return
true
;
}
...
...
@@ -306,9 +304,12 @@ public class MappingJackson2MessageConverterTests {
}
}
private
interface
Summary
{};
private
interface
Full
extends
Summary
{};
private
static
class
MyAnotherBean
{
@JsonView
(
Summary
.
class
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录