[ji] avoid "multiple Java methods found" warning

kares · kares · commit c9c48a579dc9 · 2025-03-31T11:05:06.000+02:00
diff --git a/core/src/main/java/org/jruby/javasupport/binding/MethodGatherer.java b/core/src/main/java/org/jruby/javasupport/binding/MethodGatherer.java
@@ -215,6 +215,11 @@ private static boolean sameTypesAndAccessModifier(Method child, Method parent) {
     }
 
     private static boolean methodsAreEquivalent(Method child, Method parent) {
+        if (child.getDeclaringClass().isAssignableFrom(parent.getDeclaringClass()) && child.getDeclaringClass() != parent.getDeclaringClass()) {
+            final Method temp = parent; // swap them since child is actually the parent in terms of class hierarchy
+            parent = child; child = temp;
+        }
+
         if (parent.getDeclaringClass().isAssignableFrom(child.getDeclaringClass())) {
             return sameTypesAndAccessModifier(child, parent); // most cases will end here
         }
@@ -261,7 +266,7 @@ private static void addNewMethods(
                 // we have seen other methods; check if we already have an equivalent one
                 for (int i = 0; i < childMethods.size(); i++) {
                     final Method current = childMethods.get(i);
-                    if ( methodsAreEquivalent(current, method) ) {
+                    if (methodsAreEquivalent(current, method)) {
                         if (removeDuplicate) {
                             // Replace the existing method, since the super call is more general
                             // and virtual dispatch will call the subclass impl anyway.
