Skip to content

Commit 4c8d968

Browse files
committed
Run mvn javadoc:fix
1 parent 71a6ca4 commit 4c8d968

29 files changed

+524
-68
lines changed

src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,11 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
220220
*/
221221
private InputHandler inputHandler;
222222

223+
/**
224+
* <p>Constructor for AbstractFixJavadocMojo.</p>
225+
*
226+
* @param inputHandler a {@link org.codehaus.plexus.components.interactivity.InputHandler} object
227+
*/
223228
public AbstractFixJavadocMojo(InputHandler inputHandler) {
224229
this.inputHandler = inputHandler;
225230
}
@@ -397,9 +402,7 @@ public AbstractFixJavadocMojo(InputHandler inputHandler) {
397402
*/
398403
private List<String> sinceClasses;
399404

400-
/**
401-
* {@inheritDoc}
402-
*/
405+
/** {@inheritDoc} */
403406
@Override
404407
public void execute() throws MojoExecutionException, MojoFailureException {
405408
if (!fixClassComment && !fixFieldComment && !fixMethodComment) {
@@ -450,11 +453,18 @@ public void execute() throws MojoExecutionException, MojoFailureException {
450453
// protected methods
451454
// ----------------------------------------------------------------------
452455

456+
/**
457+
* <p>Getter for the field <code>project</code>.</p>
458+
*
459+
* @return a {@link org.apache.maven.project.MavenProject} object
460+
*/
453461
protected final MavenProject getProject() {
454462
return project;
455463
}
456464

457465
/**
466+
* <p>getArtifactType.</p>
467+
*
458468
* @param p not null maven project.
459469
* @return the artifact type.
460470
*/
@@ -463,6 +473,8 @@ protected String getArtifactType(MavenProject p) {
463473
}
464474

465475
/**
476+
* <p>getProjectSourceRoots.</p>
477+
*
466478
* @param p not null maven project.
467479
* @return the list of source paths for the given project.
468480
*/
@@ -473,9 +485,11 @@ protected List<String> getProjectSourceRoots(MavenProject p) {
473485
}
474486

475487
/**
488+
* <p>getCompileClasspathElements.</p>
489+
*
476490
* @param p not null
477491
* @return the compile classpath elements
478-
* @throws DependencyResolutionRequiredException
492+
* @throws org.apache.maven.artifact.DependencyResolutionRequiredException
479493
* if any
480494
*/
481495
protected List<String> getCompileClasspathElements(MavenProject p) throws DependencyResolutionRequiredException {
@@ -485,6 +499,8 @@ protected List<String> getCompileClasspathElements(MavenProject p) throws Depend
485499
}
486500

487501
/**
502+
* <p>getJavaMethodAsString.</p>
503+
*
488504
* @param javaExecutable not null
489505
* @return the fully qualify name of javaMethod with signature
490506
*/

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

Lines changed: 94 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,17 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
253253

254254
private ToolchainManager toolchainManager;
255255

256+
/**
257+
* <p>Constructor for AbstractJavadocMojo.</p>
258+
*
259+
* @param siteTool a {@link org.apache.maven.doxia.tools.SiteTool} object
260+
* @param archiverManager a {@link org.codehaus.plexus.archiver.manager.ArchiverManager} object
261+
* @param resourceResolver a {@link org.apache.maven.plugins.javadoc.resolver.ResourceResolver} object
262+
* @param repoSystem a {@link org.eclipse.aether.RepositorySystem} object
263+
* @param artifactHandlerManager a {@link org.apache.maven.artifact.handler.manager.ArtifactHandlerManager} object
264+
* @param mavenProjectBuilder a {@link org.apache.maven.project.ProjectBuilder} object
265+
* @param toolchainManager a {@link org.apache.maven.toolchain.ToolchainManager} object
266+
*/
256267
public AbstractJavadocMojo(
257268
SiteTool siteTool,
258269
ArchiverManager archiverManager,
@@ -1694,6 +1705,11 @@ protected boolean isTest() {
16941705
return false;
16951706
}
16961707

1708+
/**
1709+
* <p>Getter for the field <code>outputDirectory</code>.</p>
1710+
*
1711+
* @return a {@link java.lang.String} object
1712+
*/
16971713
protected String getOutputDirectory() {
16981714
return outputDirectory.getAbsolutePath();
16991715
}
@@ -1708,11 +1724,18 @@ protected String getPluginReportOutputDirectory() {
17081724
return getOutputDirectory() + "/" + (isTest() ? "test" : "") + "apidocs";
17091725
}
17101726

1727+
/**
1728+
* <p>Getter for the field <code>project</code>.</p>
1729+
*
1730+
* @return a {@link org.apache.maven.project.MavenProject} object
1731+
*/
17111732
protected MavenProject getProject() {
17121733
return project;
17131734
}
17141735

17151736
/**
1737+
* <p>getProjectBuildOutputDirs.</p>
1738+
*
17161739
* @param p not null maven project
17171740
* @return the list of directories where compiled classes are placed for the given project. These dirs are
17181741
* added to the javadoc classpath.
@@ -1726,6 +1749,8 @@ protected List<File> getProjectBuildOutputDirs(MavenProject p) {
17261749
}
17271750

17281751
/**
1752+
* <p>getClassesFile.</p>
1753+
*
17291754
* @param project the project in which to find a classes file
17301755
* @return null, the attached artifact file, or outputDirectory.
17311756
*/
@@ -1756,6 +1781,8 @@ protected File getClassesFile(MavenProject project) {
17561781
}
17571782

17581783
/**
1784+
* <p>getProjectSourceRoots.</p>
1785+
*
17591786
* @param p not null maven project
17601787
* @return the list of source paths for the given project
17611788
*/
@@ -1770,6 +1797,8 @@ protected List<String> getProjectSourceRoots(MavenProject p) {
17701797
}
17711798

17721799
/**
1800+
* <p>getExecutionProjectSourceRoots.</p>
1801+
*
17731802
* @param p not null maven project
17741803
* @return the list of source paths for the execution project of the given project
17751804
*/
@@ -1784,34 +1813,44 @@ protected List<String> getExecutionProjectSourceRoots(MavenProject p) {
17841813
}
17851814

17861815
/**
1816+
* <p>Getter for the field <code>javadocDirectory</code>.</p>
1817+
*
17871818
* @return the current javadoc directory
17881819
*/
17891820
protected File getJavadocDirectory() {
17901821
return javadocDirectory;
17911822
}
17921823

17931824
/**
1825+
* <p>Getter for the field <code>doclint</code>.</p>
1826+
*
17941827
* @return the doclint specific checks configuration
17951828
*/
17961829
protected String getDoclint() {
17971830
return doclint;
17981831
}
17991832

18001833
/**
1834+
* <p>Getter for the field <code>doctitle</code>.</p>
1835+
*
18011836
* @return the title to be placed near the top of the overview summary file
18021837
*/
18031838
protected String getDoctitle() {
18041839
return doctitle;
18051840
}
18061841

18071842
/**
1843+
* <p>Getter for the field <code>overview</code>.</p>
1844+
*
18081845
* @return the overview documentation file from the user parameter or from the <code>javadocdirectory</code>
18091846
*/
18101847
protected File getOverview() {
18111848
return overview;
18121849
}
18131850

18141851
/**
1852+
* <p>Getter for the field <code>windowtitle</code>.</p>
1853+
*
18151854
* @return the title to be placed in the HTML title tag
18161855
*/
18171856
protected String getWindowtitle() {
@@ -1841,6 +1880,7 @@ private String getEncoding() {
18411880
: encoding;
18421881
}
18431882

1883+
/** {@inheritDoc} */
18441884
@Override
18451885
public void execute() throws MojoExecutionException, MojoFailureException {
18461886
verifyRemovedParameter("aggregator");
@@ -1851,8 +1891,19 @@ public void execute() throws MojoExecutionException, MojoFailureException {
18511891
doExecute();
18521892
}
18531893

1894+
/**
1895+
* <p>doExecute.</p>
1896+
*
1897+
* @throws org.apache.maven.plugin.MojoExecutionException if any.
1898+
* @throws org.apache.maven.plugin.MojoFailureException if any.
1899+
*/
18541900
protected abstract void doExecute() throws MojoExecutionException, MojoFailureException;
18551901

1902+
/**
1903+
* <p>verifyRemovedParameter.</p>
1904+
*
1905+
* @param paramName a {@link java.lang.String} object
1906+
*/
18561907
protected final void verifyRemovedParameter(String paramName) {
18571908
Xpp3Dom configDom = mojoExecution.getConfiguration();
18581909
if (configDom != null) {
@@ -1878,7 +1929,7 @@ private void verifyReplacedParameter(String oldParamName, String newParamNew) {
18781929
* Javadoc Options used by this Plugin.
18791930
*
18801931
* @param unusedLocale the wanted locale (actually unused).
1881-
* @throws MavenReportException if any
1932+
* @throws org.apache.maven.reporting.MavenReportException if any
18821933
*/
18831934
protected void executeReport(Locale unusedLocale) throws MavenReportException {
18841935
if (getLog().isDebugEnabled()) {
@@ -2087,7 +2138,7 @@ protected void executeReport(Locale unusedLocale) throws MavenReportException {
20872138
*
20882139
* @param sourcePaths a Collection that contains the paths to the source files
20892140
* @return a List that contains the specific path for every source file
2090-
* @throws MavenReportException {@link MavenReportException} issue while generating report
2141+
* @throws org.apache.maven.reporting.MavenReportException {@link org.apache.maven.reporting.org.apache.maven.reporting.MavenReportException} issue while generating report
20912142
*/
20922143
protected Map<Path, Collection<String>> getFiles(Collection<Path> sourcePaths) throws MavenReportException {
20932144
Map<Path, Collection<String>> mappedFiles = new LinkedHashMap<>(sourcePaths.size());
@@ -2128,7 +2179,7 @@ protected Map<Path, Collection<String>> getFiles(Collection<Path> sourcePaths) t
21282179
* source roots of the project will be used.
21292180
*
21302181
* @return a Map of the project absolute source paths per projects key (G:A)
2131-
* @throws MavenReportException {@link MavenReportException} issue while generating report
2182+
* @throws org.apache.maven.reporting.MavenReportException {@link org.apache.maven.reporting.org.apache.maven.reporting.MavenReportException} issue while generating report
21322183
* @see JavadocUtil#pruneDirs(MavenProject, Collection)
21332184
*/
21342185
protected Collection<JavadocModule> getSourcePaths() throws MavenReportException {
@@ -2279,18 +2330,20 @@ private Set<MavenProject> modulesForAggregatedProject(
22792330
/**
22802331
* Override this method to customize the configuration for resolving dependency sources. The default
22812332
* behavior enables the resolution of -sources jar files.
2282-
* @param config {@link SourceResolverConfig}
2283-
* @return {@link SourceResolverConfig}
2333+
*
2334+
* @param config {@link org.apache.maven.plugins.javadoc.resolver.SourceResolverConfig}
2335+
* @return {@link org.apache.maven.plugins.javadoc.resolver.SourceResolverConfig}
22842336
*/
22852337
protected SourceResolverConfig configureDependencySourceResolution(final SourceResolverConfig config) {
22862338
return config.withCompileSources();
22872339
}
22882340

22892341
/**
22902342
* Resolve dependency sources so they can be included directly in the javadoc process. To customize this,
2291-
* override {@link AbstractJavadocMojo#configureDependencySourceResolution(SourceResolverConfig)}.
2343+
* override {@link org.apache.maven.plugins.javadoc.AbstractJavadocMojo#configureDependencySourceResolution(SourceResolverConfig)}.
2344+
*
22922345
* @return List of source paths.
2293-
* @throws MavenReportException {@link MavenReportException}
2346+
* @throws org.apache.maven.reporting.MavenReportException {@link org.apache.maven.reporting.org.apache.maven.reporting.MavenReportException}
22942347
*/
22952348
protected final Collection<JavadocModule> getDependencySourcePaths() throws MavenReportException {
22962349
try {
@@ -2585,15 +2638,22 @@ private Collection<File> getPathElements() throws MavenReportException {
25852638
return classpathElements;
25862639
}
25872640

2641+
/**
2642+
* <p>getDependencyScopeFilter.</p>
2643+
*
2644+
* @return a {@link org.eclipse.aether.util.filter.ScopeDependencyFilter} object
2645+
*/
25882646
protected ScopeDependencyFilter getDependencyScopeFilter() {
25892647
return new ScopeDependencyFilter(
25902648
Arrays.asList(Artifact.SCOPE_COMPILE, Artifact.SCOPE_PROVIDED, Artifact.SCOPE_SYSTEM), null);
25912649
}
25922650

25932651
/**
2594-
* @param dependency {@link Dependency}
2595-
* @return {@link Artifact}
2596-
* @throws MavenReportException when artifact could not be resolved
2652+
* <p>resolveDependency.</p>
2653+
*
2654+
* @param dependency {@link org.apache.maven.model.Dependency}
2655+
* @return {@link org.apache.maven.artifact.Artifact}
2656+
* @throws org.apache.maven.reporting.MavenReportException when artifact could not be resolved
25972657
*/
25982658
public Artifact resolveDependency(Dependency dependency) throws MavenReportException {
25992659
ArtifactTypeRegistry registry = RepositoryUtils.newArtifactTypeRegistry(artifactHandlerManager);
@@ -2609,6 +2669,11 @@ public Artifact resolveDependency(Dependency dependency) throws MavenReportExcep
26092669
}
26102670
}
26112671

2672+
/**
2673+
* <p>getToolchain.</p>
2674+
*
2675+
* @return a {@link org.apache.maven.toolchain.Toolchain} object
2676+
*/
26122677
protected final Toolchain getToolchain() {
26132678
Toolchain tc = null;
26142679

@@ -5496,6 +5561,8 @@ private boolean matches(DependencyLink d, Artifact artifact) {
54965561
}
54975562

54985563
/**
5564+
* <p>getDefaultJavadocApiLink.</p>
5565+
*
54995566
* @return if {@code detectJavaApiLink}, the Java API link based on the {@code javaApiLinks} properties and the
55005567
* value of the <code>source</code> parameter in the
55015568
* <code>org.apache.maven.plugins:maven-compiler-plugin</code>
@@ -5632,6 +5699,8 @@ private Set<String> followLinks(Set<String> links) {
56325699
}
56335700

56345701
/**
5702+
* <p>isValidJavadocLink.</p>
5703+
*
56355704
* @param link not null
56365705
* @param detecting <code>true</code> if the link is generated by
56375706
* <code>detectLinks</code>, or <code>false</code> otherwise
@@ -5838,7 +5907,7 @@ private static String getPluginParameter(MavenProject project, String pluginId,
58385907
* Construct the output file for the generated javadoc-options XML file, after creating the
58395908
* javadocOptionsDir if necessary. This method does NOT write to the file in question.
58405909
*
5841-
* @return The options {@link File} file.
5910+
* @return The options {@link java.io.File} file.
58425911
* @since 2.7
58435912
*/
58445913
protected final File getJavadocOptionsFile() {
@@ -5854,8 +5923,8 @@ protected final File getJavadocOptionsFile() {
58545923
* supplying to a distro module in a includeDependencySources configuration, so the javadoc options
58555924
* from this execution can be reconstructed and merged in the distro build.
58565925
*
5857-
* @return {@link JavadocOptions}
5858-
* @throws IOException {@link IOException}
5926+
* @return {@link org.apache.maven.plugins.javadoc.options.JavadocOptions}
5927+
* @throws java.io.IOException {@link java.io.java.io.IOException}
58595928
* @since 2.7
58605929
*/
58615930
protected final JavadocOptions buildJavadocOptions() throws IOException {
@@ -5914,14 +5983,21 @@ protected void logError(String message, Throwable t) {
59145983
}
59155984
}
59165985

5986+
/**
5987+
* <p>Getter for the field <code>reactorProjects</code>.</p>
5988+
*
5989+
* @return a {@link java.util.List} object
5990+
*/
59175991
protected List<MavenProject> getReactorProjects() {
59185992
return reactorProjects;
59195993
}
59205994

59215995
/**
5996+
* <p>failOnError.</p>
5997+
*
59225998
* @param prefix the prefix of the exception
59235999
* @param e the exception
5924-
* @throws MojoExecutionException {@link MojoExecutionException} issue while generating report
6000+
* @throws org.apache.maven.plugin.MojoExecutionException {@link org.apache.maven.plugin.org.apache.maven.plugin.MojoExecutionException} issue while generating report
59256001
*/
59266002
protected void failOnError(String prefix, Exception e) throws MojoExecutionException {
59276003
if (failOnError) {
@@ -5954,6 +6030,8 @@ private List<MavenProject> getAggregatedProjects() {
59546030
}
59556031

59566032
/**
6033+
* <p>isSkippedModule.</p>
6034+
*
59576035
* @param mavenProject the project that might be skipped
59586036
* @return <code>true</code> if the project needs to be skipped from aggregate generation
59596037
*/
@@ -5978,6 +6056,8 @@ protected boolean isSkippedModule(MavenProject mavenProject) {
59786056
}
59796057

59806058
/**
6059+
* <p>isSkippedJavadoc.</p>
6060+
*
59816061
* @param mavenProject the project that might be skipped
59826062
* @return <code>true</code> if the pom configuration skips javadoc generation for the project
59836063
*/

0 commit comments

Comments
 (0)