[MNG-7799] Plugin validation may falsely report there are issues (#1136)

But to show no issue, as locality to be shown is not same as reported issues. --- https://issues.apache.org/jira/browse/MNG-7799
apache · Jun 1, 2023 · 8cc6b27 · 8cc6b27
1 parent 1ee2c01
commit 8cc6b27
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/...n-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java b/...n-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
@@ -161,12 +161,11 @@ private void reportSessionCollectedValidationIssues(MavenSession mavenSession) {
             return; // we were asked to not report anything OR reporting already happened inline
         }
         ConcurrentHashMap<String, PluginValidationIssues> issuesMap = pluginIssues(mavenSession.getRepositorySession());
-        if (!issuesMap.isEmpty()) {
-
-            EnumSet<IssueLocality> issueLocalitiesToReport = validationReportLevel == ValidationReportLevel.VERBOSE
-                    ? EnumSet.allOf(IssueLocality.class)
-                    : EnumSet.of(IssueLocality.INTERNAL);
+        EnumSet<IssueLocality> issueLocalitiesToReport = validationReportLevel == ValidationReportLevel.VERBOSE
+                ? EnumSet.allOf(IssueLocality.class)
+                : EnumSet.of(IssueLocality.INTERNAL);
 
+        if (hasAnythingToReport(issuesMap, issueLocalitiesToReport)) {
             logger.warn("");
             logger.warn("Plugin {} validation issues were detected in following plugin(s)", issueLocalitiesToReport);
             logger.warn("");
@@ -227,6 +226,16 @@ private void reportSessionCollectedValidationIssues(MavenSession mavenSession) {
         }
     }
 
+    private boolean hasAnythingToReport(
+            Map<String, PluginValidationIssues> issuesMap, EnumSet<IssueLocality> issueLocalitiesToReport) {
+        for (PluginValidationIssues issues : issuesMap.values()) {
+            if (hasAnythingToReport(issues, issueLocalitiesToReport)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private boolean hasAnythingToReport(PluginValidationIssues issues, EnumSet<IssueLocality> issueLocalitiesToReport) {
         for (IssueLocality issueLocality : issueLocalitiesToReport) {
             Set<String> pluginIssues = issues.pluginIssues.get(issueLocality);