The Unified and Autonomous Development Platform
feat: Built-in vulnerability scan for open source dependencies (#1817)
Robin Shen1e5e638f554b
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.javaindex 29da9f5486..4dab7b8bcb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java@@ -8,8 +8,8 @@ import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.MilestoneManager;-import io.onedev.server.model.Build;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.persistence.TransactionManager;@@ -63,27 +63,23 @@ public class CloseMilestoneStep extends ServerSideStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- OneDev.getInstance(TransactionManager.class).run(new Runnable() {-- @Override- public void run() {- Project project = build.getProject();- String milestoneName = getMilestoneName();- MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);- Milestone milestone = milestoneManager.findInHierarchy(project, milestoneName);- if (milestone != null) {- if (build.canCloseMilestone(getAccessTokenSecret())) {- milestone.setClosed(true);- milestoneManager.createOrUpdate(milestone);- } else {- throw new ExplicitException("This build is not authorized to close milestone '" + milestoneName + "'");- }+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(TransactionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ Project project = build.getProject();+ String milestoneName = getMilestoneName();+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ Milestone milestone = milestoneManager.findInHierarchy(project, milestoneName);+ if (milestone != null) {+ if (build.canCloseMilestone(getAccessTokenSecret())) {+ milestone.setClosed(true);+ milestoneManager.createOrUpdate(milestone);} else {- logger.warning("Unable to find milestone '" + milestoneName + "' to close. Ignored.");+ throw new ExplicitException("This build is not authorized to close milestone '" + milestoneName + "'");}+ } else {+ logger.warning("Unable to find milestone '" + milestoneName + "' to close. Ignored.");}-});return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CompositeStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CompositeStep.javanew file mode 100644index 0000000000..0bddd7a24d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CompositeStep.java@@ -0,0 +1,25 @@+package io.onedev.server.buildspec.step;++import io.onedev.k8shelper.Action;+import io.onedev.k8shelper.CompositeFacade;+import io.onedev.k8shelper.StepFacade;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;++import java.util.List;++public abstract class CompositeStep extends Step {++ private static final long serialVersionUID = 1L;++ @Override+ public StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken,+ ParamCombination paramCombination) {+ return new CompositeFacade(getActions(build, jobExecutor, jobToken, paramCombination));+ }++ protected abstract List<Action> getActions(Build build, JobExecutor jobExecutor, String jobToken,+ ParamCombination paramCombination);++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.javaindex 9f9e3a69b7..3bee07ccdc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java@@ -9,11 +9,12 @@ import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.GitService;import io.onedev.server.git.service.RefFacade;-import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.web.util.SuggestionUtils;import org.eclipse.jgit.lib.Repository;@@ -90,27 +91,29 @@ public class CreateBranchStep extends ServerSideStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- Project project = build.getProject();- String branchName = getBranchName();-- if (!Repository.isValidRefName(GitUtils.branch2ref(branchName)))- throw new ExplicitException("Invalid branch name: " + branchName);-- if (build.canCreateBranch(getAccessTokenSecret(), branchName)) {- RefFacade branchRef = project.getBranchRef(branchName);- if (branchRef != null) {- logger.warning("Branch '" + branchName + "' already exists");+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ Project project = build.getProject();+ String branchName = getBranchName();++ if (!Repository.isValidRefName(GitUtils.branch2ref(branchName)))+ throw new ExplicitException("Invalid branch name: " + branchName);++ if (build.canCreateBranch(getAccessTokenSecret(), branchName)) {+ RefFacade branchRef = project.getBranchRef(branchName);+ if (branchRef != null) {+ logger.warning("Branch '" + branchName + "' already exists");+ } else {+ String branchRevision = getBranchRevision();+ if (branchRevision == null)+ branchRevision = build.getCommitHash();+ OneDev.getInstance(GitService.class).createBranch(project, branchName, branchRevision);+ }} else {- String branchRevision = getBranchRevision();- if (branchRevision == null)- branchRevision = build.getCommitHash();- OneDev.getInstance(GitService.class).createBranch(project, branchName, branchRevision);+ throw new ExplicitException("This build is not authorized to create branch '" + branchName + "'");}- } else {- throw new ExplicitException("This build is not authorized to create branch '" + branchName + "'");- }-+ });return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.javaindex 60698df9bb..40405da1a8 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java@@ -6,13 +6,14 @@ import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;import io.onedev.server.annotation.*;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.GitService;import io.onedev.server.git.service.RefFacade;-import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.persistence.SessionManager;import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.Repository;@@ -79,24 +80,26 @@ public class CreateTagStep extends ServerSideStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- PersonIdent taggerIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();- Project project = build.getProject();- String tagName = getTagName();-- if (!Repository.isValidRefName(GitUtils.tag2ref(tagName)))- throw new ExplicitException("Invalid tag name: " + tagName);-- if (build.canCreateTag(getAccessTokenSecret(), tagName)) {- RefFacade tagRef = project.getTagRef(tagName);- if (tagRef != null)- OneDev.getInstance(ProjectManager.class).deleteTag(project, tagName);- OneDev.getInstance(GitService.class).createTag(project, tagName, build.getCommitHash(),- taggerIdent, getTagMessage(), false);- } else {- throw new ExplicitException("This build is not authorized to create tag '" + tagName + "'");- }-+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ PersonIdent taggerIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();+ Project project = build.getProject();+ String tagName = getTagName();++ if (!Repository.isValidRefName(GitUtils.tag2ref(tagName)))+ throw new ExplicitException("Invalid tag name: " + tagName);++ if (build.canCreateTag(getAccessTokenSecret(), tagName)) {+ RefFacade tagRef = project.getTagRef(tagName);+ if (tagRef != null)+ OneDev.getInstance(ProjectManager.class).deleteTag(project, tagName);+ OneDev.getInstance(GitService.class).createTag(project, tagName, build.getCommitHash(),+ taggerIdent, getTagMessage(), false);+ } else {+ throw new ExplicitException("This build is not authorized to create tag '" + tagName + "'");+ }+ });return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.javaindex b7a956eaca..8a5b0f144b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java@@ -5,14 +5,15 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;+import io.onedev.server.StorageManager;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;import io.onedev.server.annotation.Patterns;import io.onedev.server.annotation.SubPath;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Build;-import io.onedev.server.StorageManager;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.util.patternset.PatternSet;import javax.validation.constraints.NotEmpty;@@ -69,13 +70,16 @@ public class PublishArtifactStep extends ServerSideStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger jobLogger) {- LockUtils.write(build.getArtifactsLockName(), () -> {- var projectId = build.getProject().getId();- var artifactsDir = OneDev.getInstance(StorageManager.class).initArtifactsDir(projectId, build.getNumber());- FileUtils.copyDirectory(inputDir, artifactsDir);- OneDev.getInstance(ProjectManager.class).directoryModified(projectId, artifactsDir);- return null;+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger jobLogger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ LockUtils.write(build.getArtifactsLockName(), () -> {+ var projectId = build.getProject().getId();+ var artifactsDir = OneDev.getInstance(StorageManager.class).initArtifactsDir(projectId, build.getNumber());+ FileUtils.copyDirectory(inputDir, artifactsDir);+ OneDev.getInstance(ProjectManager.class).directoryModified(projectId, artifactsDir);+ return null;+ });});return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.javaindex dad8b4d801..4e6ff37ce5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java@@ -1,33 +1,24 @@package io.onedev.server.buildspec.step;-import java.io.File;-import java.util.List;-import java.util.Map;--import javax.validation.constraints.NotEmpty;--import org.apache.shiro.authz.UnauthorizedException;-import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.commons.utils.FileUtils;-import io.onedev.commons.utils.LockUtils;-import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.TaskLogger;+import io.onedev.commons.utils.*;import io.onedev.server.OneDev;+import io.onedev.server.annotation.*;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.job.JobContext;import io.onedev.server.job.JobManager;-import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.annotation.SubPath;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;-import io.onedev.server.annotation.Patterns;-import io.onedev.server.annotation.ProjectChoice;+import org.apache.shiro.authz.UnauthorizedException;++import javax.validation.constraints.NotEmpty;+import java.io.File;+import java.util.List;+import java.util.Map;import static io.onedev.server.buildspec.step.StepGroup.PUBLISH;@@ -93,32 +84,35 @@ public class PublishSiteStep extends ServerSideStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger jobLogger) {- JobContext jobContext = OneDev.getInstance(JobManager.class).getJobContext(build.getId());- if (jobContext.getJobExecutor().isSitePublishEnabled()) {- Project project;- if (projectPath != null) {- project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);- if (project == null)- throw new ExplicitException("Unable to find project: " + projectPath);+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger jobLogger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ JobContext jobContext = OneDev.getInstance(JobManager.class).getJobContext(build.getId());+ if (jobContext.getJobExecutor().isSitePublishEnabled()) {+ Project project;+ if (projectPath != null) {+ project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);+ if (project == null)+ throw new ExplicitException("Unable to find project: " + projectPath);+ } else {+ project = build.getProject();+ }+ var projectId = project.getId();+ LockUtils.write(project.getSiteLockName(), () -> {+ File projectSiteDir = OneDev.getInstance(ProjectManager.class).getSiteDir(projectId);+ FileUtils.cleanDir(projectSiteDir);+ FileUtils.copyDirectory(inputDir, projectSiteDir);+ OneDev.getInstance(ProjectManager.class).directoryModified(projectId, projectSiteDir);+ return null;+ });+ String serverUrl = OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();+ jobLogger.log("Site published as "+ + StringUtils.stripEnd(serverUrl, "/") + "/" + project.getPath() + "/~site");} else {- project = build.getProject();+ throw new UnauthorizedException("Site publish is prohibited by current job executor");}- var projectId = project.getId();- LockUtils.write(project.getSiteLockName(), () -> {- File projectSiteDir = OneDev.getInstance(ProjectManager.class).getSiteDir(projectId);- FileUtils.cleanDir(projectSiteDir);- FileUtils.copyDirectory(inputDir, projectSiteDir);- OneDev.getInstance(ProjectManager.class).directoryModified(projectId, projectSiteDir);- return null;- });- String serverUrl = OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();- jobLogger.log("Site published as "- + StringUtils.stripEnd(serverUrl, "/") + "/" + project.getPath() + "/~site");- return null;- } else {- throw new UnauthorizedException("Site publish is prohibited by current job executor");- }+ });+ return null;}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.javaindex 0d2e32c0b1..fcf92b1db0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java@@ -19,6 +19,7 @@ import io.onedev.server.annotation.Interpolative;import io.onedev.server.annotation.ShowCondition;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.cluster.ClusterTask;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.RefUpdated;@@ -141,17 +142,19 @@ public class PullRepository extends SyncRepository {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- Project buildProject = build.getProject();- if (!buildProject.isCommitOnBranch(build.getCommitId(), buildProject.getDefaultBranch()))- throw new ExplicitException("For security reason, this step is only allowed to run from default branch");-- String remoteUrl = getRemoteUrlWithCredential(build);- Long projectId = getTargetProject(build).getId();-- var task = new PullTask(projectId, remoteUrl, getCertificate(), getRefs(), isForce(), isWithLfs(), getProxy());- getProjectManager().runOnActiveServer(projectId, task);-+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ Project buildProject = build.getProject();+ if (!buildProject.isCommitOnBranch(build.getCommitId(), buildProject.getDefaultBranch()))+ throw new ExplicitException("For security reason, this step is only allowed to run from default branch");++ String remoteUrl = getRemoteUrlWithCredential(build);+ Long projectId = getTargetProject(build).getId();++ var task = new PullTask(projectId, remoteUrl, getCertificate(), getRefs(), isForce(), isWithLfs(), getProxy());+ getProjectManager().runOnActiveServer(projectId, task);+ });return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.javaindex 79ef11430c..a43ca408cf 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java@@ -6,11 +6,12 @@ import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.CommandUtils;import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.persistence.SessionManager;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;@@ -27,51 +28,32 @@ public class PushRepository extends SyncRepository {private static final long serialVersionUID = 1L;@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- var certificateFile = writeCertificate(getCertificate());- try {- if (OneDev.getInstance(ProjectManager.class).hasLfsObjects(build.getProject().getId())) {- Project project = build.getProject();- Commandline git = CommandUtils.newGit();- git.workingDir(OneDev.getInstance(ProjectManager.class).getGitDir(project.getId()));- configureProxy(git, getProxy());- configureCertificate(git, certificateFile);-- String remoteUrl = getRemoteUrlWithCredential(build);- AtomicReference<String> remoteCommitId = new AtomicReference<>(null);- git.addArgs("ls-remote", remoteUrl, "HEAD", build.getRefName());- git.execute(new LineConsumer() {-- @Override- public void consume(String line) {- String refName = line.substring(40).trim();- if (refName.equals("HEAD")) {- if (remoteCommitId.get() == null)- remoteCommitId.set(line.substring(0, 40));- } else {- remoteCommitId.set(line.substring(0, 40));- }- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.warning(line);- }-- });-- if (remoteCommitId.get() != null) {- git.clearArgs();+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var certificateFile = writeCertificate(getCertificate());+ try {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ if (OneDev.getInstance(ProjectManager.class).hasLfsObjects(build.getProject().getId())) {+ Project project = build.getProject();+ Commandline git = CommandUtils.newGit();+ git.workingDir(OneDev.getInstance(ProjectManager.class).getGitDir(project.getId()));configureProxy(git, getProxy());configureCertificate(git, certificateFile);- git.addArgs("fetch", remoteUrl, remoteCommitId.get());++ String remoteUrl = getRemoteUrlWithCredential(build);+ AtomicReference<String> remoteCommitId = new AtomicReference<>(null);+ git.addArgs("ls-remote", remoteUrl, "HEAD", build.getRefName());git.execute(new LineConsumer() {@Overridepublic void consume(String line) {- logger.log(line);+ String refName = line.substring(40).trim();+ if (refName.equals("HEAD")) {+ if (remoteCommitId.get() == null)+ remoteCommitId.set(line.substring(0, 40));+ } else {+ remoteCommitId.set(line.substring(0, 40));+ }}}, new LineConsumer() {@@ -81,20 +63,13 @@ public class PushRepository extends SyncRepository {logger.warning(line);}- }).checkReturnCode();-- Repository repository = OneDev.getInstance(ProjectManager.class)- .getRepository(project.getId());- String mergeBaseId = GitUtils.getMergeBase(repository,- ObjectId.fromString(remoteCommitId.get()), build.getCommitId()).name();+ });- if (!mergeBaseId.equals(build.getCommitHash())) {- String input = String.format("%s %s %s %s\n", build.getRefName(), build.getCommitHash(),- build.getRefName(), remoteCommitId.get());+ if (remoteCommitId.get() != null) {git.clearArgs();configureProxy(git, getProxy());configureCertificate(git, certificateFile);- git.addArgs("lfs", "pre-push", remoteUrl, remoteUrl);+ git.addArgs("fetch", remoteUrl, remoteCommitId.get());git.execute(new LineConsumer() {@Override@@ -109,62 +84,90 @@ public class PushRepository extends SyncRepository {logger.warning(line);}- }, new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8))).checkReturnCode();- }- } else {- git.clearArgs();- configureProxy(git, getProxy());- configureCertificate(git, certificateFile);- git.addArgs("lfs", "push", "--all", remoteUrl, build.getCommitHash());- git.execute(new LineConsumer() {+ }).checkReturnCode();- @Override- public void consume(String line) {- logger.log(line);- }+ Repository repository = OneDev.getInstance(ProjectManager.class)+ .getRepository(project.getId());+ String mergeBaseId = GitUtils.getMergeBase(repository,+ ObjectId.fromString(remoteCommitId.get()), build.getCommitId()).name();- }, new LineConsumer() {+ if (!mergeBaseId.equals(build.getCommitHash())) {+ String input = String.format("%s %s %s %s\n", build.getRefName(), build.getCommitHash(),+ build.getRefName(), remoteCommitId.get());+ git.clearArgs();+ configureProxy(git, getProxy());+ configureCertificate(git, certificateFile);+ git.addArgs("lfs", "pre-push", remoteUrl, remoteUrl);+ git.execute(new LineConsumer() {- @Override- public void consume(String line) {- logger.warning(line);+ @Override+ public void consume(String line) {+ logger.log(line);+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.warning(line);+ }++ }, new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8))).checkReturnCode();}+ } else {+ git.clearArgs();+ configureProxy(git, getProxy());+ configureCertificate(git, certificateFile);+ git.addArgs("lfs", "push", "--all", remoteUrl, build.getCommitHash());+ git.execute(new LineConsumer() {- }).checkReturnCode();- }- }-- Commandline git = CommandUtils.newGit();- configureProxy(git, getProxy());- configureCertificate(git, certificateFile);- git.workingDir(OneDev.getInstance(ProjectManager.class).getGitDir(build.getProject().getId()));- git.addArgs("push");- if (isForce())- git.addArgs("--force");- git.addArgs(getRemoteUrlWithCredential(build));- git.addArgs(build.getCommitHash() + ":" + build.getRefName());-- git.execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.log(line);- }+ @Override+ public void consume(String line) {+ logger.log(line);+ }++ }, new LineConsumer() {- }, new LineConsumer() {+ @Override+ public void consume(String line) {+ logger.warning(line);+ }- @Override- public void consume(String line) {- logger.warning(line);+ }).checkReturnCode();+ }}- }).checkReturnCode();+ Commandline git = CommandUtils.newGit();+ configureProxy(git, getProxy());+ configureCertificate(git, certificateFile);+ git.workingDir(OneDev.getInstance(ProjectManager.class).getGitDir(build.getProject().getId()));+ git.addArgs("push");+ if (isForce())+ git.addArgs("--force");+ git.addArgs(getRemoteUrlWithCredential(build));+ git.addArgs(build.getCommitHash() + ":" + build.getRefName());++ git.execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.log(line);+ }++ }, new LineConsumer() {- return null;- } finally {- if (certificateFile != null)- FileUtils.deleteFile(certificateFile);- }+ @Override+ public void consume(String line) {+ logger.warning(line);+ }++ }).checkReturnCode();+ } finally {+ if (certificateFile != null)+ FileUtils.deleteFile(certificateFile);+ }+ });+ return null;}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.javaindex 8a0ae732eb..3dffd82a4c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java@@ -43,7 +43,7 @@ public abstract class ServerSideStep extends Step {}@Nullable- public abstract Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger);+ public abstract Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger);public Collection<String> getPlaceholders() {Collection<String> placeholders = new HashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.javaindex 09786740b1..6fb7c1b651 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java@@ -1,23 +1,21 @@package io.onedev.server.buildspec.step;-import java.io.File;-import java.util.List;-import java.util.Map;-import java.util.concurrent.Callable;--import javax.validation.constraints.NotEmpty;-import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;+import io.onedev.server.annotation.Markdown;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.build.BuildUpdated;-import io.onedev.server.model.Build;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;-import io.onedev.server.annotation.Markdown;++import javax.validation.constraints.NotEmpty;+import java.io.File;+import java.util.List;+import java.util.Map;@Editable(order=265, name="Set Build Description")public class SetBuildDescriptionStep extends ServerSideStep {@@ -44,16 +42,12 @@ public class SetBuildDescriptionStep extends ServerSideStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger jobLogger) {- return OneDev.getInstance(TransactionManager.class).call(new Callable<Map<String, byte[]>>() {-- @Override- public Map<String, byte[]> call() {- build.setDescription(buildDescription);- OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(build));- return null;- }-+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger jobLogger) {+ return OneDev.getInstance(TransactionManager.class).call(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ build.setDescription(buildDescription);+ OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(build));+ return null;});}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.javaindex 3bc13feb46..0d10ac25f1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java@@ -1,26 +1,24 @@package io.onedev.server.buildspec.step;-import static io.onedev.k8shelper.KubernetesHelper.BUILD_VERSION;--import java.io.File;-import java.nio.charset.StandardCharsets;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-import java.util.concurrent.Callable;--import javax.validation.constraints.NotEmpty;-import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.build.BuildUpdated;-import io.onedev.server.model.Build;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;++import javax.validation.constraints.NotEmpty;+import java.io.File;+import java.nio.charset.StandardCharsets;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import static io.onedev.k8shelper.KubernetesHelper.BUILD_VERSION;@Editable(order=260, name="Set Build Version")public class SetBuildVersionStep extends ServerSideStep {@@ -46,8 +44,9 @@ public class SetBuildVersionStep extends ServerSideStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger jobLogger) {+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger jobLogger) {return OneDev.getInstance(TransactionManager.class).call(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);build.setVersion(buildVersion);OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(build));Map<String, byte[]> outputFiles = new HashMap<>();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.javaindex 7f308e92ad..5f0a80f41d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java@@ -2,6 +2,8 @@ package io.onedev.server.buildspec.step;public class StepGroup {+ public static final String SECURITY_COMPLIANCE = "Security & Compliance";+public static final String PUBLISH = "Publish";public static final String REPOSITORY_SYNC = "Repository Sync";diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.javaindex 6275ac4196..1abf95418a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java@@ -2,8 +2,6 @@ package io.onedev.server.buildspec.step;import io.onedev.commons.utils.ExplicitException;import io.onedev.k8shelper.Action;-import io.onedev.k8shelper.CompositeFacade;-import io.onedev.k8shelper.StepFacade;import io.onedev.server.annotation.*;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;@@ -27,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;@Editable(order=10000, name="Use Step Template", description="Run specified step template")-public class UseTemplateStep extends Step {+public class UseTemplateStep extends CompositeStep {private static final long serialVersionUID = 1L;@@ -103,7 +101,7 @@ public class UseTemplateStep extends Step {}@Override- public StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken,+ protected List<Action> getActions(Build build, JobExecutor jobExecutor, String jobToken,ParamCombination paramCombination) {StepTemplate template = build.getSpec().getStepTemplateMap().get(templateName);if (template == null)@@ -126,7 +124,7 @@ public class UseTemplateStep extends Step {actions.add(step.getAction(actionName, build, jobExecutor, jobToken, newParamCombination));}}- return new CompositeFacade(actions);+ return actions;}}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.javaindex 87d9554b7d..314504b39e 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,36 +1,31 @@package io.onedev.server.codequality;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-+import io.onedev.commons.utils.PlanarRange;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import io.onedev.commons.utils.PlanarRange;+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 enum Severity {HIGH, MEDIUM, LOW};+ public enum Severity {CRITICAL, HIGH, MEDIUM, LOW};private final Severity severity;- private final String type;-private final String blobPath;private final PlanarRange range;private final String message;- public CodeProblem(Severity severity, String type, String blobPath, PlanarRange range, String message) {+ public CodeProblem(Severity severity, String blobPath, @Nullable PlanarRange range, String message) {this.severity = severity;- this.type = type;this.blobPath = blobPath;this.range = range;this.message = message;@@ -39,15 +34,12 @@ public class CodeProblem implements Serializable {public Severity getSeverity() {return severity;}-- public String getType() {- return type;- }public String getBlobPath() {return blobPath;}+ @Nullablepublic PlanarRange getRange() {return range;}@@ -57,7 +49,7 @@ public class CodeProblem implements Serializable {}public CodeProblem normalizeRange(List<String> lines) {- return new CodeProblem(severity, type, blobPath, range.normalize(lines), message);+ return new CodeProblem(severity, blobPath, range!=null?range.normalize(lines):null, message);}@Override@@ -69,7 +61,6 @@ public class CodeProblem implements Serializable {CodeProblem otherProblem = (CodeProblem) other;return new EqualsBuilder().append(severity, otherProblem.severity)- .append(type, otherProblem.type).append(blobPath, otherProblem.blobPath).append(range, otherProblem.range).append(message, otherProblem.message)@@ -80,7 +71,6 @@ public class CodeProblem implements Serializable {public int hashCode() {return new HashCodeBuilder(17, 37).append(severity)- .append(type).append(blobPath).append(range).append(message)@@ -91,18 +81,20 @@ public class CodeProblem implements Serializable {Map<Integer, List<CodeProblem>> problemsByLine = new HashMap<>();for (CodeProblem problem: problems) {- PlanarRange position = problem.getRange();- int line = position.getFromRow();- List<CodeProblem> problemsAtLine = problemsByLine.get(line);- if (problemsAtLine == null) {- problemsAtLine = new ArrayList<>();- problemsByLine.put(line, problemsAtLine);+ 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);}- problemsAtLine.add(problem);}for (List<CodeProblem> value: problemsByLine.values()) {- value.sort((o1, o2)->(int)(o1.getSeverity().ordinal()-o2.getSeverity().ordinal()));+ value.sort(comparingInt(o -> o.getSeverity().ordinal()));}return problemsByLine;diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 80d5eb3462..8e2b81aa73 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -87,7 +87,6 @@ import javax.inject.Inject;import javax.inject.Singleton;import javax.servlet.http.HttpServletRequest;import javax.validation.ConstraintViolation;-import javax.validation.Valid;import javax.validation.ValidationException;import javax.validation.Validator;import javax.ws.rs.client.Client;@@ -1463,10 +1462,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}- return sessionManager.call(() -> {- Build build = buildManager.load(jobContext.getBuildId());- return transformedServerSideStep.run(build, inputDir, logger);- });+ return transformedServerSideStep.run(jobContext.getBuildId(), inputDir, logger);} else {throw new IllegalStateException("Job actions not found");}diff --git a/server-core/src/main/java/io/onedev/server/model/ProblemMetric.java b/server-core/src/main/java/io/onedev/server/model/ProblemMetric.javaindex 1b220efaae..db9728f6b1 100644--- a/server-core/src/main/java/io/onedev/server/model/ProblemMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/ProblemMetric.java@@ -1,10 +1,10 @@package io.onedev.server.model;-import javax.persistence.*;-import io.onedev.server.model.support.BuildMetric;import io.onedev.server.util.MetricIndicator;+import javax.persistence.*;+import static io.onedev.server.model.support.BuildMetric.PROP_REPORT;@Entity@@ -23,6 +23,8 @@ public class ProblemMetric extends AbstractEntity implements BuildMetric {@Column(nullable=false)private String reportName;+ private int criticalSeverities;+private int highSeverities;private int mediumSeverities;@@ -47,16 +49,25 @@ public class ProblemMetric extends AbstractEntity implements BuildMetric {this.reportName = reportName;}- @MetricIndicator(group="Total Problems", order=100, minValue=0, name="High Severity", color="#F64E60")+ @MetricIndicator(group="Total Problems", order=100, minValue=0, name="Critical Severity", color="#F64E60")+ public int getCriticalSeverities() {+ return criticalSeverities;+ }++ public void setCriticalSeverities(int criticalSeverities) {+ this.criticalSeverities = criticalSeverities;+ }++ @MetricIndicator(group="Total Problems", order=200, minValue=0, name="High Severity", color="#F64E60")public int getHighSeverities() {return highSeverities;}- public void setHighSeverities(int totalErrors) {- this.highSeverities = totalErrors;+ public void setHighSeverities(int highSeverities) {+ this.highSeverities = highSeverities;}- @MetricIndicator(group="Total Problems", order=200, minValue=0, name="Medium Severity", color="#FFA800")+ @MetricIndicator(group="Total Problems", order=300, minValue=0, name="Medium Severity", color="#FFA800")public int getMediumSeverities() {return mediumSeverities;}@@ -64,8 +75,8 @@ public class ProblemMetric extends AbstractEntity implements BuildMetric {public void setMediumSeverities(int mediumSeverities) {this.mediumSeverities = mediumSeverities;}-- @MetricIndicator(group="Total Problems", order=300, minValue=0, name="Low Severity", color="#8950FC")++ @MetricIndicator(group="Total Problems", order=500, minValue=0, name="Low Severity", color="#8950FC")public int getLowSeverities() {return lowSeverities;}@@ -73,5 +84,5 @@ public class ProblemMetric extends AbstractEntity implements BuildMetric {public void setLowSeverities(int lowSeverities) {this.lowSeverities = lowSeverities;}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.cssindex aa1f931e44..3863a5bf71 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css@@ -171,7 +171,15 @@ a.link-gray:hover, a.link-gray:focus {.dark-mode a.link-gray:hover, .dark-mode a.link-gray:focus {color: var(--primary) !important;}-+.text-muted, a.link-muted {+ color: var(--muted) !important;+}+a.link-muted:hover, a.link-muted:focus {+ color: var(--gray) !important;+}+.dark-mode .text-muted, .dark-mode .link-muted {+ color: rgb(98, 101, 126) !important;+}.text-hover-primary:hover, .text-hover-primary:focus,a.link-hover-primary:hover, a.link-hover-primary:focus {@@ -444,12 +452,6 @@ pre code {border-color: var(--dark-mode-light-dark);}-.text-muted {- color: var(--muted) !important;-}-.dark-mode .text-muted {- color: rgb(98, 101, 126) !important;-}.form-group .form-text {font-size: 0.9rem;font-weight: 400;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.css b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.cssindex 788477b744..f9b82be301 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.css@@ -6,6 +6,9 @@border-top: 1px solid var(--light);padding-top: 0.75rem;}+.problem-popover .problem-content>.badge {+ width: 64px;+}.dark-mode .problem-popover .problem-content+.problem-content {border-top-color: var(--dark-mode-light-dark);}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.jsindex ea62f4f898..7b226faaf7 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js@@ -1,51 +1,48 @@onedev.server.codeProblem = {- getIconInfo: function(problems) {+ getSeverityInfo: function(problems) {if (Array.isArray(problems)) {+ var hasCriticalSeverities = false;var hasHighSeverities = false;var hasMediumSeverities = false;for (var i in problems) {- if (problems[i].severity == "HIGH") {+ if (problems[i].severity == "CRITICAL") {+ hasCriticalSeverities = true;+ break;+ } if (problems[i].severity == "HIGH") {hasHighSeverities = true;break;} else if (problems[i].severity == "MEDIUM") {hasMediumSeverities = true;+ break;}}- if (hasHighSeverities)- return ["times-circle-o", "link-danger", "text-danger"];+ if (hasCriticalSeverities || hasHighSeverities)+ return "link-danger";else if (hasMediumSeverities)- return ["warning-o", "link-warning", "text-warning"];+ return "link-warning";else- return ["info-circle-o", "link-info", "text-info"];+ return "link-muted";} else {- if (problems.severity == "HIGH")- return ["times-circle-o", "link-danger", "text-danger"];+ if (problems.severity == "CRITICAL" || problems.severity == "HIGH")+ return "badge-danger";else if (problems.severity == "MEDIUM")- return ["warning-o", "link-warning", "text-warning"];+ return "badge-warning";else- return ["info-circle-o", "link-info", "text-info"];+ return "badge-secondary";}},renderProblems: function(problems) {- if (problems.length != 1) {- var $container = $("<div></div>");- for (var i in problems) {- var problem = problems[i];- var iconInfo = onedev.server.codeProblem.getIconInfo(problem);- var $content = $("<pre class='problem-content mb-0 font-size-sm'></pre>");- $container.append($content);- $content.html(problem.message);-- $content.prepend(`<svg class='icon icon-sm mr-2 ${iconInfo[2]}'><use xlink:href='${onedev.server.icons}#${iconInfo[0]}'/></svg>`);- $content.append("<a title='Add comment' class='add-comment ml-2'><svg class='icon icon-sm mr-2'><use xlink:href='" + onedev.server.icons + "#comment'/></svg></a>");- }- return $container.html();- } else {- var $container = $("<div><pre class='problem-content mb-0 font-size-sm'></pre></div>");- var $content = $container.children('.problem-content');- $content.html(problems[0].message);+ var $container = $("<div></div>");+ for (var i in problems) {+ var problem = problems[i];+ var severityInfo = onedev.server.codeProblem.getSeverityInfo(problem);+ var $content = $("<pre class='problem-content mb-0 font-size-sm'></pre>");+ $container.append($content);+ $content.html(problem.message);++ $content.prepend(`<span class='badge badge-sm mr-2 ${severityInfo}'>${problem.severity}</span>`);$content.append("<a title='Add comment' class='add-comment ml-2'><svg class='icon icon-sm mr-2'><use xlink:href='" + onedev.server.icons + "#comment'/></svg></a>");- return $container.html();}+ return $container.html();}}\ No newline at end of filediff --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.jsindex c7a2fa715f..77161d4d57 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@@ -1059,10 +1059,9 @@ onedev.server.blobTextDiff = {let $trigger = $(document.createElement("a"));$trigger.addClass("problem-trigger");- let iconInfo = onedev.server.codeProblem.getIconInfo(problems);- $trigger.addClass(iconInfo[1]);+ $trigger.addClass(onedev.server.codeProblem.getSeverityInfo(problems));- $trigger.append(`<svg class='icon icon-sm'><use xlink:href='${onedev.server.icons}#${iconInfo[0]}'/></svg>`);+ $trigger.append(`<svg class='icon icon-sm'><use xlink:href='${onedev.server.icons}#exclamation-circle-o'/></svg>`);let markRanges = [];for (var i in problems)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 c57cad6d70..e87d90a29c 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@@ -1136,7 +1136,7 @@ public abstract class RevisionDiffPanel extends Panel {oldProblems = new HashSet<>();if (getOldBlobIdent().path != null) {for (CodeProblem problem: annotationSupport.getOldProblems(getOldBlobIdent().path)) {- if (isVisible(new DiffPlanarRange(true, problem.getRange())))+ if (problem.getRange() != null && isVisible(new DiffPlanarRange(true, problem.getRange())))oldProblems.add(problem);}}@@ -1152,7 +1152,7 @@ public abstract class RevisionDiffPanel extends Panel {newProblems = new HashSet<>();if (getNewBlobIdent().path != null) {for (CodeProblem problem: annotationSupport.getNewProblems(getNewBlobIdent().path)) {- if (isVisible(new DiffPlanarRange(false, problem.getRange())))+ if (problem.getRange() != null && isVisible(new DiffPlanarRange(false, problem.getRange())))newProblems.add(problem);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.javaindex 386aab4607..95ea1aca70 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java@@ -47,7 +47,15 @@ public class CodeStatsPanel extends GenericPanel<Project> {super.onInitialize();PageParameters params = ProjectBlobPage.paramsOf(getProject());- Link<Void> filesLink = new BookmarkablePageLink<Void>("files", ProjectBlobPage.class, params);+ Link<Void> filesLink = new BookmarkablePageLink<Void>("files", ProjectBlobPage.class, params) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getCommitInfoManager().getFileCount(getProject().getId()) != 0);+ }++ };filesLink.add(new Label("label", new LoadableDetachableModel<String>() {@Overridediff --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.jsindex 87fcb0cfed..6921d8ac1e 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@@ -250,10 +250,10 @@ onedev.server.sourceView = {for (var i in problems)markRanges.push(problems[i].range);- var iconInfo = onedev.server.codeProblem.getIconInfo(problems);+ var severityInfo = onedev.server.codeProblem.getSeverityInfo(problems);- let svg = `<svg class='icon icon-sm'><use xlink:href='${onedev.server.icons}#${iconInfo[0]}'/></svg>`;- $gutter.append(`<a class='problem-trigger ${iconInfo[1]}'>${svg}</a>`);+ let svg = `<svg class='icon icon-sm'><use xlink:href='${onedev.server.icons}#exclamation-circle-o'/></svg>`;+ $gutter.append(`<a class='problem-trigger ${severityInfo}'>${svg}</a>`);var $trigger = $gutter.children("a");$trigger.mouseover(function() {onedev.server.codemirror.mark(cm, markRanges);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 5776b78f3a..b9b2186b5c 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@@ -943,10 +943,12 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Revfor (CodeProblem problem: contribution.getCodeProblems(build, blobPath, null)) {if (!buildCommitId.equals(getComparisonBase())) {Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId, getComparisonBase(), blobPath);- PlanarRange range = DiffUtils.mapRange(lineMapping, problem.getRange());- if (range != null) {- problems.add(new CodeProblem(problem.getSeverity(), problem.getType(),- problem.getBlobPath(), range, problem.getMessage()));+ 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()));+ }}} else {problems.add(problem);@@ -974,10 +976,12 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Revif (!state.newCommitHash.equals(buildCommitId.name())) {Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId,ObjectId.fromString(state.newCommitHash), blobPath);- PlanarRange range = DiffUtils.mapRange(lineMapping, problem.getRange());- if (range != null) {- problems.add(new CodeProblem(problem.getSeverity(), problem.getType(),- problem.getBlobPath(), range, problem.getMessage()));+ 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()));+ }}} else {problems.add(problem);diff --git a/server-ee b/server-eeindex dce943d4c5..b208f525f5 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit dce943d4c506e76ead614a0806bbf35cd34e894a+Subproject commit b208f525f541702af26a1ca57a886e5513d93eb7diff --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.javaindex 4373d77d09..17d31c72d4 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@@ -82,8 +82,8 @@ public class PublishCheckstyleReportStep extends PublishProblemReportStep {severity = Severity.MEDIUM;elseseverity = Severity.LOW;- String message = HtmlEscape.escapeHtml5(violationElement.attributeValue("message"));- String rule = violationElement.attributeValue("source");+ String message = violationElement.attributeValue("source") + ": "+ + HtmlEscape.escapeHtml5(violationElement.attributeValue("message"));int lineNo = Integer.parseInt(violationElement.attributeValue("line"))-1;String column = violationElement.attributeValue("column");@@ -95,7 +95,7 @@ public class PublishCheckstyleReportStep extends PublishProblemReportStep {range = new PlanarRange(lineNo, -1, lineNo, -1, TAB_WIDTH);}- problems.add(new CodeProblem(severity, rule, blobPath, range, message));+ problems.add(new CodeProblem(severity, blobPath, range, message));}} else {logger.warning("Unable to find blob path for file: " + filePath);diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.javaindex 2c48dad4a4..2a36a0d6cf 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java@@ -7,10 +7,12 @@ import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;import io.onedev.server.buildspec.step.PublishReportStep;import io.onedev.server.codequality.CoverageStatus;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.CoverageMetric;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.dao.Dao;import org.apache.commons.lang.SerializationUtils;@@ -27,46 +29,48 @@ public abstract class PublishCoverageReportStep extends PublishReportStep {private static final long serialVersionUID = 1L;@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- ProcessResult result = write(getReportLockName(build), () -> {- File reportDir = new File(build.getDir(), CoverageReport.CATEGORY + "/" + getReportName());+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ ProcessResult result = write(getReportLockName(build), () -> {+ File reportDir = new File(build.getDir(), CoverageReport.CATEGORY + "/" + getReportName());++ FileUtils.createDir(reportDir);+ try {+ ProcessResult aResult = process(build, inputDir, logger);+ if (aResult != null) {+ aResult.getReport().writeTo(reportDir);+ for (var entry: aResult.getStatuses().entrySet())+ writeLineStatuses(build, entry.getKey(), entry.getValue());- FileUtils.createDir(reportDir);- try {- ProcessResult aResult = process(build, inputDir, logger);- if (aResult != null) {- aResult.getReport().writeTo(reportDir);- for (var entry: aResult.getStatuses().entrySet())- writeLineStatuses(build, entry.getKey(), entry.getValue());-- OneDev.getInstance(ProjectManager.class).directoryModified(- build.getProject().getId(), reportDir.getParentFile());- return aResult;- } else {+ OneDev.getInstance(ProjectManager.class).directoryModified(+ build.getProject().getId(), reportDir.getParentFile());+ return aResult;+ } else {+ FileUtils.deleteDir(reportDir);+ return null;+ }+ } catch (Exception e) {FileUtils.deleteDir(reportDir);- return null;+ throw ExceptionUtils.unchecked(e);+ }+ });++ if (result != null) {+ var metric = OneDev.getInstance(BuildMetricManager.class).find(CoverageMetric.class, build, getReportName());+ if (metric == null) {+ metric = new CoverageMetric();+ metric.setBuild(build);+ metric.setReportName(getReportName());}- } catch (Exception e) {- FileUtils.deleteDir(reportDir);- throw ExceptionUtils.unchecked(e);++ CoverageInfo coverages = result.getReport().getOverallCoverages();+ metric.setBranchCoverage(coverages.getBranchCoverage());+ metric.setLineCoverage(coverages.getLineCoverage());++ OneDev.getInstance(Dao.class).persist(metric);}});-- if (result != null) {- var metric = OneDev.getInstance(BuildMetricManager.class).find(CoverageMetric.class, build, getReportName());- if (metric == null) {- metric = new CoverageMetric();- metric.setBuild(build);- metric.setReportName(getReportName());- }-- CoverageInfo coverages = result.getReport().getOverallCoverages();- metric.setBranchCoverage(coverages.getBranchCoverage());- metric.setLineCoverage(coverages.getLineCoverage());-- OneDev.getInstance(Dao.class).persist(metric);- }-return null;}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.javaindex f6ba034cef..aabd03f733 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@@ -121,7 +121,7 @@ public class PublishCPDReportStep extends PublishProblemReportStep {+ "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, "Code Duplication", duplication.blobPath,+ CodeProblem problem = new CodeProblem(Severity.LOW, duplication.blobPath,duplication.range, message);problems.add(problem);}diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.javaindex 4561ea30af..c10e37907f 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java@@ -9,10 +9,12 @@ import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.step.PublishReportStep;import io.onedev.server.buildspec.step.StepGroup;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.job.JobContext;import io.onedev.server.job.JobManager;import io.onedev.server.model.Build;+import io.onedev.server.persistence.SessionManager;import org.apache.shiro.authz.UnauthorizedException;import org.jetbrains.annotations.Nullable;@@ -53,35 +55,38 @@ public class PublishHtmlReportStep extends PublishReportStep {@Nullable@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- JobContext jobContext = OneDev.getInstance(JobManager.class).getJobContext(build.getId());- if (jobContext.getJobExecutor().isHtmlReportPublishEnabled()) {- return write(getReportLockName(build), () -> {- File reportDir = new File(build.getDir(), CATEGORY + "/" + getReportName());- File startPage = new File(inputDir, getStartPage());- if (startPage.exists()) {- FileUtils.createDir(reportDir);- File startPageFile = new File(reportDir, START_PAGE);- FileUtils.writeFile(startPageFile, getStartPage());+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ JobContext jobContext = OneDev.getInstance(JobManager.class).getJobContext(build.getId());+ if (jobContext.getJobExecutor().isHtmlReportPublishEnabled()) {+ write(getReportLockName(build), () -> {+ File reportDir = new File(build.getDir(), CATEGORY + "/" + getReportName());+ File startPage = new File(inputDir, getStartPage());+ if (startPage.exists()) {+ FileUtils.createDir(reportDir);+ File startPageFile = new File(reportDir, START_PAGE);+ FileUtils.writeFile(startPageFile, getStartPage());- int baseLen = inputDir.getAbsolutePath().length() + 1;- for (File file : getPatternSet().listFiles(inputDir)) {- try {- FileUtils.copyFile(file, new File(reportDir, file.getAbsolutePath().substring(baseLen)));- } catch (IOException e) {- throw new RuntimeException(e);+ int baseLen = inputDir.getAbsolutePath().length() + 1;+ for (File file : getPatternSet().listFiles(inputDir)) {+ try {+ FileUtils.copyFile(file, new File(reportDir, file.getAbsolutePath().substring(baseLen)));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}+ OneDev.getInstance(ProjectManager.class).directoryModified(+ build.getProject().getId(), reportDir.getParentFile());+ } else {+ logger.warning("Html report start page not found: " + startPage.getAbsolutePath());}- OneDev.getInstance(ProjectManager.class).directoryModified(- build.getProject().getId(), reportDir.getParentFile());- } else {- logger.warning("Html report start page not found: " + startPage.getAbsolutePath());- }- return null;- });- } else {- throw new UnauthorizedException("Html report publish is prohibited by current job executor");- }+ });+ } else {+ throw new UnauthorizedException("Html report publish is prohibited by current job executor");+ }+ });+ return null;}public static String getReportLockName(Build build) {diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.javaindex 28bd1c93e6..97800a780b 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java@@ -1,23 +1,24 @@package io.onedev.server.plugin.report.markdown;-import java.io.File;-import java.io.IOException;-import java.util.List;-import java.util.Map;--import javax.validation.constraints.NotEmpty;-import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.step.PublishReportStep;import io.onedev.server.buildspec.step.StepGroup;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;+import io.onedev.server.persistence.SessionManager;++import javax.validation.constraints.NotEmpty;+import java.io.File;+import java.io.IOException;+import java.util.List;+import java.util.Map;import static io.onedev.commons.utils.LockUtils.write;@@ -57,32 +58,34 @@ public class PublishMarkdownReportStep extends PublishReportStep {}@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- write(getReportLockName(build), () -> {- File startPage = new File(inputDir, getStartPage());- if (startPage.exists()) {- File reportDir = new File(build.getDir(), CATEGORY + "/" + getReportName());+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ write(getReportLockName(build), () -> {+ File startPage = new File(inputDir, getStartPage());+ if (startPage.exists()) {+ File reportDir = new File(build.getDir(), CATEGORY + "/" + getReportName());++ FileUtils.createDir(reportDir);+ File startPageFile = new File(reportDir, START_PAGE);+ FileUtils.writeFile(startPageFile, getStartPage());- FileUtils.createDir(reportDir);- File startPageFile = new File(reportDir, START_PAGE);- FileUtils.writeFile(startPageFile, getStartPage());-- int baseLen = inputDir.getAbsolutePath().length() + 1;- for (File file: getPatternSet().listFiles(inputDir)) {- try {- FileUtils.copyFile(file, new File(reportDir, file.getAbsolutePath().substring(baseLen)));- } catch (IOException e) {- throw new RuntimeException(e);+ int baseLen = inputDir.getAbsolutePath().length() + 1;+ for (File file: getPatternSet().listFiles(inputDir)) {+ try {+ FileUtils.copyFile(file, new File(reportDir, file.getAbsolutePath().substring(baseLen)));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}+ OneDev.getInstance(ProjectManager.class).directoryModified(+ build.getProject().getId(), reportDir.getParentFile());+ } else {+ logger.log("WARNING: Markdown report start page not found: " + startPage.getAbsolutePath());}- OneDev.getInstance(ProjectManager.class).directoryModified(- build.getProject().getId(), reportDir.getParentFile());- } else {- logger.log("WARNING: Markdown report start page not found: " + startPage.getAbsolutePath());- }- return null;+ return null;+ });});-return null;}diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.javaindex cf14ad443f..277dd23fcf 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java@@ -1,23 +1,22 @@package io.onedev.server.plugin.report.markdown;-import java.io.File;-import java.nio.charset.StandardCharsets;-import java.util.List;-import java.util.Map;--import javax.validation.constraints.NotEmpty;-import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.step.PublishReportStep;import io.onedev.server.buildspec.step.StepGroup;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Build;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;+import io.onedev.server.persistence.SessionManager;++import javax.validation.constraints.NotEmpty;+import java.io.File;+import java.util.List;+import java.util.Map;import static io.onedev.commons.utils.LockUtils.write;import static java.nio.charset.StandardCharsets.UTF_8;@@ -56,23 +55,26 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {}@Override- public Map<String, byte[]> run(Build build, File workspace, TaskLogger logger) {- if (build.getRequest() != null) {- write(getReportLockName(build.getProject().getId(), build.getNumber()), () -> {- File file = new File(workspace, getFile());- if (file.exists()) {- File reportDir = new File(build.getDir(), CATEGORY + "/" + getReportName());- String markdown = FileUtils.readFileToString(file, UTF_8);- FileUtils.createDir(reportDir);- FileUtils.writeFile(new File(reportDir, CONTENT), markdown, UTF_8);- OneDev.getInstance(ProjectManager.class).directoryModified(- build.getProject().getId(), reportDir.getParentFile());- } else {- logger.log("WARNING: Markdown report file not found: " + file.getAbsolutePath());- }- return null;- });- }+ public Map<String, byte[]> run(Long buildId, File workspace, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ if (build.getRequest() != null) {+ write(getReportLockName(build.getProject().getId(), build.getNumber()), () -> {+ File file = new File(workspace, getFile());+ if (file.exists()) {+ File reportDir = new File(build.getDir(), CATEGORY + "/" + getReportName());+ String markdown = FileUtils.readFileToString(file, UTF_8);+ FileUtils.createDir(reportDir);+ FileUtils.writeFile(new File(reportDir, CONTENT), markdown, UTF_8);+ OneDev.getInstance(ProjectManager.class).directoryModified(+ build.getProject().getId(), reportDir.getParentFile());+ } else {+ logger.log("WARNING: Markdown report file not found: " + file.getAbsolutePath());+ }+ return null;+ });+ }+ });return null;}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.javaindex e134f909b1..d74996894f 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@@ -92,8 +92,8 @@ public class PublishPMDReportStep extends PublishProblemReportStep {elseseverity = Severity.LOW;- String message = HtmlEscape.escapeHtml5(violationElement.getText());- problems.add(new CodeProblem(severity, type, blobPath, range, message));+ String message = type + ": " + HtmlEscape.escapeHtml5(violationElement.getText());+ problems.add(new CodeProblem(severity, blobPath, range, 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/ProblemReport.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.javaindex 811eafd0da..81bb4d1143 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@@ -4,6 +4,7 @@ import io.onedev.server.codequality.CodeProblem;import io.onedev.server.model.Build;import org.apache.commons.lang3.SerializationUtils;+import javax.annotation.Nullable;import java.io.*;import java.util.*;@@ -19,15 +20,27 @@ public class ProblemReport implements Serializable {private final Collection<CodeProblem> problems;- private transient Collection<ProblemFile> problemFiles;+ private final String failBuildReason;- public ProblemReport(Collection<CodeProblem> problems) {+ private transient Collection<ProblemFile> problemFiles;++ public ProblemReport(Collection<CodeProblem> problems, @Nullable String failBuildReason) {this.problems = problems;+ this.failBuildReason = failBuildReason;}+ public ProblemReport(Collection<CodeProblem> problems) {+ this(problems, null);+ }+public Collection<CodeProblem> getProblems() {return problems;- }+ }++ @Nullable+ public String getFailBuildReason() {+ return failBuildReason;+ }public Collection<ProblemFile> getProblemFiles() {if (problemFiles == null) {@@ -72,17 +85,20 @@ public class ProblemReport implements Serializable {}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<>();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());}- return new Comparator<ProblemFile>() {+ return new Comparator<>() {private int compareSeverityCount(Map<String, Long> severityCounts, ProblemFile file1, ProblemFile file2) {var severityCount1 = severityCounts.getOrDefault(file1.getBlobPath(), 0L);@@ -92,15 +108,21 @@ public class ProblemReport implements Serializable {@Overridepublic int compare(ProblemFile o1, ProblemFile o2) {- var order = compareSeverityCount(highSeverityCounts, o1, o2);+ var order = compareSeverityCount(criticalSeverityCounts, o1, o2);+ if (order != 0)+ return order;+ order = compareSeverityCount(highSeverityCounts, o1, o2);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.htmlindex 7729414674..2bdd0678fb 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@@ -19,18 +19,17 @@<div class="file 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></a><a wicket:id="view" title="Show problems in file view" class="mr-auto"><wicket:svg href="file" class="icon"/></a>- <span wicket:id="numOfProblems" class="ml-2 text-muted"></span></div><wicket:enclosure child="problems"><div class="problems mt-2"><div wicket:id="tooManyProblems" class="alert alert-notice alert-light-warning"></div>- <div wicket:id="problems" class="problem d-flex px-3 py-2 rounded bg-hover-light">- <svg wicket:id="icon" class="icon icon-sm mr-2 mt-1 flex-shrink-0"/>- <div class="flex-grow-1">- <div class="d-flex mb-1">- <div wicket:id="message" class="message text-break mr-auto"></div>- <a wicket:id="range" class="range ml-3 text-nowrap"><span wicket:id="label"></span></a>+ <div wicket:id="problems" class="problem px-3 py-2 rounded bg-hover-light">+ <div class="d-flex mb-1">+ <div class="mr-auto">+ <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></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.javaindex 8d251a4df6..bca9c45d19 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@@ -246,9 +246,7 @@ public class ProblemReportPage extends BuildReportPage {state.problemReport = getReportName();PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);item.add(new BookmarkablePageLink<Void>("view", ProjectBlobPage.class, params));-- item.add(new Label("numOfProblems", file.getProblems().size() + " problems"));-+item.add(new Label("tooManyProblems","Too many problems, displaying first " + MAX_PROBLEMS_TO_DISPLAY) {@@ -269,10 +267,21 @@ public class ProblemReportPage extends BuildReportPage {problems.sort((o1, o2) -> {if (o1.getSeverity() != o2.getSeverity())return o1.getSeverity().ordinal() - o2.getSeverity().ordinal();- else if (o1.getRange().getFromRow() != o2.getRange().getFromRow())- return o1.getRange().getFromRow() - o2.getRange().getFromRow();- else- return o1.getRange().getFromColumn() - o2.getRange().getFromColumn();+ if (o1.getRange() != null) {+ if (o2.getRange() != null) {+ if (o1.getRange().getFromRow() != o2.getRange().getFromRow())+ return o1.getRange().getFromRow() - o2.getRange().getFromRow();+ else+ return o1.getRange().getFromColumn() - o2.getRange().getFromColumn();+ } else {+ return -1;+ }+ } else {+ if (o2.getRange() != null)+ return 1;+ else+ return 0;+ }});if (problems.size() > MAX_PROBLEMS_TO_DISPLAY)return problems.subList(0, MAX_PROBLEMS_TO_DISPLAY);@@ -285,19 +294,34 @@ public class ProblemReportPage extends BuildReportPage {@Overrideprotected void populateItem(ListItem<CodeProblem> item) {CodeProblem problem = item.getModelObject();- item.add(newSeverityIcon("icon", problem.getSeverity()));+ var severityLabel = new Label("severity", problem.getSeverity().name());+ item.add(severityLabel);+ if (problem.getSeverity() == Severity.CRITICAL || problem.getSeverity() == Severity.HIGH)+ severityLabel.add(AttributeAppender.append("class", "badge-danger"));+ else if (problem.getSeverity() == Severity.MEDIUM)+ severityLabel.add(AttributeAppender.append("class", "badge-warning"));+ else+ severityLabel.add(AttributeAppender.append("class", "badge-secondary"));+item.add(new Label("message", problem.getMessage()).setEscapeModelStrings(false));- ProjectBlobPage.State state = new ProjectBlobPage.State();- state.blobIdent = new BlobIdent(getBuild().getCommitHash(),- filePath, FileMode.REGULAR_FILE.getBits());- state.problemReport = getReportName();- state.position = BlobRenderer.getSourcePosition(problem.getRange());- PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);- BookmarkablePageLink<Void> rangeLink = new BookmarkablePageLink<Void>("range",- ProjectBlobPage.class, params);- rangeLink.add(new Label("label", describe(problem.getRange())));- item.add(rangeLink);+ if (problem.getRange() != null) {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(getBuild().getCommitHash(),+ filePath, FileMode.REGULAR_FILE.getBits());+ state.problemReport = getReportName();+ state.position = BlobRenderer.getSourcePosition(problem.getRange());+ PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);+ BookmarkablePageLink<Void> rangeLink = new BookmarkablePageLink<Void>("range",+ ProjectBlobPage.class, params);+ rangeLink.add(new Label("label", describe(problem.getRange())));+ item.add(rangeLink);+ } else {+ var rangeLink = new WebMarkupContainer("range");+ rangeLink.add(new WebMarkupContainer("label"));+ rangeLink.setVisible(false);+ item.add(rangeLink);+ }}@Override@@ -373,28 +397,6 @@ public class ProblemReportPage extends BuildReportPage {return "Line: " + (range.getFromRow()+1) + " - " + (range.getToRow()+1);}- protected SpriteImage newSeverityIcon(String componentId, Severity severity) {- String iconHref;- String iconClass;- switch (severity) {- case HIGH:- iconHref = "times-circle-o";- iconClass = "text-danger";- break;- case MEDIUM:- iconHref = "warning-o";- iconClass = "text-warning";- break;- default:- iconClass = "text-info";- iconHref = "info-circle-o";- }-- SpriteImage icon = new SpriteImage(componentId, iconHref);- icon.add(AttributeAppender.append("class", iconClass));- return icon;- }-public static PageParameters paramsOf(Build build, String reportName, @Nullable String file) {PageParameters params = paramsOf(build, reportName);if (file != null)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.javaindex ea5cbf26e6..f9e8085ff6 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@@ -1,21 +1,21 @@package io.onedev.server.plugin.report.problem;-import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.commons.utils.FileUtils;-import io.onedev.commons.utils.LockUtils;-import io.onedev.commons.utils.TaskLogger;+import io.onedev.commons.utils.*;import io.onedev.server.OneDev;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.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.ProblemMetric;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.dao.Dao;import org.apache.commons.lang3.SerializationUtils;+import javax.annotation.Nullable;import java.io.*;import java.util.Collection;import java.util.Map;@@ -26,53 +26,61 @@ public abstract class PublishProblemReportStep extends PublishReportStep {private static final long serialVersionUID = 1L;@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- File reportDir = new File(build.getDir(), ProblemReport.CATEGORY + "/" + getReportName());-- ProblemReport report = LockUtils.write(ProblemReport.getReportLockName(build), () -> {- FileUtils.createDir(reportDir);- try {- ProblemReport aReport = process(build, inputDir, reportDir, logger);- if (aReport != null) {- aReport.writeTo(reportDir);- for (var problemFile: aReport.getProblemFiles())- writeFileProblems(build, problemFile.getBlobPath(), problemFile.getProblems());- OneDev.getInstance(ProjectManager.class).directoryModified(- build.getProject().getId(), reportDir.getParentFile());- return aReport;- } else {+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ File reportDir = new File(build.getDir(), ProblemReport.CATEGORY + "/" + getReportName());++ ProblemReport report = LockUtils.write(ProblemReport.getReportLockName(build), () -> {+ FileUtils.createDir(reportDir);+ try {+ ProblemReport aReport = process(build, inputDir, reportDir, logger);+ if (aReport != null) {+ aReport.writeTo(reportDir);+ for (var problemFile: aReport.getProblemFiles())+ writeFileProblems(build, problemFile.getBlobPath(), problemFile.getProblems());+ OneDev.getInstance(ProjectManager.class).directoryModified(+ build.getProject().getId(), reportDir.getParentFile());+ return aReport;+ } else {+ FileUtils.deleteDir(reportDir);+ return null;+ }+ } catch (Exception e) {FileUtils.deleteDir(reportDir);- return null;+ throw ExceptionUtils.unchecked(e);}- } catch (Exception e) {- FileUtils.deleteDir(reportDir);- throw ExceptionUtils.unchecked(e);- }- });-- if (report != null) {- FileUtils.createDir(reportDir);- report.writeTo(reportDir);+ });- var metric = OneDev.getInstance(BuildMetricManager.class).find(ProblemMetric.class, build, getReportName());- if (metric == null) {- metric = new ProblemMetric();- metric.setBuild(build);- metric.setReportName(getReportName());- }- metric.setHighSeverities((int) report.getProblems().stream()- .filter(it->it.getSeverity()==Severity.HIGH)- .count());- metric.setMediumSeverities((int) report.getProblems().stream()- .filter(it->it.getSeverity()==Severity.MEDIUM)- .count());- metric.setLowSeverities((int) report.getProblems().stream()- .filter(it->it.getSeverity()==Severity.LOW)- .count());-- OneDev.getInstance(Dao.class).persist(metric);- }-+ if (report != null) {+ FileUtils.createDir(reportDir);+ report.writeTo(reportDir);++ var metric = OneDev.getInstance(BuildMetricManager.class).find(ProblemMetric.class, build, getReportName());+ if (metric == null) {+ metric = new ProblemMetric();+ metric.setBuild(build);+ metric.setReportName(getReportName());+ }+ metric.setCriticalSeverities((int) report.getProblems().stream()+ .filter(it->it.getSeverity()==Severity.CRITICAL)+ .count());+ metric.setHighSeverities((int) report.getProblems().stream()+ .filter(it->it.getSeverity()==Severity.HIGH)+ .count());+ metric.setMediumSeverities((int) report.getProblems().stream()+ .filter(it->it.getSeverity()==Severity.MEDIUM)+ .count());+ metric.setLowSeverities((int) report.getProblems().stream()+ .filter(it->it.getSeverity()==Severity.LOW)+ .count());++ OneDev.getInstance(Dao.class).persist(metric);++ if (report.getFailBuildReason() != null)+ throw new ExplicitException(report.getFailBuildReason());+ }+ });return null;}@@ -87,6 +95,7 @@ public abstract class PublishProblemReportStep extends PublishReportStep {}}+ @Nullableprotected abstract ProblemReport process(Build build, File inputDir, File reportDir, TaskLogger logger);}diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/problem-report.css b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/problem-report.cssindex c0f7476d29..df72d8445d 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/problem-report.css+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/problem-report.css@@ -1,3 +1,6 @@.problem-report .expanded .icon:first-child {transform: rotate(90deg);+}+.problem-report .problem .severity {+ width: 64px;}\ No newline at end of filediff --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.javaindex de1f4221cb..b65e639e16 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@@ -87,6 +87,7 @@ public class PublishRoslynatorReportStep extends PublishProblemReportStep {var message = messages.get(id);if (message == null)message = diagnosticsElement.elementText("Message");+ message = id + ": " + message;CodeProblem.Severity severity;switch (diagnosticsElement.elementText("Severity").trim()) {case "Error":@@ -111,7 +112,7 @@ public class PublishRoslynatorReportStep extends PublishProblemReportStep {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, id, blobPath.get(), range, message));+ problems.add(new CodeProblem(severity, blobPath.get(), range, 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.javaindex fbe8a53f72..d3b2102c02 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@@ -92,7 +92,7 @@ public class PublishSpotBugsReportStep extends PublishProblemReportStep {if (StringUtils.isBlank(message))message = bugElement.elementText("ShortMessage");- message = HtmlEscape.escapeHtml5(message);+ message = type + ": " + HtmlEscape.escapeHtml5(message);PlanarRange range = getRange(bugElement, true);@@ -105,7 +105,7 @@ public class PublishSpotBugsReportStep extends PublishProblemReportStep {if (range == null)range = new PlanarRange(0, -1, 0, -1);- problems.add(new CodeProblem(severity, type, blobPath, range, message));+ problems.add(new CodeProblem(severity, blobPath, range, message));} else {logger.warning("Unable to find blob path for file: " + filePath);}diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.javaindex 4bb71ea375..d0c3b2f4cd 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java@@ -5,10 +5,12 @@ import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;import io.onedev.server.buildspec.step.PublishReportStep;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.UnitTestMetric;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.dao.Dao;import javax.annotation.Nullable;@@ -24,37 +26,40 @@ public abstract class PublishUnitTestReportStep extends PublishReportStep {private static final long serialVersionUID = 1L;@Override- public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- File reportDir = new File(build.getDir(), UnitTestReport.CATEGORY + "/" + getReportName());+ public Map<String, byte[]> run(Long buildId, File inputDir, TaskLogger logger) {+ OneDev.getInstance(SessionManager.class).run(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);+ File reportDir = new File(build.getDir(), UnitTestReport.CATEGORY + "/" + getReportName());- UnitTestReport report = write(getReportLockName(build), () -> {- UnitTestReport aReport = createReport(build, inputDir, logger);- if (aReport != null) {- FileUtils.createDir(reportDir);- aReport.writeTo(reportDir);- OneDev.getInstance(ProjectManager.class).directoryModified(- build.getProject().getId(), reportDir.getParentFile());- return aReport;- } else {- return null;+ UnitTestReport report = write(getReportLockName(build), () -> {+ UnitTestReport aReport = createReport(build, inputDir, logger);+ if (aReport != null) {+ FileUtils.createDir(reportDir);+ aReport.writeTo(reportDir);+ OneDev.getInstance(ProjectManager.class).directoryModified(+ build.getProject().getId(), reportDir.getParentFile());+ return aReport;+ } else {+ return null;+ }+ });++ if (report != null) {+ var metric = OneDev.getInstance(BuildMetricManager.class).find(UnitTestMetric.class, build, getReportName());+ if (metric == null) {+ metric = new UnitTestMetric();+ metric.setBuild(build);+ metric.setReportName(getReportName());+ }+ metric.setTestCaseSuccessRate(report.getTestCaseSuccessRate());+ metric.setTestSuiteSuccessRate(report.getTestSuiteSuccessRate());+ metric.setNumOfTestCases(report.getTestCases().size());+ metric.setNumOfTestSuites(report.getTestSuites().size());+ metric.setTotalTestDuration(report.getTestDuration());+ OneDev.getInstance(Dao.class).persist(metric);}+});-- if (report != null) {- var metric = OneDev.getInstance(BuildMetricManager.class).find(UnitTestMetric.class, build, getReportName());- if (metric == null) {- metric = new UnitTestMetric();- metric.setBuild(build);- metric.setReportName(getReportName());- }- metric.setTestCaseSuccessRate(report.getTestCaseSuccessRate());- metric.setTestSuiteSuccessRate(report.getTestSuiteSuccessRate());- metric.setNumOfTestCases(report.getTestCases().size());- metric.setNumOfTestSuites(report.getTestSuites().size());- metric.setTotalTestDuration(report.getTestDuration());- OneDev.getInstance(Dao.class).persist(metric);- }-return null;}diff --git a/server-product/pom.xml b/server-product/pom.xmlindex a245d5f90f..02294d5164 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -245,10 +245,6 @@<groupId>commons-codec</groupId><artifactId>commons-codec</artifactId></dependency>- <dependency>- <groupId>org.apache.commons</groupId>- <artifactId>commons-collections4</artifactId>- </dependency><dependency><groupId>commons-io</groupId><artifactId>commons-io</artifactId>