The Unified and Autonomous Development Platform
Fix issue #219 - Render Jest unit test report in build detail page
Robin Shenbd615dbb865f
diff --git a/pom.xml b/pom.xmlindex 107f801de5..699f2a30f8 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -573,8 +573,8 @@</repository></repositories><properties>- <commons.version>2.0.0</commons.version>- <k8shelper.version>1.0.22</k8shelper.version>+ <commons.version>2.0.1</commons.version>+ <k8shelper.version>1.0.24</k8shelper.version><slf4j.version>1.7.5</slf4j.version><logback.version>1.0.11</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex e322831367..79dc50dbb6 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex ed29d71b36..77e231910c 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -83,6 +83,7 @@ import io.onedev.commons.launcher.loader.AbstractPlugin;import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.commons.launcher.loader.ImplementationProvider;import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.job.DefaultJobManager;import io.onedev.server.buildspec.job.JobManager;@@ -596,7 +597,7 @@ public class CoreModule extends AbstractPluginModule {public Collection<Class<? extends Exception>> getExpectedExceptionClasses() {return Sets.newHashSet(ConstraintViolationException.class, EntityNotFoundException.class,ObjectNotFoundException.class, StaleStateException.class, UnauthorizedException.class,- GeneralException.class, PageExpiredException.class, StalePageException.class);+ ExplicitException.class, PageExpiredException.class, StalePageException.class);}});diff --git a/server-core/src/main/java/io/onedev/server/GeneralException.java b/server-core/src/main/java/io/onedev/server/GeneralException.javadeleted file mode 100644index 91366e8f82..0000000000--- a/server-core/src/main/java/io/onedev/server/GeneralException.java+++ /dev/null@@ -1,19 +0,0 @@-package io.onedev.server;--public class GeneralException extends RuntimeException {-- private static final long serialVersionUID = 1L;-- public GeneralException(String message) {- super(message);- }-- public GeneralException(String message, Throwable cause) {- super(message, cause);- }-- public GeneralException(Throwable cause) {- super(cause);- }--}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecException.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecException.javaindex 6d5141e231..945642dc8a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecException.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecException.java@@ -1,9 +1,9 @@package io.onedev.server.buildspec;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.util.Path;-public class BuildSpecException extends GeneralException {+public class BuildSpecException extends ExplicitException {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java b/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.javaindex 18b75444ad..227a882952 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java@@ -1,8 +1,8 @@package io.onedev.server.buildspec;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;-public class InvalidBuildSpecException extends GeneralException {+public class InvalidBuildSpecException extends ExplicitException {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 8e8428a502..1c685a76cc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -47,10 +47,10 @@ import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;import io.onedev.k8shelper.CacheInstance;import io.onedev.k8shelper.CloneInfo;-import io.onedev.server.GeneralException;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.action.PostBuildAction;@@ -161,7 +161,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizfor (ConstraintViolation<?> violation: validator.validate(project.getBuildSpec(commitId))) {String message = String.format("Error validating build spec (project: %s, commit: %s, property: %s, message: %s)",project.getName(), commitId.name(), violation.getPropertyPath(), violation.getMessage());- throw new GeneralException(message);+ throw new ExplicitException(message);}} finally {Project.pop();@@ -214,7 +214,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizif (!checkedJobNames.add(jobName)) {String message = String.format("Circular job dependencies found (%s)", checkedJobNames);- throw new GeneralException(message);+ throw new ExplicitException(message);}Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);@@ -273,14 +273,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizfor (ProjectDependency dependency: build.getJob().getProjectDependencies()) {Project dependencyProject = projectManager.find(dependency.getProjectName());if (dependencyProject == null)- throw new GeneralException("Unable to find dependency project: " + dependency.getProjectName());+ throw new ExplicitException("Unable to find dependency project: " + dependency.getProjectName());Subject subject;if (dependency.getAccessTokenSecret() != null) {String accessToken = build.getSecretValue(dependency.getAccessTokenSecret());User user = userManager.findByAccessToken(accessToken);if (user == null) {- throw new GeneralException("Unable to access dependency project '"+ throw new ExplicitException("Unable to access dependency project '"+ dependency.getProjectName() + "': invalid access token");}subject = user.asSubject();@@ -295,12 +295,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizif (dependencyBuild == null) {String errorMessage = String.format("Unable to find dependency build (project: %s, build number: %d)",dependency.getProjectName(), buildNumber);- throw new GeneralException(errorMessage);+ throw new ExplicitException(errorMessage);}JobPermission jobPermission = new JobPermission(dependencyBuild.getJobName(), new AccessBuild());if (!subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {- throw new GeneralException("Unable to access dependency build '"+ throw new ExplicitException("Unable to access dependency build '"+ dependencyBuild.getFQN() + "': permission denied");}@@ -433,6 +433,20 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});}++ @Override+ public void reportJobWorkspace(String jobWorkspace) {+ transactionManager.run(new Runnable() {++ @Override+ public void run() {+ Build build = buildManager.load(buildId);+ build.setJobWorkspace(jobWorkspace);+ buildManager.save(build);+ }++ });+ }};} finally {@@ -456,7 +470,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic Boolean call() {Build build = buildManager.load(buildId);- if (e instanceof GeneralException)+ if (e instanceof ExplicitException)build.setErrorMessage(e.getMessage());elsebuild.setErrorMessage(Throwables.getStackTraceAsString(e));@@ -526,7 +540,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizjobLogger.log("Publishing job artifacts...");build.publishArtifacts(serverWorkspace, job.getArtifacts());}-+jobLogger.log("Processing job reports...");for (JobReport report: job.getReports())report.process(build, serverWorkspace, jobLogger);@@ -548,7 +562,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizreturn executionRef.get();} else {- throw new GeneralException("No applicable job executor");+ throw new ExplicitException("No applicable job executor");}} finally {Build.pop();@@ -556,23 +570,23 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}private void log(Throwable e, SimpleLogger logger) {- if (e instanceof GeneralException)+ if (e instanceof ExplicitException)logger.log(e.getMessage());elselogger.log(e);}private RuntimeException maskSecrets(Throwable e, Collection<String> jobSecretsToMask) {- if (e instanceof GeneralException) {+ if (e instanceof ExplicitException) {String errorMessage = e.getMessage();for (String secret: jobSecretsToMask)errorMessage = StringUtils.replace(errorMessage, secret, SecretInput.MASK);- return new GeneralException(errorMessage);+ return new ExplicitException(errorMessage);} else {String stackTrace = Throwables.getStackTraceAsString(e);for (String secret: jobSecretsToMask)stackTrace = StringUtils.replace(stackTrace, secret, SecretInput.MASK);- return new GeneralException(stackTrace);+ return new ExplicitException(stackTrace);}}@@ -580,7 +594,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizpublic JobContext getJobContext(String jobToken, boolean mustExist) {JobContext jobContext = jobContexts.get(jobToken);if (mustExist && jobContext == null)- throw new GeneralException("No job context found for specified job token");+ throw new ExplicitException("No job context found for specified job token");return jobContext;}@@ -698,7 +712,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuildManager.save(build);listenerRegistry.post(new BuildSubmitted(build));} else {- throw new GeneralException("Build #" + build.getNumber() + " not finished yet");+ throw new ExplicitException("Build #" + build.getNumber() + " not finished yet");}}@@ -791,7 +805,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriztry {jobExecutions.put(build.getId(), execute(build));} catch (Throwable t) {- if (t instanceof GeneralException)+ if (t instanceof ExplicitException)markBuildError(build, t.getMessage());elsemarkBuildError(build, Throwables.getStackTraceAsString(t));@@ -838,7 +852,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}build.setStatus(Build.Status.CANCELLED);} catch (ExecutionException e) {- if (e.getCause() instanceof GeneralException)+ if (e.getCause() instanceof ExplicitException)build.setStatus(Build.Status.FAILED, e.getCause().getMessage());elsebuild.setStatus(Build.Status.FAILED, e.getMessage());diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.javaindex b7dd01786f..a106302897 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java@@ -163,4 +163,6 @@ public abstract class JobContext {public abstract void notifyJobRunning();+ public abstract void reportJobWorkspace(String jobWorkspace);+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.javaindex 61884f3406..e0bec8e4f2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java@@ -18,7 +18,7 @@ import io.onedev.server.web.editable.annotation.Patterns;public abstract class JobReport implements Serializable {private static final long serialVersionUID = 1L;-+private String filePatterns;private transient PatternSet patternSet;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.javaindex 3d6ba51529..ee4b6d3bd8 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java@@ -11,8 +11,8 @@ import java.util.Map;import java.util.Map.Entry;import java.util.function.Function;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.model.Build;import io.onedev.server.util.BeanUtils;@@ -61,18 +61,18 @@ public class VariableInterpolator implements Function<String, String> {}return StringUtils.join(paramValues, ",");} else {- throw new GeneralException("Invisible param: " + paramName);+ throw new ExplicitException("Invisible param: " + paramName);}}}- throw new GeneralException("Undefined param: " + paramName);+ throw new ExplicitException("Undefined param: " + paramName);} else if (t.startsWith(PREFIX_PROPERTIES)) {String propertyName = t.substring(PREFIX_PROPERTIES.length());String propertyValue = build.getSpec().getPropertyMap().get(propertyName);if (propertyValue != null)return propertyValue;else- throw new GeneralException("Undefined property: " + propertyName);+ throw new ExplicitException("Undefined property: " + propertyName);} else if (t.startsWith(PREFIX_SECRETS)) {String secretName = t.substring(PREFIX_SECRETS.length());return build.getSecretValue(secretName);@@ -86,7 +86,7 @@ public class VariableInterpolator implements Function<String, String> {elsereturn "";} else {- throw new GeneralException("Unrecognized interpolation variable: " + t);+ throw new ExplicitException("Unrecognized interpolation variable: " + t);}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.javaindex 5917409269..a00e237131 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java@@ -5,8 +5,8 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Build;@@ -57,10 +57,10 @@ public class CloseMilestoneAction extends PostBuildAction {milestone.setClosed(true);milestoneManager.save(milestone);} else {- throw new GeneralException("Closing milestone '" + milestoneName + "' is not allowed in this build");+ throw new ExplicitException("Closing milestone '" + milestoneName + "' is not allowed in this build");}} else {- throw new GeneralException("Unable to find milestone '" + milestoneName + "'");+ throw new ExplicitException("Unable to find milestone '" + milestoneName + "'");}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.javaindex d44dad6c6f..4b8b2a9f63 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java@@ -7,8 +7,8 @@ import org.eclipse.jgit.lib.Ref;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UserManager;@@ -73,7 +73,7 @@ public class CreateTagAction extends PostBuildAction {project.createTag(tagName, build.getCommitHash(), tagIdent, getTagMessage());}} else {- throw new GeneralException("Creating tag '" + tagName + "' is not allowed in this build");+ throw new ExplicitException("Creating tag '" + tagName + "' is not allowed in this build");}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.javaindex e6d1ee28e5..063f261490 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java@@ -13,8 +13,8 @@ import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.AndCriteriaContext;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.ConditionContext;@@ -102,7 +102,7 @@ public class ActionCondition extends Criteria<Build> {case ActionConditionLexer.PreviousIsTimedOut:return new PreviousIsTimedOutCriteria();default:- throw new GeneralException("Unexpected operator: " + ctx.operator.getText());+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}@@ -177,12 +177,12 @@ public class ActionCondition extends Criteria<Build> {if (operator != ActionConditionLexer.IsEmpty && operator != ActionConditionLexer.Is)throw newOperatorException(fieldName, operator);} else {- throw new GeneralException("Param not found: " + fieldName);+ throw new ExplicitException("Param not found: " + fieldName);}}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '"+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '"+ AntlrUtils.getLexerRuleName(ActionConditionLexer.ruleNames, operator) + "'");}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.javaindex 65bb0b7c17..d93976d8e0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java@@ -18,9 +18,9 @@ import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverParser.CriteriaContext;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.UserManager;@@ -63,14 +63,14 @@ public class NotificationReceiver {if (user != null)emails.add(user.getEmail());else- throw new GeneralException("Unable to find user '" + userName + "'");+ throw new ExplicitException("Unable to find user '" + userName + "'");} else if (criteria.groupCriteria() != null) {String groupName = getValue(criteria.groupCriteria().Value());Group group = OneDev.getInstance(GroupManager.class).find(groupName);if (group != null)emails.addAll(group.getMembers().stream().map(it->it.getEmail()).collect(Collectors.toList()));else- throw new GeneralException("Unable to find group '" + groupName + "'");+ throw new ExplicitException("Unable to find group '" + groupName + "'");} else if (criteria.Committers() != null) {if (build != null) {for (RevCommit commit: build.getCommits(null)) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.javaindex 81dcaf5df7..ac1092fb35 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java@@ -13,8 +13,8 @@ import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.AndCriteriaContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ConditionContext;@@ -139,7 +139,7 @@ public class RetryCondition extends Criteria<Build> {if (operator != RetryConditionLexer.IsEmpty && operator != RetryConditionLexer.Is)throw newOperatorException(fieldName, operator);} else {- throw new GeneralException("Param not found: " + fieldName);+ throw new ExplicitException("Param not found: " + fieldName);}}@@ -147,8 +147,8 @@ public class RetryCondition extends Criteria<Build> {return AntlrUtils.getLexerRuleName(RetryConditionLexer.ruleNames, rule);}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '"+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '"+ AntlrUtils.getLexerRuleName(RetryConditionLexer.ruleNames, operator) + "'");}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 0677b38e1f..18c320ba8d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -56,8 +56,8 @@ import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.GeneralException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;@@ -869,7 +869,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestString errorMessage = String.format("Impossible to provide required number of reviewers "+ "(candidates: %s, required number of reviewers: %d, pull request: #%d)",reviewers, missingCount, update.getRequest().getNumber());- throw new GeneralException(errorMessage);+ throw new ExplicitException(errorMessage);}}diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex fb7973d727..a2c9f52d42 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -32,7 +32,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.utils.command.ErrorCollector;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;@@ -191,8 +191,8 @@ public class GitFilter implements Filter {};UploadPackCommand upload = new UploadPackCommand(gitDir, environments);upload.stdin(stdin).stdout(stdout).stderr(stderr).statelessRpc(true);- ExecuteResult result = upload.call();- result.setErrorMessage(stderr.getMessage());+ ExecutionResult result = upload.call();+ result.setStderr(stderr.getMessage());if (result.getReturnCode() != 0 && !toleratedErrors.get())throw result.buildException();@@ -222,8 +222,8 @@ public class GitFilter implements Filter {};ReceivePackCommand receive = new ReceivePackCommand(gitDir, environments);receive.stdin(stdin).stdout(stdout).stderr(stderr).statelessRpc(true);- ExecuteResult result = receive.call();- result.setErrorMessage(stderr.getMessage());+ ExecutionResult result = receive.call();+ result.setStderr(stderr.getMessage());result.checkReturnCode();} catch (IOException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.javaindex e9d45c8a2e..c894bcc503 100644--- a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java@@ -25,7 +25,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.command.ReceivePackCommand;@@ -74,7 +74,7 @@ public class GitSshCommandCreator implements SshCommandCreator {return new GitSshCommand(command) {@Override- protected ExecuteResult execute(File gitDir, Map<String, String> gitEnvs) {+ protected ExecutionResult execute(File gitDir, Map<String, String> gitEnvs) {return new UploadPackCommand(gitDir, gitEnvs).stdin(inputStream).stdout(outputStream)@@ -95,7 +95,7 @@ public class GitSshCommandCreator implements SshCommandCreator {return new GitSshCommand(command) {@Override- protected ExecuteResult execute(File gitDir, Map<String, String> gitEnvs) {+ protected ExecutionResult execute(File gitDir, Map<String, String> gitEnvs) {return new ReceivePackCommand(gitDir, gitEnvs).stdin(inputStream).stdout(outputStream)@@ -188,7 +188,7 @@ public class GitSshCommandCreator implements SshCommandCreator {@Overridepublic void run() {try {- ExecuteResult result = execute(gitDir, gitEnvs);+ ExecutionResult result = execute(gitDir, gitEnvs);onExit(result.getReturnCode(), null);} catch (Exception e) {logger.error("Error executing git command", e);@@ -203,7 +203,7 @@ public class GitSshCommandCreator implements SshCommandCreator {@Nullableprotected abstract String checkPermission(Project project);- protected abstract ExecuteResult execute(File gitDir, Map<String, String> gitEnvs);+ protected abstract ExecutionResult execute(File gitDir, Map<String, String> gitEnvs);@Overridepublic void destroy() throws Exception {diff --git a/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.java b/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.javaindex ed37b8edee..fc83e1b68b 100644--- a/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.java@@ -23,7 +23,7 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.BlameCommit;@@ -112,7 +112,7 @@ public class BlameCommand extends GitCommand<Collection<BlameBlock>> {long time = System.currentTimeMillis();Logger effectiveLogger = logger!=null?logger:BlameCommand.logger;- ExecuteResult result = cmd.execute(new LineConsumer() {+ ExecutionResult result = cmd.execute(new LineConsumer() {@Overridepublic void consume(String line) {diff --git a/server-core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java b/server-core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.javaindex 1434bf4ecd..102e1d4b28 100644--- a/server-core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java@@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.commons.utils.command.LineConsumer;public class IsAncestorCommand extends GitCommand<Boolean> {@@ -43,7 +43,7 @@ public class IsAncestorCommand extends GitCommand<Boolean> {cmd.addArgs("merge-base", "--is-ancestor", ancestor, descendant);- ExecuteResult result = cmd.execute(new LineConsumer() {+ ExecutionResult result = cmd.execute(new LineConsumer() {@Overridepublic void consume(String line) {diff --git a/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.java b/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.javaindex d3b5ce1f60..5dc2ef4f57 100644--- a/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.java@@ -8,9 +8,9 @@ import java.util.Map;import com.google.common.base.Preconditions;import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;-public class ReceivePackCommand extends GitCommand<ExecuteResult> {+public class ReceivePackCommand extends GitCommand<ExecutionResult> {private InputStream stdin;@@ -45,7 +45,7 @@ public class ReceivePackCommand extends GitCommand<ExecuteResult> {}@Override- public ExecuteResult call() {+ public ExecutionResult call() {Preconditions.checkNotNull(stdin);Preconditions.checkNotNull(stdout);Preconditions.checkNotNull(stderr);diff --git a/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.java b/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.javaindex 4e25d9fb7c..660322bae6 100644--- a/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.java@@ -8,9 +8,9 @@ import java.util.Map;import com.google.common.base.Preconditions;import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;-public class UploadPackCommand extends GitCommand<ExecuteResult> {+public class UploadPackCommand extends GitCommand<ExecutionResult> {private InputStream stdin;@@ -45,7 +45,7 @@ public class UploadPackCommand extends GitCommand<ExecuteResult> {}@Override- public ExecuteResult call() {+ public ExecutionResult call() {Preconditions.checkNotNull(stdin);Preconditions.checkNotNull(stdout);Preconditions.checkNotNull(stderr);diff --git a/server-core/src/main/java/io/onedev/server/git/exception/GitException.java b/server-core/src/main/java/io/onedev/server/git/exception/GitException.javaindex a147ae4058..89c6040eb4 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/GitException.java+++ b/server-core/src/main/java/io/onedev/server/git/exception/GitException.java@@ -1,8 +1,8 @@package io.onedev.server.git.exception;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;-public class GitException extends GeneralException {+public class GitException extends ExplicitException {private static final long serialVersionUID = 1L;@@ -14,9 +14,5 @@ public class GitException extends GeneralException {super(message, cause);}- public GitException(Throwable cause) {- super(cause);- }-}diff --git a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.javaindex 8ec1916ceb..6a9981053d 100644--- a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java@@ -23,8 +23,8 @@ import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.google.common.collect.Lists;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;@@ -161,7 +161,7 @@ public class GitPreReceiveCallback extends HttpServlet {if (errorMessages.isEmpty() && newObjectId.equals(ObjectId.zeroId())) {try {projectManager.onDeleteBranch(project, branchName);- } catch (GeneralException e) {+ } catch (ExplicitException e) {errorMessages.addAll(Splitter.on("\n").splitToList(e.getMessage()));}}@@ -183,7 +183,7 @@ public class GitPreReceiveCallback extends HttpServlet {if (errorMessages.isEmpty() && newObjectId.equals(ObjectId.zeroId())) {try {projectManager.onDeleteTag(project, tagName);- } catch (GeneralException e) {+ } catch (ExplicitException e) {errorMessages.addAll(Splitter.on("\n").splitToList(e.getMessage()));}}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 118534f11f..56ad3a8193 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -25,8 +25,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;@Singleton@SuppressWarnings("unused")@@ -1086,7 +1086,7 @@ public class DataMigrator {Path target = projectsDir.toPath();File linkDir = new File(Bootstrap.installDir, "site/projects");if (linkDir.exists())- throw new GeneralException("Directory already exists: " + linkDir);+ throw new ExplicitException("Directory already exists: " + linkDir);Files.createSymbolicLink(linkDir.toPath(), target);}} catch (IOException e) {diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.javaindex 1bc50481e4..2c4da14e07 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java@@ -38,7 +38,7 @@ import org.yaml.snakeyaml.serializer.Serializer;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.launcher.loader.ImplementationRegistry;import io.onedev.commons.utils.ClassUtils;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.util.BeanUtils;import io.onedev.server.web.editable.annotation.Editable;@@ -80,7 +80,7 @@ public class VersionedYamlDoc extends MappingNode {if (keyNode.getValue().equals("version"))return ((ScalarNode)tuple.getValueNode()).getValue();}- throw new GeneralException("Unable to find version");+ throw new ExplicitException("Unable to find version");}private void removeVersion() {diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 280154e16e..c40924e7c7 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -60,9 +60,9 @@ import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;@@ -274,6 +274,8 @@ public class Build extends AbstractEntity implements Referenceable {@Column(nullable=false)private String jobName;+ private String jobWorkspace;+@Column(nullable=false)private String refName;@@ -401,6 +403,15 @@ public class Build extends AbstractEntity implements Referenceable {this.jobName = jobName;}+ @Nullable+ public String getJobWorkspace() {+ return jobWorkspace;+ }++ public void setJobWorkspace(String jobWorkspace) {+ this.jobWorkspace = jobWorkspace;+ }+public String getVersion() {return version;}@@ -753,10 +764,10 @@ public class Build extends AbstractEntity implements Referenceable {if (isOnBranches(secret.getAuthorizedBranches()))return secret.getValue();else- throw new GeneralException("Job secret not authorized: " + secretName);+ throw new ExplicitException("Job secret not authorized: " + secretName);}}- throw new GeneralException("No job secret found: " + secretName);+ throw new ExplicitException("No job secret found: " + secretName);}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 5aa11724d3..b5b6bfbe15 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -15,7 +15,7 @@ import javax.annotation.Nullable;import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;@@ -576,7 +576,7 @@ public class GlobalIssueSetting implements Serializable {if (!getStateSpecs().isEmpty())return getStateSpecs().iterator().next();else- throw new GeneralException("No any issue state is defined");+ throw new ExplicitException("No any issue state is defined");}public List<BoardSpec> getBoardSpecs() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.javaindex 3f6adc2ed7..e0504dde83 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java@@ -5,8 +5,8 @@ import java.util.Comparator;import java.util.List;import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.JobContext;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;import io.onedev.server.web.editable.EditableUtils;@@ -46,7 +46,7 @@ public class AutoDiscoveredJobExecutor extends JobExecutor {jobExecutor.setJobMatch(getJobMatch());jobExecutor.execute(jobToken, context);} else {- throw new GeneralException("No job executors discovered");+ throw new ExplicitException("No job executors discovered");}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaindex 11d397dbfa..969f0e4c7a 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -54,7 +54,7 @@ public class ScriptingChoices extends ChoiceProvider {choices.put(item, null);return choices;} else {- throw new GeneralException("Script should return either a Map or a List");+ throw new ExplicitException("Script should return either a Map or a List");}} catch (RuntimeException e) {if (allPossible) {diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.javaindex 2068711482..dd913be44d 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java@@ -8,7 +8,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.base.Preconditions;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;@@ -33,7 +33,7 @@ public class AuthorCriteria extends CommitCriteria {if (SecurityUtils.getUser() != null)command.authors().add("<" + SecurityUtils.getUser().getEmail() + ">");else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");} else {command.authors().add(StringUtils.replace(value, "*", ".*"));}@@ -47,7 +47,7 @@ public class AuthorCriteria extends CommitCriteria {for (String value: values) {if (value == null) { // authored by meif (User.get() == null)- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");else if (User.get().getEmail().equals(authorEmail))return true;} else {diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.javaindex 61197af7a8..9437721f6a 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java@@ -18,9 +18,9 @@ import org.apache.commons.lang.math.NumberUtils;import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;@@ -99,11 +99,11 @@ public class CommitQuery implements Serializable {if (NumberUtils.isDigits(numberStr)) {Build build = OneDev.getInstance(BuildManager.class).find(project, Long.parseLong(numberStr));if (build == null)- throw new GeneralException("Unable to find build: " + value);+ throw new ExplicitException("Unable to find build: " + value);elsevalue = build.getCommitHash();} else {- throw new GeneralException("Invalid build number: " + numberStr);+ throw new ExplicitException("Invalid build number: " + numberStr);}}if (criteria.revisionCriteria().SINCE() != null)diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.javaindex 5c1e3a6768..1a0ed1da85 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java@@ -8,7 +8,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.base.Preconditions;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;@@ -33,7 +33,7 @@ public class CommitterCriteria extends CommitCriteria {if (SecurityUtils.getUser() != null)command.committers().add("<" + SecurityUtils.getUser().getEmail() + ">");else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");} else {command.committers().add(StringUtils.replace(value, "*", ".*"));}@@ -47,7 +47,7 @@ public class CommitterCriteria extends CommitCriteria {for (String value: values) {if (value == null) { // committed by meif (User.get() == null)- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");else if (User.get().getEmail().equals(committerEmail))return true;} else {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 10ead1d85c..69dfb88d82 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -12,9 +12,9 @@ import javax.persistence.criteria.Path;import com.google.common.base.Splitter;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.MilestoneManager;@@ -51,7 +51,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializatry {return Integer.parseInt(value);} catch (NumberFormatException e) {- throw new GeneralException("Invalid number: " + value);+ throw new ExplicitException("Invalid number: " + value);}}@@ -59,21 +59,21 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializatry {return Long.parseLong(value);} catch (NumberFormatException e) {- throw new GeneralException("Invalid number: " + value);+ throw new ExplicitException("Invalid number: " + value);}}public static User getUser(String loginName) {User user = OneDev.getInstance(UserManager.class).findByName(loginName);if (user == null)- throw new GeneralException("Unable to find user with login: " + loginName);+ throw new ExplicitException("Unable to find user with login: " + loginName);return user;}public static Project getProject(String projectName) {Project project = OneDev.getInstance(ProjectManager.class).find(projectName);if (project == null)- throw new GeneralException("Unable to find project with name: " + projectName);+ throw new ExplicitException("Unable to find project with name: " + projectName);return project;}@@ -83,13 +83,13 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaelse if (value.equals("false"))return false;else- throw new GeneralException("Invalid boolean: " + value);+ throw new ExplicitException("Invalid boolean: " + value);}public static Date getDateValue(String value) {Date dateValue = DateUtils.parseRelaxed(value);if (dateValue == null)- throw new GeneralException("Unrecognized date: " + value);+ throw new ExplicitException("Unrecognized date: " + value);return dateValue;}@@ -100,7 +100,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaif (commitId != null && commitId.getCommitId() != null)return commitId;else- throw new GeneralException("Unable to find revision: " + value);+ throw new ExplicitException("Unable to find revision: " + value);}public static ProjectScopedRevision getRevision(@Nullable Project project, String value) {@@ -110,7 +110,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaif (revision != null)return revision;else- throw new GeneralException("Unable to find revision: " + value);+ throw new ExplicitException("Unable to find revision: " + value);}public static Issue getIssue(@Nullable Project project, String value) {@@ -124,7 +124,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaif (issue != null)return issue;else- throw new GeneralException("Unable to find issue: " + value);+ throw new ExplicitException("Unable to find issue: " + value);}public static PullRequest getPullRequest(@Nullable Project project, String value) {@@ -138,7 +138,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaif (pullRequest != null)return pullRequest;else- throw new GeneralException("Unable to find pull request: " + value);+ throw new ExplicitException("Unable to find pull request: " + value);}public static Build getBuild(@Nullable Project project, String value) {@@ -152,7 +152,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaif (build != null)return build;else- throw new GeneralException("Unable to find build: " + value);+ throw new ExplicitException("Unable to find build: " + value);}public static ProjectScopedNumber getProjectScopedNumber(@Nullable Project project, String value) {@@ -172,7 +172,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaif (milestone != null)return milestone;else- throw new GeneralException("Unable to find milestone: " + value);+ throw new ExplicitException("Unable to find milestone: " + value);}public boolean matches(T entity) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 2210d24587..33514a6def 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -30,8 +30,8 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;@@ -114,26 +114,26 @@ public class BuildQuery extends EntityQuery<Build> {return new TimedOutCriteria();case BuildQueryLexer.Waiting:if (!withUnfinishedCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new WaitingCriteria();case BuildQueryLexer.Pending:if (!withUnfinishedCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new PendingCriteria();case BuildQueryLexer.Running:if (!withUnfinishedCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new RunningCriteria();case BuildQueryLexer.SubmittedByMe:if (!withCurrentUserCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();case BuildQueryLexer.CancelledByMe:if (!withCurrentUserCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CancelledByMeCriteria();default:- throw new GeneralException("Unexpected operator: " + ctx.operator.getText());+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}@@ -256,7 +256,7 @@ public class BuildQuery extends EntityQuery<Build> {for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (!ORDER_FIELDS.containsKey(fieldName))- throw new GeneralException("Can not order by field: " + fieldName);+ throw new ExplicitException("Can not order by field: " + fieldName);EntitySort buildSort = new EntitySort();buildSort.setField(fieldName);@@ -276,7 +276,7 @@ public class BuildQuery extends EntityQuery<Build> {public static void checkField(Project project, String fieldName, int operator) {Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getBuildParamNames(null);if (!QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))- throw new GeneralException("Field not found: " + fieldName);+ throw new ExplicitException("Field not found: " + fieldName);switch (operator) {case BuildQueryLexer.IsBefore:case BuildQueryLexer.IsAfter:@@ -310,8 +310,8 @@ public class BuildQuery extends EntityQuery<Build> {}}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}public static String getRuleName(int rule) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.javaindex 5276962634..b9b5217bc0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -20,7 +20,7 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {Path<User> attribute = root.get(Build.PROP_CANCELLER);return builder.equal(attribute, User.get());} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -29,7 +29,7 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {if (User.get() != null)return User.get().equals(build.getCanceller());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.javaindex 80dbf5bf21..90be9f9cdc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -20,7 +20,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {Path<User> attribute = root.get(Build.PROP_SUBMITTER);return builder.equal(attribute, User.get());} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -29,7 +29,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {if (User.get() != null)return User.get().equals(build.getSubmitter());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 80772addfd..3c1005bf05 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -24,7 +24,7 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.search.entity.AndEntityCriteria;@@ -188,7 +188,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (!ORDER_FIELDS.containsKey(fieldName))- throw new GeneralException("Can not order by field: " + fieldName);+ throw new ExplicitException("Can not order by field: " + fieldName);EntitySort commentSort = new EntitySort();commentSort.setField(fieldName);@@ -207,7 +207,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {public static void checkField(Project project, String fieldName, int operator) {if (!QUERY_FIELDS.contains(fieldName))- throw new GeneralException("Field not found: " + fieldName);+ throw new ExplicitException("Field not found: " + fieldName);switch (operator) {case CodeCommentQueryLexer.IsBefore:case CodeCommentQueryLexer.IsAfter:@@ -230,8 +230,8 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {}}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}public static String getRuleName(int rule) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.javaindex 16e19ab339..2764d4f293 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -20,7 +20,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {Path<?> attribute = root.get(CodeComment.PROP_USER);return builder.equal(attribute, User.get());} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -29,7 +29,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {if (User.get() != null)return User.get().equals(comment.getUser());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex d821b05f87..85e9b5ac4a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -12,7 +12,7 @@ import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;@@ -49,7 +49,7 @@ public class FieldOperatorCriteria extends FieldCriteria {if (User.get() != null)return builder.equal(valueAttribute, User.get().getName());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");} else if (operator == IssueQueryLexer.IsCurrent) {if (getFieldSpec() instanceof BuildChoiceField) {Build build = Build.get();@@ -58,7 +58,7 @@ public class FieldOperatorCriteria extends FieldCriteria {builder.equal(projectAttribute, build.getProject()),builder.equal(valueAttribute, String.valueOf(build.getNumber())));} else {- throw new GeneralException("No current build in query context");+ throw new ExplicitException("No current build in query context");}} else if (getFieldSpec() instanceof PullRequestChoiceField) {PullRequest request = PullRequest.get();@@ -67,7 +67,7 @@ public class FieldOperatorCriteria extends FieldCriteria {builder.equal(projectAttribute, request.getTargetProject()),builder.equal(valueAttribute, String.valueOf(request.getNumber())));} else {- throw new GeneralException("No current pull request in query context");+ throw new ExplicitException("No current pull request in query context");}} else if (getFieldSpec() instanceof CommitField) {ProjectScopedCommit commit = ProjectScopedCommit.get();@@ -76,7 +76,7 @@ public class FieldOperatorCriteria extends FieldCriteria {builder.equal(projectAttribute, commit.getProject()),builder.equal(valueAttribute, commit.getCommitId().name()));} else {- throw new GeneralException("No current commit in query context");+ throw new ExplicitException("No current commit in query context");}} else {throw new IllegalStateException();@@ -94,7 +94,7 @@ public class FieldOperatorCriteria extends FieldCriteria {return builder.equal(projectAttribute, build.getProject());}} else {- throw new GeneralException("No current build in query context");+ throw new ExplicitException("No current build in query context");}} else {throw new IllegalStateException();@@ -113,26 +113,26 @@ public class FieldOperatorCriteria extends FieldCriteria {if (User.get() != null)return Objects.equals(fieldValue, User.get().getName());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");} else if (operator == IssueQueryLexer.IsCurrent) {if (getFieldSpec() instanceof BuildChoiceField) {Build build = Build.get();if (build != null)return build.getProject().equals(issue.getProject()) && build.getId().toString().equals(fieldValue);else- throw new GeneralException("No build in query context");+ throw new ExplicitException("No build in query context");} else if (getFieldSpec() instanceof PullRequestChoiceField) {PullRequest request = PullRequest.get();if (request != null)return request.getTargetProject().equals(issue.getProject()) && request.getId().toString().equals(fieldValue);else- throw new GeneralException("No pull request in query context");+ throw new ExplicitException("No pull request in query context");} else if (getFieldSpec() instanceof CommitField) {ProjectScopedCommit commit = ProjectScopedCommit.get();if (commit != null)return commit.getProject().equals(issue.getProject()) && commit.getCommitId().name().equals(fieldValue);else- throw new GeneralException("No commit in query context");+ throw new ExplicitException("No commit in query context");} else {throw new IllegalStateException();}@@ -145,7 +145,7 @@ public class FieldOperatorCriteria extends FieldCriteria {.stream().anyMatch(it->it.equals(fieldValue));} else {- throw new GeneralException("No build in query context");+ throw new ExplicitException("No build in query context");}} else {throw new IllegalStateException();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex 632c076e88..113703951f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -18,8 +18,8 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;@@ -61,7 +61,7 @@ public class FixedBetweenCriteria extends IssueCriteria {if (first.getProject().equals(second.getProject())) {this.project = first.getProject();} else {- throw new GeneralException("'" + getRuleName(IssueQueryLexer.FixedBetween)+ throw new ExplicitException("'" + getRuleName(IssueQueryLexer.FixedBetween)+ "' should be used for same projects");}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.javaindex abcc738fe1..a3518e3083 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java@@ -4,7 +4,7 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;@@ -17,7 +17,7 @@ public class FixedInCurrentBuildCriteria extends IssueCriteria {if (Build.get() != null)return new FixedInBuildCriteria(Build.get()).getPredicate(root, builder);else- throw new GeneralException("No build in query context");+ throw new ExplicitException("No build in query context");}@Override@@ -25,7 +25,7 @@ public class FixedInCurrentBuildCriteria extends IssueCriteria {if (Build.get() != null)return new FixedInBuildCriteria(Build.get()).matches(issue);else- throw new GeneralException("No build in query context");+ throw new ExplicitException("No build in query context");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.javaindex 71fa71f13e..004d07303a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java@@ -4,7 +4,7 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScopedCommit;@@ -17,7 +17,7 @@ public class FixedInCurrentCommitCriteria extends IssueCriteria {if (ProjectScopedCommit.get() != null)return new FixedInCommitCriteria(ProjectScopedCommit.get()).getPredicate(root, builder);else- throw new GeneralException("No commit id in query context");+ throw new ExplicitException("No commit id in query context");}@Override@@ -25,7 +25,7 @@ public class FixedInCurrentCommitCriteria extends IssueCriteria {if (ProjectScopedCommit.get() != null)return new FixedInCommitCriteria(ProjectScopedCommit.get()).matches(issue);else- throw new GeneralException("No commit in query context");+ throw new ExplicitException("No commit in query context");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.javaindex 29620ffe62..38ba5d51ab 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java@@ -4,7 +4,7 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;@@ -17,7 +17,7 @@ public class FixedInCurrentPullRequestCriteria extends IssueCriteria {if (PullRequest.get() != null)return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(root, builder);else- throw new GeneralException("No pull request in query context");+ throw new ExplicitException("No pull request in query context");}@Override@@ -25,7 +25,7 @@ public class FixedInCurrentPullRequestCriteria extends IssueCriteria {if (PullRequest.get() != null)return new FixedInPullRequestCriteria(PullRequest.get()).matches(issue);else- throw new GeneralException("No pull request in query context");+ throw new ExplicitException("No pull request in query context");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 1afced97a9..f2d9ed52ee 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -18,8 +18,8 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;@@ -126,22 +126,22 @@ public class IssueQuery extends EntityQuery<Issue> {switch (ctx.operator.getType()) {case IssueQueryLexer.SubmittedByMe:if (!withCurrentUserCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();case IssueQueryLexer.FixedInCurrentBuild:if (!withCurrentBuildCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FixedInCurrentBuildCriteria();case IssueQueryLexer.FixedInCurrentPullRequest:if (!withCurrentPullRequestCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FixedInCurrentPullRequestCriteria();case IssueQueryLexer.FixedInCurrentCommit:if (!withCurrentCommitCriteria)- throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FixedInCurrentCommitCriteria();default:- throw new GeneralException("Unexpected operator: " + ctx.operator.getText());+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}@@ -282,7 +282,7 @@ public class IssueQuery extends EntityQuery<Issue> {}}default:- throw new GeneralException("Unexpected operator " + getRuleName(operator));+ throw new ExplicitException("Unexpected operator " + getRuleName(operator));}}@@ -319,7 +319,7 @@ public class IssueQuery extends EntityQuery<Issue> {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (validate && !(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)&& !(fieldSpec instanceof NumberField)) {- throw new GeneralException("Can not order by field: " + fieldName);+ throw new ExplicitException("Can not order by field: " + fieldName);}}@@ -345,8 +345,8 @@ public class IssueQuery extends EntityQuery<Issue> {return OneDev.getInstance(SettingManager.class).getIssueSetting();}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}public static void checkField(String fieldName, int operator,@@ -354,7 +354,7 @@ public class IssueQuery extends EntityQuery<Issue> {boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null && !Issue.QUERY_FIELDS.contains(fieldName))- throw new GeneralException("Field not found: " + fieldName);+ throw new ExplicitException("Field not found: " + fieldName);switch (operator) {case IssueQueryLexer.IsEmpty:if (Issue.QUERY_FIELDS.contains(fieldName)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.javaindex 51a6521224..0cec33cba1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;import io.onedev.server.model.User;@@ -19,7 +19,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {Path<User> attribute = root.get(Issue.PROP_SUBMITTER);return builder.equal(attribute, User.get());} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -28,7 +28,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {if (User.get() != null)return User.get().equals(issue.getSubmitter());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.javaindex 844b96518b..15fa6f0820 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java@@ -4,7 +4,7 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -18,7 +18,7 @@ public class OwnedByMeCriteria extends EntityCriteria<Project> {if (User.get() != null)return new OwnedByCriteria(User.get()).getPredicate(root, builder);else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Override@@ -26,7 +26,7 @@ public class OwnedByMeCriteria extends EntityCriteria<Project> {if (User.get() != null)return new OwnedByCriteria(User.get()).matches(project);else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 96e6ddca1b..eda4154b5f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -14,7 +14,7 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Project;import io.onedev.server.search.entity.AndEntityCriteria;import io.onedev.server.search.entity.EntityCriteria;@@ -125,7 +125,7 @@ public class ProjectQuery extends EntityQuery<Project> {case ProjectQueryLexer.IsAfter:return new UpdateDateCriteria(value, operator);default:- throw new GeneralException("Unexpected operator " + getRuleName(operator));+ throw new ExplicitException("Unexpected operator " + getRuleName(operator));}}@@ -159,7 +159,7 @@ public class ProjectQuery extends EntityQuery<Project> {for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (!Project.ORDER_FIELDS.containsKey(fieldName))- throw new GeneralException("Can not order by field: " + fieldName);+ throw new ExplicitException("Can not order by field: " + fieldName);EntitySort projectSort = new EntitySort();projectSort.setField(fieldName);@@ -176,13 +176,13 @@ public class ProjectQuery extends EntityQuery<Project> {}}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}public static void checkField(String fieldName, int operator) {if (!Project.QUERY_FIELDS.contains(fieldName))- throw new GeneralException("Field not found: " + fieldName);+ throw new ExplicitException("Field not found: " + fieldName);switch (operator) {case ProjectQueryLexer.Contains:if (!fieldName.equals(Project.NAME_DESCRIPTION))diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex 50e91503f3..c95c368126 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -30,7 +30,7 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {builder.equal(approvedPath, true)));return join.isNotNull();} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -40,7 +40,7 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {PullRequestReview review = request.getReview(User.get());return review != null && review.getResult() != null && review.getResult().isApproved();} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.javaindex 7a51a85907..e4a4623ef2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.User;@@ -26,7 +26,7 @@ public class AssignedToMeCriteria extends EntityCriteria<PullRequest> {join.on(builder.equal(userPath, User.get()));return join.isNotNull();} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -36,7 +36,7 @@ public class AssignedToMeCriteria extends EntityCriteria<PullRequest> {if (user != null)return request.getAssignments().stream().anyMatch(it->it.getUser().equals(user));else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.javaindex de4bb0f306..92591bc4fe 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;@@ -21,7 +21,7 @@ public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {Path<User> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_USER);return builder.equal(attribute, User.get());} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -30,7 +30,7 @@ public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {if (User.get() != null)return User.get().equals(request.getSubmitter());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 87ad75f20e..bb750387de 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -14,7 +14,7 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;@@ -113,7 +113,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.HasPendingReviews:return new HasPendingReviewsCriteria();default:- throw new GeneralException("Unexpected operator: " + ctx.operator.getText());+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}@@ -138,7 +138,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.IncludesIssue:return new IncludesIssueCriteria(project, value);default:- throw new GeneralException("Unexpected operator: " + ctx.operator.getText());+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}@@ -242,7 +242,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (!PullRequest.ORDER_FIELDS.containsKey(fieldName))- throw new GeneralException("Can not order by field: " + fieldName);+ throw new ExplicitException("Can not order by field: " + fieldName);EntitySort requestSort = new EntitySort();requestSort.setField(fieldName);@@ -261,7 +261,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {public static void checkField(String fieldName, int operator) {if (!PullRequest.QUERY_FIELDS.contains(fieldName))- throw new GeneralException("Field not found: " + fieldName);+ throw new ExplicitException("Field not found: " + fieldName);switch (operator) {case PullRequestQueryLexer.IsBefore:case PullRequestQueryLexer.IsAfter:@@ -299,8 +299,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}public static String getRuleName(int rule) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex 51c96e07cf..30c9452939 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -30,7 +30,7 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>builder.equal(approvedPath, false)));return join.isNotNull();} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -40,7 +40,7 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>PullRequestReview review = request.getReview(User.get());return review != null && review.getResult() != null && !review.getResult().isApproved();} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.javaindex 287c142c4e..a373d557a9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -20,7 +20,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {Path<?> attribute = root.get(PullRequest.PROP_SUBMITTER);return builder.equal(attribute, User.get());} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -29,7 +29,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {if (User.get() != null)return User.get().equals(request.getSubmitter());else- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex 01db80bc7e..bf97da406c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -30,7 +30,7 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {builder.isNull(approvedPath)));return join.isNotNull();} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}@@ -40,7 +40,7 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {PullRequestReview review = request.getReview(User.get());return review != null && review.getResult() == null;} else {- throw new GeneralException("Please login to perform this query");+ throw new ExplicitException("Please login to perform this query");}}diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex 0dca6379e1..95c7aae442 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -12,9 +12,9 @@ import com.google.common.collect.MapMaker;import groovy.lang.Binding;import groovy.lang.GroovyClassLoader;import groovy.lang.Script;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.script.ScriptContribution;@@ -89,13 +89,13 @@ public class GroovyUtils {try {return evalScript(StringUtils.join(script.getContent(), "\n"), variables);} catch (Exception e) {- throw new GeneralException("Error evaluating groovy script: " + scriptName, e);+ throw new RuntimeException("Error evaluating groovy script: " + scriptName, e);}} else {- throw new GeneralException("Unauthorized groovy script: " + scriptName);+ throw new ExplicitException("Unauthorized groovy script: " + scriptName);}} else {- throw new GeneralException("Groovy script not found: " + scriptName);+ throw new ExplicitException("Groovy script not found: " + scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.javaindex 97d47e08a5..e48d1eca15 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java@@ -3,9 +3,9 @@ package io.onedev.server.util;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;@@ -30,14 +30,14 @@ public class ProjectScopedNumber {try {return new ProjectScopedNumber(project, Long.valueOf(numberStr));} catch (NumberFormatException e) {- throw new GeneralException("Invalid number: " + numberStr);+ throw new ExplicitException("Invalid number: " + numberStr);}} else {- throw new GeneralException("Unable to find project: " + projectName);+ throw new ExplicitException("Unable to find project: " + projectName);}}}- throw new GeneralException("Project is not specified");+ throw new ExplicitException("Project is not specified");}public Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/util/ScriptException.java b/server-core/src/main/java/io/onedev/server/util/ScriptException.javaindex 56debd6a24..cf192718f1 100644--- a/server-core/src/main/java/io/onedev/server/util/ScriptException.java+++ b/server-core/src/main/java/io/onedev/server/util/ScriptException.java@@ -1,8 +1,8 @@package io.onedev.server.util;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;-public class ScriptException extends GeneralException {+public class ScriptException extends ExplicitException {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java b/server-core/src/main/java/io/onedev/server/util/SimpleLogger.javaindex 47063fb136..9c2b06993b 100644--- a/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java+++ b/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java@@ -2,6 +2,8 @@ package io.onedev.server.util;import java.util.regex.Pattern;+import javax.annotation.Nullable;+import com.google.common.base.Splitter;import com.google.common.base.Throwables;@@ -10,12 +12,24 @@ public abstract class SimpleLogger {private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");public void log(Throwable t) {+ log(null, t);+ }++ public void log(@Nullable String message, Throwable t) {StringBuilder builder = new StringBuilder();- for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(t)))- builder.append("\n ").append(line);+ if (message != null)+ builder.append(message);+ boolean firstLine = true;+ for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(t))) {+ if (firstLine)+ builder.append(line);+ else+ builder.append("\n ").append(line);+ firstLine = false;+ }log(builder.toString());}-+public abstract void log(String message);}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.javaindex dd5b232276..6750deba95 100644--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java@@ -13,8 +13,8 @@ import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.model.Build;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;@@ -130,12 +130,12 @@ public class JobMatch extends Criteria<Build> {if (operator != JobMatchLexer.Is)throw newOperatorException(fieldName, operator);} else {- throw new GeneralException("Invalid field: " + fieldName);+ throw new ExplicitException("Invalid field: " + fieldName);}}- private static GeneralException newOperatorException(String fieldName, int operator) {- return new GeneralException("Field '" + fieldName + "' is not applicable for operator '"+ private static ExplicitException newOperatorException(String fieldName, int operator) {+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '"+ AntlrUtils.getLexerRuleName(JobMatchLexer.ruleNames, operator) + "'");}diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex 6a32cb5435..dab4a8e886 100644--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -17,9 +17,9 @@ import org.antlr.v4.runtime.Recognizer;import org.antlr.v4.runtime.tree.TerminalNode;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;@@ -71,9 +71,9 @@ public class ReviewRequirement {if (!users.contains(user))users.add(user);else if (validate)- throw new GeneralException("User '" + userName + "' is included multiple times");+ throw new ExplicitException("User '" + userName + "' is included multiple times");} else if (validate) {- throw new GeneralException("Unable to find user '" + userName + "'");+ throw new ExplicitException("Unable to find user '" + userName + "'");}} else if (criteria.groupCriteria() != null) {String groupName = getValue(criteria.groupCriteria().Value());@@ -90,10 +90,10 @@ public class ReviewRequirement {groups.put(group, 1);}} else if (validate) {- throw new GeneralException("Group '" + groupName + "' is included multiple times");+ throw new ExplicitException("Group '" + groupName + "' is included multiple times");}} else if (validate) {- throw new GeneralException("Unable to find group '" + groupName + "'");+ throw new ExplicitException("Unable to find group '" + groupName + "'");}}}diff --git a/server-core/src/main/java/io/onedev/server/util/usage/InUseException.java b/server-core/src/main/java/io/onedev/server/util/usage/InUseException.javaindex 3355230b61..1871501fa0 100644--- a/server-core/src/main/java/io/onedev/server/util/usage/InUseException.java+++ b/server-core/src/main/java/io/onedev/server/util/usage/InUseException.java@@ -1,8 +1,8 @@package io.onedev.server.util.usage;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;-public class InUseException extends GeneralException {+public class InUseException extends ExplicitException {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.javaindex d0e2f7a2f5..5eb681f846 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java@@ -17,8 +17,8 @@ import org.antlr.v4.runtime.Recognizer;import org.antlr.v4.runtime.tree.TerminalNode;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.usermatch.UserMatchParser.CriteriaContext;@@ -72,7 +72,7 @@ public class UserMatch implements Serializable {specifiedGroup.setGroupName(groupName);return specifiedGroup;} else {- throw new GeneralException("Unrecognized user match criteria");+ throw new ExplicitException("Unrecognized user match criteria");}}diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javaindex 30ed811ffd..39ef9535b1 100644--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java@@ -6,7 +6,7 @@ import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.request.IRequestMapper;import org.apache.wicket.request.mapper.CompoundRequestMapper;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.mapper.BaseResourceMapper;import io.onedev.server.web.mapper.DynamicPathPageMapper;@@ -119,7 +119,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {@Overridepublic CompoundRequestMapper add(IRequestMapper mapper) {if (mapper instanceof ResourceMapper && !(mapper instanceof BaseResourceMapper))- throw new GeneralException("Base resource mapper should be used");+ throw new ExplicitException("Base resource mapper should be used");return super.add(mapper);}diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.javaindex 2db9168807..96557d6f5e 100644--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java@@ -59,7 +59,7 @@ import org.apache.wicket.util.time.Duration;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.util.usage.InUseException;import io.onedev.server.web.component.svg.SpriteImageResolver;@@ -142,7 +142,7 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati&& !(component instanceof AbstractErrorPage)&& !(component instanceof BasePage)&& !(component instanceof BrowserInfoPage)) {- throw new GeneralException("Page classes should extend from BasePage.");+ throw new ExplicitException("Page classes should extend from BasePage.");}}});@@ -238,7 +238,7 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati@Overridepublic void mount(IRequestMapper mapper) {if (mapper instanceof ResourceMapper && !(mapper instanceof BaseResourceMapper))- throw new GeneralException("Base resource mapper should be used");+ throw new ExplicitException("Base resource mapper should be used");super.mount(mapper);}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.cssindex 1892c161ee..d57ad8449c 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css@@ -1,8 +1,27 @@.cm-identifierhighlight {- background: #CCC;+ background: #D1D3E0;+}+.cm-searching {+ background: #ffa;}.CodeMirror-mark {- background: #CCCCFF;+ background: #8950FC;+}+.cm-identifierhighlight.CodeMirror-mark {+ background: #ad91ee;+}+.cm-searching.CodeMirror-mark {+ background: #c4a7d3;+}+.cm-searching.cm-identifierhighlight {+ background: #e8e9c5;+}+.cm-searching.cm-identifierhighlight.CodeMirror-mark {+ background: #b89ce0;+}++.CodeMirror-mark:not(.CodeMirror-selectedtext) {+ color: white !important;}.CodeMirror {font-size: 12px;@@ -14,10 +33,7 @@border-right-color: var(--secondary);}.CodeMirror-selected {- background-color: #3399FF !important;-}-.CodeMirror-selectedtext {- color: white !important;+ background-color: #b4d7ff !important;}.CodeMirror-simplescroll-horizontal div, .CodeMirror-simplescroll-vertical div {background: none repeat scroll 0 0 var(--light-dark);diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.jsindex 9a301b9b91..e8e0425e75 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js@@ -33,15 +33,15 @@cm.removeOverlay(over);clearTimeout(cm.state.identifierHighlighter.timeout);cm.state.identifierHighlighter = null;- cm.off("cursorActivity", cursorActivity);+ cm.off("mousedown", mousedown);}if (val) {cm.state.identifierHighlighter = new State(val);- cm.on("cursorActivity", cursorActivity);+ cm.on("mousedown", mousedown);}});- function cursorActivity(cm) {+ function mousedown(cm) {var state = cm.state.identifierHighlighter;clearTimeout(state.timeout);state.timeout = setTimeout(function() {highlightIdentifiers(cm);}, state.delay);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.javaindex ceaea8b106..b0d6499251 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java@@ -16,7 +16,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.action.condition.ActionCondition;@@ -100,7 +100,7 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {try {ActionCondition.checkField(job, fieldName,AntlrUtils.getLexerRule(ActionConditionLexer.ruleNames, suggestedLiteral));- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex fcaa068f89..4e530cf7be 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -19,7 +19,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.model.Build;@@ -145,7 +145,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {} else {return null;}- } catch (GeneralException ex) {+ } catch (ExplicitException ex) {}}}@@ -188,7 +188,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {String fieldName = BuildQuery.getValue(fieldElements.iterator().next().getMatchedText());try {BuildQuery.checkField(getProject(), fieldName, BuildQuery.getOperator(suggestedLiteral));- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex a140c702d6..c9e8f53664 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -16,7 +16,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Project;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;@@ -85,7 +85,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {} else {return null;}- } catch (GeneralException ex) {+ } catch (ExplicitException ex) {}}}@@ -112,7 +112,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {String fieldName = CodeCommentQuery.getValue(fieldElements.iterator().next().getMatchedText());try {CodeCommentQuery.checkField(getProject(), fieldName, CodeCommentQuery.getOperator(suggestedLiteral));- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex a68f37d9a0..e643b823a6 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -44,8 +44,8 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;@@ -224,7 +224,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {|| fieldSpec instanceof TextField) {return null;}- } catch (GeneralException ex) {+ } catch (ExplicitException ex) {}}}@@ -260,7 +260,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {checkField(fieldName, getOperator(suggestedLiteral),withCurrentUserCriteria, withCurrentBuildCriteria,withCurrentPullRequestCriteria, withCurrentCommitCriteria);- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.javaindex b1db709baf..4fb6170b43 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java@@ -16,7 +16,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Build;import io.onedev.server.util.jobmatch.JobMatch;import io.onedev.server.util.jobmatch.JobMatchLexer;@@ -86,7 +86,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {String fieldName = JobMatch.getValue(fieldElements.iterator().next().getMatchedText());try {JobMatch.checkField(fieldName, AntlrUtils.getLexerRule(JobMatchLexer.ruleNames, suggestedLiteral));- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex 3e7c1e0ba2..9d16f7bbf2 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -14,7 +14,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.search.entity.project.ProjectQueryParser;@@ -73,7 +73,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {} else {return null;}- } catch (GeneralException ex) {+ } catch (ExplicitException ex) {}}}@@ -100,7 +100,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {String fieldName = ProjectQuery.getValue(fieldElements.iterator().next().getMatchedText());try {ProjectQuery.checkField(fieldName, ProjectQuery.getOperator(suggestedLiteral));- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex d5dcc8f205..d9d70ec557 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -18,7 +18,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Project;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.project.ProjectQuery;@@ -118,7 +118,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {|| fieldName.equals(PullRequest.NAME_COMMENT)) {return null;}- } catch (GeneralException ex) {+ } catch (ExplicitException ex) {}}}@@ -145,7 +145,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {String fieldName = PullRequestQuery.getValue(fieldElements.iterator().next().getMatchedText());try {PullRequestQuery.checkField(fieldName, PullRequestQuery.getOperator(suggestedLiteral));- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.javaindex b21c7ee4e9..f694190286 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java@@ -16,7 +16,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.paramspec.ParamSpec;@@ -93,7 +93,7 @@ public class RetryConditionBehavior extends ANTLRAssistBehavior {try {RetryCondition.checkField(job, fieldName,AntlrUtils.getLexerRule(RetryConditionLexer.ruleNames, suggestedLiteral));- } catch (GeneralException e) {+ } catch (ExplicitException e) {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 87bd12dd61..eff657f396 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -44,7 +44,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;@@ -134,7 +134,7 @@ public abstract class BuildListPanel extends Panel {private BuildQuery parse(@Nullable String queryString, BuildQuery baseQuery) {try {return BuildQuery.merge(baseQuery, BuildQuery.parse(getProject(), queryString, true, true));- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return null;} catch (Exception e) {@@ -436,7 +436,7 @@ public abstract class BuildListPanel extends Panel {try {return getBuildManager().query(getProject(), queryModel.getObject(),(int)first, (int)count).iterator();- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return new ArrayList<Build>().iterator();}@@ -448,7 +448,7 @@ public abstract class BuildListPanel extends Panel {if (query != null) {try {return getBuildManager().count(getProject(), query.getCriteria());- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex ced520a7a7..c713b3ba29 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -38,7 +38,7 @@ import io.onedev.server.web.component.build.ParamValuesLabel;import io.onedev.server.web.component.entity.reference.ReferencePanel;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;+import io.onedev.server.web.component.pullrequest.RequestStatusBadge;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.builds.BuildListPage;@@ -267,7 +267,7 @@ public abstract class BuildSidePanel extends Panel {PullRequestActivitiesPage.paramsOf(request));link.add(new Label("label", "#" + request.getNumber() + " " + request.getTitle()));add(link);- add(new RequestStatusLabel("status", new AbstractReadOnlyModel<PullRequest>() {+ add(new RequestStatusBadge("status", new AbstractReadOnlyModel<PullRequest>() {@Overridepublic PullRequest getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex cb73236c51..261d371e63 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -40,8 +40,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.ObjectId;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;@@ -88,7 +88,7 @@ public abstract class CodeCommentListPanel extends Panel {String queryString = queryStringModel.getObject();try {return CodeCommentQuery.parse(getProject(), queryString);- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return null;} catch (Exception e) {@@ -281,7 +281,7 @@ public abstract class CodeCommentListPanel extends Panel {try {return getCodeCommentManager().query(getProject(), getPullRequest(),queryModel.getObject(), (int)first, (int)count).iterator();- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return new ArrayList<CodeComment>().iterator();}@@ -293,7 +293,7 @@ public abstract class CodeCommentListPanel extends Panel {if (query != null) {try {return getCodeCommentManager().count(getProject(), getPullRequest(), query.getCriteria());- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 2f0fa42b83..fecd58e516 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -52,7 +52,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.BlobIdent;@@ -105,7 +105,7 @@ public abstract class CommitListPanel extends Panel {String queryString = queryStringModel.getObject();try {return CommitQuery.merge(getBaseQuery(), CommitQuery.parse(getProject(), queryString));- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return null;} catch (Exception e) {@@ -150,7 +150,7 @@ public abstract class CommitListPanel extends Panel {command.ignoreCase(true);if (page > MAX_PAGES)- throw new GeneralException("Page should be no more than " + MAX_PAGES);+ throw new ExplicitException("Page should be no more than " + MAX_PAGES);command.count(page * COMMITS_PER_PAGE);diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.cssindex cea05bf3f0..2d40cd1e09 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css@@ -131,13 +131,14 @@font-size: inherit;}.text-diff>tbody>tr>td.content>span.content-mark {- background: #CCCCFF;+ background: #8950FC;+ color: white !important;}.text-diff>tbody>tr>td.content>span.content-mark.insert {- background: #88FFFF;+ background: #91c8ae;}.text-diff>tbody>tr>td.content>span.content-mark.delete {- background: #FF88FF;+ background: #dc9ec9;}.text-diff>tbody>tr>td.number>.comment-indicator {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.javaindex 29c2f6f812..4c2a9650f9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java@@ -11,11 +11,11 @@ import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.util.ColorUtils;@SuppressWarnings("serial")-public class IssueStateLabel extends Label {+public class IssueStateBadge extends Label {private IModel<Issue> issueModel;- public IssueStateLabel(String id, IModel<Issue> issueModel) {+ public IssueStateBadge(String id, IModel<Issue> issueModel) {super(id, issueModel.getObject().getState());this.issueModel = issueModel;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 1834cd6fad..907f495410 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -50,7 +50,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;@@ -80,7 +80,7 @@ import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.issue.IssueStateLabel;+import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;@@ -158,7 +158,7 @@ public abstract class IssueListPanel extends Panel {private IssueQuery parse(@Nullable String queryString, IssueQuery baseQuery) {try {return IssueQuery.merge(baseQuery, IssueQuery.parse(getProject(), queryString, true, true, false, false, false));- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return null;} catch (Exception e) {@@ -604,7 +604,7 @@ public abstract class IssueListPanel extends Panel {try {return getIssueManager().query(getProject(), queryModel.getObject(),(int)first, (int)count, true).iterator();- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return new ArrayList<Issue>().iterator();}@@ -616,7 +616,7 @@ public abstract class IssueListPanel extends Panel {if (query != null) {try {return getIssueManager().count(getProject(), query.getCriteria());- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());}}@@ -736,7 +736,7 @@ public abstract class IssueListPanel extends Panel {if (field.equals(Issue.NAME_STATE)) {Fragment stateFragment = new Fragment(fieldsView.newChildId(),"stateFrag", IssueListPanel.this);- stateFragment.add(new IssueStateLabel("state", rowModel));+ stateFragment.add(new IssueStateBadge("state", rowModel));fieldsView.add(stateFragment);} else {fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex b5928cfd51..e6fba01c4c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -43,7 +43,7 @@ import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTriggerimport io.onedev.server.security.SecurityUtils;import io.onedev.server.util.IssueUtils;import io.onedev.server.web.behavior.WebSocketObserver;-import io.onedev.server.web.component.issue.IssueStateLabel;+import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.editable.BeanContext;@@ -76,7 +76,7 @@ public abstract class IssueOperationsPanel extends Panel {protected void onBeforeRender() {WebMarkupContainer stateContainer = new WebMarkupContainer("state");addOrReplace(stateContainer);- stateContainer.add(new IssueStateLabel("state", new AbstractReadOnlyModel<Issue>() {+ stateContainer.add(new IssueStateBadge("state", new AbstractReadOnlyModel<Issue>() {@Overridepublic Issue getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.javaindex 308cb2de66..da0b8c34d7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;-import io.onedev.server.web.component.issue.IssueStateLabel;+import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.util.ReferenceTransformer;@@ -36,7 +36,7 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {protected void onInitialize() {super.onInitialize();- add(new IssueStateLabel("state", getModel()));+ add(new IssueStateBadge("state", getModel()));Project project = ((ProjectPage)getPage()).getProject();diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.javaindex 108101a60e..528b4a63ec 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java@@ -14,7 +14,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.unbescape.javascript.JavaScriptEscape;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.web.component.link.PreventDefaultAjaxLink;@SuppressWarnings("serial")@@ -55,7 +55,7 @@ abstract class ContentPanel extends Panel {public void onClick(AjaxRequestTarget target) {try {onConfirm(target);- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());target.add(ContentPanel.this);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.html b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.htmlnew file mode 100644index 0000000000..7f77e230e7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <div class="pie-chart resize-aware"></div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.java b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.javanew file mode 100644index 0000000000..bb2931d4e2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.java@@ -0,0 +1,73 @@+package io.onedev.server.web.component.piechart;++import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.CallbackParameter;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.cycle.RequestCycle;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;++import io.onedev.server.OneDev;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;++@SuppressWarnings("serial")+public abstract class PieChartPanel extends GenericPanel<List<PieSlice>> {++ private AbstractPostAjaxBehavior selectionBehavior;++ public PieChartPanel(String id, IModel<List<PieSlice>> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(selectionBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ String sliceName = RequestCycle.get().getRequest()+ .getPostParameters().getParameterValue("sliceName").toString();+ onSelectionChange(target, sliceName);+ }++ });+ }++ @Nullable+ private List<PieSlice> getSlices() {+ return getModelObject();+ }++ protected abstract void onSelectionChange(AjaxRequestTarget target, String sliceName);++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new PieChartResourceReference()));++ String jsonOfSlices;+ try {+ jsonOfSlices = OneDev.getInstance(ObjectMapper.class).writeValueAsString(getSlices());+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }++ CallbackParameter param = CallbackParameter.explicit("sliceName");+ String callback = selectionBehavior.getCallbackFunction(param).toString();+ String script = String.format("onedev.server.pieChart.onDomReady('%s', %s, %s);",+ getMarkupId(true), jsonOfSlices, callback);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartResourceReference.javanew file mode 100644index 0000000000..59ef1f56c7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartResourceReference.java@@ -0,0 +1,30 @@+package io.onedev.server.web.component.piechart;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.asset.echarts.EChartsResourceReference;+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class PieChartResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public PieChartResourceReference() {+ super(PieChartResourceReference.class, "pie-chart.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new EChartsResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ PieChartResourceReference.class, "pie-chart.css")));+ return dependencies;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieSlice.java b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieSlice.javanew file mode 100644index 0000000000..089c282cce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/piechart/PieSlice.java@@ -0,0 +1,40 @@+package io.onedev.server.web.component.piechart;++import java.io.Serializable;++public class PieSlice implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String name;++ private final int value;++ private final String color;++ private final boolean selected;++ public PieSlice(String name, int value, String color, boolean selected) {+ this.name = name;+ this.value = value;+ this.color = color;+ this.selected = selected;+ }++ public String getColor() {+ return color;+ }++ public String getName() {+ return name;+ }++ public int getValue() {+ return value;+ }++ public boolean isSelected() {+ return selected;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.css b/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.cssnew file mode 100644index 0000000000..1d35c841b9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.css@@ -0,0 +1,3 @@+.pie-chart {+ height: 240px;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.js b/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.jsnew file mode 100644index 0000000000..785a9f6eea--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.js@@ -0,0 +1,63 @@+onedev.server.pieChart = {+ onDomReady: function(containerId, pieSlices, selectionCallback) {+ var $chart = $("#" + containerId + ">.pie-chart");+ if (pieSlices) {+ var chart = echarts.init($chart[0]);++ var chartColors = [];+ var chartData = [];+ var pieSelections = {};++ for (var i in pieSlices) {+ chartColors.push(pieSlices[i].color);+ chartData.push({+ name: pieSlices[i].name,+ value: pieSlices[i].value+ })+ pieSelections[pieSlices[i].name] = pieSlices[i].selected;+ }++ chart.setOption({+ color: chartColors,+ tooltip: {+ formatter: "{b}"+ },+ legend: {+ show: true,+ selected: pieSelections,+ top: 0,+ x: "center",+ formatter: function(name) {+ var value = 0;+ for (var i = 0; i < chartData.length; i++) {+ if (chartData[i].name == name)+ value = chartData[i].value;+ }+ return `${name} ${value}`;+ },+ },+ series: [{+ type: "pie",+ radius: "70%",+ center: ["50%", "55%"],+ label: {+ normal: {+ position: "inner",+ formatter: '{d}%'+ }+ },+ stillShowZeroSum: false,+ data: chartData+ }]+ });+ chart.on("legendselectchanged", function(obj) {+ selectionCallback(obj.name);+ });+ $chart.on("resized", function() {+ chart.resize();+ });+ } else {+ $chart.append("No Data").addClass("d-flex align-items-center h1 text-muted justify-content-center");+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 15dee8df74..f0c3bc4a4a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -36,7 +36,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;@@ -78,7 +78,7 @@ public class ProjectListPanel extends Panel {String queryString = queryStringModel.getObject();try {return ProjectQuery.parse(queryString);- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return null;} catch (Exception e) {@@ -276,7 +276,7 @@ public class ProjectListPanel extends Panel {public Iterator<? extends Project> iterator(long first, long count) {try {return getProjectManager().query(queryModel.getObject(), (int)first, (int)count).iterator();- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return new ArrayList<Project>().iterator();}@@ -288,7 +288,7 @@ public class ProjectListPanel extends Panel {if (query != null) {try {return getProjectManager().count(query.getCriteria());- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.javarename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.javaindex e6cb8ac45f..ddf0aa9388 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java@@ -10,11 +10,11 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;@SuppressWarnings("serial")-public class RequestStatusLabel extends Label {+public class RequestStatusBadge extends Label {private final IModel<PullRequest> requestModel;- public RequestStatusLabel(String id, IModel<PullRequest> requestModel) {+ public RequestStatusBadge(String id, IModel<PullRequest> requestModel) {super(id, new LoadableDetachableModel<String>() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 564445a496..5fbafe04df 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -46,7 +46,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -76,7 +76,7 @@ import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.pagenavigator.HistoryAwarePagingNavigator;import io.onedev.server.web.component.project.selector.ProjectSelector;-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;+import io.onedev.server.web.component.pullrequest.RequestStatusBadge;import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;import io.onedev.server.web.component.pullrequest.review.ReviewerAvatar;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;@@ -142,7 +142,7 @@ public abstract class PullRequestListPanel extends Panel {private PullRequestQuery parse(@Nullable String queryString, PullRequestQuery baseQuery) {try {return PullRequestQuery.merge(baseQuery, PullRequestQuery.parse(getProject(), queryString));- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return null;} catch (Exception e) {@@ -458,7 +458,7 @@ public abstract class PullRequestListPanel extends Panel {fragment.add(new Label("comments", request.getCommentCount()));- fragment.add(new RequestStatusLabel("status", rowModel));+ fragment.add(new RequestStatusBadge("status", rowModel));fragment.add(new BranchLink("target", request.getTarget()));@@ -503,7 +503,7 @@ public abstract class PullRequestListPanel extends Panel {try {return getPullRequestManager().query(getProject(), queryModel.getObject(),(int)first, (int)count, true, true).iterator();- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());return new ArrayList<PullRequest>().iterator();}@@ -515,7 +515,7 @@ public abstract class PullRequestListPanel extends Panel {if (query != null) {try {return getPullRequestManager().count(getProject(), query.getCriteria());- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.javaindex 4d7dabbbe5..78b6f4d53d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;+import io.onedev.server.web.component.pullrequest.RequestStatusBadge;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.ReferenceTransformer;@@ -36,7 +36,7 @@ public class ReferencedFromPullRequestPanel extends GenericPanel<PullRequest> {protected void onInitialize() {super.onInitialize();- add(new RequestStatusLabel("state", getModel()));+ add(new RequestStatusBadge("state", getModel()));Project project = ((ProjectPage)getPage()).getProject();diff --git a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.javaindex 9811c01e13..84329d8bc1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java+++ b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java@@ -18,8 +18,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.CompoundRequestMapper;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.GeneralException;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.mapper.BaseResourceMapper;import io.onedev.server.web.resource.SvgSpriteResourceReference;@@ -90,14 +90,14 @@ public class SpriteImage extends WebComponent {if (baseMapper.getResourceReference() instanceof SvgSpriteResourceReference) {scope = ((SvgSpriteResourceReference) baseMapper.getResourceReference()).getScope();} else {- throw new GeneralException("Path '" + mountPath+ throw new ExplicitException("Path '" + mountPath+ "' should be mounted to a svg sprite resource reference");}}}if (scope == null)- throw new GeneralException("Unable to find svg sprite resource mounted at: " + mountPath);+ throw new ExplicitException("Unable to find svg sprite resource mounted at: " + mountPath);spriteScopes.put(mountPath, scope);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex c80d444b58..75e3e94adb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -13,7 +13,7 @@ import javax.annotation.Nullable;import com.google.common.collect.Sets;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.util.BeanUtils;import io.onedev.server.web.editable.annotation.Editable;@@ -113,7 +113,7 @@ public class BeanDescriptor implements Serializable {return property.getPropertyName();}}- throw new GeneralException("No property found with name: " + propertyNameOrDisplayName);+ throw new ExplicitException("No property found with name: " + propertyNameOrDisplayName);}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.javaindex a6bd7756b9..563d83961f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java@@ -5,7 +5,7 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;@@ -50,7 +50,7 @@ public class CodeEditSupport implements EditSupport {};} else {- throw new GeneralException("@Code annotation should only be applied to a List<String> property");+ throw new ExplicitException("@Code annotation should only be applied to a List<String> property");}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex eabf6660c7..110ff9dfa8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -15,7 +15,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;@@ -46,7 +46,7 @@ public abstract class UserPage extends AdministrationPage {Long userId = Long.valueOf(userIdString);if (userId == User.SYSTEM_ID)- throw new GeneralException("System user is not accessible");+ throw new ExplicitException("System user is not accessible");userModel = new LoadableDetachableModel<User>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.jsindex f4bf335397..54183f0a0e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js@@ -112,6 +112,17 @@ onedev.server.layout = {});var $main = $body.children(".main");++ $main.on("getViewState", function() {+ return {+ scrollLeft: $main.scrollLeft(),+ scrollTop: $main.scrollTop()+ }+ });+ $main.on("setViewState", function(e, viewState) {+ $main.scrollLeft(viewState.scrollLeft);+ $main.scrollTop(viewState.scrollTop);+ });$main.on("resized", function() {var count = $(".need-width:visible:not(:has('.need-width:visible'))").length;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 953c9c5e5e..8ac89e40b1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -19,7 +19,7 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.collect.Lists;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;@@ -89,7 +89,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {Project project = OneDev.getInstance(ProjectManager.class).find(projectName);if (project == null)- throw new GeneralException("Unable to find project " + projectName);+ throw new ExplicitException("Unable to find project " + projectName);Long projectId = project.getId();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex babd08b2ae..1798207ce0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -20,7 +20,7 @@<div class="card-body d-flex flex-grow-1 position-relative"><div class="main flex-grow-1 d-flex flex-column"><pre wicket:id="errorMessage" class="error-message alert alert-notice alert-light-danger overflow-auto mb-4 flex-shrink-0 p-3 text-break"></pre>- <ul wicket:id="buildTabs" class="tabs nav nav-tabs nav nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul>+ <ul wicket:id="buildTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul><wicket:child></wicket:child></div><div wicket:id="side" class="more-info"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.javaindex 573342e8ab..e6e830eea4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java@@ -12,8 +12,33 @@ import io.onedev.server.web.component.tabbable.PageTabHead;@SuppressWarnings("serial")public class BuildTab extends PageTab {- public BuildTab(String title, Class<? extends BuildDetailPage> pageClass) {- super(Model.of(title), pageClass);+ public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass) {+ super(Model.of(title), mainPageClass);+ }++ public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,+ Class<? extends BuildDetailPage> additionalPageClass1) {+ super(Model.of(title), mainPageClass, additionalPageClass1);+ }++ public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,+ Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);+ }++ public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,+ Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2,+ Class<? extends BuildDetailPage> additionalPageClass3, Class<? extends BuildDetailPage> additionalPageClass4) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,+ additionalPageClass3, additionalPageClass4);+ }++ public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,+ Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2,+ Class<? extends BuildDetailPage> additionalPageClass3, Class<? extends BuildDetailPage> additionalPageClass4,+ Class<? extends BuildDetailPage> additionalPageClass5) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,+ additionalPageClass3, additionalPageClass4, additionalPageClass5);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 8343e66e29..4b9001e351 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -22,7 +22,7 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;@@ -65,7 +65,7 @@ abstract class BacklogColumnPanel extends Panel {if (getQuery() != null) {try {return OneDev.getInstance(IssueManager.class).count(getProject(), getQuery().getCriteria());- } catch (GeneralException e) {+ } catch (ExplicitException e) {return 0;}} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex cae7e6e5c0..cea2e8d184 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -29,7 +29,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;-import io.onedev.server.web.component.issue.IssueStateLabel;+import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.modal.ModalLink;@@ -61,7 +61,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {super.onInitialize();List<String> displayFields = ((IssueBoardsPage)getPage()).getBoard().getDisplayFields();- add(new IssueStateLabel("state", new AbstractReadOnlyModel<Issue>() {+ add(new IssueStateBadge("state", new AbstractReadOnlyModel<Issue>() {@Overridepublic Issue getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex adef750cec..a4344c4b3a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -29,7 +29,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.unbescape.html.HtmlEscape;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;@@ -103,7 +103,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (getQuery() != null) {try {return OneDev.getInstance(IssueManager.class).count(getProject(), getQuery().getCriteria());- } catch(GeneralException e) {+ } catch(ExplicitException e) {return 0;}} else {@@ -404,7 +404,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {} else {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null)- throw new GeneralException("Undefined custom field: " + fieldName);+ throw new ExplicitException("Undefined custom field: " + fieldName);if (!SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName()))throw new UnauthorizedException("Permission denied");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 35e1863451..6fe16a0ae1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -16,7 +16,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Sets;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;@@ -70,7 +70,7 @@ abstract class CardListPanel extends Panel {});index++;}- } catch (GeneralException e) {+ } catch (ExplicitException e) {error(e.getMessage());}add(cardsView);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 8f838c20a2..ad90e5252d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -39,7 +39,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;@@ -142,7 +142,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {IssueQuery query;try {query = IssueQuery.parse(getProject(), queryString, true, true, false, false, false);- } catch (GeneralException e) {+ } catch (ExplicitException e) {contentFrag.error(new QueryParseMessage(backlog, "Error parsing %squery: " + e.getMessage()));return null;} catch (Exception e) {@@ -158,7 +158,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {IssueQuery baseQuery;try {baseQuery = IssueQuery.parse(getProject(), baseQueryString, true, true, false, false, false);- } catch (GeneralException e) {+ } catch (ExplicitException e) {contentFrag.error(new QueryParseMessage(backlog, "Error parsing %sbase query: " + e.getMessage()));return null;} catch (Exception e) {@@ -177,7 +177,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {if (StringUtils.isNotBlank(boardName)) {boardIndex = BoardSpec.getBoardIndex(boards, boardName);if (boardIndex == -1)- throw new GeneralException("Can not find issue board: " + boardName);+ throw new ExplicitException("Can not find issue board: " + boardName);} else if (!boards.isEmpty()) {boardIndex = 0;} else {@@ -189,7 +189,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {if (milestoneName != null) {milestone = getProject().getMilestone(milestoneName);if (milestone == null)- throw new GeneralException("Can not find milestone: " + milestoneName);+ throw new ExplicitException("Can not find milestone: " + milestoneName);} else if (!getProject().getSortedMilestones().isEmpty()) {milestone = getProject().getSortedMilestones().iterator().next();} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.javaindex ad4a88bd3a..9165d526f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java@@ -14,7 +14,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;@@ -66,7 +66,7 @@ public class PasswordResetPage extends SimplePage {if (user == null)user = userManager.findByEmail(loginNameOrEmail);if (user == null) {- throw new GeneralException("No user found with login name or email: " + loginNameOrEmail);+ throw new ExplicitException("No user found with login name or email: " + loginNameOrEmail);} else {SettingManager settingManager = OneDev.getInstance(SettingManager.class);if (settingManager.getMailSetting() != null) {@@ -94,7 +94,7 @@ public class PasswordResetPage extends SimplePage {"Your OneDev password has been reset", htmlBody, textBody);return "Please check your email " + user.getEmail() + " for the reset password";} else {- throw new GeneralException("Unable to send password reset email as smtp setting is not defined");+ throw new ExplicitException("Unable to send password reset email as smtp setting is not defined");}}}diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.javaindex 340ddad9a0..3488d129c6 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java@@ -21,9 +21,9 @@ import org.apache.wicket.request.resource.AbstractResource;import com.google.common.base.Joiner;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;@@ -75,7 +75,7 @@ public class ArtifactResource extends AbstractResource {if (pathSegment.length() != 0)pathSegments.add(pathSegment);else- throw new GeneralException("Artifact path has to be specified");+ throw new ExplicitException("Artifact path has to be specified");for (int i = 0; i < params.getIndexedCount(); i++) {pathSegment = params.get(i).toString();@@ -90,7 +90,7 @@ public class ArtifactResource extends AbstractResource {if (!artifactFile.exists() || artifactFile.isDirectory()) {String message = String.format("Specified artifact path does not exist or is a directory (project: %s, build number: %d, path: %s)",project.getName(), build.getNumber(), artifactPath);- throw new GeneralException(message);+ throw new ExplicitException(message);}ResourceResponse response = new ResourceResponse();diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.javaindex d3bc280b97..349dac7bf9 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java@@ -28,6 +28,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.OneDev;import io.onedev.server.persistence.SessionManager;@@ -124,11 +125,11 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We@Overridepublic void onWebSocketError(Throwable throwable) {- if (throwable instanceof IOException && throwable.getMessage().equals("Broken pipe")) {+ IOException ioException = ExceptionUtils.find(throwable, IOException.class);+ if (ioException != null && "Broken pipe".equals(ioException.getMessage()))logger.debug("WebSocket closed", throwable);- } else {+ elselogger.error("An error occurred when using WebSocket.", throwable);- }}@Overridediff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 9897a273bb..7cb10a5e29 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><dependencies><dependency>@@ -26,5 +26,6 @@<module>server-plugin-authenticator-ldap</module><module>server-plugin-sso-openid</module><module>server-plugin-report-markdown</module>+ <module>server-plugin-report-jest</module></modules></project>\ No newline at end of filediff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex a940637529..5da736a84c 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex aa4218dcec..b7ee1b3d0e 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 5cb3d45b76..1d0c14e51e 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex e0f091e914..58819c33a3 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 5e15e42696..0232c3dc6e 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.javaindex cdeb18e0d0..8e1e568e0f 100644--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java@@ -272,8 +272,13 @@ public class NodeJobSuggestion implements JobSuggestion {Build build = Build.get();if (build != null) {JsonNode jsonNode = getPackageJson(build.getProject(), build.getCommitId());- if (jsonNode != null)- return jsonNode.findValue("version").asText();+ if (jsonNode != null) {+ JsonNode versionNode = jsonNode.findValue("version");+ if (versionNode != null)+ return versionNode.asText();+ else+ return null;+ }elsereturn null;} else {diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xmlindex 371160c9a4..253e38745d 100644--- a/server-plugin/server-plugin-executor-docker/pom.xml+++ b/server-plugin/server-plugin-executor-docker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.javaindex 2afc3255e7..87baec380b 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java@@ -34,17 +34,17 @@ import com.google.common.base.Splitter;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.commons.utils.command.ProcessKiller;import io.onedev.k8shelper.CacheInstance;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.k8shelper.SshCloneInfo;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.buildspec.job.JobContext;import io.onedev.server.buildspec.job.JobManager;@@ -391,7 +391,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Velsedocker.addArgs("sh", "-c", jobService.getReadinessCheckCommand());- ExecuteResult result = docker.execute(new LineConsumer() {+ ExecutionResult result = docker.execute(new LineConsumer() {@Overridepublic void consume(String line) {@@ -434,7 +434,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V}).checkReturnCode();- throw new GeneralException(String.format("Service '" + jobService.getName() + "' is stopped unexpectedly"));+ throw new ExplicitException(String.format("Service '" + jobService.getName() + "' is stopped unexpectedly"));}try {@@ -520,7 +520,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VhostWorkspace = new File(hostBuildHome, "workspace");FileUtils.createDir(hostWorkspace);}-+File hostHome = null;try {LineConsumer logger = new LineConsumer(StandardCharsets.UTF_8.name()) {@@ -668,6 +668,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V}}+ jobContext.reportJobWorkspace(containerWorkspace);+String containerName = network + "-job";docker.clearArgs();docker.addArgs("run", "--name=" + containerName, "--network=" + network);@@ -703,7 +705,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VjobLogger.log("Running job container...");try {- docker.execute(logger, logger, null, new ProcessKiller() {+ ExecutionResult result = docker.execute(logger, logger, null, new ProcessKiller() {@Overridepublic void kill(Process process, String executionId) {@@ -727,7 +729,13 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V}).checkReturnCode();}- }).checkReturnCode();+ });+ if (result.getReturnCode() != 0) {+ String logMessage = String.format("Job command failed in build %s#%d",+ jobContext.getProjectName(), jobContext.getBuildNumber());+ DockerExecutor.logger.debug(logMessage, result.buildException());+ throw new ExplicitException("Job command failed with exit code " + result.getReturnCode());+ }} finally {jobLogger.log("Sending job outcomes...");@@ -807,7 +815,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Vif (argument.startsWith(option))return true;} else {- throw new GeneralException("Invalid option: " + option);+ throw new ExplicitException("Invalid option: " + option);}}}diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 8137197f98..d13aadcd8a 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 6b2bfbb44b..0fd1903883 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -35,13 +35,13 @@ import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.ExecuteResult;+import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.CacheSpec;import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.buildspec.job.JobContext;@@ -402,7 +402,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (!osInfos.isEmpty()) {return OsInfo.getBaseline(osInfos);} else {- throw new GeneralException("No applicable working nodes found");+ throw new ExplicitException("No applicable working nodes found");}}@@ -628,7 +628,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataelsekubectl.addArgs("cmd.exe", "/c");kubectl.addArgs(jobService.getReadinessCheckCommand());- ExecuteResult result = kubectl.execute(new LineConsumer() {+ ExecutionResult result = kubectl.execute(new LineConsumer() {@Overridepublic void consume(String line) {@@ -667,7 +667,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatacollectContainerLog(namespace, podName, "default", null, jobLogger);String message = "Service '" + jobService.getName() + "' is stopped unexpectedly";- throw new GeneralException(message);+ throw new ExplicitException(message);}}@@ -955,7 +955,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataJsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");String errorMessage = getContainerError(initContainerStatusesNode, "init");if (errorMessage != null)- return new StopWatch(new GeneralException("Error executing init logic: " + errorMessage));+ return new StopWatch(new ExplicitException("Error executing init logic: " + errorMessage));JsonNode containerStatusesNode = statusNode.get("containerStatuses");if (isContainerStarted(containerStatusesNode, "main"))@@ -994,11 +994,11 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataJsonNode containerStatusesNode = statusNode.get("containerStatuses");String errorMessage = getContainerError(containerStatusesNode, "main");if (errorMessage != null) {- return new StopWatch(new GeneralException(errorMessage));+ return new StopWatch(new ExplicitException(errorMessage));} else {errorMessage = getContainerError(containerStatusesNode, "sidecar");if (errorMessage != null)- return new StopWatch(new GeneralException("Error executing sidecar logic: " + errorMessage));+ return new StopWatch(new ExplicitException("Error executing sidecar logic: " + errorMessage));else if (isContainerStopped(containerStatusesNode, "sidecar"))return new StopWatch(null);else@@ -1032,7 +1032,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (reasonNode != null)reason = reasonNode.asText();else- reason = "terminated for unknown reason";+ reason = "Unknown reason";if (!reason.equals("Completed")) {JsonNode messageNode = terminatedNode.get("message");@@ -1041,7 +1041,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData} else {JsonNode exitCodeNode = terminatedNode.get("exitCode");if (exitCodeNode != null && exitCodeNode.asInt() != 0)- return "exit code: " + exitCodeNode.asText();+ return "Job command failed with exit code " + exitCodeNode.asText();elsereturn reason;}@@ -1145,7 +1145,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatafor (String labelUpdate: partition)kubectl.addArgs(labelUpdate);AtomicBoolean labelNotFound = new AtomicBoolean(false);- ExecuteResult result = kubectl.execute(new LineConsumer() {+ ExecutionResult result = kubectl.execute(new LineConsumer() {@Overridepublic void consume(String line) {@@ -1243,7 +1243,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}}if (errorMessage != null)- stopWatchRef.set(new StopWatch(new GeneralException(errorMessage)));+ stopWatchRef.set(new StopWatch(new ExplicitException(errorMessage)));elsestopWatchRef.set(statusChecker.check(statusNode));if (stopWatchRef.get() != null)@@ -1259,7 +1259,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}).checkReturnCode();- throw new GeneralException("Unexpected end of pod watching");+ throw new ExplicitException("Unexpected end of pod watching");} catch (Exception e) {StopWatch stopWatch = stopWatchRef.get();if (stopWatch != null) {@@ -1303,7 +1303,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (reason.equals("FailedScheduling"))jobLogger.log("Kubernetes: " + message);else- stopWatchRef.set(new StopWatch(new GeneralException(message)));+ stopWatchRef.set(new StopWatch(new ExplicitException(message)));} else if (type.equals("Normal") && reason.equals("Started")) {stopWatchRef.set(new StopWatch(null));}@@ -1328,7 +1328,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}).checkReturnCode();- throw new GeneralException("Unexpected end of event watching");+ throw new ExplicitException("Unexpected end of event watching");} catch (Exception e) {StopWatch stopWatch = stopWatchRef.get();if (stopWatch != null) {@@ -1387,7 +1387,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatakubectl.execute(logConsumer, logConsumer).checkReturnCode();} catch (Exception e) {if (errorMessageRef.get() != null)- throw new GeneralException(errorMessageRef.get());+ throw new ExplicitException(errorMessageRef.get());elsethrow ExceptionUtils.unchecked(e);}@@ -1488,20 +1488,20 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (osInfos.iterator().next().isLinux()) {for (OsInfo osInfo: osInfos) {if (!osInfo.isLinux())- throw new GeneralException("Linux and non-linux nodes should not be included in same executor");+ throw new ExplicitException("Linux and non-linux nodes should not be included in same executor");}return osInfos.iterator().next();} else if (osInfos.iterator().next().isWindows()) {OsInfo baseline = null;for (OsInfo osInfo: osInfos) {if (!osInfo.isWindows())- throw new GeneralException("Windows and non-windows nodes should not be included in same executor");+ throw new ExplicitException("Windows and non-windows nodes should not be included in same executor");if (baseline == null || baseline.getWindowsVersion() > osInfo.getWindowsVersion())baseline = osInfo;}return baseline;} else {- throw new GeneralException("Either Windows or Linux nodes can be included in an executor");+ throw new ExplicitException("Either Windows or Linux nodes can be included in an executor");}}@@ -1511,7 +1511,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (kernelVersion.contains(entry.getKey()))return entry.getValue();}- throw new GeneralException("Unsupported windows kernel version: " + kernelVersion);+ throw new ExplicitException("Unsupported windows kernel version: " + kernelVersion);}public String getHelperImageSuffix() {diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.javaindex 840c4460a7..10aad74294 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java@@ -10,6 +10,7 @@ import java.util.HashMap;import java.util.Map;import java.util.UUID;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.servlet.http.HttpServletRequest;@@ -28,10 +29,11 @@ import org.apache.commons.lang.SerializationUtils;import com.google.common.base.Splitter;import com.google.common.collect.Lists;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TarUtils;import io.onedev.k8shelper.CacheAllocationRequest;import io.onedev.k8shelper.CacheInstance;-import io.onedev.server.GeneralException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobContext;import io.onedev.server.buildspec.job.JobManager;@@ -55,9 +57,11 @@ public class KubernetesResource {@Path("/job-context")@Produces(MediaType.APPLICATION_OCTET_STREAM)- @GET- public byte[] getJobContext() {+ @POST+ public byte[] getJobContext(@Nullable String jobWorkspace) {JobContext context = jobManager.getJobContext(getJobToken(), true);+ if (StringUtils.isNotBlank(jobWorkspace))+ context.reportJobWorkspace(jobWorkspace);Map<String, Object> contextMap = new HashMap<>();contextMap.put("commands", context.getCommands());contextMap.put("retrieveSource", context.isRetrieveSource());@@ -132,7 +136,7 @@ public class KubernetesResource {if (jobToken != null)return jobToken;else- throw new GeneralException("Job token is expected");+ throw new ExplicitException("Job token is expected");}}diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xmlindex 8c63f39156..e5e7e6a09a 100644--- a/server-plugin/server-plugin-report-html/pom.xml+++ b/server-plugin/server-plugin-report-html/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.html.HtmlReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.javaindex 65060649ef..5fea02baa6 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java@@ -22,9 +22,9 @@ import org.apache.wicket.request.resource.AbstractResource;import com.google.common.base.Joiner;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;@@ -83,7 +83,7 @@ public class HtmlReportDownloadResource extends AbstractResource {if (pathSegment.length() != 0)pathSegments.add(pathSegment);else- throw new GeneralException("Html report path has to be specified");+ throw new ExplicitException("Html report path has to be specified");for (int i = 0; i < params.getIndexedCount(); i++) {pathSegment = params.get(i).toString();@@ -100,7 +100,7 @@ public class HtmlReportDownloadResource extends AbstractResource {if (!htmlFile.exists() || htmlFile.isDirectory()) {String message = String.format("Specified html path does not exist or is a directory (project: %s, build number: %d, path: %s)",project.getName(), build.getNumber(), htmlPath);- throw new GeneralException(message);+ throw new ExplicitException(message);}ResourceResponse response = new ResourceResponse();diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlnew file mode 100644index 0000000000..327a826507--- /dev/null+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -0,0 +1,13 @@+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-plugin-report-jest</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin</artifactId>+ <version>4.1.0</version>+ </parent>+ <properties>+ <moduleClass>io.onedev.server.plugin.report.jest.JestReportModule</moduleClass>+ </properties>+</project>diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportData.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportData.javanew file mode 100644index 0000000000..88e1052a7f--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportData.java@@ -0,0 +1,242 @@+package io.onedev.server.plugin.report.jest;++import java.io.File;+import java.io.FileInputStream;+import java.io.FileOutputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.OutputStream;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.commons.lang.SerializationUtils;+import org.apache.commons.lang3.StringUtils;++import com.fasterxml.jackson.databind.JsonNode;++import io.onedev.server.model.Build;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;++public class JestReportData implements Serializable {++ private static final long serialVersionUID = 1L;++ public static enum Status {++ PASSED("#1BC5BD"), FAILED("#F64E60"), SKIPPED("#8950FC"), TODO("#3699FF");++ private final String color;++ Status(String color) {+ this.color = color;+ };++ public String getColor() {+ return color;+ }++ };++ private static final String FILE_NAME = "data.ser";++ private final List<TestSuite> testSuites;++ public JestReportData(Build build, Collection<JsonNode> rootNodes) {+ testSuites = new ArrayList<>();+ for (JsonNode rootNode: rootNodes) {+ for (JsonNode testSuiteNode: rootNode.get("testResults"))+ testSuites.add(new TestSuite(build, testSuiteNode));+ }+ }++ public List<TestSuite> getTestSuites(@Nullable PatternSet filePatterns, Collection<Status> statuses) {+ Matcher matcher = new PathMatcher();+ return testSuites.stream().filter(it->{+ return (filePatterns == null || filePatterns.matches(matcher, it.getName()))+ && (statuses == null || statuses.contains(it.getStatus()));+ }).collect(Collectors.toList());+ }++ public List<TestCase> getTestCases(@Nullable PatternSet filePatterns,+ @Nullable PatternSet namePatterns, Collection<Status> statuses) {+ Matcher matcher = new PathMatcher();++ return testSuites.stream().flatMap(it->it.getTestCases().stream()).filter(it->{+ return (filePatterns == null || filePatterns.matches(matcher, it.getTestSuite().getName()))+ && (namePatterns == null || namePatterns.matches(matcher, it.getName()))+ && (statuses == null || statuses.contains(it.getStatus()));+ }).collect(Collectors.toList());+ }++ public List<TestSuite> getTestSuites() {+ return testSuites;+ }++ @Nullable+ public static JestReportData readFrom(File reportDir) {+ File dataFile = new File(reportDir, FILE_NAME);+ if (dataFile.exists()) {+ try (InputStream is = new FileInputStream(dataFile)) {+ return (JestReportData) SerializationUtils.deserialize(is);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ return null;+ }+ }++ public void writeTo(File reportDir) {+ File dataFile = new File(reportDir, FILE_NAME);+ try (OutputStream os = new FileOutputStream(dataFile)) {+ SerializationUtils.serialize(this, os);+ } catch (IOException e) {+ throw new RuntimeException(e);+ };+ }++ public static class TestSuite implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String name;++ private final Status status;++ private final long duration;++ private final String message;++ private final List<TestCase> testCases;++ public TestSuite(Build build, JsonNode rootNode) {+ String name = rootNode.get("name").asText();+ if (build.getJobWorkspace() != null && name.startsWith(build.getJobWorkspace()))+ name = name.substring(build.getJobWorkspace().length()+1);++ this.name = name;++ String message = rootNode.get("message").asText(null);+ if (StringUtils.isBlank(message))+ message = null;+ this.message = message;++ duration = rootNode.get("endTime").asLong() - rootNode.get("startTime").asLong();++ testCases = new ArrayList<>();+ for (JsonNode testCaseNode: rootNode.get("assertionResults"))+ testCases.add(new TestCase(this, testCaseNode));++ switch(rootNode.get("status").asText()) {+ case "pending":+ status = Status.SKIPPED;+ break;+ case "todo":+ status = Status.TODO;+ break;+ case "failed":+ status = Status.FAILED;+ break;+ default:+ if (!testCases.isEmpty()) {+ if (testCases.stream().allMatch(it->it.getStatus() == Status.TODO))+ status = Status.TODO;+ else if (testCases.stream().allMatch(it->it.getStatus() == Status.SKIPPED))+ status = Status.SKIPPED;+ else+ status = Status.PASSED;+ } else {+ status = Status.PASSED;+ }+ }+ }++ public String getName() {+ return name;+ }++ public long getDuration() {+ return duration;+ }++ public List<TestCase> getTestCases() {+ return testCases;+ }++ public Status getStatus() {+ return status;+ }++ @Nullable+ public String getMessage() {+ return message;+ }++ }++ public static class TestCase implements Serializable {++ private static final long serialVersionUID = 1L;++ private final TestSuite testSuite;++ private final String name;++ private final Status status;++ private final List<String> messages;++ public TestCase(TestSuite testSuite, JsonNode rootNode) {+ this.testSuite = testSuite;++ StringBuilder nameBuilder = new StringBuilder();+ for (JsonNode ancestorTitleNode: rootNode.get("ancestorTitles"))+ nameBuilder.append(ancestorTitleNode.asText()).append("/");+ nameBuilder.append(rootNode.get("title").asText());++ name = nameBuilder.toString();++ messages = new ArrayList<>();+ for (JsonNode messageNode: rootNode.get("failureMessages"))+ messages.add(messageNode.asText());++ switch (rootNode.get("status").asText()) {+ case "passed":+ status = Status.PASSED;+ break;+ case "pending":+ status = Status.SKIPPED;+ break;+ case "todo":+ status = Status.TODO;+ break;+ default:+ status = Status.FAILED;+ }+ }++ public TestSuite getTestSuite() {+ return testSuite;+ }++ public String getName() {+ return name;+ }++ public Status getStatus() {+ return status;+ }++ public List<String> getMessages() {+ return messages;+ }++ }+}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportModule.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportModule.javanew file mode 100644index 0000000000..60bde6aabb--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportModule.java@@ -0,0 +1,131 @@+package io.onedev.server.plugin.report.jest;++import java.io.File;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.concurrent.Callable;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.protocol.http.WebApplication;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.google.common.collect.Sets;++import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.buildspec.job.JobReport;+import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.tabbable.PageTabHead;+import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildTab;+import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;++/**+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.+ *+ */+public class JestReportModule extends AbstractPluginModule {++ @Override+ protected void configure() {+ super.configure();++ contribute(ImplementationProvider.class, new ImplementationProvider() {++ @Override+ public Class<?> getAbstractClass() {+ return JobReport.class;+ }++ @Override+ public Collection<Class<?>> getImplementations() {+ return Sets.newHashSet(JobJestReport.class);+ }++ });++ contribute(BuildTabContribution.class, new BuildTabContribution() {++ @Override+ public List<BuildTab> getTabs(Build build) {+ List<BuildTab> tabs = new ArrayList<>();+ LockUtils.read(build.getReportLockKey(JobJestReport.DIR), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ if (build.getReportDir(JobJestReport.DIR).exists()) {+ for (File reportDir: build.getReportDir(JobJestReport.DIR).listFiles()) {+ if (SecurityUtils.canAccessReport(build, reportDir.getName()))+ tabs.add(new JestReportTab(reportDir.getName()));+ }+ }+ return null;+ }++ });+ return tabs;+ }++ @Override+ public int getOrder() {+ return 200;+ }++ });++ contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {++ @Override+ public void configure(WebApplication application) {+ application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/jest-reports/${report}/test-suites", JestTestSuitesPage.class));+ application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/jest-reports/${report}/test-cases", JestTestCasesPage.class));+ }++ });+ }++ private static class JestReportTab extends BuildTab {++ private static final long serialVersionUID = 1L;++ public JestReportTab(String title) {+ super(title, JestTestSuitesPage.class, JestReportPage.class);+ }++ @Override+ public Component render(String componentId) {+ return new PageTabHead(componentId, this) {++ private static final long serialVersionUID = 1L;++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ BuildDetailPage page = (BuildDetailPage) getPage();+ PageParameters params = JestReportPage.paramsOf(+ page.getBuild(), getTitle());+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);+ }++ };+ }++ @Override+ public boolean isActive(Page currentPage) {+ if (super.isActive(currentPage)) {+ JestReportPage jestReportPage = (JestReportPage) currentPage;+ return getTitle().equals(jestReportPage.getReportName());+ } else {+ return false;+ }+ }++ }+}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.html b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.htmlnew file mode 100644index 0000000000..da155dbe19--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.html@@ -0,0 +1,6 @@+<wicket:extend>+ <div class="jest-report">+ <ul wicket:id="reportTabs" class="tabs nav nav-tabs nav-tabs-line mb-5 flex-shrink-0 test-detail"></ul>+ <wicket:child></wicket:child>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.javanew file mode 100644index 0000000000..61017f4dbc--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.java@@ -0,0 +1,135 @@+package io.onedev.server.plugin.report.jest;++import java.io.File;+import java.util.ArrayList;+import java.util.List;+import java.util.concurrent.Callable;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.commons.utils.LockUtils;+import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.tabbable.PageTabHead;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildTab;++@SuppressWarnings("serial")+public abstract class JestReportPage extends BuildDetailPage {++ private static final String PARAM_REPORT = "report";++ private final String reportName;++ private final IModel<JestReportData> reportDataModel = new LoadableDetachableModel<JestReportData>() {++ @Override+ protected JestReportData load() {+ return LockUtils.read(getBuild().getReportLockKey(JobJestReport.DIR), new Callable<JestReportData>() {++ @Override+ public JestReportData call() throws Exception {+ File reportsDir = new File(getBuild().getReportDir(JobJestReport.DIR), reportName);+ return JestReportData.readFrom(reportsDir);+ }++ });+ }++ };++ public JestReportPage(PageParameters params) {+ super(params);++ reportName = params.get(PARAM_REPORT).toString();+ }++ @Override+ protected void onDetach() {+ reportDataModel.detach();+ super.onDetach();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Tab> tabs = new ArrayList<>();+ tabs.add(new JestReportTab("Test Suites", JestTestSuitesPage.class));+ tabs.add(new JestReportTab("Test Cases", JestTestCasesPage.class));++ add(new Tabbable("reportTabs", tabs));+ }++ @Nullable+ protected JestReportData getReportData() {+ return reportDataModel.getObject();+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canAccessReport(getBuild(), reportName);+ }++ public String getReportName() {+ return reportName;+ }++ public static PageParameters paramsOf(Build build, String reportName) {+ PageParameters params = paramsOf(build);+ params.add(PARAM_REPORT, reportName);+ return params;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new JestReportResourceReference()));+ }++ private class JestReportTab extends BuildTab {++ public JestReportTab(String title, Class<? extends JestReportPage> pageClass) {+ super(title, pageClass);+ }++ @Override+ public Component render(String componentId) {+ return new PageTabHead(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ BuildDetailPage page = (BuildDetailPage) getPage();+ PageParameters params = JestReportPage.paramsOf(+ page.getBuild(), reportName);+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);+ }++ };+ }++ @Override+ public boolean isActive(Page currentPage) {+ if (super.isActive(currentPage)) {+ JestReportPage jestReportPage = (JestReportPage) currentPage;+ return reportName.equals(jestReportPage.getReportName());+ } else {+ return false;+ }+ }++ }++}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportResourceReference.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportResourceReference.javanew file mode 100644index 0000000000..5f24b30591--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportResourceReference.java@@ -0,0 +1,30 @@+package io.onedev.server.plugin.report.jest;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.asset.echarts.EChartsResourceReference;+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class JestReportResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public JestReportResourceReference() {+ super(JestReportResourceReference.class, "jest-report.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new EChartsResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ JestReportResourceReference.class, "jest-report.css")));+ return dependencies;+ }++}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.html b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.htmlnew file mode 100644index 0000000000..1ddc7ed2a3--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.html@@ -0,0 +1,42 @@+<wicket:extend>+ <div wicket:id="testCases"></div>+ <wicket:fragment wicket:id="hasDataFrag">+ <div class="test-cases">+ <div class="d-flex flex-wrap flex-md-nowrap no-autofocus">+ <form wicket:id="fileForm" class="w-100 pr-md-2">+ <div class="clearable-wrapper">+ <div class="input-group">+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter by path">+ <span class="input-group-append">+ <button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>+ </span>+ </div>+ </div>+ <div wicket:id="feedback" class="mt-3"></div>+ </form>+ <form wicket:id="nameForm" class="w-100 pl-md-2">+ <div class="clearable-wrapper">+ <div class="input-group">+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter by name">+ <span class="input-group-append">+ <button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>+ </span>+ </div>+ </div>+ <div wicket:id="feedback" class="mt-3"></div>+ </form>+ </div>+ <div wicket:id="summary" class="summary"></div>+ <table wicket:id="detail" class="detail table"></table>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="testCaseFrag">+ <div class="d-flex">+ <span wicket:id="status" class="mr-3"></span>+ <span wicket:id="name" class="mr-4 text-break"></span>+ <a wicket:id="testSuite" class="ml-auto text-break" title="Show test cases of this test suite"><span wicket:id="label"></span></a>+ <a wicket:id="viewSource" class="ml-2" title="View source file"><wicket:svg href="file" class="icon"/></a>+ </div>+ <pre wicket:id="messages" class="text-gray mt-3"></pre>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.javanew file mode 100644index 0000000000..94572f9891--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.java@@ -0,0 +1,505 @@+package io.onedev.server.plugin.report.jest;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Arrays;+import java.util.Collection;+import java.util.Iterator;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.string.StringValue;+import org.eclipse.jgit.lib.FileMode;++import com.google.common.base.Optional;+import com.google.common.collect.Lists;+import com.google.common.collect.Sets;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Build;+import io.onedev.server.plugin.report.jest.JestReportData.Status;+import io.onedev.server.plugin.report.jest.JestReportData.TestCase;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.behavior.PatternSetAssistBehavior;+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.pagenavigator.HistoryAwarePagingNavigator;+import io.onedev.server.web.component.piechart.PieChartPanel;+import io.onedev.server.web.component.piechart.PieSlice;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.util.LoadableDetachableDataProvider;+import io.onedev.server.web.util.SuggestionUtils;++@SuppressWarnings("serial")+public class JestTestCasesPage extends JestReportPage {++ public static final String PARAM_FILE = "file";++ public static final String PARAM_NAME = "name";++ public static final String PARAM_STATUS = "status";++ private State state = new State();++ private Optional<PatternSet> filePatterns;++ private Optional<PatternSet> namePatterns;++ private final IModel<List<TestCase>> testCasesModel = new LoadableDetachableModel<List<TestCase>>() {++ @Override+ protected List<TestCase> load() {+ if (filePatterns != null && namePatterns != null)+ return getReportData().getTestCases(filePatterns.orNull(), namePatterns.orNull(), state.statuses);+ else+ return new ArrayList<>();+ }++ };++ private Form<?> fileForm;++ private Form<?> nameForm;++ private Component fileFeedback;++ private Component nameFeedback;++ private Component summary;++ private DataTable<TestCase, Void> detail;++ public JestTestCasesPage(PageParameters params) {+ super(params);++ state.file = params.get(PARAM_FILE).toOptionalString();+ state.name = params.get(PARAM_NAME).toOptionalString();++ state.statuses = new LinkedHashSet<>();++ if (!"none".equals(params.get(PARAM_STATUS).toString())) {+ for (StringValue each: params.getValues(PARAM_STATUS))+ state.statuses.add(Status.valueOf(each.toString().toUpperCase()));++ if (state.statuses.isEmpty()) {+ state.statuses.add(Status.PASSED);+ state.statuses.add(Status.FAILED);+ }+ }+ }++ private void pushState(AjaxRequestTarget target) {+ CharSequence url = urlFor(JestTestCasesPage.class, paramsOf(getBuild(), getReportName(), state));+ pushState(target, url.toString(), state);+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);+ state = (State) data;+ parseFilePatterns();+ parseNamePatterns();+ target.add(fileForm);+ target.add(nameForm);+ target.add(summary);+ target.add(detail);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getReportData() != null) {+ Fragment fragment = new Fragment("testCases", "hasDataFrag", this);++ fileForm = new Form<Void>("fileForm");++ TextField<String> input = new TextField<String>("input", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.file;+ }++ @Override+ public void setObject(String object) {+ state.file = object;+ }++ });+ input.add(new PatternSetAssistBehavior() {++ @Override+ protected List<InputSuggestion> suggest(String matchWith) {+ return SuggestionUtils.suggest(+ getReportData().getTestSuites().stream().map(it->it.getName()).collect(Collectors.toList()),+ matchWith);+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ return Lists.newArrayList(+ "Path containing spaces or starting with dash needs to be quoted",+ "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude"+ );+ }++ });+ fileForm.add(input);++ input.add(new AjaxFormComponentUpdatingBehavior("clear") {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ pushState(target);+ parseFilePatterns();+ target.add(fileFeedback);+ target.add(summary);+ target.add(detail);+ }++ });++ fileForm.add(fileFeedback = new FencedFeedbackPanel("feedback", fileForm));+ fileFeedback.setOutputMarkupPlaceholderTag(true);++ fileForm.add(new AjaxButton("submit") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(this));+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ pushState(target);+ parseFilePatterns();+ target.add(fileFeedback);+ target.add(summary);+ target.add(detail);+ }++ });++ fragment.add(fileForm);++ nameForm = new Form<Void>("nameForm");++ input = new TextField<String>("input", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.name;+ }++ @Override+ public void setObject(String object) {+ state.name = object;+ }++ });+ input.add(new PatternSetAssistBehavior() {++ @Override+ protected List<InputSuggestion> suggest(String matchWith) {+ return SuggestionUtils.suggest(+ getReportData().getTestCases(null, null, null).stream().map(it->it.getName()).distinct().collect(Collectors.toList()),+ matchWith);+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ return Lists.newArrayList(+ "Path containing spaces or starting with dash needs to be quoted",+ "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude"+ );+ }++ });+ nameForm.add(input);++ input.add(new AjaxFormComponentUpdatingBehavior("clear") {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ pushState(target);+ parseNamePatterns();+ target.add(nameFeedback);+ target.add(summary);+ target.add(detail);+ }++ });++ nameForm.add(nameFeedback = new FencedFeedbackPanel("feedback", nameForm));+ nameFeedback.setOutputMarkupPlaceholderTag(true);++ nameForm.add(new AjaxButton("submit") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(this));+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ pushState(target);+ parseNamePatterns();+ target.add(nameFeedback);+ target.add(summary);+ target.add(detail);+ }++ });++ fragment.add(nameForm);++ parseFilePatterns();+ parseNamePatterns();++ fragment.add(summary = new PieChartPanel("summary", new LoadableDetachableModel<List<PieSlice>>() {++ @Override+ protected List<PieSlice> load() {+ if (filePatterns != null && namePatterns != null) {+ List<PieSlice> slices = new ArrayList<>();+ for (Status status: Status.values()) {+ int numOfTestCases = getReportData().getTestCases(+ filePatterns.orNull(), namePatterns.orNull(), Sets.newHashSet(status)).size();+ slices.add(new PieSlice(status.name().toLowerCase(), numOfTestCases,+ status.getColor(), state.statuses.contains(status)));+ }+ return slices;+ } else {+ return null;+ }+ }++ }) {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target, String sliceName) {+ Status status = Status.valueOf(sliceName.toUpperCase());+ if (state.statuses.contains(status))+ state.statuses.remove(status);+ else+ state.statuses.add(status);+ pushState(target);+ target.add(detail);+ }++ });++ List<IColumn<TestCase, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<TestCase, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<TestCase>> cellItem,+ String componentId, IModel<TestCase> rowModel) {+ TestCase testCase = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "testCaseFrag", JestTestCasesPage.this);++ fragment.add(new TestStatusBadge("status", testCase.getStatus()));+ fragment.add(new Label("name", testCase.getName()));++ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("testSuite") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ state.file = testCase.getTestSuite().getName();+ pushState(target);+ parseFilePatterns();+ target.add(fileForm);+ target.add(summary);+ target.add(detail);+ }++ };+ link.add(new Label("label", testCase.getTestSuite().getName()));+ fragment.add(link);++ BlobIdent blobIdent = new BlobIdent(getBuild().getCommitHash(), testCase.getTestSuite().getName(),+ FileMode.REGULAR_FILE.getBits());+ if (SecurityUtils.canReadCode(getProject()) && getProject().getBlob(blobIdent, false) != null) {+ fragment.add(new ViewStateAwarePageLink<Void>("viewSource", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(getProject(), blobIdent)));+ } else {+ fragment.add(new WebMarkupContainer("viewSource").setVisible(false));+ }++ RepeatingView messagesView = new RepeatingView("messages");+ for (String message: testCase.getMessages()) {+ messagesView.add(new TestMessagePanel(messagesView.newChildId(), message) {++ @Override+ protected Build getBuild() {+ return JestTestCasesPage.this.getBuild();+ }++ });+ }+ fragment.add(messagesView);++ cellItem.add(fragment);+ }++ });++ SortableDataProvider<TestCase, Void> dataProvider = new LoadableDetachableDataProvider<TestCase, Void>() {++ @Override+ public Iterator<? extends TestCase> iterator(long first, long count) {+ if (getTestCases().size() > first+count)+ return getTestCases().subList((int)first, (int)(first+count)).iterator();+ else+ return getTestCases().subList((int)first, getTestCases().size()).iterator();+ }++ @Override+ public long calcSize() {+ return getTestCases().size();+ }++ @Override+ public IModel<TestCase> model(TestCase object) {+ return Model.of(object);+ }++ };+ fragment.add(detail = new DataTable<TestCase, Void>("detail", columns,+ dataProvider, WebConstants.PAGE_SIZE));++ detail.addBottomToolbar(new NavigationToolbar(detail) {++ @Override+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {+ return new HistoryAwarePagingNavigator(navigatorId, table, null);+ }++ });++ fragment.add(detail.setOutputMarkupId(true));++ add(fragment);+ } else {+ add(new Label("testCases", "No test suites published")+ .add(AttributeAppender.append("class", "alert alert-notice alert-light-warning")));+ }++ }++ private void parseFilePatterns() {+ if (state.file != null) {+ try {+ filePatterns = Optional.of(PatternSet.parse(state.file));+ } catch (Exception e) {+ filePatterns = null;+ fileForm.error("Malformed file filter");+ }+ } else {+ filePatterns = Optional.absent();+ }+ }++ private void parseNamePatterns() {+ if (state.name != null) {+ try {+ namePatterns = Optional.of(PatternSet.parse(state.name));+ } catch (Exception e) {+ namePatterns = null;+ nameForm.error("Malformed name filter");+ }+ } else {+ namePatterns = Optional.absent();+ }+ }++ private List<TestCase> getTestCases() {+ return testCasesModel.getObject();+ }++ @Override+ protected void onDetach() {+ testCasesModel.detach();+ super.onDetach();+ }++ public static PageParameters paramsOf(Build build, String reportName, State state) {+ PageParameters params = paramsOf(build, reportName);+ if (state.file != null)+ params.add(PARAM_FILE, state.file);+ if (state.name != null)+ params.add(PARAM_NAME, state.name);+ if (state.statuses != null) {+ if (!state.statuses.isEmpty()) {+ if (!state.statuses.containsAll(Arrays.asList(Status.values()))) {+ for (Status status: state.statuses)+ params.add(PARAM_STATUS, status.name().toLowerCase());+ }+ } else {+ params.add(PARAM_STATUS, "none");+ }+ }+ return params;+ }++ public static class State implements Serializable {++ @Nullable+ public String file;++ @Nullable+ public String name;++ public Collection<Status> statuses;++ }++}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.html b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.htmlnew file mode 100644index 0000000000..7d133c6ea8--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.html@@ -0,0 +1,37 @@+<wicket:extend>+ <div wicket:id="testSuites"></div>+ <wicket:fragment wicket:id="hasDataFrag">+ <div class="test-suites">+ <form wicket:id="form" class="form no-autofocus">+ <div class="clearable-wrapper">+ <div class="input-group">+ <input wicket:id="file" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter by path">+ <span class="input-group-append">+ <button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>+ </span>+ </div>+ </div>+ <div wicket:id="feedback" class="mt-3"></div>+ </form>+ <div wicket:id="summary" class="summary"></div>+ <div class="d-flex align-items-center mb-2">+ <span class="ml-auto mr-3 font-weight-bold">Longest Execution Time First</span>+ <span class="switch switch-sm switch-primary">+ <label>+ <input wicket:id="longestDurationFirst" type="checkbox">+ </label>+ </span>+ </div>+ <table wicket:id="detail" class="detail table"></table>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="testSuiteFrag">+ <div class="d-flex">+ <span wicket:id="status" class="mr-3"></span>+ <a wicket:id="testCases" class="mr-4 text-break" title="Show test cases of this test suite"><span wicket:id="label"></span></a>+ <a wicket:id="viewSource" class="ml-n3 mr-4" title="View source file"><wicket:svg href="file" class="icon"/></a>+ <span wicket:id="duration" class="ml-auto"></span>+ </div>+ <pre wicket:id="message" class="text-gray mt-3"></pre>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.javanew file mode 100644index 0000000000..5abf02b9e8--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.java@@ -0,0 +1,432 @@+package io.onedev.server.plugin.report.jest;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.Iterator;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.string.StringValue;+import org.eclipse.jgit.lib.FileMode;++import com.google.common.base.Optional;+import com.google.common.collect.Lists;+import com.google.common.collect.Sets;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Build;+import io.onedev.server.plugin.report.jest.JestReportData.Status;+import io.onedev.server.plugin.report.jest.JestReportData.TestSuite;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.behavior.PatternSetAssistBehavior;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.pagenavigator.HistoryAwarePagingNavigator;+import io.onedev.server.web.component.piechart.PieChartPanel;+import io.onedev.server.web.component.piechart.PieSlice;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.util.LoadableDetachableDataProvider;+import io.onedev.server.web.util.SuggestionUtils;++@SuppressWarnings("serial")+public class JestTestSuitesPage extends JestReportPage {++ public static final String PARAM_FILE = "file";++ public static final String PARAM_LONGEST_DURATION_FIRST = "longestDurationFirst";++ public static final String PARAM_STATUS = "status";++ private State state = new State();++ private Optional<PatternSet> filePatterns;++ private final IModel<List<TestSuite>> testSuitesModel = new LoadableDetachableModel<List<TestSuite>>() {++ @Override+ protected List<TestSuite> load() {+ if (filePatterns != null) {+ List<TestSuite> testSuites = getReportData().getTestSuites(filePatterns.orNull(), state.statuses);+ if (state.longestDurationFirst) {+ testSuites.sort(new Comparator<TestSuite>() {++ @Override+ public int compare(TestSuite o1, TestSuite o2) {+ return (int)(o2.getDuration()/1000 - o1.getDuration()/1000);+ }++ });+ }+ return testSuites;+ } else {+ return new ArrayList<>();+ }+ }++ };++ private Form<?> form;++ private Component feedback;++ private Component summary;++ private Component orderBy;++ private DataTable<TestSuite, Void> detail;++ public JestTestSuitesPage(PageParameters params) {+ super(params);++ state.file = params.get(PARAM_FILE).toOptionalString();+ state.longestDurationFirst = params.get(PARAM_LONGEST_DURATION_FIRST).toBoolean(false);+ state.statuses = new LinkedHashSet<>();++ if (!"none".equals(params.get(PARAM_STATUS).toString())) {+ for (StringValue each: params.getValues(PARAM_STATUS))+ state.statuses.add(Status.valueOf(each.toString().toUpperCase()));++ if (state.statuses.isEmpty()) {+ state.statuses.add(Status.PASSED);+ state.statuses.add(Status.FAILED);+ }+ }+ }++ private void pushState(AjaxRequestTarget target) {+ CharSequence url = urlFor(JestTestSuitesPage.class, paramsOf(getBuild(), getReportName(), state));+ pushState(target, url.toString(), state);+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);+ state = (State) data;+ parseFilePatterns();+ target.add(form);+ target.add(summary);+ target.add(orderBy);+ target.add(detail);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getReportData() != null) {+ Fragment fragment = new Fragment("testSuites", "hasDataFrag", this);++ form = new Form<Void>("form");+ TextField<String> fileFilter = new TextField<String>("file", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.file;+ }++ @Override+ public void setObject(String object) {+ state.file = object;+ }++ });+ fileFilter.add(new PatternSetAssistBehavior() {++ @Override+ protected List<InputSuggestion> suggest(String matchWith) {+ return SuggestionUtils.suggest(+ getReportData().getTestSuites().stream().map(it->it.getName()).collect(Collectors.toList()),+ matchWith);+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ return Lists.newArrayList(+ "Path containing spaces or starting with dash needs to be quoted",+ "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude"+ );+ }++ });+ form.add(fileFilter);++ fileFilter.add(new AjaxFormComponentUpdatingBehavior("clear") {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ pushState(target);+ parseFilePatterns();+ target.add(feedback);+ target.add(summary);+ target.add(detail);+ }++ });++ form.add(feedback = new FencedFeedbackPanel("feedback", form));+ feedback.setOutputMarkupPlaceholderTag(true);++ form.add(new AjaxButton("submit") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(this));+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ pushState(target);+ parseFilePatterns();+ target.add(feedback);+ target.add(summary);+ target.add(detail);+ }++ });++ fragment.add(form);++ parseFilePatterns();++ fragment.add(summary = new PieChartPanel("summary", new LoadableDetachableModel<List<PieSlice>>() {++ @Override+ protected List<PieSlice> load() {+ if (filePatterns != null) {+ List<PieSlice> slices = new ArrayList<>();+ for (Status status: Status.values()) {+ int numOfTestSuites = getReportData().getTestSuites(+ filePatterns.orNull(), Sets.newHashSet(status)).size();+ slices.add(new PieSlice(status.name().toLowerCase(), numOfTestSuites,+ status.getColor(), state.statuses.contains(status)));+ }+ return slices;+ } else {+ return null;+ }+ }++ }) {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target, String sliceName) {+ Status status = Status.valueOf(sliceName.toUpperCase());+ if (state.statuses.contains(status))+ state.statuses.remove(status);+ else+ state.statuses.add(status);+ pushState(target);+ target.add(detail);+ }++ });++ fragment.add(orderBy = new AjaxCheckBox("longestDurationFirst", new IModel<Boolean>() {++ @Override+ public void detach() {+ }++ @Override+ public Boolean getObject() {+ return state.longestDurationFirst;+ }++ @Override+ public void setObject(Boolean object) {+ state.longestDurationFirst = object;+ }++ }) {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ pushState(target);+ target.add(detail);+ }++ });++ List<IColumn<TestSuite, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<TestSuite, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<TestSuite>> cellItem,+ String componentId, IModel<TestSuite> rowModel) {+ TestSuite testSuite = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "testSuiteFrag", JestTestSuitesPage.this);++ fragment.add(new TestStatusBadge("status", testSuite.getStatus()));++ JestTestCasesPage.State state = new JestTestCasesPage.State();+ state.file = testSuite.getName();+ state.statuses = JestTestSuitesPage.this.state.statuses;+ PageParameters params = JestTestCasesPage.paramsOf(getBuild(), getReportName(), state);+ Link<Void> link = new ViewStateAwarePageLink<Void>("testCases",+ JestTestCasesPage.class, params);+ link.add(new Label("label", testSuite.getName()));++ BlobIdent blobIdent = new BlobIdent(getBuild().getCommitHash(), testSuite.getName(),+ FileMode.REGULAR_FILE.getBits());+ if (SecurityUtils.canReadCode(getProject()) && getProject().getBlob(blobIdent, false) != null) {+ fragment.add(new ViewStateAwarePageLink<Void>("viewSource", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(getProject(), blobIdent)));+ } else {+ fragment.add(new WebMarkupContainer("viewSource").setVisible(false));+ }++ fragment.add(new Label("duration", DateUtils.formatDuration(testSuite.getDuration())));+ fragment.add(link);++ fragment.add(new TestMessagePanel("message", testSuite.getMessage()) {++ @Override+ protected Build getBuild() {+ return JestTestSuitesPage.this.getBuild();+ }++ }.setVisible(testSuite.getMessage() != null));++ cellItem.add(fragment);+ }++ });++ SortableDataProvider<TestSuite, Void> dataProvider = new LoadableDetachableDataProvider<TestSuite, Void>() {++ @Override+ public Iterator<? extends TestSuite> iterator(long first, long count) {+ if (getTestSuites().size() > first+count)+ return getTestSuites().subList((int)first, (int)(first+count)).iterator();+ else+ return getTestSuites().subList((int)first, getTestSuites().size()).iterator();+ }++ @Override+ public long calcSize() {+ return getTestSuites().size();+ }++ @Override+ public IModel<TestSuite> model(TestSuite object) {+ return Model.of(object);+ }++ };+ fragment.add(detail = new DataTable<TestSuite, Void>("detail", columns,+ dataProvider, WebConstants.PAGE_SIZE));++ detail.addBottomToolbar(new NavigationToolbar(detail) {++ @Override+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {+ return new HistoryAwarePagingNavigator(navigatorId, table, null);+ }++ });++ fragment.add(detail.setOutputMarkupId(true));++ add(fragment);+ } else {+ add(new Label("testSuites", "No test suites published")+ .add(AttributeAppender.append("class", "alert alert-notice alert-light-warning")));+ }++ }++ private void parseFilePatterns() {+ if (state.file != null) {+ try {+ filePatterns = Optional.of(PatternSet.parse(state.file));+ } catch (Exception e) {+ filePatterns = null;+ form.error("Malformed file filter");+ }+ } else {+ filePatterns = Optional.absent();+ }+ }++ private List<TestSuite> getTestSuites() {+ return testSuitesModel.getObject();+ }++ @Override+ protected void onDetach() {+ testSuitesModel.detach();+ super.onDetach();+ }++ public static PageParameters paramsOf(Build build, String reportName, State state) {+ PageParameters params = paramsOf(build, reportName);+ if (state.file != null)+ params.add(PARAM_FILE, state.file);+ if (state.longestDurationFirst)+ params.add(PARAM_LONGEST_DURATION_FIRST, state.longestDurationFirst);+ if (state.statuses != null) {+ if (!state.statuses.isEmpty()) {+ for (Status status: state.statuses)+ params.add(PARAM_STATUS, status.name().toLowerCase());+ } else {+ params.add(PARAM_STATUS, "none");+ }+ }+ return params;+ }++ public static class State implements Serializable {++ @Nullable+ public String file;++ public boolean longestDurationFirst;++ public Collection<Status> statuses;++ }++}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.javanew file mode 100644index 0000000000..a0fe4d86f0--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java@@ -0,0 +1,98 @@+package io.onedev.server.plugin.report.jest;++import java.io.File;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.concurrent.Callable;++import org.hibernate.validator.constraints.NotEmpty;++import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;+import io.onedev.server.buildspec.job.Job;+import io.onedev.server.buildspec.job.JobReport;+import io.onedev.server.model.Build;+import io.onedev.server.util.SimpleLogger;+import io.onedev.server.util.validation.annotation.PathSegment;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.editable.annotation.Patterns;++@Editable(name="Jest Test Report")+public class JobJestReport extends JobReport {++ private static final long serialVersionUID = 1L;++ public static final String DIR = "jest-reports";++ private String reportName;++ @Editable(order=100, description="Specify json file containing Jest test results relative to OneDev workspace. "+ + "It can be generated via Jest option <tt>--json</tt> and <tt>--outputFile</tt>. Use * or ? for pattern match. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ @Interpolative(variableSuggester="suggestVariables")+ @Patterns(interpolative = true, path=true)+ @NotEmpty+ @Override+ public String getFilePatterns() {+ return super.getFilePatterns();+ }++ @Override+ public void setFilePatterns(String filePatterns) {+ super.setFilePatterns(filePatterns);+ }++ @Editable(order=1000, description="Specify report name. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ @Interpolative(variableSuggester="suggestVariables")+ @PathSegment+ @NotEmpty+ public String getReportName() {+ return reportName;+ }++ public void setReportName(String reportName) {+ this.reportName = reportName;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }++ @Override+ public void process(Build build, File workspace, SimpleLogger logger) {+ File reportDir = new File(build.getReportDir(DIR), getReportName());+ FileUtils.createDir(reportDir);++ LockUtils.write(build.getReportLockKey(DIR), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);++ Collection<JsonNode> rootNodes = new ArrayList<>();+ int baseLen = workspace.getAbsolutePath().length() + 1;+ for (File file: getPatternSet().listFiles(workspace)) {+ try {+ rootNodes.add(mapper.readTree(file));+ } catch (Exception e) {+ logger.log("Failed to process Jest report: " + file.getAbsolutePath().substring(baseLen), e);+ }+ }+ if (!rootNodes.isEmpty())+ new JestReportData(build, rootNodes).writeTo(reportDir);+ return null;+ }++ });+ }++}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestMessagePanel.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestMessagePanel.javanew file mode 100644index 0000000000..6ffaeaea94--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestMessagePanel.java@@ -0,0 +1,75 @@+package io.onedev.server.plugin.report.jest;++import java.util.regex.Matcher;+import java.util.regex.Pattern;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.unbescape.html.HtmlEscape;++import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;++@SuppressWarnings("serial")+abstract class TestMessagePanel extends Label {++ private static final Pattern LOCATION = Pattern.compile("\\((.*):(\\d+):(\\d+)\\)", Pattern.MULTILINE);++ public TestMessagePanel(String id, String message) {+ super(id);+ setDefaultModel(new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (SecurityUtils.canReadCode(getBuild().getProject())) {+ StringBuffer buffer = new StringBuffer();+ int lastPos = 0;+ Matcher matcher = LOCATION.matcher(message);+ while (matcher.find()) {+ buffer.append(HtmlEscape.escapeHtml5(message.substring(lastPos, matcher.start())));+ lastPos = matcher.end();++ String file = matcher.group(1);+ int line = Integer.parseInt(matcher.group(2));+ int col = Integer.parseInt(matcher.group(3));++ if (getBuild().getJobWorkspace() != null && file.startsWith(getBuild().getJobWorkspace()))+ file = file.substring(getBuild().getJobWorkspace().length()+1);+ BlobIdent blobIdent = new BlobIdent(getBuild().getCommitHash(), file, FileMode.REGULAR_FILE.getBits());+ if (getBuild().getProject().getBlob(blobIdent, false) != null) {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = blobIdent;+ PlanarRange range = new PlanarRange(line-1, col-1, line-1, col);+ state.position = SourceRendererProvider.getPosition(range);+ PageParameters params = ProjectBlobPage.paramsOf(getBuild().getProject(), state);+ String url = urlFor(ProjectBlobPage.class, params).toString();+ buffer.append(String.format("(<a onclick='onedev.server.viewState.getFromViewAndSetToHistory();' href='%s'>%s:%d:%d</a>)",+ url, HtmlEscape.escapeHtml5(file), line, col));+ } else {+ buffer.append("(" + HtmlEscape.escapeHtml5(file) + ":" + line + ":" + col + ")");+ }+ }+ buffer.append(HtmlEscape.escapeHtml5(message.substring(lastPos)));+ return buffer.toString();+ } else {+ return HtmlEscape.escapeHtml5(message);+ }+ }++ });+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ setEscapeModelStrings(false);+ }++ protected abstract Build getBuild();+}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestStatusBadge.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestStatusBadge.javanew file mode 100644index 0000000000..93b0503f25--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestStatusBadge.java@@ -0,0 +1,44 @@+package io.onedev.server.plugin.report.jest;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;++import io.onedev.server.plugin.report.jest.JestReportData.Status;++@SuppressWarnings("serial")+class TestStatusBadge extends Label {++ private final Status status;++ public TestStatusBadge(String id, Status status) {+ super(id, status.name().toLowerCase());+ this.status = status;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ switch (status) {+ case PASSED:+ return "jest-test-status badge badge-success flex-shrink-0";+ case FAILED:+ return "jest-test-status badge badge-danger flex-shrink-0";+ case TODO:+ return "jest-test-status badge badge-primary flex-shrink-0";+ case SKIPPED:+ return "jest-test-status badge badge-info flex-shrink-0";+ default:+ throw new RuntimeException("Unexpected jest test status: " + status);+ }+ }++ }));+ }++}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.css b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.cssnew file mode 100644index 0000000000..97e9468883--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.css@@ -0,0 +1,3 @@+.jest-test-status {+ width: 70px;+}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.js b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.jsnew file mode 100644index 0000000000..60272dea7c--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.js@@ -0,0 +1,4 @@+onedev.server.jestReport = {+ testSuites: {+ }+}diff --git a/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/JestReportDataTest.java b/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/JestReportDataTest.javanew file mode 100644index 0000000000..4df3e2ad8e--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/JestReportDataTest.java@@ -0,0 +1,65 @@+package io.onedev.server.plugin.report.jest;++import static org.junit.Assert.assertEquals;++import java.io.IOException;+import java.io.InputStream;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;++import org.junit.Test;++import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.google.common.collect.Sets;+import com.google.common.io.Resources;++import io.onedev.server.model.Build;+import io.onedev.server.plugin.report.jest.JestReportData.Status;+import io.onedev.server.util.patternset.PatternSet;++public class JestReportDataTest {++ @Test+ public void test() {+ try (InputStream is = Resources.getResource(JestReportDataTest.class, "testResults.json").openStream()) {+ JsonNode rootNode = new ObjectMapper().readTree(is);+ Collection<JsonNode> rootNodes = new ArrayList<>();+ rootNodes.add(rootNode);++ Build build = new Build();+ build.setJobWorkspace("/Users/robin/Projects/onedev/reports/jest-demo");+ JestReportData reportData = new JestReportData(build, rootNodes);+ assertEquals(1, reportData.getTestCases(null, null, Sets.newHashSet(Status.FAILED)).size());+ assertEquals(1, reportData.getTestCases(null, null, Sets.newHashSet(Status.SKIPPED)).size());+ assertEquals(1, reportData.getTestCases(null, null, Sets.newHashSet(Status.TODO)).size());+ assertEquals(4, reportData.getTestCases(null, null, Sets.newHashSet(Status.PASSED)).size());+ assertEquals(7, reportData.getTestCases(null, null, null).size());+ assertEquals(1, reportData.getTestCases(+ new PatternSet(Sets.newHashSet("src/utils/"), new HashSet<>()),+ new PatternSet(Sets.newHashSet("mul"), new HashSet<>()), null).size());+ assertEquals(1, reportData.getTestCases(+ new PatternSet(Sets.newHashSet("src/"), new HashSet<>()),+ new PatternSet(Sets.newHashSet("should return the product"), new HashSet<>()), null).size());+ assertEquals(2, reportData.getTestCases(+ new PatternSet(Sets.newHashSet("src/"), new HashSet<>()),+ new PatternSet(Sets.newHashSet("NewsContent/"), new HashSet<>()), null).size());+ assertEquals(5, reportData.getTestCases(+ new PatternSet(Sets.newHashSet("src/"), new HashSet<>()),+ new PatternSet(Sets.newHashSet(), Sets.newHashSet("NewsContent/")), null).size());++ assertEquals(1, reportData.getTestSuites(null, Sets.newHashSet(Status.FAILED)).size());+ assertEquals(0, reportData.getTestSuites(null, Sets.newHashSet(Status.SKIPPED)).size());+ assertEquals(0, reportData.getTestSuites(null, Sets.newHashSet(Status.TODO)).size());+ assertEquals(3, reportData.getTestSuites(null, Sets.newHashSet(Status.PASSED)).size());+ assertEquals(4, reportData.getTestSuites(null, null).size());+ assertEquals(4, reportData.getTestSuites(new PatternSet(Sets.newHashSet("**"), new HashSet<>()), null).size());+ assertEquals(1, reportData.getTestSuites(new PatternSet(Sets.newHashSet("src/components/"), new HashSet<>()), null).size());+ assertEquals(3, reportData.getTestSuites(new PatternSet(Sets.newHashSet("src/"), Sets.newHashSet("src/components/")), null).size());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++}diff --git a/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/testResults.json b/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/testResults.jsonnew file mode 100644index 0000000000..50478fa6e3--- /dev/null+++ b/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/testResults.json@@ -0,0 +1,144 @@+{+ "numFailedTestSuites": 1,+ "numFailedTests": 1,+ "numPassedTestSuites": 3,+ "numPassedTests": 4,+ "numPendingTestSuites": 0,+ "numPendingTests": 1,+ "numRuntimeErrorTestSuites": 0,+ "numTodoTests": 1,+ "numTotalTestSuites": 4,+ "numTotalTests": 7,+ "openHandles": [],+ "snapshot": {+ "added": 0,+ "didUpdate": false,+ "failure": true,+ "filesAdded": 0,+ "filesRemoved": 0,+ "filesRemovedList": [],+ "filesUnmatched": 0,+ "filesUpdated": 0,+ "matched": 2,+ "total": 2,+ "unchecked": 1,+ "uncheckedKeysByFile": [+ {+ "filePath": "/Users/robin/Projects/onedev/reports/jest-demo/src/components/Items.test.js",+ "keys": [+ "renders correctly when there are no items 1"+ ]+ }+ ],+ "unmatched": 0,+ "updated": 0+ },+ "startTime": 1608965513244,+ "success": false,+ "testResults": [+ {+ "assertionResults": [+ {+ "ancestorTitles": [],+ "failureMessages": [+ "Error: expect(received).toBe(expected) // Object.is equality\n\nExpected: 600\nReceived: 500\n at Object.<anonymous> (/Users/robin/Projects/onedev/reports/jest-demo/src/utils/Arith.test.js:4:21)\n at Promise.then.completed (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/utils.js:276:28)\n at new Promise (<anonymous>)\n at callAsyncCircusFn (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/utils.js:216:10)\n at _callCircusTest (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/run.js:212:40)\n at processTicksAndRejections (internal/process/task_queues.js:97:5)\n at _runTest (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/run.js:149:3)\n at _runTestsForDescribeBlock (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/run.js:63:9)\n at run (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/run.js:25:3)\n at runAndTransformResultsToJestFormat (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapterInit.js:176:21)\n at jestAdapter (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapter.js:109:19)\n at runTestInternal (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-runner/build/runTest.js:380:16)\n at runTest (/Users/robin/Projects/onedev/reports/jest-demo/node_modules/jest-runner/build/runTest.js:472:34)"+ ],+ "fullName": "calc",+ "location": null,+ "status": "failed",+ "title": "calc"+ },+ {+ "ancestorTitles": [],+ "failureMessages": [],+ "fullName": "mul",+ "location": null,+ "status": "passed",+ "title": "mul"+ }+ ],+ "endTime": 1608965514276,+ "message": " ● calc\n\n expect(received).toBe(expected) // Object.is equality\n\n Expected: 600\n Received: 500\n\n 2 | \n 3 | it('calc', () => {\n > 4 | expect(add(2, 3)).toBe(600);\n | ^\n 5 | });\n 6 | \n 7 | it('mul', () => {\n\n at Object.<anonymous> (src/utils/Arith.test.js:4:21)\n",+ "name": "/Users/robin/Projects/onedev/reports/jest-demo/src/utils/Arith.test.js",+ "startTime": 1608965513679,+ "status": "failed",+ "summary": ""+ },+ {+ "assertionResults": [+ {+ "ancestorTitles": [+ "NewsContent"+ ],+ "failureMessages": [],+ "fullName": "NewsContent Should render a normal string",+ "location": null,+ "status": "pending",+ "title": "Should render a normal string"+ },+ {+ "ancestorTitles": [+ "NewsContent",+ "NewsContent2"+ ],+ "failureMessages": [],+ "fullName": "NewsContent NewsContent2 Should render a normal string",+ "location": null,+ "status": "todo",+ "title": "Should render a normal string"+ }+ ],+ "endTime": 1608965514417,+ "message": "",+ "name": "/Users/robin/Projects/onedev/reports/jest-demo/src/Integration.test.js",+ "startTime": 1608965514292,+ "status": "passed",+ "summary": ""+ },+ {+ "assertionResults": [+ {+ "ancestorTitles": [],+ "failureMessages": [],+ "fullName": "renders correctly when there is a single item",+ "location": null,+ "status": "passed",+ "title": "renders correctly when there is a single item"+ },+ {+ "ancestorTitles": [],+ "failureMessages": [],+ "fullName": "renders correctly when there are multiple items",+ "location": null,+ "status": "passed",+ "title": "renders correctly when there are multiple items"+ }+ ],+ "endTime": 1608965514575,+ "message": "",+ "name": "/Users/robin/Projects/onedev/reports/jest-demo/src/components/Items.test.js",+ "startTime": 1608965514428,+ "status": "passed",+ "summary": ""+ },+ {+ "assertionResults": [+ {+ "ancestorTitles": [],+ "failureMessages": [],+ "fullName": "should return the product",+ "location": null,+ "status": "passed",+ "title": "should return the product"+ }+ ],+ "endTime": 1608965514696,+ "message": "",+ "name": "/Users/robin/Projects/onedev/reports/jest-demo/src/ProductManager.test.js",+ "startTime": 1608965514584,+ "status": "passed",+ "summary": ""+ }+ ],+ "wasInterrupted": false+}\ No newline at end of filediff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 35b0c31888..a08da98acf 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.javaindex 9bb213a2d4..a382d4f03b 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java@@ -22,9 +22,9 @@ import org.apache.wicket.request.resource.AbstractResource;import com.google.common.base.Joiner;+import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;-import io.onedev.server.GeneralException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;@@ -83,7 +83,7 @@ public class MarkdownReportDownloadResource extends AbstractResource {if (pathSegment.length() != 0)pathSegments.add(pathSegment);else- throw new GeneralException("Markdown report path has to be specified");+ throw new ExplicitException("Markdown report path has to be specified");for (int i = 0; i < params.getIndexedCount(); i++) {pathSegment = params.get(i).toString();@@ -100,7 +100,7 @@ public class MarkdownReportDownloadResource extends AbstractResource {if (!markdownFile.exists() || markdownFile.isDirectory()) {String message = String.format("Specified markdown path does not exist or is a directory (project: %s, build number: %d, path: %s)",project.getName(), build.getNumber(), markdownPath);- throw new GeneralException(message);+ throw new ExplicitException(message);}ResourceResponse response = new ResourceResponse();diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 7ae6dabd2e..7f35743c65 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex ee3ee1d47f..e8c076a201 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.0.9</version>+ <version>4.1.0</version></parent><dependencies><dependency>@@ -20,6 +20,11 @@<artifactId>server-plugin-report-html</artifactId><version>${project.version}</version></dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin-report-jest</artifactId>+ <version>${project.version}</version>+ </dependency><dependency><groupId>io.onedev</groupId><artifactId>server-plugin-buildspec-maven</artifactId>diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.javaindex ee785ab9d6..c2c6fcd078 100644--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java@@ -13,7 +13,7 @@ import org.glassfish.jersey.internal.guava.Preconditions;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;-import io.onedev.server.GeneralException;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.util.ServerConfig;@Singleton@@ -64,7 +64,7 @@ public class DefaultServerConfig implements ServerConfig {httpsPort = Integer.parseInt(httpsPortStr.trim());if (httpPort == 0 && httpsPort == 0)- throw new GeneralException("Either " + PROP_HTTPPORT + " or " + PROP_HTTPSPORT + " or both should be enabled");+ throw new ExplicitException("Either " + PROP_HTTPPORT + " or " + PROP_HTTPSPORT + " or both should be enabled");String sshPortStr = System.getenv(PROP_SSHPORT);if (StringUtils.isBlank(sshPortStr))@@ -72,7 +72,7 @@ public class DefaultServerConfig implements ServerConfig {if (StringUtils.isNotBlank(sshPortStr))sshPort = Integer.parseInt(sshPortStr.trim());else- throw new GeneralException(PROP_SSHPORT + " should be specified");+ throw new ExplicitException(PROP_SSHPORT + " should be specified");String keystore = System.getenv(PROP_KEYSTORE);if (StringUtils.isBlank(keystore))@@ -100,7 +100,7 @@ public class DefaultServerConfig implements ServerConfig {}}} else if (httpsPort != 0) {- throw new GeneralException(PROP_KEYSTORE + " is required for https support");+ throw new ExplicitException(PROP_KEYSTORE + " is required for https support");}keystorePassword = System.getenv(PROP_KEYSTOREPASSWORD);@@ -126,7 +126,7 @@ public class DefaultServerConfig implements ServerConfig {if (StringUtils.isNotBlank(sessionTimeoutStr))sessionTimeout = Integer.parseInt(sessionTimeoutStr.trim());else- throw new GeneralException(PROP_SESSION_TIMEOUT + " should be specified");+ throw new ExplicitException(PROP_SESSION_TIMEOUT + " should be specified");}@Override