[LANG-1778] MethodUtils.getMatchingMethod() doesn't respect the

hierarchy of methods #1414

- Javadoc
- Sort members
- Simplify test

Author: garydgregory

src/changes/changes.xml

@@ -48,6 +48,7 @@ The <action> type attribute can be add,update,fix,remove.
     <!-- FIX -->
     <action                   type="fix" dev="ppkarwasz" due-to="Sebastian Steiner">[javadoc] Fix typo in Javadoc of Strings instances #1406.</action>
     <action                   type="fix" dev="ggregory" due-to="Hassan A Hashim">[javadoc] Fix Javadocs in ClassUtils #1410.</action>
+    <action issue="LANG-1778" type="fix" dev="ggregory" due-to="wuwu2000">MethodUtils.getMatchingMethod() doesn't respect the hierarchy of methods #1414.</action>
     <!-- ADD -->
     <!-- UPDATE -->
   </release>

src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java

@@ -57,7 +57,7 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * Tests MethodUtils
+ * {@link Tests MethodUtils}.
  */
 class MethodUtilsTest extends AbstractLangTest {
     protected abstract static class AbstractGetMatchingMethod implements InterfaceGetMatchingMethod {
@@ -74,6 +74,13 @@ interface ChildInterface {
     public static class ChildObject extends ParentObject implements ChildInterface {
     }
 
+    private static final class ConcreteGetMatchingMethod2 extends AbstractGetMatchingMethod2 { }
+
+    private static final class ConcreteGetMatchingMethod22 extends AbstractGetMatchingMethod2 {
+        @Override
+        public void testMethod6() { }
+    }
+
     private static final class GetMatchingMethodClass {
 
         public void testMethod() {
@@ -109,19 +116,12 @@ public void testMethod4(final Color aColor1, final Color aColor2) {
         public void testMethod4(final Long aLong, final Long anotherLong) {
         }
     }
-
     private static final class GetMatchingMethodImpl extends AbstractGetMatchingMethod {
         @Override
         public void testMethod5(final Exception exception) {
         }
     }
 
-    private static final class ConcreteGetMatchingMethod2 extends AbstractGetMatchingMethod2 { }
-    private static final class ConcreteGetMatchingMethod22 extends AbstractGetMatchingMethod2 {
-        @Override
-        public void testMethod6() { }
-    }
-
     public static class GrandParentObject {
     }
     public static class InheritanceBean {
@@ -681,16 +681,13 @@ void testGetMatchingMethod() throws NoSuchMethodException {
         assertNullPointerException(
                 () -> MethodUtils.getMatchingMethod(null, "testMethod5", RuntimeException.class));
 
-        {
-            final Method testMethod6 = MethodUtils.getMatchingMethod(ConcreteGetMatchingMethod2.class, "testMethod6");
-            assertNotNull(testMethod6);
-            assertEquals(AbstractGetMatchingMethod2.class, testMethod6.getDeclaringClass());
-        }
-        {
-            final Method testMethod6 = MethodUtils.getMatchingMethod(ConcreteGetMatchingMethod22.class, "testMethod6");
-            assertNotNull(testMethod6);
-            assertEquals(ConcreteGetMatchingMethod22.class, testMethod6.getDeclaringClass());
-        }
+        Method testMethod6 = MethodUtils.getMatchingMethod(ConcreteGetMatchingMethod2.class, "testMethod6");
+        assertNotNull(testMethod6);
+        assertEquals(AbstractGetMatchingMethod2.class, testMethod6.getDeclaringClass());
+
+        testMethod6 = MethodUtils.getMatchingMethod(ConcreteGetMatchingMethod22.class, "testMethod6");
+        assertNotNull(testMethod6);
+        assertEquals(ConcreteGetMatchingMethod22.class, testMethod6.getDeclaringClass());
     }
 
     @Test