Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7b189d11
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 搜索 >>
提交
7b189d11
编写于
6月 15, 2010
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid ConverterNotFoundException if source object is assignable to target type
上级
bd88bbab
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
2 deletion
+28
-2
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
...mework/core/convert/support/GenericConversionService.java
+7
-1
org.springframework.expression/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java
...pression/spel/standard/PropertiesConversionSpelTests.java
+21
-1
未找到文件。
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
浏览文件 @
7b189d11
...
...
@@ -172,7 +172,13 @@ public class GenericConversionService implements ConversionService, ConverterReg
}
GenericConverter
converter
=
getConverter
(
sourceType
,
targetType
);
if
(
converter
==
null
)
{
throw
new
ConverterNotFoundException
(
sourceType
,
targetType
);
if
(
targetType
.
getType
().
isInstance
(
source
))
{
logger
.
debug
(
"No converter found - returning assignable source object as-is"
);
return
source
;
}
else
{
throw
new
ConverterNotFoundException
(
sourceType
,
targetType
);
}
}
Object
result
=
ConversionUtils
.
invokeConverter
(
converter
,
source
,
sourceType
,
targetType
);
if
(
logger
.
isDebugEnabled
())
{
...
...
org.springframework.expression/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java
浏览文件 @
7b189d11
...
...
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Properties
;
import
java.util.UUID
;
import
org.junit.Test
;
...
...
@@ -61,12 +62,26 @@ public class PropertiesConversionSpelTests {
assertEquals
(
"123"
,
result
);
}
@Test
// questionable, but this passes with 3.0.2.RELEASE
@Test
public
void
mapWithNonStringValue
()
{
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
map
.
put
(
"x"
,
"1"
);
map
.
put
(
"y"
,
2
);
map
.
put
(
"z"
,
"3"
);
map
.
put
(
"a"
,
new
UUID
(
1
,
1
));
Expression
expression
=
parser
.
parseExpression
(
"foo(#props)"
);
StandardEvaluationContext
context
=
new
StandardEvaluationContext
();
context
.
setVariable
(
"props"
,
map
);
String
result
=
expression
.
getValue
(
context
,
new
TestBean
(),
String
.
class
);
assertEquals
(
"1null3"
,
result
);
}
@Test
public
void
customMapWithNonStringValue
()
{
CustomMap
map
=
new
CustomMap
();
map
.
put
(
"x"
,
"1"
);
map
.
put
(
"y"
,
2
);
map
.
put
(
"z"
,
"3"
);
Expression
expression
=
parser
.
parseExpression
(
"foo(#props)"
);
StandardEvaluationContext
context
=
new
StandardEvaluationContext
();
context
.
setVariable
(
"props"
,
map
);
...
...
@@ -83,4 +98,9 @@ public class PropertiesConversionSpelTests {
}
}
@SuppressWarnings
(
"serial"
)
private
static
class
CustomMap
extends
HashMap
<
String
,
Object
>
{
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录