Skip to content

Commit

Permalink
8317289: javadoc fails with -sourcepath if module-info.java contains …
Browse files Browse the repository at this point in the history
…import statements

Reviewed-by: jlahoda
  • Loading branch information
pavelrappo committed Oct 24, 2023
1 parent 6d3cb45 commit fd332da
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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 @@ -1321,15 +1321,6 @@ public static boolean isModuleInfo(JCCompilationUnit tree) {
&& tree.getModuleDecl() != null;
}

public static JCModuleDecl getModule(JCCompilationUnit t) {
if (t.defs.nonEmpty()) {
JCTree def = t.defs.head;
if (def.hasTag(MODULEDEF))
return (JCModuleDecl) def;
}
return null;
}

public static boolean isPackageInfo(JCCompilationUnit tree) {
return tree.sourcefile.isNameCompatible("package-info", JavaFileObject.Kind.SOURCE);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 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 @@ -67,7 +67,6 @@
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCModuleDecl;
import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Name;
Expand Down Expand Up @@ -391,7 +390,7 @@ private String getModuleName(Location location) throws ToolException {
"module-info", JavaFileObject.Kind.SOURCE);
if (jfo != null) {
JCCompilationUnit jcu = compiler.parse(jfo);
JCModuleDecl module = TreeInfo.getModule(jcu);
JCModuleDecl module = jcu.getModule();
if (module != null) {
return module.getName().toString();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Copyright (c) 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
* 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.nio.file.Path;

import javadoc.tester.JavadocTester;
import toolbox.ToolBox;

/*
* @test
* @bug 8317289
* @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build toolbox.ToolBox javadoc.tester.*
* @run main TestSourcePathModule
*/
public class TestSourcePathModule extends JavadocTester {

public static void main(String... args) throws Exception {
new TestSourcePathModule().runTests();
}

@Test
public void testSourcePath(Path base) throws Exception {
Path src = base.resolve("src");
new ToolBox().writeJavaFiles(src, """
import java.lang.Object;
/** documentation */
module m { }
""");
javadoc("-d", "out",
"-sourcepath", src.toString(),
"--module", "m");
checkExit(Exit.OK);
}
}

1 comment on commit fd332da

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Please sign in to comment.