Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
50985d5a
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,发现更多精彩内容 >>
提交
50985d5a
编写于
5月 11, 2009
作者:
K
Keith Donald
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
renamed executeConversion to simply convert for readibility
上级
c3f54b4c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
16 deletion
+16
-16
org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java
...a/org/springframework/core/convert/ConversionService.java
+2
-2
org.springframework.core/src/main/java/org/springframework/core/convert/service/GenericConversionService.java
...mework/core/convert/service/GenericConversionService.java
+2
-2
org.springframework.core/src/test/java/org/springframework/core/convert/service/GenericConversionServiceTests.java
...k/core/convert/service/GenericConversionServiceTests.java
+7
-7
org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
...mework/expression/spel/support/StandardTypeConverter.java
+1
-1
org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
...ssion/spel/ExpressionTestsUsingCoreConversionService.java
+4
-4
未找到文件。
org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java
浏览文件 @
50985d5a
...
...
@@ -18,7 +18,7 @@ package org.springframework.core.convert;
/**
* A service interface for type conversion. This is the entry point into the convert system.
* <p>
* Call {@link #
executeConversion
(Object, TypeDescriptor)} to perform a thread-safe type conversion using
* Call {@link #
convert
(Object, TypeDescriptor)} to perform a thread-safe type conversion using
* this system.
*
* @author Keith Donald
...
...
@@ -43,6 +43,6 @@ public interface ConversionService {
* source to an instance of targetType
* @throws ConversionException if an exception occurred during the conversion process
*/
public
Object
executeConversion
(
Object
source
,
TypeDescriptor
targetType
);
public
Object
convert
(
Object
source
,
TypeDescriptor
targetType
);
}
\ No newline at end of file
org.springframework.core/src/main/java/org/springframework/core/convert/service/GenericConversionService.java
浏览文件 @
50985d5a
...
...
@@ -140,7 +140,7 @@ public class GenericConversionService implements ConversionService {
}
}
public
Object
executeConversion
(
Object
source
,
TypeDescriptor
targetType
)
{
public
Object
convert
(
Object
source
,
TypeDescriptor
targetType
)
{
if
(
source
==
null
)
{
return
null
;
}
...
...
@@ -149,7 +149,7 @@ public class GenericConversionService implements ConversionService {
return
executor
.
execute
(
source
);
}
else
{
if
(
parent
!=
null
)
{
return
parent
.
executeConversion
(
source
,
targetType
);
return
parent
.
convert
(
source
,
targetType
);
}
else
{
throw
new
ConverterNotFoundException
(
source
.
getClass
(),
targetType
,
"No converter found that can convert from sourceType ["
+
source
.
getClass
().
getName
()
...
...
org.springframework.core/src/test/java/org/springframework/core/convert/service/GenericConversionServiceTests.java
浏览文件 @
50985d5a
...
...
@@ -45,17 +45,17 @@ public class GenericConversionServiceTests {
@Test
public
void
executeConversion
()
{
service
.
addConverter
(
new
StringToInteger
());
assertEquals
(
new
Integer
(
3
),
service
.
executeConversion
(
"3"
,
type
(
Integer
.
class
)));
assertEquals
(
new
Integer
(
3
),
service
.
convert
(
"3"
,
type
(
Integer
.
class
)));
}
@Test
public
void
executeConversionNullSource
()
{
assertEquals
(
null
,
service
.
executeConversion
(
null
,
type
(
Integer
.
class
)));
assertEquals
(
null
,
service
.
convert
(
null
,
type
(
Integer
.
class
)));
}
@Test
public
void
executeCompatibleSource
()
{
assertEquals
(
false
,
service
.
executeConversion
(
false
,
type
(
boolean
.
class
)));
assertEquals
(
false
,
service
.
convert
(
false
,
type
(
boolean
.
class
)));
}
@Test
...
...
@@ -83,7 +83,7 @@ public class GenericConversionServiceTests {
@Test
public
void
convertExecutorNotFound
()
{
try
{
service
.
executeConversion
(
"3"
,
type
(
Integer
.
class
));
service
.
convert
(
"3"
,
type
(
Integer
.
class
));
fail
(
"Should have thrown an exception"
);
}
catch
(
ConverterNotFoundException
e
)
{
}
...
...
@@ -160,7 +160,7 @@ public class GenericConversionServiceTests {
}
});
try
{
service
.
executeConversion
(
"3"
,
type
(
Integer
.
class
));
service
.
convert
(
"3"
,
type
(
Integer
.
class
));
fail
(
"Should have failed"
);
}
catch
(
ConverterNotFoundException
e
)
{
...
...
@@ -271,7 +271,7 @@ public class GenericConversionServiceTests {
foo
.
put
(
"2"
,
"BAZ"
);
service
.
addConverter
(
new
StringToInteger
());
service
.
addConverter
(
new
StringToEnum
());
service
.
executeConversion
(
foo
,
new
TypeDescriptor
(
getClass
().
getField
(
"genericMap"
)));
service
.
convert
(
foo
,
new
TypeDescriptor
(
getClass
().
getField
(
"genericMap"
)));
}
@Ignore
...
...
@@ -359,7 +359,7 @@ public class GenericConversionServiceTests {
@Test
public
void
testSuperTwoWayConverterConverterAdaption
()
{
service
.
addConverter
(
GenericConversionService
.
converterFor
(
String
.
class
,
FooEnum
.
class
,
new
StringToEnum
()));
assertEquals
(
FooEnum
.
BAR
,
service
.
executeConversion
(
"BAR"
,
type
(
FooEnum
.
class
)));
assertEquals
(
FooEnum
.
BAR
,
service
.
convert
(
"BAR"
,
type
(
FooEnum
.
class
)));
}
private
TypeDescriptor
type
(
Class
<?>
clazz
)
{
...
...
org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
浏览文件 @
50985d5a
...
...
@@ -52,7 +52,7 @@ public class StandardTypeConverter implements TypeConverter {
public
Object
convertValue
(
Object
value
,
TypeDescriptor
typeDescriptor
)
throws
EvaluationException
{
try
{
return
conversionService
.
executeConversion
(
value
,
typeDescriptor
);
return
conversionService
.
convert
(
value
,
typeDescriptor
);
}
catch
(
ConverterNotFoundException
cenfe
)
{
throw
new
SpelException
(
cenfe
,
SpelMessages
.
TYPE_CONVERSION_ERROR
,
value
.
getClass
(),
typeDescriptor
.
asString
());
}
catch
(
ConversionException
ce
)
{
...
...
org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
浏览文件 @
50985d5a
...
...
@@ -64,14 +64,14 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
// ArrayList containing List<Integer> to List<String>
Class
<?>
clazz
=
typeDescriptorForListOfString
.
getElementType
();
assertEquals
(
String
.
class
,
clazz
);
List
l
=
(
List
)
tcs
.
executeConversion
(
listOfInteger
,
typeDescriptorForListOfString
);
List
l
=
(
List
)
tcs
.
convert
(
listOfInteger
,
typeDescriptorForListOfString
);
assertNotNull
(
l
);
// ArrayList containing List<String> to List<Integer>
clazz
=
typeDescriptorForListOfInteger
.
getElementType
();
assertEquals
(
Integer
.
class
,
clazz
);
l
=
(
List
)
tcs
.
executeConversion
(
listOfString
,
typeDescriptorForListOfString
);
l
=
(
List
)
tcs
.
convert
(
listOfString
,
typeDescriptorForListOfString
);
assertNotNull
(
l
);
}
...
...
@@ -103,13 +103,13 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
@SuppressWarnings
(
"unchecked"
)
public
<
T
>
T
convertValue
(
Object
value
,
Class
<
T
>
targetType
)
throws
EvaluationException
{
return
(
T
)
super
.
executeConversion
(
value
,
TypeDescriptor
.
valueOf
(
targetType
));
return
(
T
)
super
.
convert
(
value
,
TypeDescriptor
.
valueOf
(
targetType
));
}
@SuppressWarnings
(
"unchecked"
)
public
Object
convertValue
(
Object
value
,
TypeDescriptor
typeDescriptor
)
throws
EvaluationException
{
return
super
.
executeConversion
(
value
,
typeDescriptor
);
return
super
.
convert
(
value
,
typeDescriptor
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录