From 7494e197614ce075bcb7d7100ae5ff24c0c8a7d9 Mon Sep 17 00:00:00 2001 From: sgehwolf Date: Tue, 19 Jun 2018 12:03:35 +0200 Subject: [PATCH] 8061305: Javadoc crashes when method name ends with "Property" Reviewed-by: jjg --- .../toolkit/util/VisibleMemberMap.java | 7 +- .../testMethodEndingInProperty/Test.java | 26 +++++++ .../TestMethodEndingInProperty.java | 73 +++++++++++++++++++ 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 test/com/sun/javadoc/testMethodEndingInProperty/Test.java create mode 100644 test/com/sun/javadoc/testMethodEndingInProperty/TestMethodEndingInProperty.java diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java index bc38491b..b49feadd 100644 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java @@ -664,6 +664,9 @@ public class VisibleMemberMap { // properties aren't named setA* or getA* private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*"); private boolean isPropertyMethod(MethodDoc method) { + if (!configuration.javafx) { + return false; + } if (!method.name().endsWith("Property")) { return false; } @@ -675,7 +678,9 @@ public class VisibleMemberMap { if (pattern.matcher(method.name()).matches()) { return false; } - + if (method.typeParameters().length > 0) { + return false; + } return 0 == method.parameters().length && !"void".equals(method.returnType().simpleTypeName()); } diff --git a/test/com/sun/javadoc/testMethodEndingInProperty/Test.java b/test/com/sun/javadoc/testMethodEndingInProperty/Test.java new file mode 100644 index 00000000..2d449dab --- /dev/null +++ b/test/com/sun/javadoc/testMethodEndingInProperty/Test.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2012, 2018, 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. + */ + +public class Test { + public Object fProperty() { return null; } +} diff --git a/test/com/sun/javadoc/testMethodEndingInProperty/TestMethodEndingInProperty.java b/test/com/sun/javadoc/testMethodEndingInProperty/TestMethodEndingInProperty.java new file mode 100644 index 00000000..b3429aa1 --- /dev/null +++ b/test/com/sun/javadoc/testMethodEndingInProperty/TestMethodEndingInProperty.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2012, 2018, 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. + */ + +/* + * @test + * @bug 8061305 + * @summary Test methods ending in 'Property' + * @library ../lib/ + * @build JavadocTester TestMethodEndingInProperty + * @run main TestMethodEndingInProperty + */ + +public class TestMethodEndingInProperty extends JavadocTester { + + private static final String BUG_ID = "8061305"; + private static final String ERROR_OUTPUT = "com.sun.tools.doclets.formats.html.PropertyWriterImpl " + + "cannot be cast to " + + "com.sun.tools.doclets.formats.html.AbstractExecutableMemberWriter"; + + private static final String[] ARGS = new String[] { + "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "Test.java" + }; + + /** + * The entry point of the test. + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestMethodEndingInProperty tester = new TestMethodEndingInProperty(); + int actual = tester.runJavadoc(ARGS); + int expected = 0; + tester.checkExitCode(expected, actual); + String errOut = tester.getErrorOutput(); + if (errOut.contains(ERROR_OUTPUT)) { + throw new Error("Error output contained: " + ERROR_OUTPUT); + } + System.out.println("Test passed"); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +} -- GitLab