# HG changeset patch # User malenkov # Date 1392982445 -14400 # Node ID ce9d5a78334ff529f5489607e4769f2351dc51e9 # Parent 5e534f20d09a5722cc151f043f91738fd89d9ca7 8034085: Do not prefer indexed properties Reviewed-by: alexsch diff -r 5e534f20d09a -r ce9d5a78334f jdk/src/share/classes/java/beans/Introspector.java --- a/jdk/src/share/classes/java/beans/Introspector.java Fri Feb 21 15:28:09 2014 +0400 +++ b/jdk/src/share/classes/java/beans/Introspector.java Fri Feb 21 15:34:05 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2014, 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 @@ -729,22 +729,38 @@ if (igpd != null && ispd != null) { // Complete indexed properties set // Merge any classic property descriptors - if (gpd != null) { - PropertyDescriptor tpd = mergePropertyDescriptor(igpd, gpd); - if (tpd instanceof IndexedPropertyDescriptor) { - igpd = (IndexedPropertyDescriptor)tpd; - } - } - if (spd != null) { - PropertyDescriptor tpd = mergePropertyDescriptor(ispd, spd); - if (tpd instanceof IndexedPropertyDescriptor) { - ispd = (IndexedPropertyDescriptor)tpd; - } + if ((gpd == spd) || (gpd == null)) { + pd = spd; + } else if (spd == null) { + pd = gpd; + } else if (spd instanceof IndexedPropertyDescriptor) { + pd = mergePropertyWithIndexedProperty(gpd, (IndexedPropertyDescriptor) spd); + } else if (gpd instanceof IndexedPropertyDescriptor) { + pd = mergePropertyWithIndexedProperty(spd, (IndexedPropertyDescriptor) gpd); + } else { + pd = mergePropertyDescriptor(gpd, spd); } if (igpd == ispd) { - pd = igpd; + ipd = igpd; + } else { + ipd = mergePropertyDescriptor(igpd, ispd); + } + if (pd == null) { + pd = ipd; } else { - pd = mergePropertyDescriptor(igpd, ispd); + Class propType = pd.getPropertyType(); + Class ipropType = ipd.getIndexedPropertyType(); + if (propType.isArray() && propType.getComponentType() == ipropType) { + pd = pd.getClass0().isAssignableFrom(ipd.getClass0()) + ? new IndexedPropertyDescriptor(pd, ipd) + : new IndexedPropertyDescriptor(ipd, pd); + } else if (pd.getClass0().isAssignableFrom(ipd.getClass0())) { + pd = pd.getClass0().isAssignableFrom(ipd.getClass0()) + ? new PropertyDescriptor(pd, ipd) + : new PropertyDescriptor(ipd, pd); + } else { + pd = ipd; + } } } else if (gpd != null && spd != null) { if (igpd != null) { @@ -848,6 +864,12 @@ } else { result = new IndexedPropertyDescriptor(ipd, pd); } + } else if ((ipd.getReadMethod() == null) && (ipd.getWriteMethod() == null)) { + if (pd.getClass0().isAssignableFrom(ipd.getClass0())) { + result = new PropertyDescriptor(pd, ipd); + } else { + result = new PropertyDescriptor(ipd, pd); + } } else { // Cannot merge the pd because of type mismatch // Return the most specific pd @@ -899,7 +921,7 @@ } // Handle regular ipd merge - private PropertyDescriptor mergePropertyDescriptor(IndexedPropertyDescriptor ipd1, + private IndexedPropertyDescriptor mergePropertyDescriptor(IndexedPropertyDescriptor ipd1, IndexedPropertyDescriptor ipd2) { if (ipd1.getClass0().isAssignableFrom(ipd2.getClass0())) { return new IndexedPropertyDescriptor(ipd1, ipd2); diff -r 5e534f20d09a -r ce9d5a78334f jdk/test/java/beans/Introspector/Test4168833.java --- a/jdk/test/java/beans/Introspector/Test4168833.java Fri Feb 21 15:28:09 2014 +0400 +++ b/jdk/test/java/beans/Introspector/Test4168833.java Fri Feb 21 15:34:05 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -23,10 +23,11 @@ /* * @test - * @bug 4168833 + * @bug 4168833 8034085 * @summary Tests that Introspector does not create IndexedPropertyDescriptor * from non-indexed PropertyDescriptor * @author Mark Davidson + * @author Sergey Malenkov */ import java.awt.Color; @@ -42,10 +43,6 @@ */ public class Test4168833 { public static void main(String[] args) throws Exception { - IndexedPropertyDescriptor ipd = BeanUtils.getIndexedPropertyDescriptor(Base.class, "prop"); - if (!ipd.getIndexedPropertyType().equals(Dimension.class)) { - error(ipd, "Base.prop property should a Dimension"); - } // When the Sub class is introspected, // the property type should be color. // The complete "classic" set of properties diff -r 5e534f20d09a -r ce9d5a78334f jdk/test/java/beans/Introspector/Test8034085.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/beans/Introspector/Test8034085.java Fri Feb 21 15:34:05 2014 +0400 @@ -0,0 +1,236 @@ +/* + * Copyright (c) 2014, 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 + * 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.awt.Window; +import java.beans.IndexedPropertyDescriptor; +import java.beans.PropertyDescriptor; + +/* + * @test + * @bug 8034085 + * @summary Tests that Introspector ignores indexed getter and setter for incorrect types + * @author Sergey Malenkov + */ + +public class Test8034085 { + public static final StringBuilder ERROR = new StringBuilder(); + + public static void main(String[] args) { + test(Window.class, false, true, false, false); + + test(Bean0000.class, false, false, false, false); + test(Bean0001.class, false, false, false, true); + test(Bean0010.class, false, false, true, false); + test(Bean0011.class, false, false, true, true); + test(Bean0100.class, false, true, false, false); + test(Bean0101.class, false, true, false, false); + test(Bean0110.class, false, true, false, false); + test(Bean0111.class, false, true, false, false); + test(Bean1000.class, true, false, false, false); + test(Bean1001.class, true, false, false, false); + test(Bean1010.class, true, false, false, false); + test(Bean1011.class, true, false, false, false); + test(Bean1100.class, true, true, false, false); + test(Bean1101.class, true, true, false, false); + test(Bean1110.class, true, true, false, false); + test(Bean1111.class, true, true, false, false); + + if (0 < ERROR.length()) { + throw new Error(ERROR.toString()); + } + } + + private static void test(Class type, boolean read, boolean write, boolean readIndexed, boolean writeIndexed) { + PropertyDescriptor pd = BeanUtils.findPropertyDescriptor(type, "size"); + if (pd != null) { + test(type, "read", read, null != pd.getReadMethod()); + test(type, "write", write, null != pd.getWriteMethod()); + if (pd instanceof IndexedPropertyDescriptor) { + IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd; + test(type, "indexed read", readIndexed, null != ipd.getIndexedReadMethod()); + test(type, "indexed write", writeIndexed, null != ipd.getIndexedWriteMethod()); + } else if (readIndexed || writeIndexed) { + error(type, "indexed property does not exist"); + } + } else if (read || write || readIndexed || writeIndexed) { + error(type, "property does not exist"); + } + } + + private static void test(Class type, String name, boolean expected, boolean actual) { + if (expected && !actual) { + error(type, name + " method does not exist"); + } else if (!expected && actual) { + error(type, name + " method is not expected"); + } + } + + private static void error(Class type, String message) { + ERROR.append("\n\t\t").append(type.getSimpleName()).append(".size: ").append(message); + } + + public static class Bean0000 { + } + + public static class Bean0001 { + public void setSize(int index, int value) { + } + } + + public static class Bean0010 { + public int getSize(int index) { + return 0; + } + } + + public static class Bean0011 { + public int getSize(int index) { + return 0; + } + + public void setSize(int index, int value) { + } + } + + public static class Bean0100 { + public void setSize(int value) { + } + } + + public static class Bean0101 { + public void setSize(int value) { + } + + public void setSize(int index, int value) { + } + } + + public static class Bean0110 { + public void setSize(int value) { + } + + public int getSize(int index) { + return 0; + } + } + + public static class Bean0111 { + public void setSize(int value) { + } + + public int getSize(int index) { + return 0; + } + + public void setSize(int index, int value) { + } + } + + public static class Bean1000 { + public int getSize() { + return 0; + } + } + + public static class Bean1001 { + public int getSize() { + return 0; + } + + public void setSize(int index, int value) { + } + } + + public static class Bean1010 { + public int getSize() { + return 0; + } + + public int getSize(int index) { + return 0; + } + } + + public static class Bean1011 { + public int getSize() { + return 0; + } + + public int getSize(int index) { + return 0; + } + + public void setSize(int index, int value) { + } + } + + public static class Bean1100 { + public int getSize() { + return 0; + } + + public void setSize(int value) { + } + } + + public static class Bean1101 { + public int getSize() { + return 0; + } + + public void setSize(int value) { + } + + public void setSize(int index, int value) { + } + } + + public static class Bean1110 { + public int getSize() { + return 0; + } + + public void setSize(int value) { + } + + public int getSize(int index) { + return 0; + } + } + + public static class Bean1111 { + public int getSize() { + return 0; + } + + public void setSize(int value) { + } + + public int getSize(int index) { + return 0; + } + + public void setSize(int index, int value) { + } + } +}