Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
18be2ffa
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,发现更多精彩内容 >>
提交
18be2ffa
编写于
5月 17, 2009
作者:
K
Keith Donald
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed autoboxing bug
上级
c5cc7569
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
10 deletion
+9
-10
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericTypeConverter.java
...gframework/core/convert/support/GenericTypeConverter.java
+5
-6
org.springframework.expression/src/test/java/org/springframework/expression/spel/HelperTests.java
...java/org/springframework/expression/spel/HelperTests.java
+4
-4
未找到文件。
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericTypeConverter.java
浏览文件 @
18be2ffa
...
...
@@ -38,9 +38,8 @@ import org.springframework.util.Assert;
/**
* Base implementation of a conversion service. Initially empty, e.g. no converters are registered by default.
*
* TODO - custom converters
* TODO - object to collection/map converters
* TODO - allow registration of converters to apply on presence of annotation values on setter or field
e.g. String-to-@Mask String to apply a mask
* TODO - allow registration of converters to apply on presence of annotation values on setter or field
*
* @author Keith Donald
*/
...
...
@@ -141,9 +140,6 @@ public class GenericTypeConverter implements TypeConverter, ConverterRegistry {
if
(
source
==
null
)
{
return
null
;
}
if
(
source
.
getClass
().
isAssignableFrom
(
targetType
.
getType
()))
{
return
(
T
)
source
;
}
ConversionExecutor
executor
=
getConversionExecutor
(
source
.
getClass
(),
targetType
);
if
(
executor
!=
null
)
{
return
(
T
)
executor
.
execute
(
source
);
...
...
@@ -196,7 +192,10 @@ public class GenericTypeConverter implements TypeConverter, ConverterRegistry {
return
null
;
}
}
Converter
converter
=
findRegisteredConverter
(
sourceClass
,
targetType
.
getType
());
if
(
sourceType
.
isAssignableTo
(
targetType
))
{
return
NoOpConversionExecutor
.
INSTANCE
;
}
Converter
converter
=
findRegisteredConverter
(
sourceType
.
getType
(),
targetType
.
getType
());
if
(
converter
!=
null
)
{
return
new
StaticConversionExecutor
(
sourceType
,
targetType
,
converter
);
}
else
{
...
...
org.springframework.expression/src/test/java/org/springframework/expression/spel/HelperTests.java
浏览文件 @
18be2ffa
...
...
@@ -113,16 +113,16 @@ public class HelperTests extends ExpressionTestCase {
StandardTypeConverter
typeConverter
=
new
StandardTypeConverter
();
// Calling foo(String,int) with (String,Integer) requires boxing conversion of argument one
//
checkMatch(new Class[]{String.class,Integer.TYPE},new Class[]{String.class,Integer.class},typeConverter,ArgsMatchKind.REQUIRES_CONVERSION,1);
checkMatch
(
new
Class
[]{
String
.
class
,
Integer
.
TYPE
},
new
Class
[]{
String
.
class
,
Integer
.
class
},
typeConverter
,
ArgsMatchKind
.
REQUIRES_CONVERSION
,
1
);
// Passing (int,String) on call to foo(Integer,String) requires boxing conversion of argument zero
//
checkMatch(new Class[]{Integer.TYPE,String.class},new Class[]{Integer.class, String.class},typeConverter,ArgsMatchKind.REQUIRES_CONVERSION,0);
checkMatch
(
new
Class
[]{
Integer
.
TYPE
,
String
.
class
},
new
Class
[]{
Integer
.
class
,
String
.
class
},
typeConverter
,
ArgsMatchKind
.
REQUIRES_CONVERSION
,
0
);
// Passing (int,Sub) on call to foo(Integer,Super) requires boxing conversion of argument zero
//
checkMatch(new Class[]{Integer.TYPE,Sub.class},new Class[]{Integer.class, Super.class},typeConverter,ArgsMatchKind.REQUIRES_CONVERSION,0);
checkMatch
(
new
Class
[]{
Integer
.
TYPE
,
Sub
.
class
},
new
Class
[]{
Integer
.
class
,
Super
.
class
},
typeConverter
,
ArgsMatchKind
.
REQUIRES_CONVERSION
,
0
);
// Passing (int,Sub,boolean) on call to foo(Integer,Super,Boolean) requires boxing conversion of arguments zero and two
//
checkMatch(new Class[]{Integer.TYPE,Sub.class,Boolean.TYPE},new Class[]{Integer.class, Super.class,Boolean.class},typeConverter,ArgsMatchKind.REQUIRES_CONVERSION,0,2);
checkMatch
(
new
Class
[]{
Integer
.
TYPE
,
Sub
.
class
,
Boolean
.
TYPE
},
new
Class
[]{
Integer
.
class
,
Super
.
class
,
Boolean
.
class
},
typeConverter
,
ArgsMatchKind
.
REQUIRES_CONVERSION
,
0
,
2
);
}
public
void
testReflectionHelperCompareArguments_NotAMatch
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录