eclipse classpath fix for 2.5.6; now handling ConversionException root class for ValueCoersion scenarios--moved catch logic closer to where exception was thrown

spring-binding/src/main/java/org/springframework/binding/expression/ValueCoercionException.java

@@ -15,16 +15,15 @@
  */
 package org.springframework.binding.expression;
 
-import org.springframework.core.style.StylerUtils;
-
 /**
- * An evaluation exception indicating a expression failed to evaluate because the source value could not be coerced to
+ * An evaluation exception indicating an expression failed to evaluate because the source value could not be coerced to
  * the target class
  * @author Scott Andrews
  */
 public class ValueCoercionException extends EvaluationException {
 
-	private Object value;
+	private transient Object value;
+
 	private Class targetClass;
 
 	/**
@@ -49,14 +48,14 @@ public class ValueCoercionException extends EvaluationException {
 	 * @param cause root cause of the failure
 	 */
 	public ValueCoercionException(Class contextClass, String property, Object value, Class targetClass, Throwable cause) {
-		super(contextClass, property, "value " + StylerUtils.style(value) + " could not be coerced to ["
-				+ targetClass.getName() + "]", cause);
+		super(contextClass, property, "Value [" + value + "] could not be coerced to type [" + targetClass.getName()
+				+ "]", cause);
 		this.value = value;
 		this.targetClass = targetClass;
 	}
 
 	/**
-	 * @return the value that could not be coerced
+	 * @return the value that could not be coerced; this value is a transient field
 	 */
 	public Object getValue() {
 		return value;

spring-binding/src/main/java/org/springframework/binding/expression/el/BindingValueExpression.java

@@ -7,7 +7,9 @@ import javax.el.PropertyNotFoundException;
 import javax.el.PropertyNotWritableException;
 import javax.el.ValueExpression;
 
+import org.springframework.binding.convert.ConversionException;
 import org.springframework.binding.convert.ConversionService;
+import org.springframework.binding.expression.ValueCoercionException;
 import org.springframework.util.Assert;
 
 /**
@@ -47,9 +49,10 @@ class BindingValueExpression extends ValueExpression {
 		return targetExpression.getType(context);
 	}
 
-	public Object getValue(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException {
+	public Object getValue(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException,
+			ValueCoercionException {
 		Object value = targetExpression.getValue(context);
-		return convertValueIfNecessary(value, expectedType);
+		return convertValueIfNecessary(value, expectedType, context);
 	}
 
 	public boolean isReadOnly(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException {
@@ -57,8 +60,8 @@ class BindingValueExpression extends ValueExpression {
 	}
 
 	public void setValue(ELContext context, Object value) throws NullPointerException, PropertyNotFoundException,
-			PropertyNotWritableException, ELException {
-		value = convertValueIfNecessary(value, targetExpression.getType(context));
+			PropertyNotWritableException, ELException, ValueCoercionException {
+		value = convertValueIfNecessary(value, targetExpression.getType(context), context);
 		targetExpression.setValue(context, value);
 	}
 
@@ -87,11 +90,16 @@ class BindingValueExpression extends ValueExpression {
 		return targetExpression.hashCode();
 	}
 
-	private Object convertValueIfNecessary(Object value, Class expectedType) {
+	private Object convertValueIfNecessary(Object value, Class expectedType, Object context)
+			throws ValueCoercionException {
 		if (expectedType == null) {
 			return value;
 		} else {
-			return conversionService.executeConversion(value, expectedType);
+			try {
+				return conversionService.executeConversion(value, expectedType);
+			} catch (ConversionException e) {
+				throw new ValueCoercionException(context.getClass(), getExpressionString(), value, expectedType, e);
+			}
 		}
 	}
 

spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java

@@ -19,11 +19,9 @@ import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ValueExpression;
 
-import org.springframework.binding.convert.ConversionExecutionException;
 import org.springframework.binding.expression.EvaluationException;
 import org.springframework.binding.expression.Expression;
 import org.springframework.binding.expression.PropertyNotFoundException;
-import org.springframework.binding.expression.ValueCoercionException;
 import org.springframework.util.Assert;
 
 /**
@@ -85,8 +83,6 @@ public class ELExpression implements Expression {
 			}
 		} catch (javax.el.PropertyNotFoundException e) {
 			throw new PropertyNotFoundException(context.getClass(), getExpressionString(), e);
-		} catch (ConversionExecutionException e) {
-			throw new ValueCoercionException(context.getClass(), getExpressionString(), value, e.getTargetClass(), e);
 		} catch (ELException e) {
 			throw new EvaluationException(context.getClass(), getExpressionString(),
 					"An ELException occurred setting the value of expression '" + getExpressionString()

spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java

@@ -29,7 +29,7 @@ import ognl.TypeConverter;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.InvalidPropertyException;
-import org.springframework.binding.convert.ConversionExecutionException;
+import org.springframework.binding.convert.ConversionException;
 import org.springframework.binding.convert.ConversionService;
 import org.springframework.binding.expression.EvaluationException;
 import org.springframework.binding.expression.Expression;
@@ -86,9 +86,13 @@ class OgnlExpression implements Expression {
 		} catch (NoSuchPropertyException e) {
 			throw new PropertyNotFoundException(context.getClass(), getExpressionString(), e);
 		} catch (OgnlException e) {
-			throw new EvaluationException(context.getClass(), getExpressionString(),
-					"An OgnlException occurred getting the value for expression '" + getExpressionString()
-							+ "' on context [" + context.getClass() + "]", e);
+			if (e.getReason() instanceof ValueCoercionException) {
+				throw (ValueCoercionException) e.getReason();
+			} else {
+				throw new EvaluationException(context.getClass(), getExpressionString(),
+						"An OgnlException occurred getting the value for expression '" + getExpressionString()
+								+ "' on context [" + context.getClass() + "]", e.getReason());
+			}
 		}
 	}
 
@@ -100,10 +104,8 @@ class OgnlExpression implements Expression {
 		} catch (NoSuchPropertyException e) {
 			throw new PropertyNotFoundException(context.getClass(), getExpressionString(), e);
 		} catch (OgnlException e) {
-			if (e.getReason() instanceof ConversionExecutionException) {
-				ConversionExecutionException conversionEx = (ConversionExecutionException) e.getReason();
-				throw new ValueCoercionException(context.getClass(), expressionString, value, conversionEx
-						.getTargetClass(), conversionEx);
+			if (e.getReason() instanceof ValueCoercionException) {
+				throw (ValueCoercionException) e.getReason();
 			} else {
 				throw new EvaluationException(context.getClass(), getExpressionString(),
 						"An OgnlException occurred setting the value of expression '" + getExpressionString()
@@ -115,8 +117,12 @@ class OgnlExpression implements Expression {
 	private TypeConverter createTypeConverter() {
 		return new TypeConverter() {
 			public Object convertValue(Map context, Object target, Member member, String propertyName, Object value,
-					Class toType) {
-				return conversionService.executeConversion(value, toType);
+					Class toType) throws ValueCoercionException {
+				try {
+					return conversionService.executeConversion(value, toType);
+				} catch (ConversionException e) {
+					throw new ValueCoercionException(context.getClass(), expressionString, value, toType, e);
+				}
 			}
 		};
 	}