This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-634 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit a1c07b5c17069d8fba21eb639495fc1a9d9eaa94 Author: rfscholte <[email protected]> AuthorDate: Thu Apr 29 20:18:09 2021 +0200 Simplify code --- .../maven/plugins/javadoc/AbstractJavadocMojo.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 09c6dc8..1738079 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -4534,17 +4534,13 @@ public abstract class AbstractJavadocMojo Collection<Path> artifactSourcePaths = javadocModule.getSourcePaths(); Set<String> exportedPackages = new HashSet<>(); boolean exportAllPackages; - File mainDescriptor = findMainDescriptor( artifactSourcePaths ); + Path mainDescriptor = findMainDescriptor( artifactSourcePaths ); if ( mainDescriptor != null && !isTest() ) { - ResolvePathsRequest<File> request = - ResolvePathsRequest.ofFiles( Collections.<File>emptyList() ). - setMainModuleDescriptor( mainDescriptor ); - try { - Set<JavaModuleDescriptor.JavaExports> exports = locationManager.resolvePaths( request ). - getMainModuleDescriptor().exports(); + Set<JavaModuleDescriptor.JavaExports> exports = + locationManager.parseModuleDescriptor( mainDescriptor ).getModuleDescriptor().exports(); if ( exports.isEmpty() ) { continue; @@ -5024,7 +5020,7 @@ public abstract class AbstractJavadocMojo if ( resolvePathResult == null || resolvePathResult.getModuleNameSource() == ModuleNameSource.FILENAME ) { - File moduleDescriptor = findMainDescriptor( entry.getSourcePaths() ); + Path moduleDescriptor = findMainDescriptor( entry.getSourcePaths() ); if ( moduleDescriptor != null ) { @@ -5087,7 +5083,7 @@ public abstract class AbstractJavadocMojo } else { - File moduleDescriptor = findMainDescriptor( javadocModule.getSourcePaths() ); + Path moduleDescriptor = findMainDescriptor( javadocModule.getSourcePaths() ); if ( moduleDescriptor != null ) { @@ -5395,13 +5391,13 @@ public abstract class AbstractJavadocMojo return resolvePathResult; } - private File findMainDescriptor( Collection<Path> roots ) throws MavenReportException + private Path findMainDescriptor( Collection<Path> roots ) throws MavenReportException { for ( Map.Entry<Path, Collection<String>> entry : getFiles( roots ).entrySet() ) { if ( entry.getValue().contains( "module-info.java" ) ) { - return entry.getKey().resolve( "module-info.java" ).toFile(); + return entry.getKey().resolve( "module-info.java" ); } } return null;
