revised "ClassUtils.isAssignable" semantics to cover primitives vs wrappers in both directions (SPR-7610)

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

org.springframework.core/src/main/java/org/springframework/util/ClassUtils.java

@@ -809,15 +809,29 @@ public abstract class ClassUtils {
 	public static boolean isAssignable(Class<?> lhsType, Class<?> rhsType) {
 		Assert.notNull(lhsType, "Left-hand side type must not be null");
 		Assert.notNull(rhsType, "Right-hand side type must not be null");
-		return (lhsType.isAssignableFrom(rhsType) ||
+		if (lhsType.isAssignableFrom(rhsType)) {
-				lhsType.equals(primitiveWrapperTypeMap.get(rhsType)));
+			return true;
+		}
+		if (lhsType.isPrimitive()) {
+			Class resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType);
+			if (resolvedPrimitive != null && lhsType.equals(resolvedPrimitive)) {
+				return true;
+			}
+		}
+		else {
+			Class resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType);
+			if (resolvedWrapper != null && lhsType.isAssignableFrom(resolvedWrapper)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	/**
 	 * Determine if the given type is assignable from the given value,
 	 * assuming setting by reflection. Considers primitive wrapper classes
 	 * as assignable to the corresponding primitive types.
-	 * @param type	the target type
+	 * @param type the target type
 	 * @param value the value that should be assigned to the type
 	 * @return if the type is assignable from the value
 	 */

org.springframework.core/src/test/java/org/springframework/util/ClassUtilsTests.java

@@ -227,6 +227,21 @@ public class ClassUtilsTests extends TestCase {
 				InnerClass.overloadedCalled);
 	}
 
+	public void testIsAssignable() {
+		assertTrue(ClassUtils.isAssignable(Object.class, Object.class));
+		assertTrue(ClassUtils.isAssignable(String.class, String.class));
+		assertTrue(ClassUtils.isAssignable(Object.class, String.class));
+		assertTrue(ClassUtils.isAssignable(Object.class, Integer.class));
+		assertTrue(ClassUtils.isAssignable(Number.class, Integer.class));
+		assertTrue(ClassUtils.isAssignable(Number.class, int.class));
+		assertTrue(ClassUtils.isAssignable(Integer.class, int.class));
+		assertTrue(ClassUtils.isAssignable(int.class, Integer.class));
+		assertFalse(ClassUtils.isAssignable(String.class, Object.class));
+		assertFalse(ClassUtils.isAssignable(Integer.class, Number.class));
+		assertFalse(ClassUtils.isAssignable(Integer.class, double.class));
+		assertFalse(ClassUtils.isAssignable(double.class, Integer.class));
+	}
+
 	public void testClassPackageAsResourcePath() {
 		String result = ClassUtils.classPackageAsResourcePath(Proxy.class);
 		assertTrue(result.equals("java/lang/reflect"));