Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BEANUTILS-381 getMatchingAccessibleMethod does not correctly handle inheritance and method overloading - thanks to Todd Nine for the patch 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1037572 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Niall Pemberton 2010-11-21 22:09:04 +00:00
parent ea623e575e
commit e8138eafe7
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
View File

@ -136,7 +136,7 @@ abstract class MemberUtils {
return getPrimitivePromotionCost(srcClass, destClass); return getPrimitivePromotionCost(srcClass, destClass);
} }
float cost = 0.0f; float cost = 0.0f;
while (destClass != null && !destClass.equals(srcClass)) { while (srcClass != null && !destClass.equals(srcClass)) {
if (destClass.isInterface() && ClassUtils.isAssignable(srcClass, destClass)) { if (destClass.isInterface() && ClassUtils.isAssignable(srcClass, destClass)) {
// slight penalty for interface match. // slight penalty for interface match.
// we still want an exact match to override an interface match, // we still want an exact match to override an interface match,
@ -147,13 +147,13 @@ abstract class MemberUtils {
break; break;
} }
cost++; cost++;
destClass = destClass.getSuperclass(); srcClass = srcClass.getSuperclass();
} }
/* /*
* If the destination class is null, we've travelled all the way up to * If the destination class is null, we've travelled all the way up to
* an Object match. We'll penalize this by adding 1.5 to the cost. * an Object match. We'll penalize this by adding 1.5 to the cost.
*/ */
if (destClass == null) { if (srcClass == null) {
cost += 1.5f; cost += 1.5f;
} }
return cost; return cost;

23
src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
View File

@ -296,6 +296,16 @@ public class MethodUtilsTest extends TestCase {
singletonArray(Double.class), singletonArray(Double.TYPE)); singletonArray(Double.class), singletonArray(Double.TYPE));
expectMatchingAccessibleMethodParameterTypes(TestBean.class, "foo", expectMatchingAccessibleMethodParameterTypes(TestBean.class, "foo",
singletonArray(Double.TYPE), singletonArray(Double.TYPE)); singletonArray(Double.TYPE), singletonArray(Double.TYPE));
expectMatchingAccessibleMethodParameterTypes(TestBean.class, "foo",
singletonArray(Double.TYPE), singletonArray(Double.TYPE));
expectMatchingAccessibleMethodParameterTypes(InheritanceBean.class, "testOne",
singletonArray(ParentObject.class), singletonArray(ParentObject.class));
expectMatchingAccessibleMethodParameterTypes(InheritanceBean.class, "testOne",
singletonArray(ChildObject.class), singletonArray(ParentObject.class));
expectMatchingAccessibleMethodParameterTypes(InheritanceBean.class, "testTwo",
singletonArray(ParentObject.class), singletonArray(GrandParentObject.class));
expectMatchingAccessibleMethodParameterTypes(InheritanceBean.class, "testTwo",
singletonArray(ChildObject.class), singletonArray(ChildInterface.class));
} }
private void expectMatchingAccessibleMethodParameterTypes(Class<?> cls, private void expectMatchingAccessibleMethodParameterTypes(Class<?> cls,
@ -320,4 +330,17 @@ public class MethodUtilsTest extends TestCase {
return result; return result;
} }
public static class InheritanceBean {
public void testOne(Object obj) {}
public void testOne(GrandParentObject obj) {}
public void testOne(ParentObject obj) {}
public void testTwo(Object obj) {}
public void testTwo(GrandParentObject obj) {}
public void testTwo(ChildInterface obj) {}
}
interface ChildInterface {}
public static class GrandParentObject {}
public static class ParentObject extends GrandParentObject {}
public static class ChildObject extends ParentObject implements ChildInterface {}
} }