(maven-reporting-exec) branch master updated: [MSHARED-1329] Add field to MavenReportExecution whether it is user-defined or autodetected

[michaelo]

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-reporting-exec.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b3e42d  [MSHARED-1329] Add field to MavenReportExecution whether it 
is user-defined or autodetected
8b3e42d is described below

commit 8b3e42d55fd82bbcc4f63b2f5ef9eb865e24a5d2
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun Oct 29 19:05:34 2023 +0100

    [MSHARED-1329] Add field to MavenReportExecution whether it is user-defined 
or autodetected
---
 .../reporting/exec/DefaultMavenReportExecutor.java |  8 +++----
 .../maven/reporting/exec/MavenReportExecution.java | 25 ++++++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java 
b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
index 9bf5568..24fdf30 100644
--- 
a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
+++ 
b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
@@ -265,7 +265,7 @@ public class DefaultMavenReportExecutor implements 
MavenReportExecutor {
     }
 
     private MavenReportExecution prepareReportExecution(
-            MavenReportExecutorRequest mavenReportExecutorRequest, 
GoalWithConf report, boolean hasUserDefinedReports)
+            MavenReportExecutorRequest mavenReportExecutorRequest, 
GoalWithConf report, boolean userDefined)
             throws Exception {
         ReportPlugin reportPlugin = report.getReportPlugin();
         PluginDescriptor pluginDescriptor = report.getPluginDescriptor();
@@ -276,7 +276,7 @@ public class DefaultMavenReportExecutor implements 
MavenReportExecutor {
         }
 
         MavenProject project = mavenReportExecutorRequest.getProject();
-        if (!hasUserDefinedReports && mojoDescriptor.isAggregator() && 
!canAggregate(project)) {
+        if (!userDefined && mojoDescriptor.isAggregator() && 
!canAggregate(project)) {
             // aggregator mojos automatically added from plugin are only run 
at execution root
             return null;
         }
@@ -294,7 +294,7 @@ public class DefaultMavenReportExecutor implements 
MavenReportExecutor {
                 EXCLUDES);
 
         if (!isMavenReport(mojoExecution, pluginDescriptor)) {
-            if (hasUserDefinedReports) {
+            if (userDefined) {
                 // reports were explicitly written in the POM
                 LOGGER.warn("Ignoring {}:{}"
                                 + " goal since it is not a report: should be 
removed from reporting configuration in POM",
@@ -326,7 +326,7 @@ public class DefaultMavenReportExecutor implements 
MavenReportExecutor {
         MavenReport mavenReport = getConfiguredMavenReport(mojoExecution, 
pluginDescriptor, mavenReportExecutorRequest);
 
         MavenReportExecution mavenReportExecution = new MavenReportExecution(
-                report.getGoal(), mojoExecution.getPlugin(), mavenReport, 
pluginDescriptor.getClassRealm());
+                report.getGoal(), mojoExecution.getPlugin(), mavenReport, 
pluginDescriptor.getClassRealm(), userDefined);
 
         lifecycleExecutor.calculateForkedExecutions(mojoExecution, 
mavenReportExecutorRequest.getMavenSession());
 
diff --git 
a/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java 
b/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
index a4f4468..a6e491e 100644
--- a/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
+++ b/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
@@ -45,27 +45,30 @@ import org.apache.maven.reporting.MavenReportException;
  * @author Olivier Lamy
  */
 public class MavenReportExecution {
+    private final String goal;
+
+    private Plugin plugin;
+
     private MavenReport mavenReport;
 
     private ClassLoader classLoader;
 
-    private Plugin plugin;
+    private boolean userDefined;
 
-    private final String goal;
-
-    public MavenReportExecution(String goal, Plugin plugin, MavenReport 
mavenReport, ClassLoader classLoader) {
+    public MavenReportExecution(String goal, Plugin plugin, MavenReport 
mavenReport, ClassLoader classLoader, boolean userDefined) {
         this.goal = goal;
         this.setPlugin(plugin);
         this.mavenReport = mavenReport;
         this.classLoader = classLoader;
+        this.userDefined = userDefined;
     }
 
-    public MavenReportExecution(Plugin plugin, MavenReport mavenReport, 
ClassLoader classLoader) {
-        this(null, plugin, mavenReport, classLoader);
+    public MavenReportExecution(Plugin plugin, MavenReport mavenReport, 
ClassLoader classLoader, boolean userDefined) {
+        this(null, plugin, mavenReport, classLoader, userDefined);
     }
 
     public MavenReportExecution(MavenReport mavenReport) {
-        this(null, null, mavenReport, null);
+        this(null, null, mavenReport, null, false);
     }
 
     /**
@@ -115,4 +118,12 @@ public class MavenReportExecution {
     public String getGoal() {
         return goal;
     }
+
+    public boolean isUserDefined() {
+        return userDefined;
+    }
+
+    public void setUserDefined(boolean userDefined) {
+        this.userDefined = userDefined;
+    }
 }