Skip to content

Commit

Permalink
8308152: PropertyDescriptor should work with overridden generic gette…
Browse files Browse the repository at this point in the history
…r method

Reviewed-by: azvegint
  • Loading branch information
mrserb committed Jun 8, 2023
1 parent 760cb04 commit 73dd03c
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/java.desktop/share/classes/java/beans/Introspector.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, 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
Expand Down Expand Up @@ -1158,6 +1158,8 @@ private static Method internalFindMethod(Class<?> start, String methodName,
// For overridden methods we need to find the most derived version.
// So we start with the given class and walk up the superclass chain.
for (Class<?> cl = start; cl != null; cl = cl.getSuperclass()) {
Class<?> type = null;
Method foundMethod = null;
for (Method method : ClassInfo.get(cl).getMethods()) {
// make sure method signature matches.
if (method.getName().equals(methodName)) {
Expand All @@ -1177,10 +1179,17 @@ private static Method internalFindMethod(Class<?> start, String methodName,
}
}
}
return method;
Class<?> rt = method.getReturnType();
if (foundMethod == null || type.isAssignableFrom(rt)) {
foundMethod = method;
type = rt;
}
}
}
}
if (foundMethod != null) {
return foundMethod;
}
}
// Now check any inherited interfaces. This is necessary both when
// the argument class is itself an interface, and when the argument
Expand Down
96 changes: 96 additions & 0 deletions test/jdk/java/beans/PropertyDescriptor/OverriddenGetter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
* Copyright Amazon.com Inc. 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;

import javax.swing.JPanel;

/**
* @test
* @bug 8308152
* @summary PropertyDescriptor should work with overridden generic getter method
*/
public class OverriddenGetter {

static class Parent<T> {
private T value;
public T getValue() {return value;}
public final void setValue(T value) {this.value = value;}
}

static class ChildO extends Parent<Object> {
public ChildO() {}
@Override
public Object getValue() {return super.getValue();}
}

static class ChildA extends Parent<ArithmeticException> {
public ChildA() {}
@Override
public ArithmeticException getValue() {return super.getValue();}
}

static class ChildS extends Parent<String> {
public ChildS() {}
@Override
public String getValue() {return super.getValue();}
}

public static void main(String[] args) throws Exception {
test("UI", JPanel.class, "getUI", "setUI");
test("value", ChildO.class, "getValue", "setValue");
test("value", ChildA.class, "getValue", "setValue");
test("value", ChildS.class, "getValue", "setValue");
}

private static void test(String name, Class<?> beanClass,
String read, String write) throws Exception
{
var gold = new PropertyDescriptor(name, beanClass, read, write);
BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
for (PropertyDescriptor pd : pds) {
if (pd.getName().equals(gold.getName())) {
if (pd.getReadMethod() != gold.getReadMethod()) {
System.err.println("Expected: " + gold.getReadMethod());
System.err.println("Actual: " + pd.getReadMethod());
throw new RuntimeException("Wrong read method");
}
if (pd.getWriteMethod() != gold.getWriteMethod()) {
System.err.println("Expected: " + gold.getWriteMethod());
System.err.println("Actual: " + pd.getWriteMethod());
throw new RuntimeException("Wrong write method");
}
if (pd.getPropertyType() != gold.getPropertyType()) {
System.err.println("Expected: " + gold.getPropertyType());
System.err.println("Actual: " + pd.getPropertyType());
throw new RuntimeException("Wrong property type");
}
return;
}
}
throw new RuntimeException("The PropertyDescriptor is not found");
}
}

3 comments on commit 73dd03c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 73dd03c Jun 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 73dd03c Jun 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch mrserb-backport-73dd03cc in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 73dd03cc from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 8 Jun 2023 and was reviewed by Alexander Zvegintsev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git mrserb-backport-73dd03cc:mrserb-backport-73dd03cc
$ git checkout mrserb-backport-73dd03cc
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git mrserb-backport-73dd03cc

Please sign in to comment.