[MPLUGIN-493] Consistently evaluate skip parameter in MavenReport#can…

…GenerateReport()
apache · Nov 12, 2023 · 104b261 · 104b261
1 parent b8ba9ef
commit 104b261
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/...-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java b/...-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java
@@ -107,21 +107,18 @@ protected MavenProject getProject() {
      * {@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/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 @@ protected MavenProject getProject() {
 
     /** {@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/...lugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java b/...lugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
@@ -128,19 +128,23 @@ 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;
     }
 
     /**
      * {@inheritDoc}
      */
     @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