Skip to content

The Unified and Autonomous Development Platform

chore: Refactoring problem report

Robin Shen8ef1c7bd73a7
diff --git a/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java b/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java
index 23f27a3aef..7c8db9c6dd 100644
--- a/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java
+++ b/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java
@@ -1,21 +1,14 @@
package io.onedev.server.codequality;
-import io.onedev.commons.utils.PlanarRange;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import javax.annotation.Nullable;
import java.io.Serializable;
-import java.util.*;
-
-import static java.util.Comparator.comparingInt;
public class CodeProblem implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String NON_REPO_FILE_PREFIX = ":";
-
public enum Severity {
CRITICAL,
HIGH,
@@ -37,16 +30,13 @@ public class CodeProblem implements Serializable {
private final Severity severity;
- private final String blobPath;
-
- private final PlanarRange range;
+ private final ProblemTarget target;
private final String message;
- public CodeProblem(Severity severity, String blobPath, @Nullable PlanarRange range, String message) {
+ public CodeProblem(Severity severity, ProblemTarget target, String message) {
this.severity = severity;
- this.blobPath = blobPath;
- this.range = range;
+ this.target = target;
this.message = message;
}
@@ -54,23 +44,14 @@ public class CodeProblem implements Serializable {
return severity;
}
- public String getBlobPath() {
- return blobPath;
- }
-
- @Nullable
- public PlanarRange getRange() {
- return range;
+ public ProblemTarget getTarget() {
+ return target;
}
public String getMessage() {
return message;
}
- public CodeProblem normalizeRange(List<String> lines) {
- return new CodeProblem(severity, blobPath, range!=null?range.normalize(lines):null, message);
- }
-
@Override
public boolean equals(Object other) {
if (!(other instanceof CodeProblem))
@@ -80,8 +61,7 @@ public class CodeProblem implements Serializable {
CodeProblem otherProblem = (CodeProblem) other;
return new EqualsBuilder()
.append(severity, otherProblem.severity)
- .append(blobPath, otherProblem.blobPath)
- .append(range, otherProblem.range)
+ .append(target, otherProblem.target)
.append(message, otherProblem.message)
.isEquals();
}
@@ -90,33 +70,9 @@ public class CodeProblem implements Serializable {
public int hashCode() {
return new HashCodeBuilder(17, 37)
.append(severity)
- .append(blobPath)
- .append(range)
+ .append(target)
.append(message)
.toHashCode();
}
- public static Map<Integer, List<CodeProblem>> groupByLine(Collection<CodeProblem> problems) {
- Map<Integer, List<CodeProblem>> problemsByLine = new HashMap<>();
-
- for (CodeProblem problem: problems) {
- PlanarRange range = problem.getRange();
- if (range != null) {
- int line = range.getFromRow();
- List<CodeProblem> problemsAtLine = problemsByLine.get(line);
- if (problemsAtLine == null) {
- problemsAtLine = new ArrayList<>();
- problemsByLine.put(line, problemsAtLine);
- }
- problemsAtLine.add(problem);
- }
- }
-
- for (List<CodeProblem> value: problemsByLine.values()) {
- value.sort(comparingInt(o -> o.getSeverity().ordinal()));
- }
-
- return problemsByLine;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/codequality/ContainerTarget.java b/server-core/src/main/java/io/onedev/server/codequality/ContainerTarget.java
new file mode 100644
index 0000000000..c05028b48a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/codequality/ContainerTarget.java
@@ -0,0 +1,57 @@
+package io.onedev.server.codequality;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.wicket.Component;
+
+public class ContainerTarget extends ProblemTarget {
+
+ private static final long serialVersionUID = 1L;
+
+ public ContainerTarget(String name, String platform) {
+ super(new GroupKey(name, platform));
+ }
+
+ public static class GroupKey extends ProblemTarget.GroupKey {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String platform;
+
+ public GroupKey(String name, String platform) {
+ super(name);
+ this.platform = platform;
+ }
+
+ public String getPlatform() {
+ return platform;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new ContainerTargetKeyPanel(componentId, getName(), getPlatform());
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof GroupKey))
+ return false;
+ if (this == other)
+ return true;
+ var otherKey = (GroupKey) other;
+ return new EqualsBuilder()
+ .append(getName(), otherKey.getName())
+ .append(platform, otherKey.platform)
+ .isEquals();
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder(17, 37)
+ .append(getName())
+ .append(platform)
+ .toHashCode();
+ }
+
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/codequality/ContainerTargetKeyPanel.html b/server-core/src/main/java/io/onedev/server/codequality/ContainerTargetKeyPanel.html
new file mode 100644
index 0000000000..5aab8e841b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/codequality/ContainerTargetKeyPanel.html
@@ -0,0 +1,4 @@
+<wicket:panel>
+ <span wicket:id="name" class="text-break"></span>
+ <span wicket:id="platform" class="text-muted ml-2"></span>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/codequality/ContainerTargetKeyPanel.java b/server-core/src/main/java/io/onedev/server/codequality/ContainerTargetKeyPanel.java
new file mode 100644
index 0000000000..ab86da1e84
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/codequality/ContainerTargetKeyPanel.java
@@ -0,0 +1,25 @@
+package io.onedev.server.codequality;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+
+public class ContainerTargetKeyPanel extends Panel {
+
+ private final String name;
+
+ private final String platform;
+
+ public ContainerTargetKeyPanel(String id, String name, String platform) {
+ super(id);
+ this.name = name;
+ this.platform = platform;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("name", name));
+ add(new Label("platform", platform));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/codequality/GeneralTarget.java b/server-core/src/main/java/io/onedev/server/codequality/GeneralTarget.java
new file mode 100644
index 0000000000..e96ff67414
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/codequality/GeneralTarget.java
@@ -0,0 +1,50 @@
+package io.onedev.server.codequality;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+
+public class GeneralTarget extends ProblemTarget {
+
+ private static final long serialVersionUID = 1L;
+
+ public GeneralTarget(String name) {
+ super(new GroupKey(name));
+ }
+
+ public static class GroupKey extends ProblemTarget.GroupKey {
+
+ private static final long serialVersionUID = 1L;
+
+ public GroupKey(String name) {
+ super(name);
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, getName()).add(AttributeAppender.append("class", "text-break"));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof GroupKey))
+ return false;
+ if (this == other)
+ return true;
+ var otherKey = (GroupKey) other;
+ return new EqualsBuilder()
+ .append(getName(), otherKey.getName())
+ .isEquals();
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder(17, 37)
+ .append(getName())
+ .toHashCode();
+ }
+
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/codequality/ProblemTarget.java b/server-core/src/main/java/io/onedev/server/codequality/ProblemTarget.java
new file mode 100644
index 0000000000..6d1669fa88
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/codequality/ProblemTarget.java
@@ -0,0 +1,40 @@
+package io.onedev.server.codequality;
+
+import io.onedev.server.model.Group;
+import org.apache.wicket.Component;
+
+import java.io.Serializable;
+
+public abstract class ProblemTarget implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final GroupKey groupKey;
+
+ public ProblemTarget(GroupKey groupKey) {
+ this.groupKey = groupKey;
+ }
+
+ public GroupKey getGroupKey() {
+ return groupKey;
+ }
+
+ public static abstract class GroupKey implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ public GroupKey(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public abstract Component render(String componentId);
+
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/codequality/RepoTarget.java b/server-core/src/main/java/io/onedev/server/codequality/RepoTarget.java
new file mode 100644
index 0000000000..95806a1ce7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/codequality/RepoTarget.java
@@ -0,0 +1,88 @@
+package io.onedev.server.codequality;
+
+import io.onedev.commons.utils.PlanarRange;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+
+import javax.annotation.Nullable;
+import java.util.*;
+
+import static java.util.Comparator.comparingInt;
+
+public class RepoTarget extends ProblemTarget {
+
+ private static final long serialVersionUID = 1L;
+
+ private final PlanarRange location;
+
+ public RepoTarget(String name, @Nullable PlanarRange location) {
+ super(new GroupKey(name));
+ this.location = location;
+ }
+
+ @Nullable
+ public PlanarRange getLocation() {
+ return location;
+ }
+
+ public static Map<Integer, List<CodeProblem>> groupByLine(Collection<CodeProblem> problems, List<String> lines) {
+ Map<Integer, List<CodeProblem>> problemsByLine = new HashMap<>();
+
+ for (CodeProblem problem: problems) {
+ if (problem.getTarget() instanceof RepoTarget) {
+ RepoTarget repoTarget = (RepoTarget) problem.getTarget();
+ if (repoTarget.getLocation() != null) {
+ repoTarget = new RepoTarget(repoTarget.getGroupKey().getName(), repoTarget.getLocation().normalize(lines));
+ problem = new CodeProblem(problem.getSeverity(), repoTarget, problem.getMessage());
+ int line = repoTarget.getLocation().getFromRow();
+ var problemsAtLine = problemsByLine.computeIfAbsent(line, k -> new ArrayList<>());
+ problemsAtLine.add(problem);
+ }
+ }
+ }
+
+ for (List<CodeProblem> value: problemsByLine.values()) {
+ value.sort(comparingInt(o -> o.getSeverity().ordinal()));
+ }
+
+ return problemsByLine;
+ }
+
+ public static class GroupKey extends ProblemTarget.GroupKey {
+
+ private static final long serialVersionUID = 1L;
+
+ public GroupKey(String name) {
+ super(name);
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, getName()).add(AttributeAppender.append("class", "text-break"));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof GroupKey))
+ return false;
+ if (this == other)
+ return true;
+ var otherKey = (GroupKey) other;
+ return new EqualsBuilder()
+ .append(getName(), otherKey.getName())
+ .isEquals();
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder(17, 37)
+ .append(getName())
+ .toHashCode();
+ }
+
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 1db8135a4d..f63b5d1c59 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.diff.blob.text;
+import static io.onedev.server.codequality.RepoTarget.groupByLine;
import static io.onedev.server.util.diff.DiffRenderer.toHtml;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -12,6 +13,7 @@ import java.util.Map;
import javax.annotation.Nullable;
+import io.onedev.server.codequality.RepoTarget;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -100,20 +102,17 @@ public class BlobTextDiffPanel extends Panel {
Map<Integer, List<CodeCommentInfo>> newCommentsByLine =
CodeCommentInfo.groupByLine(change.getAnnotationSupport().getNewComments());
- List<CodeProblem> oldProblems = new ArrayList<>();
- for (CodeProblem problem: change.getAnnotationSupport().getOldProblems())
- oldProblems.add(problem.normalizeRange(change.getOldText().getLines()));
- Map<Integer, List<CodeProblem>> oldProblemsByLine = CodeProblem.groupByLine(oldProblems);
-
- List<CodeProblem> newProblems = new ArrayList<>();
- for (CodeProblem problem: change.getAnnotationSupport().getNewProblems())
- newProblems.add(problem.normalizeRange(change.getNewText().getLines()));
- Map<Integer, List<CodeProblem>> newProblemsByLine = CodeProblem.groupByLine(newProblems);
+ Map<Integer, List<CodeProblem>> oldProblems = groupByLine(
+ change.getAnnotationSupport().getOldProblems(),
+ change.getOldText().getLines());
+ Map<Integer, List<CodeProblem>> newProblems = groupByLine(
+ change.getAnnotationSupport().getNewProblems(),
+ change.getNewText().getLines());
return new DiffAnnotationInfo(
- new AnnotationInfo(oldCommentsByLine, oldProblemsByLine,
+ new AnnotationInfo(oldCommentsByLine, oldProblems,
change.getAnnotationSupport().getOldCoverages()),
- new AnnotationInfo(newCommentsByLine, newProblemsByLine,
+ new AnnotationInfo(newCommentsByLine, newProblems,
change.getAnnotationSupport().getNewCoverages()));
} else {
return new DiffAnnotationInfo(
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
index 77161d4d57..cc9c817858 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
@@ -429,7 +429,7 @@ onedev.server.blobTextDiff = {
if (oldProblems.hasOwnProperty(line)) {
let oldProblemsOnLine = oldProblems[line];
for (var i in oldProblemsOnLine)
- oldProblemsOnLine[i].range.leftSide = true;
+ oldProblemsOnLine[i].target.location.leftSide = true;
onedev.server.blobTextDiff.addProblemInfo($container, true, line, oldProblems[line]);
}
}
@@ -439,7 +439,7 @@ onedev.server.blobTextDiff = {
if (newProblems.hasOwnProperty(line)) {
let newProblemsOnLine = newProblems[line];
for (var i in newProblemsOnLine)
- newProblemsOnLine[i].range.leftSide = false;
+ newProblemsOnLine[i].target.location.leftSide = false;
onedev.server.blobTextDiff.addProblemInfo($container, false, line, newProblems[line]);
}
}
@@ -452,7 +452,7 @@ onedev.server.blobTextDiff = {
if (oldComments.hasOwnProperty(line)) {
let oldCommentsOnLine = oldComments[line];
for (var i in oldCommentsOnLine)
- oldCommentsOnLine[i].range.leftSide = true;
+ oldCommentsOnLine[i].target.location.leftSide = true;
onedev.server.blobTextDiff.addCommentIndicator($container, true, line, oldCommentsOnLine);
}
}
@@ -461,7 +461,7 @@ onedev.server.blobTextDiff = {
if (newComments.hasOwnProperty(line)) {
let newCommentsOnLine = newComments[line];
for (var i in newCommentsOnLine)
- newCommentsOnLine[i].range.leftSide = false;
+ newCommentsOnLine[i].target.location.leftSide = false;
onedev.server.blobTextDiff.addCommentIndicator($container, false, line, newCommentsOnLine);
}
}
@@ -1065,7 +1065,7 @@ onedev.server.blobTextDiff = {
let markRanges = [];
for (var i in problems)
- markRanges.push(problems[i].range);
+ markRanges.push(problems[i].target.location);
$trigger.mouseover(function() {
onedev.server.blobTextDiff.mark($container, markRanges);
@@ -1090,7 +1090,7 @@ onedev.server.blobTextDiff = {
var $currentPopover = $(`.problem-popover.${oldOrNew}[data-line='${line}']`);
$(".popover").not($currentPopover).popover("hide");
$currentPopover.find(".problem-content").mouseover(function() {
- onedev.server.blobTextDiff.mark($container, problems[$(this).index()].range);
+ onedev.server.blobTextDiff.mark($container, problems[$(this).index()].target.location);
}).mouseout(function() {
onedev.server.blobTextDiff.restoreMark($container);
}).each(function() {
@@ -1098,7 +1098,7 @@ onedev.server.blobTextDiff = {
$(this).children(".add-comment").click(function() {
if (onedev.server.blobTextDiff.confirmUnsavedChanges($container)) {
$currentPopover.popover("hide");
- var range = problem.range;
+ var range = problem.target.location;
$container.data("callback")("addComment", leftSide, range.fromRow, range.fromColumn,
range.toRow, range.toColumn);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 2c4c656fd8..ab41c01b19 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -9,10 +9,13 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CoverageStatus;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.entitymanager.PendingSuggestionApplyManager;
import io.onedev.server.event.project.CommitIndexed;
import io.onedev.server.git.BlobChange;
@@ -30,8 +33,6 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Pair;
import io.onedev.server.util.PathComparator;
import io.onedev.server.util.diff.WhitespaceOption;
-import io.onedev.commons.utils.match.Matcher;
-import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -1136,8 +1137,11 @@ public abstract class RevisionDiffPanel extends Panel {
oldProblems = new HashSet<>();
if (getOldBlobIdent().path != null) {
for (CodeProblem problem: annotationSupport.getOldProblems(getOldBlobIdent().path)) {
- if (problem.getRange() != null && isVisible(new DiffPlanarRange(true, problem.getRange())))
- oldProblems.add(problem);
+ if (problem.getTarget() instanceof RepoTarget) {
+ var repoTarget = (RepoTarget) problem.getTarget();
+ if (repoTarget.getLocation() != null && isVisible(new DiffPlanarRange(true, repoTarget.getLocation())))
+ oldProblems.add(problem);
+ }
}
}
}
@@ -1152,8 +1156,11 @@ public abstract class RevisionDiffPanel extends Panel {
newProblems = new HashSet<>();
if (getNewBlobIdent().path != null) {
for (CodeProblem problem: annotationSupport.getNewProblems(getNewBlobIdent().path)) {
- if (problem.getRange() != null && isVisible(new DiffPlanarRange(false, problem.getRange())))
- newProblems.add(problem);
+ if (problem.getTarget() instanceof RepoTarget) {
+ var repoTarget = (RepoTarget) problem.getTarget();
+ if (repoTarget.getLocation() != null && isVisible(new DiffPlanarRange(false, repoTarget.getLocation())))
+ newProblems.add(problem);
+ }
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index 84f0b9c47b..2820750212 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -11,10 +11,7 @@ import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.ProjectAttachmentSupport;
-import io.onedev.server.codequality.CodeProblem;
-import io.onedev.server.codequality.CodeProblemContribution;
-import io.onedev.server.codequality.CoverageStatus;
-import io.onedev.server.codequality.LineCoverageContribution;
+import io.onedev.server.codequality.*;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
@@ -140,24 +137,23 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
CodeCommentManager codeCommentManager = OneDev.getInstance(CodeCommentManager.class);
Map<CodeComment, PlanarRange> comments = codeCommentManager.queryInHistory(project, commitId, path);
- Set<CodeProblem> problems = new HashSet<>();
+ var problems = new HashSet<CodeProblem>();
Map<Integer, CoverageStatus> coverages = new HashMap<>();
-
- List<String> lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();
+ var lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- for (Build build: buildManager.query(project, commitId, null, null, null, null, new HashMap<>(), null)) {
- for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {
- for (CodeProblem problem: contribution.getCodeProblems(build, path, context.getProblemReport()))
- problems.add(problem.normalizeRange(lines));
- }
- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
+ for (var build: buildManager.query(project, commitId, null, null, null, null, new HashMap<>(), null)) {
+ for (var contribution: OneDev.getExtensions(CodeProblemContribution.class))
+ problems.addAll(contribution.getCodeProblems(build, path, context.getProblemReport()));
+ for (var contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
contribution.getLineCoverages(build, path, context.getCoverageReport()).forEach((key, value)->{
- coverages.merge(key, value, (v1, v2)->v1.mergeWith(v2));
+ coverages.merge(key, value, CoverageStatus::mergeWith);
});
}
}
- return new AnnotationInfo(CodeCommentInfo.groupByLine(comments), CodeProblem.groupByLine(problems), coverages);
+ return new AnnotationInfo(
+ CodeCommentInfo.groupByLine(comments),
+ RepoTarget.groupByLine(problems, lines), coverages);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
index 6921d8ac1e..08089d5f1e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
@@ -248,7 +248,7 @@ onedev.server.sourceView = {
var markRanges = [];
for (var i in problems)
- markRanges.push(problems[i].range);
+ markRanges.push(problems[i].target.location);
var severityInfo = onedev.server.codeProblem.getSeverityInfo(problems);
@@ -278,7 +278,7 @@ onedev.server.sourceView = {
var $currentPopover = $(".problem-popover[data-line='" + line + "']");
$(".popover").not($currentPopover).popover("hide");
$currentPopover.find(".problem-content").mouseover(function() {
- onedev.server.codemirror.mark(cm, problems[$(this).index()].range);
+ onedev.server.codemirror.mark(cm, problems[$(this).index()].target.location);
}).mouseout(function() {
onedev.server.sourceView.restoreMark();
}).each(function() {
@@ -286,7 +286,7 @@ onedev.server.sourceView = {
$(this).children(".add-comment").click(function() {
if (onedev.server.sourceView.confirmUnsavedChanges()) {
$currentPopover.popover("hide");
- var range = problem.range;
+ var range = problem.target.location;
callback("addComment", range.fromRow, range.fromColumn,
range.toRow, range.toColumn);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index b9b2186b5c..ece2ea0e83 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -4,10 +4,7 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
-import io.onedev.server.codequality.CodeProblem;
-import io.onedev.server.codequality.CodeProblemContribution;
-import io.onedev.server.codequality.CoverageStatus;
-import io.onedev.server.codequality.LineCoverageContribution;
+import io.onedev.server.codequality.*;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
@@ -943,11 +940,14 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
for (CodeProblem problem: contribution.getCodeProblems(build, blobPath, null)) {
if (!buildCommitId.equals(getComparisonBase())) {
Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId, getComparisonBase(), blobPath);
- if (problem.getRange() != null) {
- PlanarRange range = DiffUtils.mapRange(lineMapping, problem.getRange());
- if (range != null) {
- problems.add(new CodeProblem(problem.getSeverity(),
- problem.getBlobPath(), range, problem.getMessage()));
+ if (problem.getTarget() instanceof RepoTarget) {
+ RepoTarget repoTarget = (RepoTarget) problem.getTarget();
+ if (repoTarget.getLocation() != null) {
+ PlanarRange location = DiffUtils.mapRange(lineMapping, repoTarget.getLocation());
+ if (location != null) {
+ repoTarget = new RepoTarget(repoTarget.getGroupKey().getName(), location);
+ problems.add(new CodeProblem(problem.getSeverity(), repoTarget, problem.getMessage()));
+ }
}
}
} else {
@@ -976,11 +976,14 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
if (!state.newCommitHash.equals(buildCommitId.name())) {
Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId,
ObjectId.fromString(state.newCommitHash), blobPath);
- if (problem.getRange() != null) {
- PlanarRange range = DiffUtils.mapRange(lineMapping, problem.getRange());
- if (range != null) {
- problems.add(new CodeProblem(problem.getSeverity(),
- problem.getBlobPath(), range, problem.getMessage()));
+ if (problem.getTarget() instanceof RepoTarget) {
+ RepoTarget repoTarget = (RepoTarget) problem.getTarget();
+ if (repoTarget.getLocation() != null) {
+ PlanarRange location = DiffUtils.mapRange(lineMapping, repoTarget.getLocation());
+ if (location != null) {
+ repoTarget = new RepoTarget(repoTarget.getGroupKey().getName(), location);
+ problems.add(new CodeProblem(problem.getSeverity(), repoTarget, problem.getMessage()));
+ }
}
}
} else {
diff --git a/server-ee b/server-ee
index 510daa7e95..b2e528589e 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 510daa7e952f9b9e1d02635c6222f37431e445f6
+Subproject commit b2e528589ecd62b7c407709c10e16a6ef7764a62
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
index 2563691a41..9731ef127f 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
@@ -11,6 +11,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.problem.PublishProblemReportStep;
import io.onedev.server.util.XmlUtils;
@@ -86,15 +87,15 @@ public class PublishCheckstyleReportStep extends PublishProblemReportStep {
int lineNo = Integer.parseInt(violationElement.attributeValue("line"))-1;
String column = violationElement.attributeValue("column");
- PlanarRange range;
+ PlanarRange location;
if (column != null) {
int columnNo = Integer.parseInt(column)-1;
- range = new PlanarRange(lineNo, columnNo, lineNo, -1, TAB_WIDTH);
+ location = new PlanarRange(lineNo, columnNo, lineNo, -1, TAB_WIDTH);
} else {
- range = new PlanarRange(lineNo, -1, lineNo, -1, TAB_WIDTH);
+ location = new PlanarRange(lineNo, -1, lineNo, -1, TAB_WIDTH);
}
- problems.add(new CodeProblem(severity, blobPath, range, message));
+ problems.add(new CodeProblem(severity, new RepoTarget(blobPath, location), message));
}
} else {
logger.warning("Unable to find blob path for file: " + filePath);
diff --git a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
index a32ae8b303..fcc3a77dc8 100644
--- a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
+++ b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
@@ -12,6 +12,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.problem.PublishProblemReportStep;
@@ -83,10 +84,10 @@ public class PublishCPDReportStep extends PublishProblemReportStep {
int endLine = Integer.parseInt(fileElement.attributeValue("endline"));
int beginColumn = Integer.parseInt(fileElement.attributeValue("column"));
int endColumn = Integer.parseInt(fileElement.attributeValue("endcolumn"));
- PlanarRange range = new PlanarRange(beginLine-1, beginColumn-1, endLine-1, endColumn);
+ PlanarRange location = new PlanarRange(beginLine-1, beginColumn-1, endLine-1, endColumn);
CodeDuplication duplication = new CodeDuplication();
duplication.blobPath = blobPath;
- duplication.range = range;
+ duplication.location = location;
duplications.add(duplication);
} else {
logger.warning("Unable to find blob path for file: " + filePath);
@@ -105,7 +106,7 @@ public class PublishCPDReportStep extends PublishProblemReportStep {
ProjectBlobPage.State state = new ProjectBlobPage.State();
state.blobIdent = new BlobIdent();
state.problemReport = getReportName();
- state.position = BlobRenderer.getSourcePosition(duplicateWith.range);
+ state.position = BlobRenderer.getSourcePosition(duplicateWith.location);
params.set(0, build.getCommitHash());
List<String> pathSegments = Splitter.on("/").splitToList(duplicateWith.blobPath);
@@ -118,10 +119,12 @@ public class PublishCPDReportStep extends PublishProblemReportStep {
String url = "/" + build.getProject().getPath() + "/~files/" + paramsEncoder.encodePageParameters(params);
String message = String.format(""
+ "Duplicated with '%s' at <a href='%s'>line %s - %s</a>",
- HtmlEscape.escapeHtml5(duplicateWith.blobPath), url, duplicateWith.range.getFromRow()+1,
- duplicateWith.range.getToRow()+1);
- CodeProblem problem = new CodeProblem(Severity.LOW, duplication.blobPath,
- duplication.range, message);
+ HtmlEscape.escapeHtml5(duplicateWith.blobPath), url, duplicateWith.location.getFromRow()+1,
+ duplicateWith.location.getToRow()+1);
+ CodeProblem problem = new CodeProblem(
+ Severity.LOW,
+ new RepoTarget(duplication.blobPath, duplication.location),
+ message);
problems.add(problem);
}
}
@@ -139,7 +142,7 @@ public class PublishCPDReportStep extends PublishProblemReportStep {
String blobPath;
- PlanarRange range;
+ PlanarRange location;
}
}
diff --git a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java
index 674d590fe9..6eb4c1f607 100644
--- a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java
+++ b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java
@@ -11,6 +11,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.problem.PublishProblemReportStep;
import io.onedev.server.util.XmlUtils;
@@ -78,7 +79,7 @@ public class PublishPMDReportStep extends PublishProblemReportStep {
int endLine = Integer.parseInt(violationElement.attributeValue("endline"));
int beginColumn = Integer.parseInt(violationElement.attributeValue("begincolumn"));
int endColumn = Integer.parseInt(violationElement.attributeValue("endcolumn"));
- PlanarRange range = new PlanarRange(beginLine-1, beginColumn-1, endLine-1, endColumn, TAB_WIDTH);
+ PlanarRange location = new PlanarRange(beginLine-1, beginColumn-1, endLine-1, endColumn, TAB_WIDTH);
String type = violationElement.attributeValue("rule");
@@ -92,7 +93,7 @@ public class PublishPMDReportStep extends PublishProblemReportStep {
severity = Severity.LOW;
String message = type + ": " + HtmlEscape.escapeHtml5(violationElement.getText());
- problems.add(new CodeProblem(severity, blobPath, range, message));
+ problems.add(new CodeProblem(severity, new RepoTarget(blobPath, location), message));
}
} else {
logger.warning("Unable to find blob path for file: " + filePath);
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemFile.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemFile.java
deleted file mode 100644
index e18d18f740..0000000000
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemFile.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package io.onedev.server.plugin.report.problem;
-
-import io.onedev.server.codequality.CodeProblem;
-
-import javax.annotation.Nullable;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import static io.onedev.server.codequality.CodeProblem.NON_REPO_FILE_PREFIX;
-import static org.apache.commons.lang3.StringUtils.substringAfterLast;
-import static org.apache.commons.lang3.StringUtils.substringBeforeLast;
-
-public class ProblemFile implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String blobPath;
-
- private final String moreInfo;
-
- private final boolean inRepo;
-
- private final Collection<CodeProblem> problems = new ArrayList<>();
-
- public ProblemFile(String blobPath) {
- if (blobPath.startsWith(NON_REPO_FILE_PREFIX)) {
- blobPath = blobPath.substring(NON_REPO_FILE_PREFIX.length());
- inRepo = false;
- } else {
- inRepo = true;
- }
- if (blobPath.endsWith(")") && blobPath.contains("(")) {
- moreInfo = substringBeforeLast(substringAfterLast(blobPath, "("), ")");
- blobPath = substringBeforeLast(blobPath, "(").trim();
- } else {
- moreInfo = null;
- }
- this.blobPath = blobPath;
- }
-
- public String getBlobPath() {
- return blobPath;
- }
-
- @Nullable
- public String getMoreInfo() {
- return moreInfo;
- }
-
- public boolean isInRepo() {
- return inRepo;
- }
-
- public Collection<CodeProblem> getProblems() {
- return problems;
- }
-
- @Override
- public String toString() {
- var builder = new StringBuilder();
- if (!inRepo)
- builder.append(NON_REPO_FILE_PREFIX);
- builder.append(blobPath);
- if (moreInfo != null)
- builder.append(" (").append(moreInfo).append(")");
- return builder.toString();
- }
-
-}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemGroup.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemGroup.java
new file mode 100644
index 0000000000..ca8ac4384e
--- /dev/null
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemGroup.java
@@ -0,0 +1,30 @@
+package io.onedev.server.plugin.report.problem;
+
+import io.onedev.server.codequality.CodeProblem;
+import io.onedev.server.codequality.ProblemTarget;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class ProblemGroup implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final ProblemTarget.GroupKey key;
+
+ private final Collection<CodeProblem> problems = new ArrayList<>();
+
+ public ProblemGroup(ProblemTarget.GroupKey key) {
+ this.key = key;
+ }
+
+ public ProblemTarget.GroupKey getKey() {
+ return key;
+ }
+
+ public Collection<CodeProblem> getProblems() {
+ return problems;
+ }
+
+}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.java
index 6b4673b52f..0188365ca9 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.java
@@ -1,6 +1,7 @@
package io.onedev.server.plugin.report.problem;
import io.onedev.server.codequality.CodeProblem;
+import io.onedev.server.codequality.ProblemTarget;
import io.onedev.server.model.Build;
import org.apache.commons.lang3.SerializationUtils;
@@ -19,7 +20,7 @@ public class ProblemReport implements Serializable {
private final Collection<CodeProblem> problems;
- private transient Collection<ProblemFile> problemFiles;
+ private transient Collection<ProblemGroup> problemGroups;
public ProblemReport(Collection<CodeProblem> problems) {
this.problems = problems;
@@ -29,20 +30,20 @@ public class ProblemReport implements Serializable {
return problems;
}
- public Collection<ProblemFile> getProblemFiles() {
- if (problemFiles == null) {
- Map<String, ProblemFile> map = new LinkedHashMap<>();
+ public Collection<ProblemGroup> getProblemGroups() {
+ if (problemGroups == null) {
+ Map<ProblemTarget.GroupKey, ProblemGroup> map = new LinkedHashMap<>();
for (CodeProblem problem: problems) {
- ProblemFile file = map.get(problem.getBlobPath());
- if (file == null) {
- file = new ProblemFile(problem.getBlobPath());
- map.put(problem.getBlobPath(), file);
+ ProblemGroup group = map.get(problem.getTarget().getGroupKey());
+ if (group == null) {
+ group = new ProblemGroup(problem.getTarget().getGroupKey());
+ map.put(problem.getTarget().getGroupKey(), group);
}
- file.getProblems().add(problem);
+ group.getProblems().add(problem);
}
- problemFiles = map.values();
+ problemGroups = map.values();
}
- return problemFiles;
+ return problemGroups;
}
public static ProblemReport readFrom(File reportDir) {
@@ -71,30 +72,29 @@ public class ProblemReport implements Serializable {
return ProblemReport.class.getName() + ":" + projectId + ":" + buildNumber;
}
- public Comparator<ProblemFile> newProblemFileComparator() {
- Map<String, Long> criticalSeverityCounts = new HashMap<>();
- Map<String, Long> highSeverityCounts = new HashMap<>();
- Map<String, Long> mediumSeverityCounts = new HashMap<>();
- Map<String, Long> unknownSeverityCounts = new HashMap<>();
- Map<String, Long> lowSeverityCounts = new HashMap<>();
+ public Comparator<ProblemGroup> newProblemGroupComparator() {
+ Map<ProblemTarget.GroupKey, Long> criticalSeverityCounts = new HashMap<>();
+ Map<ProblemTarget.GroupKey, Long> highSeverityCounts = new HashMap<>();
+ Map<ProblemTarget.GroupKey, Long> mediumSeverityCounts = new HashMap<>();
+ Map<ProblemTarget.GroupKey, Long> lowSeverityCounts = new HashMap<>();
- for (var problemFile: problemFiles) {
- criticalSeverityCounts.put(problemFile.getBlobPath(), problemFile.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.CRITICAL).count());
- highSeverityCounts.put(problemFile.getBlobPath(), problemFile.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.HIGH).count());
- mediumSeverityCounts.put(problemFile.getBlobPath(), problemFile.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.MEDIUM).count());
- lowSeverityCounts.put(problemFile.getBlobPath(), problemFile.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.LOW).count());
+ for (var problemGroup: problemGroups) {
+ criticalSeverityCounts.put(problemGroup.getKey(), problemGroup.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.CRITICAL).count());
+ highSeverityCounts.put(problemGroup.getKey(), problemGroup.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.HIGH).count());
+ mediumSeverityCounts.put(problemGroup.getKey(), problemGroup.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.MEDIUM).count());
+ lowSeverityCounts.put(problemGroup.getKey(), problemGroup.getProblems().stream().filter(it -> it.getSeverity() == CodeProblem.Severity.LOW).count());
}
return new Comparator<>() {
- private int compareSeverityCount(Map<String, Long> severityCounts, ProblemFile file1, ProblemFile file2) {
- var severityCount1 = severityCounts.getOrDefault(file1.getBlobPath(), 0L);
- var severityCount2 = severityCounts.getOrDefault(file2.getBlobPath(), 0L);
+ private int compareSeverityCount(Map<ProblemTarget.GroupKey, Long> severityCounts, ProblemGroup group1, ProblemGroup group2) {
+ var severityCount1 = severityCounts.getOrDefault(group1.getKey(), 0L);
+ var severityCount2 = severityCounts.getOrDefault(group2.getKey(), 0L);
return severityCount2.compareTo(severityCount1);
}
@Override
- public int compare(ProblemFile o1, ProblemFile o2) {
+ public int compare(ProblemGroup o1, ProblemGroup o2) {
var order = compareSeverityCount(criticalSeverityCounts, o1, o2);
if (order != 0)
return order;
@@ -102,9 +102,6 @@ public class ProblemReport implements Serializable {
if (order != 0)
return order;
order = compareSeverityCount(mediumSeverityCounts, o1, o2);
- if (order != 0)
- return order;
- order = compareSeverityCount(unknownSeverityCounts, o1, o2);
if (order != 0)
return order;
return compareSeverityCount(lowSeverityCounts, o1, o2);
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.html b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.html
index 9d6251ccad..fa7bb2e76a 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.html
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.html
@@ -4,7 +4,7 @@
<form wicket:id="form">
<div class="clearable-wrapper flex-grow-1">
<div class="input-group">
- <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter files">
+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter targets">
<span class="input-group-append">
<button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
</span>
@@ -12,16 +12,15 @@
</div>
<div wicket:id="feedback" class="mt-3"></div>
</form>
- <table wicket:id="filesContainer" class="files table">
+ <table wicket:id="groupsContainer" class="groups table">
<tbody>
- <tr wicket:id="files">
+ <tr wicket:id="groups">
<td>
- <div class="file d-flex flex-wrap align-items-center">
+ <div class="group d-flex flex-wrap align-items-center">
<a wicket:id="toggle" class="name mr-2"><wicket:svg href="arrow" class="icon"/>
- <span wicket:id="label" class="text-break"></span>
- <span wicket:id="moreInfo" class="ml-1 text-muted"></span>
+ <span wicket:id="key"></span>
</a>
- <a wicket:id="view" title="Show problems in file view" class="mr-auto"><wicket:svg href="file" class="icon"/></a>
+ <a wicket:id="view" title="View source" class="mr-auto"><wicket:svg href="file" class="icon"/></a>
</div>
<wicket:enclosure child="problems">
<div class="problems mt-2">
@@ -32,7 +31,7 @@
<span wicket:id="severity" class="severity badge badge-sm mr-2"></span>
<span wicket:id="message" class="message text-break"></span>
</div>
- <a wicket:id="range" class="range ml-3 text-nowrap"><span wicket:id="label"></span></a>
+ <a wicket:id="location" class="range ml-3 text-nowrap"><span wicket:id="label"></span></a>
</div>
</div>
</div>
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
index 5b1399a302..3b3b60fdd1 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
@@ -12,6 +12,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.ProblemTarget;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.exception.ExceptionUtils;
@@ -68,23 +70,23 @@ import static java.util.stream.Collectors.toList;
@SuppressWarnings("serial")
public class ProblemReportPage extends BuildReportPage {
- private static final String PARAM_FILE = "file";
+ private static final String PARAM_NAME = "name";
protected static final int MAX_PROBLEMS_TO_DISPLAY = 200;
- private String file;
+ private String keyName;
- private Optional<PatternSet> filePatterns;
+ private Optional<PatternSet> targetNamePatterns;
private Form<?> form;
private Component feedback;
- private WebMarkupContainer filesContainer;
+ private WebMarkupContainer groupsContainer;
- private List<String> filePaths;
+ private List<String> keyNames;
- private Collection<String> expandedFiles = new HashSet<>();
+ private Collection<ProblemTarget.GroupKey> expandedKeys = new HashSet<>();
private final IModel<ProblemReport> reportModel = new LoadableDetachableModel<ProblemReport>() {
@@ -94,7 +96,12 @@ public class ProblemReportPage extends BuildReportPage {
Long projectId = getProject().getId();
Long buildNumber = getBuild().getNumber();
- return OneDev.getInstance(ProjectManager.class).runOnActiveServer(projectId, new GetProblemReport(projectId, buildNumber, getReportName()));
+ var report = OneDev.getInstance(ProjectManager.class).runOnActiveServer(projectId, new GetProblemReport(projectId, buildNumber, getReportName()));
+ for (var problem: report.getProblems()) {
+ if (problem.getTarget() == null)
+ return null;
+ }
+ return report;
} catch (Exception e) {
if (ExceptionUtils.find(e, SerializationException.class) != null)
return null;
@@ -108,7 +115,7 @@ public class ProblemReportPage extends BuildReportPage {
public ProblemReportPage(PageParameters params) {
super(params);
- file = params.get(PARAM_FILE).toOptionalString();
+ keyName = params.get(PARAM_NAME).toOptionalString();
}
@Override
@@ -117,25 +124,26 @@ public class ProblemReportPage extends BuildReportPage {
if (getReport() != null) {
var fragment = new Fragment("report", "validFrag", this);
- filePaths = getReport().getProblemFiles().stream()
- .map(it->it.getBlobPath())
+ keyNames = getReport().getProblemGroups().stream()
+ .map(it->it.getKey().getName())
+ .distinct()
.collect(toList());
form = new Form<Void>("form");
- TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "file"));
+ TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "keyName"));
input.add(new PatternSetAssistBehavior() {
@Override
protected List<InputSuggestion> suggest(String matchWith) {
- return SuggestionUtils.suggestByPattern(filePaths, matchWith);
+ return SuggestionUtils.suggestByPattern(keyNames, matchWith);
}
@Override
protected List<String> getHints(TerminalExpect terminalExpect) {
return Lists.newArrayList(
- "Path containing spaces or starting with dash needs to be quoted",
- "Use '*' or '?' for wildcard match. Prefix with '-' to exclude"
+ "Target containing spaces or starting with dash needs to be quoted",
+ "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude"
);
}
@@ -149,7 +157,7 @@ public class ProblemReportPage extends BuildReportPage {
pushState(target);
parseFilePatterns();
target.add(feedback);
- target.add(filesContainer);
+ target.add(groupsContainer);
}
});
@@ -171,7 +179,7 @@ public class ProblemReportPage extends BuildReportPage {
pushState(target);
parseFilePatterns();
target.add(feedback);
- target.add(filesContainer);
+ target.add(groupsContainer);
}
});
@@ -180,28 +188,28 @@ public class ProblemReportPage extends BuildReportPage {
parseFilePatterns();
- filesContainer = new WebMarkupContainer("filesContainer");
- filesContainer.setOutputMarkupId(true);
- fragment.add(filesContainer);
+ groupsContainer = new WebMarkupContainer("groupsContainer");
+ groupsContainer.setOutputMarkupId(true);
+ fragment.add(groupsContainer);
- PageableListView<ProblemFile> filesView;
- filesContainer.add(filesView = new PageableListView<>("files",
- new LoadableDetachableModel<List<ProblemFile>>() {
+ PageableListView<ProblemGroup> filesView;
+ groupsContainer.add(filesView = new PageableListView<>("groups",
+ new LoadableDetachableModel<List<ProblemGroup>>() {
@Override
- protected List<ProblemFile> load() {
- if (filePatterns != null) {
- if (filePatterns.isPresent()) {
+ protected List<ProblemGroup> load() {
+ if (targetNamePatterns != null) {
+ if (targetNamePatterns.isPresent()) {
Matcher matcher = new PathMatcher();
- var problemFiles = getReport().getProblemFiles().stream()
- .filter(it -> filePatterns.get().matches(matcher, it.getBlobPath().toLowerCase()))
+ var problemGroups = getReport().getProblemGroups().stream()
+ .filter(it -> targetNamePatterns.get().matches(matcher, it.getKey().getName().toLowerCase()))
.collect(toList());
- problemFiles.sort(getReport().newProblemFileComparator());
- return problemFiles;
+ problemGroups.sort(getReport().newProblemGroupComparator());
+ return problemGroups;
} else {
- var problemFiles = new ArrayList<>(getReport().getProblemFiles());
- problemFiles.sort(getReport().newProblemFileComparator());
- return problemFiles;
+ var problemGroups = new ArrayList<>(getReport().getProblemGroups());
+ problemGroups.sort(getReport().newProblemGroupComparator());
+ return problemGroups;
}
} else {
return new ArrayList<>();
@@ -211,35 +219,30 @@ public class ProblemReportPage extends BuildReportPage {
}, WebConstants.PAGE_SIZE) {
@Override
- protected void populateItem(ListItem<ProblemFile> item) {
- var file = item.getModelObject();
- var fileString = file.toString();
- var filePath = file.getBlobPath();
+ protected void populateItem(ListItem<ProblemGroup> item) {
+ var group = item.getModelObject();
+ var groupKey = group.getKey();
+ var keyName = groupKey.getName();
AjaxLink<Void> toggleLink = new AjaxLink<Void>("toggle") {
@Override
public void onClick(AjaxRequestTarget target) {
- if (expandedFiles.contains(fileString))
- expandedFiles.remove(fileString);
+ if (expandedKeys.contains(groupKey))
+ expandedKeys.remove(groupKey);
else
- expandedFiles.add(fileString);
+ expandedKeys.add(groupKey);
target.add(item);
}
};
- toggleLink.add(new Label("label", filePath));
-
- if (file.getMoreInfo() != null)
- toggleLink.add(new Label("moreInfo", "(" + file.getMoreInfo() + ")"));
- else
- toggleLink.add(new WebMarkupContainer("moreInfo").setVisible(false));
+ toggleLink.add(groupKey.render("key"));
toggleLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
- return expandedFiles.contains(fileString) ? "expanded" : "collapsed";
+ return expandedKeys.contains(groupKey) ? "expanded" : "collapsed";
}
}));
@@ -247,11 +250,12 @@ public class ProblemReportPage extends BuildReportPage {
item.add(toggleLink);
ProjectBlobPage.State state = new ProjectBlobPage.State();
- state.blobIdent = new BlobIdent(getBuild().getCommitHash(), filePath,
+ state.blobIdent = new BlobIdent(getBuild().getCommitHash(), keyName,
FileMode.REGULAR_FILE.getBits());
state.problemReport = getReportName();
PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);
- item.add(new BookmarkablePageLink<Void>("view", ProjectBlobPage.class, params).setVisible(file.isInRepo()));
+ item.add(new BookmarkablePageLink<Void>("view", ProjectBlobPage.class, params)
+ .setVisible(groupKey instanceof RepoTarget.GroupKey));
item.add(new Label("tooManyProblems",
"Too many problems, displaying first " + MAX_PROBLEMS_TO_DISPLAY) {
@@ -259,7 +263,7 @@ public class ProblemReportPage extends BuildReportPage {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(expandedFiles.contains(fileString)
+ setVisible(expandedKeys.contains(groupKey)
&& item.getModelObject().getProblems().size() > MAX_PROBLEMS_TO_DISPLAY);
}
@@ -273,17 +277,24 @@ public class ProblemReportPage extends BuildReportPage {
problems.sort((o1, o2) -> {
if (o1.getSeverity() != o2.getSeverity())
return o1.getSeverity().ordinal() - o2.getSeverity().ordinal();
- if (o1.getRange() != null) {
- if (o2.getRange() != null) {
- if (o1.getRange().getFromRow() != o2.getRange().getFromRow())
- return o1.getRange().getFromRow() - o2.getRange().getFromRow();
+ PlanarRange location1 = null;
+ if (o1.getTarget() instanceof RepoTarget)
+ location1 = ((RepoTarget) o1.getTarget()).getLocation();
+ PlanarRange location2 = null;
+ if (o2.getTarget() instanceof RepoTarget)
+ location2 = ((RepoTarget) o2.getTarget()).getLocation();
+
+ if (location1 != null) {
+ if (location2 != null) {
+ if (location1.getFromRow() != location2.getFromRow())
+ return location1.getFromRow() - location2.getFromRow();
else
- return o1.getRange().getFromColumn() - o2.getRange().getFromColumn();
+ return location1.getFromColumn() - location2 .getFromColumn();
} else {
return -1;
}
} else {
- if (o2.getRange() != null)
+ if (location2 != null)
return 1;
else
return 0;
@@ -311,29 +322,31 @@ public class ProblemReportPage extends BuildReportPage {
item.add(new Label("message", problem.getMessage()).setEscapeModelStrings(false));
- if (problem.getRange() != null) {
+ if (problem.getTarget() instanceof RepoTarget
+ && ((RepoTarget) problem.getTarget()).getLocation() != null) {
+ var location = ((RepoTarget) problem.getTarget()).getLocation();
ProjectBlobPage.State state = new ProjectBlobPage.State();
state.blobIdent = new BlobIdent(getBuild().getCommitHash(),
- filePath, FileMode.REGULAR_FILE.getBits());
+ keyName, FileMode.REGULAR_FILE.getBits());
state.problemReport = getReportName();
- state.position = BlobRenderer.getSourcePosition(problem.getRange());
+ state.position = BlobRenderer.getSourcePosition(location);
PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);
- BookmarkablePageLink<Void> rangeLink = new BookmarkablePageLink<Void>("range",
+ BookmarkablePageLink<Void> locationLink = new BookmarkablePageLink<Void>("location",
ProjectBlobPage.class, params);
- rangeLink.add(new Label("label", describe(problem.getRange())));
- item.add(rangeLink);
+ locationLink.add(new Label("label", describe(location)));
+ item.add(locationLink);
} else {
- var rangeLink = new WebMarkupContainer("range");
- rangeLink.add(new WebMarkupContainer("label"));
- rangeLink.setVisible(false);
- item.add(rangeLink);
+ var locationLink = new WebMarkupContainer("location");
+ locationLink.add(new WebMarkupContainer("label"));
+ locationLink.setVisible(false);
+ item.add(locationLink);
}
}
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(expandedFiles.contains(fileString));
+ setVisible(expandedKeys.contains(groupKey));
}
});
@@ -342,15 +355,15 @@ public class ProblemReportPage extends BuildReportPage {
@Override
protected void onBeforeRender() {
- expandedFiles.clear();
+ expandedKeys.clear();
if (!getModelObject().isEmpty())
- expandedFiles.add(getModelObject().iterator().next().toString());
+ expandedKeys.add(getModelObject().iterator().next().getKey());
super.onBeforeRender();
}
});
- filesContainer.add(new OnePagingNavigator("pagingNavigator", filesView, null));
- filesContainer.add(new NoRecordsPlaceholder("noRecords", filesView));
+ groupsContainer.add(new OnePagingNavigator("pagingNavigator", filesView, null));
+ groupsContainer.add(new NoRecordsPlaceholder("noRecords", filesView));
add(fragment);
} else {
add(new Fragment("report", "invalidFrag", this));
@@ -369,29 +382,29 @@ public class ProblemReportPage extends BuildReportPage {
}
private void pushState(AjaxRequestTarget target) {
- CharSequence url = urlFor(ProblemReportPage.class, paramsOf(getBuild(), getReportName(), file));
- pushState(target, url.toString(), file);
+ CharSequence url = urlFor(ProblemReportPage.class, paramsOf(getBuild(), getReportName(), keyName));
+ pushState(target, url.toString(), keyName);
}
@Override
protected void onPopState(AjaxRequestTarget target, Serializable data) {
super.onPopState(target, data);
- file = (String) data;
+ keyName = (String) data;
parseFilePatterns();
target.add(form);
- target.add(filesContainer);
+ target.add(groupsContainer);
}
private void parseFilePatterns() {
- if (file != null) {
+ if (keyName != null) {
try {
- filePatterns = Optional.of(PatternSet.parse(file.toLowerCase()));
+ targetNamePatterns = Optional.of(PatternSet.parse(keyName.toLowerCase()));
} catch (Exception e) {
- file = null;
+ keyName = null;
form.error("Malformed filter");
}
} else {
- filePatterns = Optional.absent();
+ targetNamePatterns = Optional.absent();
}
}
@@ -411,7 +424,7 @@ public class ProblemReportPage extends BuildReportPage {
public static PageParameters paramsOf(Build build, String reportName, @Nullable String file) {
PageParameters params = paramsOf(build, reportName);
if (file != null)
- params.add(PARAM_FILE, file);
+ params.add(PARAM_NAME, file);
return params;
}
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java
index a35184fae3..cef9e5b4c9 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java
@@ -10,6 +10,7 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspec.step.PublishReportStep;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildMetricManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -58,9 +59,9 @@ public abstract class PublishProblemReportStep extends PublishReportStep {
if (!problems.isEmpty()) {
var aReport = new ProblemReport(problems);
aReport.writeTo(reportDir);
- for (var problemFile: aReport.getProblemFiles()) {
- if (problemFile.isInRepo())
- writeFileProblems(build, problemFile.getBlobPath(), problemFile.getProblems());
+ for (var group: aReport.getProblemGroups()) {
+ if (group.getKey() instanceof RepoTarget.GroupKey)
+ writeFileProblems(build, group.getKey().getName(), group.getProblems());
}
OneDev.getInstance(ProjectManager.class).directoryModified(
build.getProject().getId(), reportDir.getParentFile());
diff --git a/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java b/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java
index 1e0ee3c85f..1fca2752b3 100644
--- a/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java
+++ b/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java
@@ -12,6 +12,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.problem.PublishProblemReportStep;
import io.onedev.server.util.XmlUtils;
@@ -110,8 +111,8 @@ public class PublishRoslynatorReportStep extends PublishProblemReportStep {
var locationElement = diagnosticsElement.element("Location");
int line = parseInt(locationElement.attributeValue("Line"));
int character = parseInt(locationElement.attributeValue("Character"));
- var range = new PlanarRange(line-1, character-1, line-1, character);
- problems.add(new CodeProblem(severity, blobPath.get(), range, message));
+ var location = new PlanarRange(line-1, character-1, line-1, character);
+ problems.add(new CodeProblem(severity, new RepoTarget(blobPath.get(), location), message));
}
}
}
diff --git a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
index 0515c2a9be..0838358be3 100644
--- a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
+++ b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
@@ -11,6 +11,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
+import io.onedev.server.codequality.RepoTarget;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.problem.PublishProblemReportStep;
import io.onedev.server.util.XmlUtils;
@@ -93,18 +94,18 @@ public class PublishSpotBugsReportStep extends PublishProblemReportStep {
message = type + ": " + HtmlEscape.escapeHtml5(message);
- PlanarRange range = getRange(bugElement, true);
+ PlanarRange location = getLocation(bugElement, true);
- if (range == null)
- range = getRange(bugElement.element("Field"), false);
- if (range == null)
- range = getRange(bugElement.element("Method"), false);
- if (range == null)
- range = getRange(bugElement.element("Class"), false);
- if (range == null)
- range = new PlanarRange(0, -1, 0, -1);
+ if (location == null)
+ location = getLocation(bugElement.element("Field"), false);
+ if (location == null)
+ location = getLocation(bugElement.element("Method"), false);
+ if (location == null)
+ location = getLocation(bugElement.element("Class"), false);
+ if (location == null)
+ location = new PlanarRange(0, -1, 0, -1);
- problems.add(new CodeProblem(severity, blobPath, range, message));
+ problems.add(new CodeProblem(severity, new RepoTarget(blobPath, location), message));
} else {
logger.warning("Unable to find blob path for file: " + filePath);
}
@@ -119,7 +120,7 @@ public class PublishSpotBugsReportStep extends PublishProblemReportStep {
}
@Nullable
- private PlanarRange getRange(@Nullable Element element, boolean isOriginal) {
+ private PlanarRange getLocation(@Nullable Element element, boolean isOriginal) {
if (element != null) {
Element sourceElement = element.element("SourceLine");
String start = sourceElement.attributeValue("start");