infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 14:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8325090: javadoc fails when -subpackages option is used with non-modular -source

Browse Source 
Reviewed-by: liach, jjg
This commit is contained in:
Hannes Wallnöfer 2024-09-27 06:34:02 +00:00
parent 1bc13a1c10
commit 85dba47925
2 changed files with 81 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2024, 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
@ -870,10 +870,12 @@ public class ElementsTable {
private ModuleSymbol findModuleOfPackageName(String packageName) {
Name pack = names.fromString(packageName);
for (ModuleSymbol msym : modules.allModules()) {
PackageSymbol p = syms.getPackage(msym, pack);
if (p != null && !p.members().isEmpty()) {
return msym;
if (modules.modulesInitialized()) {
for (ModuleSymbol msym : modules.allModules()) {
PackageSymbol p = syms.getPackage(msym, pack);
if (p != null && !p.members().isEmpty()) {
return msym;
}
}
}
return null;

74
test/langtools/jdk/javadoc/tool/subpackageNoModules/SubpackageNoModules.java Normal file
View File

@ -0,0 +1,74 @@
/*
* Copyright (c) 2024, 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 8325090
* @summary javadoc fails when -subpackages option is used with non-modular -source
* @modules jdk.javadoc/jdk.javadoc.internal.api
* jdk.javadoc/jdk.javadoc.internal.tool
* @library /tools/lib
* @build toolbox.TestRunner toolbox.ToolBox
* @run main SubpackageNoModules
*/
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import toolbox.*;
import toolbox.Task.Expect;
public class SubpackageNoModules extends TestRunner {
final ToolBox tb = new ToolBox();
public SubpackageNoModules() {
super(System.err);
}
public static void main(String[] args) throws Exception {
SubpackageNoModules t = new SubpackageNoModules();
t.runTests(m -> new Object[] { Paths.get(m.getName()) });
}
@Test
public void testSubpackageNoModules(Path base) throws Exception {
Files.createDirectories(base);
tb.writeFile(base.resolve("pkg/A.java"), "package pkg;\npublic class A {}\n");
Path outDir = base.resolve("out");
Files.createDirectory(outDir);
// Combine -subpackages option with -source release that doesn't support modules
new JavadocTask(tb)
.outdir(outDir)
.sourcepath(base)
.options("-source", "8",
"-subpackages", "pkg")
.run(Expect.SUCCESS);
// Check for presence of generated docs
if (!Files.isRegularFile(outDir.resolve("pkg/A.html"))) {
error("File not found: " + outDir.resolve("pkg/A.html"));
}
}
}