Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed executeConversion to simply convert for readibility

Browse Source
This commit is contained in:
Keith Donald
2009-05-11 21:25:33 +00:00
parent c3f54b4cb4
commit 50985d5aa9
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
View File

@@ -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) {

8
org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
View File

@@ -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);
}
}