This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 104b261d246136c9983bd229f5b625e64f9d4171 Author: Michael Osipov <[email protected]> AuthorDate: Sun Nov 12 22:02:55 2023 +0100 [MPLUGIN-493] Consistently evaluate skip parameter in MavenReport#canGenerateReport() --- .../src/main/java/org/DummyReport.java | 13 +++++-------- .../it/plugin-report/src/main/java/org/DummyReport.java | 13 +++++-------- .../apache/maven/plugin/plugin/report/PluginReport.java | 16 ++++++++++------ 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java b/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java index a962b54d..66315bcd 100644 --- a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java +++ b/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java @@ -107,6 +107,11 @@ public class DummyReport extends AbstractMavenReport { * {@inheritDoc} */ public boolean canGenerateReport() { + if (skip || skipReport) { + getLog().info("Maven Plugin Plugin Report generation skipped."); + return false; + } + return true; } @@ -114,14 +119,6 @@ public class DummyReport extends AbstractMavenReport { * {@inheritDoc} */ protected void executeReport(Locale locale) throws MavenReportException { - if (!canGenerateReport()) { - return; - } - if (skip || skipReport) { - getLog().info("Maven Plugin Plugin Report generation skipped."); - return; - } - // Generate the plugin's documentation generatePluginDocumentation(locale); } diff --git a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java index 2b139ed3..c4018aee 100644 --- a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java +++ b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java @@ -101,19 +101,16 @@ public class DummyReport extends AbstractMavenReport { /** {@inheritDoc} */ public boolean canGenerateReport() { + if (skip || skipReport) { + getLog().info("Maven Plugin Plugin Report generation skipped."); + return false; + } + return true; } /** {@inheritDoc} */ protected void executeReport(Locale locale) throws MavenReportException { - if (!canGenerateReport()) { - return; - } - if (skip || skipReport) { - getLog().info("Maven Plugin Plugin Report generation skipped."); - return; - } - // Generate the plugin's documentation generatePluginDocumentation(locale); } diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java index 641e75dd..954363c5 100644 --- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java +++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java @@ -128,7 +128,16 @@ public class PluginReport extends AbstractMavenReport { */ @Override public boolean canGenerateReport() { - return enhancedPluginXmlFile != null && enhancedPluginXmlFile.isFile() && enhancedPluginXmlFile.canRead(); + if (skip) { + getLog().info("Maven Plugin Plugin Report generation skipped."); + return false; + } + + if (!(enhancedPluginXmlFile != null && enhancedPluginXmlFile.isFile() && enhancedPluginXmlFile.canRead())) { + return false; + } + + return true; } /** @@ -136,11 +145,6 @@ public class PluginReport extends AbstractMavenReport { */ @Override protected void executeReport(Locale locale) throws MavenReportException { - if (skip) { - getLog().info("Maven Plugin Plugin Report generation skipped."); - return; - } - PluginDescriptor pluginDescriptor = extractPluginDescriptor(); // Generate the mojos' documentation
