diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java b/org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java index 782f78d8bd0..16a3c58c6c4 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java +++ b/org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java @@ -18,7 +18,7 @@ package org.springframework.core.convert; /** * A service interface for type conversion. This is the entry point into the convert system. *
- * 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
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/service/GenericConversionService.java b/org.springframework.core/src/main/java/org/springframework/core/convert/service/GenericConversionService.java
index 8cee88e12eb..4adf86d348b 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/convert/service/GenericConversionService.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/convert/service/GenericConversionService.java
@@ -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()
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/service/GenericConversionServiceTests.java b/org.springframework.core/src/test/java/org/springframework/core/convert/service/GenericConversionServiceTests.java
index 201ca828855..81fe51b33d5 100644
--- a/org.springframework.core/src/test/java/org/springframework/core/convert/service/GenericConversionServiceTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/core/convert/service/GenericConversionServiceTests.java
@@ -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) {
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
index 3b11b06081b..0c9f36dfa91 100644
--- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
+++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
@@ -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) {
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
index d3920f8b6d6..03cfa900ce1 100644
--- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
+++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
@@ -64,14 +64,14 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
// ArrayList containing List