8347826: Introspector shows wrong method list after 8071693

Reviewed-by: azvegint, serb, aivanov

Author: Roman Marchenko

src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,11 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Deque;
 import java.util.List;
 import java.util.Set;
 
@@ -105,13 +106,16 @@ static List<Method> get(Class<?> type) {
                 }
             }
 
-            // Add default methods inherited from interfaces
-            for (Class<?> iface : type.getInterfaces()) {
+            // Add methods inherited from interfaces
+            Deque<Class<?>> ifaceDeque = new ArrayDeque<>(List.of(type.getInterfaces()));
+            while (!ifaceDeque.isEmpty()) {
+                Class<?> iface = ifaceDeque.removeLast();
                 if (IGNORABLE_INTERFACES.contains(iface)) {
                     continue;
                 }
+                ifaceDeque.addAll(List.of(iface.getInterfaces()));
                 for (Method method : iface.getMethods()) {
-                    if (!Modifier.isAbstract(method.getModifiers())) {
+                    if (!Modifier.isAbstract(method.getModifiers()) && !method.isBridge()) {
                         (list = createIfNeeded(list)).add(method);
                     }
                 }

src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,8 @@ private boolean initialize() {
         }
         if (!isInitedToIsGetter && this.readList != null) {
             for (MethodInfo info : this.readList) {
-                if ((this.read == null) || this.read.type.isAssignableFrom(info.type)) {
+                if ((this.read == null) || (!info.method.isDefault()
+                                            && this.read.type.isAssignableFrom(info.type))) {
                     this.read = info;
                     this.type = info.type;
                 }
@@ -91,6 +92,9 @@ private boolean initialize() {
                 if (writeType == null) {
                     this.write = info;
                     writeType = info.type;
+                } else if (isParentOfIncoming(this.write, info)) {
+                    this.write = info;
+                    writeType = info.type;
                 } else if (writeType.isAssignableFrom(info.type)) {
                     if ((this.write == null) || this.write.type.isAssignableFrom(info.type)) {
                         this.write = info;
@@ -307,4 +311,16 @@ public static Map<String,PropertyInfo> get(Class<?> type) {
                 ? Collections.unmodifiableMap(map)
                 : Collections.emptyMap();
     }
+
+    private static boolean isParentOfIncoming(MethodInfo current, MethodInfo incoming) {
+        if (null == current) {
+            return false;
+        }
+        Class<?> currentClass = current.method.getDeclaringClass();
+        Class<?> incomingClass = incoming.method.getDeclaringClass();
+        if (currentClass == incomingClass) {
+            return false;
+        }
+        return currentClass.isAssignableFrom(incomingClass);
+    }
 }

src/java.desktop/share/classes/java/beans/Introspector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1052,8 +1052,12 @@ private void addMethod(MethodDescriptor md) {
             }
         }
         if (match) {
-            MethodDescriptor composite = new MethodDescriptor(old, md);
-            methods.put(name, composite);
+            Class<?> oldClass = old.getMethod().getDeclaringClass();
+            Class<?> mdClass = md.getMethod().getDeclaringClass();
+            if (oldClass == mdClass || oldClass.isAssignableFrom(mdClass) || !mdClass.isAssignableFrom(oldClass)) {
+                MethodDescriptor composite = new MethodDescriptor(old, md);
+                methods.put(name, composite);
+            }
             return;
         }