Merge pull request #1984 from jenkinsci/use-id-from-result

[JENKINS-75438] Store parser ID directly in `AnalysisResult`

Author: uhafner

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AnalysisResult.java

@@ -1,5 +1,18 @@
 package io.jenkins.plugins.analysis.core.model; // NOPMD
 
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.collections.api.list.ImmutableList;
+import org.eclipse.collections.impl.factory.Lists;
+import org.eclipse.collections.impl.factory.Maps;
+
+import edu.hm.hafner.analysis.Report;
+import edu.hm.hafner.analysis.Severity;
+import edu.hm.hafner.echarts.Build;
+import edu.hm.hafner.util.VisibleForTesting;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.io.Serial;
 import java.io.Serializable;
 import java.lang.ref.WeakReference;
 import java.nio.file.Path;
@@ -14,18 +27,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.collections.api.list.ImmutableList;
-import org.eclipse.collections.impl.factory.Lists;
-import org.eclipse.collections.impl.factory.Maps;
-
-import edu.hm.hafner.analysis.Report;
-import edu.hm.hafner.analysis.Severity;
-import edu.hm.hafner.echarts.Build;
-import edu.hm.hafner.util.VisibleForTesting;
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;
 import hudson.model.Run;
 
@@ -50,15 +51,17 @@
  * @author Ullrich Hafner
  */
 @SuppressFBWarnings(value = "SE, DESERIALIZATION_GADGET", justification = "transient fields are restored using a Jenkins callback (or are checked for null)")
-@SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessiveClassLength", "PMD.GodClass", "checkstyle:ClassFanOutComplexity", "checkstyle:ClassDataAbstractionCoupling"})
+@SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessiveClassLength", "PMD.GodClass", "PMD.CyclomaticComplexity", "checkstyle:ClassFanOutComplexity", "checkstyle:ClassDataAbstractionCoupling"})
 public class AnalysisResult implements Serializable, StaticAnalysisRun {
+    @Serial
     private static final long serialVersionUID = 1110545450292087475L;
 
     private static final Pattern ISSUES_FILE_NAME = Pattern.compile("issues.xml", Pattern.LITERAL);
     private static final int NO_BUILD = -1;
     private static final String NO_REFERENCE = StringUtils.EMPTY;
 
     private final String id;
+    private /* almost final */ String parserId;
 
     private IssuesStatistics totals;
 
@@ -227,8 +230,10 @@ protected AnalysisResult(final Run<?, ?> owner, final String id, final DeltaRepo
         this.owner = owner;
 
         Report allIssues = report.getAllIssues();
+
         new ValidationUtilities().ensureValidId(id);
         this.id = id;
+        this.parserId = allIssues.getParserId();
 
         totals = report.getStatistics();
         this.sizePerOrigin = new HashMap<>(sizePerOrigin);
@@ -265,13 +270,17 @@ protected AnalysisResult(final Run<?, ?> owner, final String id, final DeltaRepo
      *
      * @return this
      */
+    @Serial
     protected Object readResolve() {
         if (qualityGateResult == null && qualityGateStatus != null) {
             qualityGateResult = new QualityGateResult(qualityGateStatus);
         }
         if (totals == null) {
             totals = new IssuesStatisticsBuilder().build();
         }
+        if (parserId == null) {
+            parserId = id; // fallback for old data
+        }
         return this;
     }
 
@@ -353,6 +362,10 @@ public String getId() {
         return id;
     }
 
+    String getParserId() {
+        return parserId;
+    }
+
     @Override
     public Run<?, ?> getOwner() {
         return owner;

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/ResultAction.java

@@ -43,6 +43,7 @@
 @SuppressWarnings("ClassFanOutComplexity")
 @SuppressFBWarnings(value = "SE", justification = "transient field owner ist restored using a Jenkins callback")
 public class ResultAction implements HealthReportingAction, LastBuildAction, RunAction2, StaplerProxy, Serializable {
+    @Serial
     private static final long serialVersionUID = 6683647181785654908L;
 
     private transient Run<?, ?> owner;
@@ -317,13 +318,17 @@ public StaticAnalysisLabelProvider getLabelProvider() {
     }
 
     private String getParserId() {
-        var originalReport = getResult().getIssues();
-        if (originalReport.hasParserId()) {
-            return originalReport.getParserId();
+        var parserId = getResult().getParserId();
+        if (isValidId(parserId)) {
+            return parserId;
         }
         return id;
     }
 
+    private boolean isValidId(final String parserId) {
+        return StringUtils.isNotBlank(parserId) && !"-".equals(parserId);
+    }
+
     /**
      * Returns the detail view for issues for all Stapler requests.
      *
@@ -335,7 +340,7 @@ public IssuesDetail getTarget() {
     }
 
     /**
-     * Empty method as workaround for Stapler bug: JavaScript method in target object is not found.
+     * Empty method as workaround for Stapler bug: JavaScript method in the target object is not found.
      *
      * @return unused string (since Firefox requires that Ajax calls return something)
      */