The Unified and Autonomous Development Platform
Fix issue #229 - Show clover coverage information when view source
Robin Shen31b4ab4f963d
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 10853899ac..971ab2d3b1 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -6,7 +6,9 @@ import java.lang.reflect.Field;import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;import java.util.List;+import java.util.Map;import java.util.concurrent.Callable;import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;@@ -92,7 +94,6 @@ import io.onedev.server.buildspec.job.log.LogManager;import io.onedev.server.buildspec.job.log.instruction.LogInstruction;import io.onedev.server.code.CodeProblem;import io.onedev.server.code.CodeProblemContribution;-import io.onedev.server.code.LineCoverage;import io.onedev.server.code.LineCoverageContribution;import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;@@ -504,8 +505,8 @@ public class CoreModule extends AbstractPluginModule {contribute(LineCoverageContribution.class, new LineCoverageContribution() {@Override- public List<LineCoverage> getLineCoverages(Build build, String blobPath, String reportName) {- return Lists.newArrayList();+ public Map<Integer, Integer> getLineCoverages(Build build, String blobPath, String reportName) {+ return new HashMap<>();}});diff --git a/server-core/src/main/java/io/onedev/server/code/LineCoverage.java b/server-core/src/main/java/io/onedev/server/code/LineCoverage.javadeleted file mode 100644index 60c7adde31..0000000000--- a/server-core/src/main/java/io/onedev/server/code/LineCoverage.java+++ /dev/null@@ -1,76 +0,0 @@-package io.onedev.server.code;--import java.io.Serializable;-import java.util.Collection;-import java.util.HashMap;-import java.util.Map;--import org.apache.commons.lang3.builder.EqualsBuilder;-import org.apache.commons.lang3.builder.HashCodeBuilder;--public class LineCoverage implements Serializable {-- private static final long serialVersionUID = 1L;-- private final int fromLine;-- private final int toLine;-- private final int testCount;-- public LineCoverage(int fromLine, int toLine, int testCount) {- this.fromLine = fromLine;- this.toLine = toLine;- this.testCount = testCount;- }-- public int getFromLine() {- return fromLine;- }-- public int getToLine() {- return toLine;- }-- public int getTestCount() {- return testCount;- }-- @Override- public boolean equals(Object other) {- if (!(other instanceof LineCoverage))- return false;- if (this == other)- return true;- LineCoverage otherCoverage = (LineCoverage) other;- return new EqualsBuilder()- .append(fromLine, otherCoverage.fromLine)- .append(toLine, otherCoverage.toLine)- .append(testCount, otherCoverage.testCount)- .isEquals();- }-- @Override- public int hashCode() {- return new HashCodeBuilder(17, 37)- .append(fromLine)- .append(toLine)- .append(testCount)- .toHashCode();- }-- public static Map<Integer, Integer> groupByLine(Collection<LineCoverage> coverages) {- Map<Integer, Integer> coverageByLine = new HashMap<>();- for (LineCoverage coverage: coverages) {- for (int line = coverage.getFromLine(); line <= coverage.getToLine(); line++) {- Integer testCount = coverageByLine.get(line);- if (testCount != null)- coverageByLine.put(line, testCount + coverage.getTestCount());- else- coverageByLine.put(line, coverage.getTestCount());- }- }- return coverageByLine;- }--}diff --git a/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java b/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.javaindex f0d4d36aea..273332549b 100644--- a/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java+++ b/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java@@ -1,6 +1,6 @@package io.onedev.server.code;-import java.util.List;+import java.util.Map;import javax.annotation.Nullable;@@ -10,6 +10,6 @@ import io.onedev.server.model.Build;@ExtensionPointpublic interface LineCoverageContribution {- List<LineCoverage> getLineCoverages(Build build, String blobPath, @Nullable String reportName);+ Map<Integer, Integer> getLineCoverages(Build build, String blobPath, @Nullable String reportName);}diff --git a/server-core/src/main/java/io/onedev/server/git/BlobChange.java b/server-core/src/main/java/io/onedev/server/git/BlobChange.javaindex ccbb9fbd93..f30343dbb6 100644--- a/server-core/src/main/java/io/onedev/server/git/BlobChange.java+++ b/server-core/src/main/java/io/onedev/server/git/BlobChange.java@@ -19,7 +19,6 @@ import com.google.common.base.Preconditions;import io.onedev.commons.jsyntax.Tokenized;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.code.CodeProblem;-import io.onedev.server.code.LineCoverage;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.support.Mark;@@ -240,9 +239,9 @@ public abstract class BlobChange implements Serializable {Collection<CodeProblem> getNewProblems();- Collection<LineCoverage> getOldCoverages();+ Map<Integer, Integer> getOldCoverages();- Collection<LineCoverage> getNewCoverages();+ Map<Integer, Integer> getNewCoverages();DiffPlanarRange getCommentRange(CodeComment comment);diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 34c220c8b5..8bb21a098c 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -52,8 +52,6 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;import com.google.common.base.Objects;import com.google.common.base.Preconditions;@@ -316,17 +314,20 @@ public class Build extends AbstractEntity implements Referenceable {private String errorMessage;@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)- @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<BuildParam> params = new ArrayList<>();@OneToMany(mappedBy="dependent", cascade=CascadeType.REMOVE)- @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<BuildDependence> dependencies = new ArrayList<>();@OneToMany(mappedBy="dependency", cascade=CascadeType.REMOVE)- @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<BuildDependence> dependents= new ArrayList<>();+ @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)+ private Collection<JestTestMetric> jestTestMetrics = new ArrayList<>();++ @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)+ private Collection<CloverMetric> cloverMetrics = new ArrayList<>();+@ManyToOne(fetch=FetchType.LAZY)private PullRequest request;diff --git a/server-core/src/main/java/io/onedev/server/model/CloverMetric.java b/server-core/src/main/java/io/onedev/server/model/CloverMetric.javanew file mode 100644index 0000000000..299e1d3f83--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/CloverMetric.java@@ -0,0 +1,137 @@+package io.onedev.server.model;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;++import io.onedev.server.model.support.BuildMetric;+import io.onedev.server.util.MetricIndicator;++@Entity+@Table(indexes={@Index(columnList="o_build_id"), @Index(columnList=BuildMetric.PROP_REPORT)})+public class CloverMetric extends AbstractEntity implements BuildMetric {++ private static final long serialVersionUID = 1L;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Build build;++ @Column(nullable=false)+ private String reportName;++ private int methodCoverage;++ private int statementCoverage;++ private int branchCoverage;++ private int lineCoverage;++ private int totalMethods;++ private int totalStatements;++ private int totalBranches;++ private int totalLines;++ @Override+ public Build getBuild() {+ return build;+ }++ public void setBuild(Build build) {+ this.build = build;+ }++ @Override+ public String getReportName() {+ return reportName;+ }++ public void setReportName(String reportName) {+ this.reportName = reportName;+ }++ @MetricIndicator(group="Test Coverages", order=100, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ maxValue=100, minValue=0, name="Method", color="#F64E60")+ public int getMethodCoverage() {+ return methodCoverage;+ }++ public void setMethodCoverage(int methodCoverage) {+ this.methodCoverage = methodCoverage;+ }++ @MetricIndicator(group="Test Coverages", order=200, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ maxValue=100, minValue=0, name="Statement", color="#8950FC")+ public int getStatementCoverage() {+ return statementCoverage;+ }++ public void setStatementCoverage(int statementCoverage) {+ this.statementCoverage = statementCoverage;+ }++ @MetricIndicator(group="Test Coverages", order=300, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ maxValue=100, minValue=0, name="Branch", color="#1BC5BD")+ public int getBranchCoverage() {+ return branchCoverage;+ }++ public void setBranchCoverage(int branchCoverage) {+ this.branchCoverage = branchCoverage;+ }++ @MetricIndicator(group="Test Coverages", order=400, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ maxValue=100, minValue=0, name="Line", color="#FFA800")+ public int getLineCoverage() {+ return lineCoverage;+ }++ public void setLineCoverage(int lineCoverage) {+ this.lineCoverage = lineCoverage;+ }++ @MetricIndicator(group="Total Number", order=500, minValue=0, name="Method", color="#F64E60")+ public int getTotalMethods() {+ return totalMethods;+ }++ public void setTotalMethods(int totalMethods) {+ this.totalMethods = totalMethods;+ }++ @MetricIndicator(group="Total Number", order=600, minValue=0, name="Statement", color="#8950FC")+ public int getTotalStatements() {+ return totalStatements;+ }++ public void setTotalStatements(int totalStatements) {+ this.totalStatements = totalStatements;+ }++ @MetricIndicator(group="Total Number", order=700, minValue=0, name="Branch", color="#1BC5BD")+ public int getTotalBranches() {+ return totalBranches;+ }++ public void setTotalBranches(int totalBranches) {+ this.totalBranches = totalBranches;+ }++ @MetricIndicator(group="Total Number", order=800, minValue=0, name="Effective Line", color="#FFA800")+ public int getTotalLines() {+ return totalLines;+ }++ public void setTotalLines(int totalLines) {+ this.totalLines = totalLines;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java b/server-core/src/main/java/io/onedev/server/util/SimpleLogger.javaindex 9c2b06993b..612957ccf4 100644--- a/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java+++ b/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java@@ -19,13 +19,11 @@ public abstract class SimpleLogger {StringBuilder builder = new StringBuilder();if (message != null)builder.append(message);- boolean firstLine = true;for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(t))) {- if (firstLine)+ if (builder.length() == 0)builder.append(line);elsebuilder.append("\n ").append(line);- firstLine = false;}log(builder.toString());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.jsindex 0a0878a0a5..03d219a444 100644--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js@@ -2,8 +2,6 @@ onedev.server.lineChart = {onDomReady: function(containerId, lineSeries, valueFormatter) {var $chart = $("#" + containerId + ">.line-chart");- console.log(lineSeries);-if (lineSeries) {var chart = echarts.init($chart[0]);option = {@@ -18,6 +16,9 @@ onedev.server.lineChart = {show:false},},+ tooltip: {+ trigger: 'axis'+ },series: []};if (lineSeries.lineNames.length > 1) {@@ -72,6 +73,16 @@ onedev.server.lineChart = {option.yAxis.axisLabel = {formatter: valueFormatter}+ option.tooltip.formatter = function(params) {+ if (params.length != 0) {+ let tooltip = params[0].axisValueLabel;+ for(var i in params) {+ var circle = `<span style='margin-right: 8px; border-radius: 50%; display: inline-block; width: 10px; height: 10px; background: ${params[i].color}'></span>`;+ tooltip += "<br>" + circle + params[i].seriesName + ": " + valueFormatter(params[i].data);+ }+ return tooltip;+ }+ }}if (lineSeries.minValue)option.yAxis.min = lineSeries.minValue;@@ -80,8 +91,6 @@ onedev.server.lineChart = {chart.setOption(option);- console.log(option);-$chart.on("resized", function() {chart.resize();});diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.javaindex 89386ec653..829653c97d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java@@ -44,7 +44,6 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.code.CodeProblem;-import io.onedev.server.code.LineCoverage;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.BlameCommit;@@ -109,14 +108,11 @@ public class TextDiffPanel extends Panel {Map<Integer, List<CodeProblem>> newProblemsByLine =CodeProblem.groupByLine(change.getAnnotationSupport().getNewProblems());- Map<Integer, Integer> oldCoveragesByLine =- LineCoverage.groupByLine(change.getAnnotationSupport().getOldCoverages());- Map<Integer, Integer> newCoveragesByLine =- LineCoverage.groupByLine(change.getAnnotationSupport().getNewCoverages());-return new DiffAnnotationInfo(- new AnnotationInfo(oldCommentsByLine, oldProblemsByLine, oldCoveragesByLine),- new AnnotationInfo(newCommentsByLine, newProblemsByLine, newCoveragesByLine));+ new AnnotationInfo(oldCommentsByLine, oldProblemsByLine,+ change.getAnnotationSupport().getOldCoverages()),+ new AnnotationInfo(newCommentsByLine, newProblemsByLine,+ change.getAnnotationSupport().getNewCoverages()));} else {return new DiffAnnotationInfo(new AnnotationInfo(new HashMap<>(), new HashMap<>(), new HashMap<>()),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.javaindex 51fd1f033f..b73d3986af 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@@ -65,7 +65,6 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.code.CodeProblem;-import io.onedev.server.code.LineCoverage;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobIdent;@@ -1013,36 +1012,32 @@ public abstract class RevisionDiffPanel extends Panel {return newProblems;}- private transient Collection<LineCoverage> oldCoverages;+ private transient Map<Integer, Integer> oldCoverages;@Override- public Collection<LineCoverage> getOldCoverages() {+ public Map<Integer, Integer> getOldCoverages() {if (oldCoverages == null) {- oldCoverages = new ArrayList<>();+ oldCoverages = new HashMap<>();if (getOldBlobIdent().path != null) {- for (LineCoverage coverage: annotationSupport.getOldCoverages(getOldBlobIdent().path)) {- for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {- if (isVisible(true, line))- oldCoverages.add(new LineCoverage(line, line, coverage.getTestCount()));- }+ for (Map.Entry<Integer, Integer> entry: annotationSupport.getOldCoverages(getOldBlobIdent().path).entrySet()) {+ if (isVisible(true, entry.getKey()))+ oldCoverages.put(entry.getKey(), entry.getValue());}}}return oldCoverages;}- private transient Collection<LineCoverage> newCoverages;+ private transient Map<Integer, Integer> newCoverages;@Override- public Collection<LineCoverage> getNewCoverages() {+ public Map<Integer, Integer> getNewCoverages() {if (newCoverages == null) {- newCoverages = new ArrayList<>();+ newCoverages = new HashMap<>();if (getNewBlobIdent().path != null) {- for (LineCoverage coverage: annotationSupport.getNewCoverages(getNewBlobIdent().path)) {- for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {- if (isVisible(false, line))- newCoverages.add(new LineCoverage(line, line, coverage.getTestCount()));- }+ for (Map.Entry<Integer, Integer> entry: annotationSupport.getNewCoverages(getNewBlobIdent().path).entrySet()) {+ if (isVisible(false, entry.getKey()))+ newCoverages.put(entry.getKey(), entry.getValue());}}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.html b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.htmlindex 044e975fd0..4b3bbb1ab4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="head">Reference</div>+ <div class="head">Reference <a title="Can be referenced via below string in markdown" class="ml-2 text-gray"><wicket:svg href="question-o" class="icon icon-sm"/></a></div><div class="body"><div class="d-flex align-items-center flex-nowrap"><span wicket:id="reference" class="text-nowrap text-truncate mr-3"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.javaindex e8d6830e0c..3f6caeaa34 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java@@ -124,6 +124,14 @@ class JobReportListEditPanel extends PropertyEditor<List<Serializable>> {}});+ columns.add(new AbstractColumn<JobReport, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobReport>> cellItem, String componentId, IModel<JobReport> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getReportName()));+ }+ });+columns.add(new AbstractColumn<JobReport, Void>(Model.of("File Patterns")) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.javaindex 5cdc598826..ef84e77a66 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java@@ -65,6 +65,21 @@ class JobReportListViewPanel extends Panel {}});+ columns.add(new AbstractColumn<JobReport, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobReport>> cellItem, String componentId, IModel<JobReport> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getReportName());+ }++ });+ }+ });+columns.add(new AbstractColumn<JobReport, Void>(Model.of("File Patterns")) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 394a9dc998..598fc623cc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -3,7 +3,6 @@ package io.onedev.server.web.page.project.blob.render.renderers.source;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.util.ArrayList;-import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;@@ -65,7 +64,6 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.code.CodeProblem;import io.onedev.server.code.CodeProblemContribution;-import io.onedev.server.code.LineCoverage;import io.onedev.server.code.LineCoverageContribution;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.CodeCommentManager;@@ -143,20 +141,20 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearMap<CodeComment, PlanarRange> comments = codeCommentManager.queryInHistory(project, commitId, path);Set<CodeProblem> problems = new HashSet<>();- Collection<LineCoverage> coverages = new ArrayList<>();+ Map<Integer, Integer> coverages = new HashMap<>();BuildManager buildManager = OneDev.getInstance(BuildManager.class);for (Build build: buildManager.query(project, commitId, null, null, null, new HashMap<>())) {for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))problems.addAll(contribution.getCodeProblems(build, path, context.getProblemReport()));- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))- coverages.addAll(contribution.getLineCoverages(build, path, context.getCoverageReport()));+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ contribution.getLineCoverages(build, path, context.getCoverageReport()).forEach((key, value)->{+ coverages.merge(key, value, (v1, v2)->v1+v2);+ });+ }}- return new AnnotationInfo(- CodeCommentInfo.groupByLine(comments),- CodeProblem.groupByLine(problems),- LineCoverage.groupByLine(coverages));+ return new AnnotationInfo(CodeCommentInfo.groupByLine(comments), CodeProblem.groupByLine(problems), coverages);}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 493d837677..52d9544a81 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -53,7 +53,6 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.code.CodeProblem;import io.onedev.server.code.CodeProblemContribution;-import io.onedev.server.code.LineCoverage;import io.onedev.server.code.LineCoverageContribution;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.CodeCommentManager;@@ -822,21 +821,27 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota}@Override- public Collection<LineCoverage> getOldCoverages(String blobPath) {- Collection<LineCoverage> coverages = new ArrayList<>();+ public Map<Integer, Integer> getOldCoverages(String blobPath) {+ Map<Integer, Integer> coverages = new HashMap<>();for (Build build: getBuilds(getCompareWith())) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))- coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {+ coverages.merge(key, value, (v1, v2) -> v1+v2);+ });+ }}return coverages;}@Override- public Collection<LineCoverage> getNewCoverages(String blobPath) {- Collection<LineCoverage> coverages = new ArrayList<>();+ public Map<Integer, Integer> getNewCoverages(String blobPath) {+ Map<Integer, Integer> coverages = new HashMap<>();for (Build build: getBuilds(getCommit())) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))- coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {+ coverages.merge(key, value, (v1, v2) -> v1+v2);+ });+ }}return coverages;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 9086784db7..d32693d996 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -35,7 +35,6 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.code.CodeProblem;import io.onedev.server.code.CodeProblemContribution;-import io.onedev.server.code.LineCoverage;import io.onedev.server.code.LineCoverageContribution;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;@@ -907,22 +906,28 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann}@Override- public Collection<LineCoverage> getOldCoverages(String blobPath) {- Collection<LineCoverage> coverages = new ArrayList<>();+ public Map<Integer, Integer> getOldCoverages(String blobPath) {+ Map<Integer, Integer> coverages = new HashMap<>();ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;for (Build build: getBuilds(oldCommitId)) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))- coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {+ coverages.merge(key, value, (v1, v2) -> v1+v2);+ });+ }}return coverages;}@Override- public Collection<LineCoverage> getNewCoverages(String blobPath) {- Collection<LineCoverage> coverages = new ArrayList<>();+ public Map<Integer, Integer> getNewCoverages(String blobPath) {+ Map<Integer, Integer> coverages = new HashMap<>();for (Build build: getBuilds(rightCommitId)) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))- coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {+ coverages.merge(key, value, (v1, v2) -> v1+v2);+ });+ }}return coverages;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 7b643417ef..dee4254304 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -47,7 +47,6 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.code.CodeProblem;import io.onedev.server.code.CodeProblemContribution;-import io.onedev.server.code.LineCoverage;import io.onedev.server.code.LineCoverageContribution;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;@@ -931,22 +930,28 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno}@Override- public Collection<LineCoverage> getOldCoverages(String blobPath) {- Collection<LineCoverage> coverages = new ArrayList<>();+ public Map<Integer, Integer> getOldCoverages(String blobPath) {+ Map<Integer, Integer> coverages = new HashMap<>();ObjectId baseCommitId = ObjectId.fromString(getPullRequest().getBaseCommitHash());for (Build build: getBuilds(baseCommitId)) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))- coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {+ coverages.merge(key, value, (v1, v2) -> v1+v2);+ });+ }}return coverages;}@Override- public Collection<LineCoverage> getNewCoverages(String blobPath) {- Collection<LineCoverage> coverages = new ArrayList<>();+ public Map<Integer, Integer> getNewCoverages(String blobPath) {+ Map<Integer, Integer> coverages = new HashMap<>();for (Build build: getBuilds(source.getObjectId())) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))- coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {+ coverages.merge(key, value, (v1, v2) -> v1+v2);+ });+ }}return coverages;}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.javaindex 213c278112..faf25b92cc 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@@ -48,7 +48,6 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.code.CodeProblem;import io.onedev.server.code.CodeProblemContribution;-import io.onedev.server.code.LineCoverage;import io.onedev.server.code.LineCoverageContribution;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;@@ -949,21 +948,19 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev}@Override- public Collection<LineCoverage> getOldCoverages(String blobPath) {- List<LineCoverage> coverages = new ArrayList<>();+ public Map<Integer, Integer> getOldCoverages(String blobPath) {+ Map<Integer, Integer> coverages = new HashMap<>();ObjectId buildCommitId = ObjectId.fromString(state.oldCommitHash);for (Build build: getBuilds(buildCommitId)) {for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {- for (LineCoverage coverage: contribution.getLineCoverages(build, blobPath, null)) {+ for (Map.Entry<Integer, Integer> entry: contribution.getLineCoverages(build, blobPath, null).entrySet()) {if (!buildCommitId.equals(getComparisonBase())) {Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId, getComparisonBase(), blobPath);- for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {- Integer mappedLine = lineMapping.get(line);- if (mappedLine != null)- coverages.add(new LineCoverage(mappedLine, mappedLine, coverage.getTestCount()));- }+ Integer mappedLine = lineMapping.get(entry.getKey());+ if (mappedLine != null)+ coverages.put(mappedLine, entry.getValue());} else {- coverages.add(coverage);+ coverages.put(entry.getKey(), entry.getValue());}}}@@ -972,7 +969,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev}@Override- public Collection<LineCoverage> getNewCoverages(String blobPath) {+ public Map<Integer, Integer> getNewCoverages(String blobPath) {ObjectId commitId;MergePreview preview = getPullRequest().getMergePreview();if (preview != null && preview.getMergeCommitHash() != null@@ -982,20 +979,18 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements RevcommitId = ObjectId.fromString(state.newCommitHash);}- List<LineCoverage> coverages = new ArrayList<>();+ Map<Integer, Integer> coverages = new HashMap<>();for (Build build: getBuilds(commitId)) {for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {- for (LineCoverage coverage: contribution.getLineCoverages(build, blobPath, null)) {+ for (Map.Entry<Integer, Integer> entry: contribution.getLineCoverages(build, blobPath, null).entrySet()) {if (!state.newCommitHash.equals(commitId.name())) {Map<Integer, Integer> lineMapping = getLineMapping(commitId,ObjectId.fromString(state.newCommitHash), blobPath);- for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {- Integer mappedLine = lineMapping.get(line);- if (mappedLine != null)- coverages.add(new LineCoverage(mappedLine, mappedLine, coverage.getTestCount()));- }+ Integer mappedLine = lineMapping.get(entry.getKey());+ if (mappedLine != null)+ coverages.put(mappedLine, entry.getValue());} else {- coverages.add(coverage);+ coverages.put(entry.getKey(), entry.getValue());}}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 664b26a39a..2542bb94a7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -29,9 +29,10 @@margin-right: 4px;}ul>li>a.code-comments.new .icon {- width: 0.9rem;- height: 0.9rem;+ width: 12px;+ height: 12px;fill: var(--primary);+ flex-shrink: 0;display: inline-block !important;}diff --git a/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java b/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.javaindex f4a456ae91..e6d5951405 100644--- a/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java+++ b/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java@@ -11,7 +11,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.code.CodeProblem;-import io.onedev.server.code.LineCoverage;import io.onedev.server.git.BlobChange;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;@@ -73,9 +72,9 @@ public class RevisionDiff {Collection<CodeProblem> getNewProblems(String blobPath);- Collection<LineCoverage> getOldCoverages(String blobPath);+ Map<Integer, Integer> getOldCoverages(String blobPath);- Collection<LineCoverage> getNewCoverages(String blobPath);+ Map<Integer, Integer> getNewCoverages(String blobPath);void onCommentOpened(AjaxRequestTarget target, CodeComment comment);diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex eebb32a562..babda99b0e 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -27,5 +27,6 @@<module>server-plugin-sso-openid</module><module>server-plugin-report-markdown</module><module>server-plugin-report-jest</module>+ <module>server-plugin-report-clover</module></modules></project>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlnew file mode 100644index 0000000000..c3381d4790--- /dev/null+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -0,0 +1,13 @@+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-plugin-report-clover</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin</artifactId>+ <version>4.1.2</version>+ </parent>+ <properties>+ <moduleClass>org.server.plugin.report.clover.CloverPluginModule</moduleClass>+ </properties>+</project>diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.javanew file mode 100644index 0000000000..9656a284b3--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java@@ -0,0 +1,127 @@+package org.server.plugin.report.clover;++import java.io.File;+import java.io.FileInputStream;+import java.io.InputStream;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.concurrent.Callable;++import org.apache.commons.lang.SerializationUtils;+import org.apache.wicket.protocol.http.WebApplication;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.google.common.collect.Sets;++import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;+import io.onedev.server.buildspec.job.JobReport;+import io.onedev.server.code.LineCoverageContribution;+import io.onedev.server.entitymanager.BuildMetricManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.CloverMetric;+import io.onedev.server.model.Project;+import io.onedev.server.search.buildmetric.BuildMetricQuery;+import io.onedev.server.search.buildmetric.BuildMetricQueryParser;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.page.layout.SidebarMenuItem;+import io.onedev.server.web.page.project.StatisticsMenuContribution;++/**+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.+ *+ */+public class CloverPluginModule extends AbstractPluginModule {++ @Override+ protected void configure() {+ super.configure();++ contribute(ImplementationProvider.class, new ImplementationProvider() {++ @Override+ public Class<?> getAbstractClass() {+ return JobReport.class;+ }++ @Override+ public Collection<Class<?>> getImplementations() {+ return Sets.newHashSet(JobCloverReport.class);+ }++ });++ contribute(StatisticsMenuContribution.class, new StatisticsMenuContribution() {++ @Override+ public List<SidebarMenuItem> getMenuItems(Project project) {+ List<SidebarMenuItem> menuItems = new ArrayList<>();+ if (!OneDev.getInstance(BuildMetricManager.class).getAccessibleReportNames(project, CloverMetric.class).isEmpty()) {+ String query = String.format("%s \"last month\"",+ BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since));+ PageParameters params = CloverStatsPage.paramsOf(project, query);+ menuItems.add(new SidebarMenuItem.Page(null, "Clover", CloverStatsPage.class, params));+ }+ return menuItems;+ }++ @Override+ public int getOrder() {+ return 100;+ }++ });++ contribute(LineCoverageContribution.class, new LineCoverageContribution() {++ @Override+ public Map<Integer, Integer> getLineCoverages(Build build, String blobPath, String reportName) {+ return LockUtils.read(build.getReportLockKey(JobCloverReport.DIR), new Callable<Map<Integer, Integer>>() {++ @Override+ public Map<Integer, Integer> call() throws Exception {+ Map<Integer, Integer> coverages = new HashMap<>();+ if (build.getReportDir(JobCloverReport.DIR).exists()) {+ for (File reportDir: build.getReportDir(JobCloverReport.DIR).listFiles()) {+ if (SecurityUtils.canAccessReport(build, reportDir.getName())) {+ File lineCoverageFile = new File(reportDir, JobCloverReport.LINE_COVERAGES_DIR + "/" + blobPath);+ if (lineCoverageFile.exists()) {+ try (InputStream is = new FileInputStream(lineCoverageFile)) {+ @SuppressWarnings("unchecked")+ Map<Integer, Integer> deserialized = (Map<Integer, Integer>) SerializationUtils.deserialize(is);+ deserialized.forEach((key, value) -> {+ coverages.merge(key, value, (v1, v2) -> v1+v2);+ });+ }+ }+ }+ }+ }+ return coverages;+ }++ });++ }++ });++ contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {++ @Override+ public void configure(WebApplication application) {+ application.mount(new DynamicPathPageMapper("projects/${project}/stats/clover", CloverStatsPage.class));+ }++ });++ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.javanew file mode 100644index 0000000000..c5f32186c1--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.java@@ -0,0 +1,132 @@+package org.server.plugin.report.clover;++import java.io.File;+import java.io.FileInputStream;+import java.io.FileOutputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.OutputStream;+import java.io.Serializable;++import javax.annotation.Nullable;++import org.apache.commons.lang.SerializationUtils;++public class CloverReportData implements Serializable {++ private static final long serialVersionUID = 1L;++ private static final String FILE_NAME = "data.ser";++ private final int totalStatements;++ private final int coveredStatements;++ private final int totalMethods;++ private final int coveredMethods;++ private final int totalBranches;++ private final int coveredBranches;++ private final int totalLines;++ private final int coveredLines;++ public CloverReportData(int totalStatements, int coveredStatements, int totalMethods, int coveredMethods,+ int totalBranches, int coveredBranches, int totalLines, int coveredLines) {+ this.totalStatements = totalStatements;+ this.coveredStatements = coveredStatements;+ this.totalMethods = totalMethods;+ this.coveredMethods = coveredMethods;+ this.totalBranches = coveredBranches;+ this.coveredBranches = coveredBranches;+ this.totalLines = totalLines;+ this.coveredLines = coveredLines;+ }++ public int getTotalStatements() {+ return totalStatements;+ }++ public int getCoveredStatements() {+ return coveredStatements;+ }++ public int getTotalMethods() {+ return totalMethods;+ }++ public int getCoveredMethods() {+ return coveredMethods;+ }++ public int getTotalBranches() {+ return totalBranches;+ }++ public int getCoveredBranches() {+ return coveredBranches;+ }++ public int getTotalLines() {+ return totalLines;+ }++ public int getCoveredLines() {+ return coveredLines;+ }++ @Nullable+ public static CloverReportData readFrom(File reportDir) {+ File dataFile = new File(reportDir, FILE_NAME);+ if (dataFile.exists()) {+ try (InputStream is = new FileInputStream(dataFile)) {+ return (CloverReportData) SerializationUtils.deserialize(is);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ return null;+ }+ }++ public void writeTo(File reportDir) {+ File dataFile = new File(reportDir, FILE_NAME);+ try (OutputStream os = new FileOutputStream(dataFile)) {+ SerializationUtils.serialize(this, os);+ } catch (IOException e) {+ throw new RuntimeException(e);+ };+ }++ public int getMethodCoverage() {+ if (totalMethods != 0)+ return coveredMethods*100/totalMethods;+ else+ return 0;+ }++ public int getStatementCoverage() {+ if (totalStatements != 0)+ return coveredStatements*100/totalStatements;+ else+ return 0;+ }++ public int getBranchCoverage() {+ if (totalBranches != 0)+ return coveredBranches*100/totalBranches;+ else+ return 0;+ }++ public int getLineCoverage() {+ if (totalLines != 0)+ return coveredLines*100/totalLines;+ else+ return 0;+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverStatsPage.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverStatsPage.javanew file mode 100644index 0000000000..9a7b5c9a7e--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverStatsPage.java@@ -0,0 +1,22 @@+package org.server.plugin.report.clover;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.CloverMetric;+import io.onedev.server.web.page.project.stats.buildmetric.BuildMetricStatsPage;++@SuppressWarnings("serial")+public class CloverStatsPage extends BuildMetricStatsPage<CloverMetric> {++ public CloverStatsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected Component newProjectTitle(String componentId) {+ return new Label(componentId, "Clover Coverage Statistics");+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.javanew file mode 100644index 0000000000..2c087110c7--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java@@ -0,0 +1,169 @@+package org.server.plugin.report.clover;++import java.io.File;+import java.io.FileOutputStream;+import java.io.IOException;+import java.io.OutputStream;+import java.io.Serializable;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.concurrent.Callable;++import org.apache.commons.lang.SerializationUtils;+import org.dom4j.Document;+import org.dom4j.Element;+import org.dom4j.io.SAXReader;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;+import io.onedev.server.buildspec.job.Job;+import io.onedev.server.buildspec.job.JobReport;+import io.onedev.server.model.Build;+import io.onedev.server.model.CloverMetric;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.SimpleLogger;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.editable.annotation.Patterns;++@Editable(name="Clover Coverage Metrics", description="Collected coverage information will be displayed "+ + "when view source files. <b>Note:</b> No any clover report will be displayed at build level "+ + "as clover also generates very powerful html report which can be published if necessary")+public class JobCloverReport extends JobReport {++ private static final long serialVersionUID = 1L;++ public static final String DIR = "clover-reports";++ public static final String LINE_COVERAGES_DIR = "line-coverages";++ @Editable(order=100, description="Specify clover xml file containing coverage metrics. This should be a "+ + "relative path under OneDev workspace. For instance, <tt>target/site/clover/clover.xml</tt>. "+ + "Refer to <a href='https://openclover.org/documentation'>OpenClover documentation</a> "+ + "on how to generate clover report. Use * or ? for pattern match")+ @Interpolative(variableSuggester="suggestVariables")+ @Patterns(path=true)+ @NotEmpty+ @Override+ public String getFilePatterns() {+ return super.getFilePatterns();+ }++ @Override+ public void setFilePatterns(String filePatterns) {+ super.setFilePatterns(filePatterns);+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }++ @Override+ public void process(Build build, File workspace, SimpleLogger logger) {+ File reportDir = new File(build.getReportDir(DIR), getReportName());++ CloverReportData report = LockUtils.write(build.getReportLockKey(DIR), new Callable<CloverReportData>() {++ @Override+ public CloverReportData call() throws Exception {+ int baseLen = workspace.getAbsolutePath().length() + 1;+ SAXReader reader = new SAXReader();++ // Prevent XXE attack as the xml might be provided by malicious users+ reader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);++ int totalStatements = 0;+ int coveredStatements = 0;+ int totalMethods = 0;+ int coveredMethods = 0;+ int totalBranches = 0;+ int coveredBranches = 0;+ int totalLines = 0;+ int coveredLines = 0;++ boolean hasReport = false;+ for (File file: getPatternSet().listFiles(workspace)) {+ logger.log("Processing clover coverage report: " + file.getAbsolutePath().substring(baseLen));+ try {+ Document doc = reader.read(file);+ for (Element projectElement: doc.getRootElement().elements("project")) {+ Element metricsElement = projectElement.element("metrics");++ totalStatements += Integer.parseInt(metricsElement.attributeValue("statements"));+ totalMethods += Integer.parseInt(metricsElement.attributeValue("methods"));+ totalBranches += Integer.parseInt(metricsElement.attributeValue("conditionals"));++ coveredStatements += Integer.parseInt(metricsElement.attributeValue("coveredstatements"));+ coveredMethods += Integer.parseInt(metricsElement.attributeValue("coveredmethods"));+ coveredBranches += Integer.parseInt(metricsElement.attributeValue("coveredconditionals"));++ for (Element packageElement: projectElement.elements("package")) {+ for (Element fileElement: packageElement.elements("file")) {+ String path = fileElement.attributeValue("path");+ if (build.getJobWorkspace() != null && path.startsWith(build.getJobWorkspace())) {+ path = path.substring(build.getJobWorkspace().length()+1);+ Map<Integer, Integer> lineCoverages = new HashMap<>();+ for (Element lineElement: fileElement.elements("line")) {+ int lineNum = Integer.parseInt(lineElement.attributeValue("num")) - 1;+ String testCountStr = lineElement.attributeValue("count");+ if (testCountStr != null) {+ int testCount = Integer.parseInt(testCountStr);+ lineCoverages.merge(lineNum, testCount, (v1, v2)->v1+v2);+ }+ }+ totalLines += lineCoverages.size();+ coveredLines += lineCoverages.entrySet().stream().filter(it->it.getValue()!=0).count();++ File lineCoverateFile = new File(reportDir, LINE_COVERAGES_DIR + "/" + path);+ FileUtils.createDir(lineCoverateFile.getParentFile());+ try (OutputStream os = new FileOutputStream(lineCoverateFile)) {+ SerializationUtils.serialize((Serializable) lineCoverages, os);+ } catch (IOException e) {+ throw new RuntimeException(e);+ };+ }+ }+ }+ }+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }+ hasReport = true;+ }+ if (hasReport) {+ CloverReportData report = new CloverReportData(totalStatements, coveredStatements, totalMethods, coveredMethods,+ totalBranches, coveredBranches, totalLines, coveredLines);+ FileUtils.createDir(reportDir);+ report.writeTo(reportDir);+ return report;+ } else {+ return null;+ }+ }++ });++ if (report != null) {+ CloverMetric metric = new CloverMetric();+ metric.setBuild(build);+ metric.setReportName(getReportName());+ metric.setBranchCoverage(report.getBranchCoverage());+ metric.setLineCoverage(report.getLineCoverage());+ metric.setMethodCoverage(report.getMethodCoverage());+ metric.setStatementCoverage(report.getStatementCoverage());+ metric.setTotalBranches(report.getTotalBranches());+ metric.setTotalLines(report.getTotalLines());+ metric.setTotalMethods(report.getTotalMethods());+ metric.setTotalStatements(report.getTotalStatements());++ OneDev.getInstance(Dao.class).persist(metric);+ }+ }++}diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.javaindex 10937b9a99..e1da1820a2 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java@@ -47,14 +47,14 @@ public class JobHtmlReport extends JobReport {@Overridepublic void process(Build build, File workspace, SimpleLogger logger) {File reportDir = new File(build.getReportDir(DIR), getReportName());- FileUtils.createDir(reportDir);-LockUtils.write(build.getReportLockKey(DIR), new Callable<Void>() {@Overridepublic Void call() throws Exception {File startPage = new File(workspace, getStartPage());if (startPage.exists()) {+ FileUtils.createDir(reportDir);+File startPageFile = new File(reportDir, START_PAGE);FileUtils.writeFile(startPageFile, getStartPage());diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.javaindex bcb9f1b4ca..37c13f7637 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java@@ -98,7 +98,7 @@ public class JestTestReportModule extends AbstractPluginModule {String query = String.format("%s \"last month\"",BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since));PageParameters params = JestTestStatsPage.paramsOf(project, query);- menuItems.add(new SidebarMenuItem.Page(null, "Jest Test",+ menuItems.add(new SidebarMenuItem.Page(null, "Jest",JestTestStatsPage.class, params));}return menuItems;@@ -117,7 +117,7 @@ public class JestTestReportModule extends AbstractPluginModule {public void configure(WebApplication application) {application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/jest-reports/${report}/test-suites", JestTestSuitesPage.class));application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/jest-reports/${report}/test-cases", JestTestCasesPage.class));- application.mount(new DynamicPathPageMapper("projects/${project}/stats/jest-test", JestTestStatsPage.class));+ application.mount(new DynamicPathPageMapper("projects/${project}/stats/jest", JestTestStatsPage.class));}});diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.javaindex 0540290b50..6dba083053 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java@@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;@@ -55,7 +56,6 @@ public class JobJestReport extends JobReport {@Overridepublic void process(Build build, File workspace, SimpleLogger logger) {File reportDir = new File(build.getReportDir(DIR), getReportName());- FileUtils.createDir(reportDir);JestTestReportData report = LockUtils.write(build.getReportLockKey(DIR), new Callable<JestTestReportData>() {@@ -64,15 +64,17 @@ public class JobJestReport extends JobReport {ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);Collection<JsonNode> rootNodes = new ArrayList<>();- int baseLen = workspace.getAbsolutePath().length() + 1;+ int baseLen = workspace.getAbsolutePath().length()+1;for (File file: getPatternSet().listFiles(workspace)) {+ logger.log("Processing jest test report: " + file.getAbsolutePath().substring(baseLen));try {rootNodes.add(mapper.readTree(file));} catch (Exception e) {- logger.log("Failed to process Jest report: " + file.getAbsolutePath().substring(baseLen), e);+ throw ExceptionUtils.unchecked(e);}}if (!rootNodes.isEmpty()) {+ FileUtils.createDir(reportDir);JestTestReportData report = new JestTestReportData(build, rootNodes);report.writeTo(reportDir);return report;diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.javaindex b060417734..f2abd89d54 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java@@ -47,7 +47,6 @@ public class JobMarkdownReport extends JobReport {@Overridepublic void process(Build build, File workspace, SimpleLogger logger) {File reportDir = new File(build.getReportDir(DIR), getReportName());- FileUtils.createDir(reportDir);LockUtils.write(build.getReportLockKey(DIR), new Callable<Void>() {@@ -55,6 +54,7 @@ public class JobMarkdownReport extends JobReport {public Void call() throws Exception {File startPage = new File(workspace, getStartPage());if (startPage.exists()) {+ FileUtils.createDir(reportDir);File startPageFile = new File(reportDir, START_PAGE);FileUtils.writeFile(startPageFile, getStartPage());diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 982cbc2373..d907b91ec9 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -25,6 +25,11 @@<artifactId>server-plugin-report-jest</artifactId><version>${project.version}</version></dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin-report-clover</artifactId>+ <version>${project.version}</version>+ </dependency><dependency><groupId>io.onedev</groupId><artifactId>server-plugin-buildspec-maven</artifactId>