renamed executeConversion to simply convert for readibility

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1147 50f2f4bb-b051-0410-bef5-90022cba6387

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.
  * <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);
 
 }

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()

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

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

org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java

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