The Unified and Autonomous Development Platform
fix issue #214 - Improve build submission mechanism to facilitate gitops
Robin Shenec11ee446831
diff --git a/pom.xml b/pom.xmlindex ae1d735435..e73a4d1700 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>4.0.4</version>+ <version>4.0.5</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -587,7 +587,7 @@<shiro.version>1.4.2</shiro.version><jgit.version>5.7.0.202003110725-r</jgit.version><flexmark.version>0.18.3</flexmark.version>- <groovy.version>3.0.5</groovy.version>+ <groovy.version>3.0.7</groovy.version><servlet.version>3.1.0</servlet.version></properties></project>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 40f3217c9d..6426a341d4 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.4</version>+ <version>4.0.5</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 fdcd53882e..ed29d71b36 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -116,7 +116,6 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestQuerySettingManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;-import io.onedev.server.entitymanager.PullRequestVerificationManager;import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;@@ -151,7 +150,6 @@ import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestQuerySettingManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestReviewManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestUpdateManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestVerificationManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestWatchManager;import io.onedev.server.entitymanager.impl.DefaultRoleManager;import io.onedev.server.entitymanager.impl.DefaultSettingManager;@@ -351,7 +349,6 @@ public class CoreModule extends AbstractPluginModule {bind(BuildDependenceManager.class).to(DefaultBuildDependenceManager.class);bind(JobManager.class).to(DefaultJobManager.class);bind(LogManager.class).to(DefaultLogManager.class);- bind(PullRequestVerificationManager.class).to(DefaultPullRequestVerificationManager.class);bind(MailManager.class).to(DefaultMailManager.class);bind(IssueManager.class).to(DefaultIssueManager.class);bind(IssueFieldManager.class).to(DefaultIssueFieldManager.class);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 14df82bc6a..3ef2595597 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@@ -50,8 +50,8 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.k8shelper.CacheInstance;import io.onedev.k8shelper.CloneInfo;-import io.onedev.server.OneDev;import io.onedev.server.GeneralException;+import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.buildspec.job.action.condition.ActionCondition;@@ -79,7 +79,6 @@ import io.onedev.server.model.Build.Status;import io.onedev.server.model.BuildDependence;import io.onedev.server.model.BuildParam;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequestVerification;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;@@ -95,8 +94,8 @@ import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.CommitAware;-import io.onedev.server.util.SimpleLogger;import io.onedev.server.util.MatrixRunner;+import io.onedev.server.util.SimpleLogger;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;@@ -171,7 +170,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Transactional@Override- public Build submit(Project project, ObjectId commitId, String jobName,+ public Build submit(Project project, ObjectId commitId, String jobName, String triggerId,Map<String, List<String>> paramMap, SubmitReason reason) {Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());transactionManager.mustRunAfterTransaction(new Runnable() {@@ -189,13 +188,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizvalidate(project, commitId);- return submit(project, commitId, jobName, paramMap, reason, new LinkedHashSet<>());+ return submit(project, commitId, jobName, triggerId, paramMap, reason, new LinkedHashSet<>());} catch (Throwable e) {throw ExceptionUtils.unchecked(e);}}- private Build submit(Project project, ObjectId commitId, String jobName,+ private Build submit(Project project, ObjectId commitId, String jobName, String triggerId,Map<String, List<String>> paramMap, SubmitReason reason, Set<String> checkedJobNames) {ScriptIdentity.push(new JobIdentity(project, commitId));@@ -204,19 +203,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setProject(project);build.setCommitHash(commitId.name());build.setJobName(jobName);+ build.setTriggerId(triggerId);build.setSubmitDate(new Date());build.setStatus(Build.Status.WAITING);build.setSubmitReason(reason.getDescription());build.setSubmitter(SecurityUtils.getUser());- build.setUpdatedRef(reason.getUpdatedRef());-- // Set up verifications in order to be authorized to access secret value- if (reason.getPullRequest() != null) {- PullRequestVerification verification = new PullRequestVerification();- verification.setBuild(build);- verification.setRequest(reason.getPullRequest());- build.getVerifications().add(verification);- }+ build.setRefName(reason.getRefName());+ build.setRequest(reason.getPullRequest());ParamSupply.validateParamMap(build.getJob().getParamSpecMap(), paramMap);@@ -231,7 +224,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizparamMapToQuery.remove(paramSpec.getName());}- Collection<Build> builds = buildManager.query(project, commitId, jobName, paramMapToQuery);+ Collection<Build> builds = buildManager.query(project, commitId, jobName,+ reason.getRefName(), reason.getPullRequest(), triggerId, paramMapToQuery);if (builds.isEmpty()) {for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {@@ -262,7 +256,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run(Map<String, List<String>> params) {Build dependencyBuild = submit(project, commitId, dependency.getJobName(),- params, reason, new LinkedHashSet<>(checkedJobNames));+ triggerId, params, reason, new LinkedHashSet<>(checkedJobNames));BuildDependence dependence = new BuildDependence();dependence.setDependency(dependencyBuild);dependence.setDependent(build);@@ -631,7 +625,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run(Map<String, List<String>> paramMap) {- submit(project, commitId, job.getName(), paramMap, match.getReason());+ submit(project, commitId, job.getName(), event.getUuid(),+ paramMap, match.getReason());}}.run();@@ -676,7 +671,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setSubmitReason("Resubmitted manually");build.setCanceller(null);build.setCancellerName(null);- build.setUpdatedRef(null);buildParamManager.deleteParams(build);for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.javaindex 842352faa4..e49b3b867f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Project;public interface JobManager {- Build submit(Project project, ObjectId commitId, String jobName,+ Build submit(Project project, ObjectId commitId, String jobName, String triggerId,Map<String, List<String>> paramMap, SubmitReason reason);void resubmit(Build build, Map<String, List<String>> paramMap);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.javaindex 212da841cd..709be3ded6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java@@ -1,14 +1,5 @@package io.onedev.server.buildspec.job;-import java.util.ArrayList;-import java.util.List;-import java.util.stream.Collectors;--import org.eclipse.jgit.lib.Repository;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.git.GitUtils;-import io.onedev.server.git.RefInfo;import io.onedev.server.model.Build;public enum JobVariable {@@ -29,33 +20,27 @@ public enum JobVariable {}},- UPDATED_REF {+ REF {@Overridepublic String getValue(Build build) {- return build.getUpdatedRef();+ return build.getRefName();}},- UPDATED_BRANCH {+ BRANCH {@Overridepublic String getValue(Build build) {- if (build.getUpdatedRef() != null)- return GitUtils.ref2branch(build.getUpdatedRef());- else- return null;+ return build.getBranch();}},- UPDATED_TAG {+ TAG {@Overridepublic String getValue(Build build) {- if (build.getUpdatedRef() != null)- return GitUtils.ref2tag(build.getUpdatedRef());- else- return null;+ return build.getTag();}},@@ -82,39 +67,18 @@ public enum JobVariable {return build.getVersion();}- },- ON_BRANCHES {-- @Override- public String getValue(Build build) {- return StringUtils.join(build.getOnBranches(), " ");- }-- },- COMMIT_TAGS {-- @Override- public String getValue(Build build) {- List<String> tags = new ArrayList<>();- for (RefInfo refInfo: build.getProject().getTagRefInfos()) {- if (refInfo.getPeeledObj().equals(build.getCommitId()))- tags.add(Repository.shortenRefName(refInfo.getRef().getName()));- }- return StringUtils.join(tags, " ");- }-},- PULL_REQUEST_IDS {+ PULL_REQUEST_NUMBER {@Overridepublic String getValue(Build build) {- return build.getVerifications()- .stream()- .map(it->it.getRequest().getId().toString())- .collect(Collectors.joining(" "));+ if (build.getRequest() != null)+ return String.valueOf(build.getRequest().getNumber());+ else+ return null;}- };+ };public abstract String getValue(Build build);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/SubmitReason.java b/server-core/src/main/java/io/onedev/server/buildspec/job/SubmitReason.javaindex 69f530a9e6..45fb53eaab 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/SubmitReason.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/SubmitReason.java@@ -7,7 +7,7 @@ import io.onedev.server.model.PullRequest;public interface SubmitReason {@Nullable- String getUpdatedRef();+ String getRefName();PullRequest getPullRequest();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.javaindex eda77b2838..7d084d3a7a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java@@ -93,13 +93,13 @@ public class RunJobAction extends PostBuildAction {SubmitReason reason = new SubmitReason() {@Override- public String getUpdatedRef() {- return null;+ public String getRefName() {+ return build.getRefName();}@Overridepublic PullRequest getPullRequest() {- return null;+ return build.getRequest();}@Override@@ -108,8 +108,9 @@ public class RunJobAction extends PostBuildAction {}};- OneDev.getInstance(JobManager.class).submit(build.getProject(),- build.getCommitId(), getJobName(), paramMap, reason);+ JobManager jobManager = OneDev.getInstance(JobManager.class);+ jobManager.submit(build.getProject(), build.getCommitId(), getJobName(),+ build.getTriggerId(), paramMap, reason);}}.run();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4 b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4index 29cf39c0ba..bcb7c9bebb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4@@ -5,7 +5,7 @@ condition;criteria- : operator=(Successful|Failed|Cancelled|TimedOut|PreviousIsSuccessful|PreviousIsFailed|PreviousIsCancelled|PreviousIsTimedOut|AssociatedWithPullRequests|RequiredByPullRequests) #OperatorCriteria+ : operator=(Successful|Failed|Cancelled|TimedOut|PreviousIsSuccessful|PreviousIsFailed|PreviousIsCancelled|PreviousIsTimedOut) #OperatorCriteria| criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria| operator=OnBranch WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Contains|Is) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria@@ -55,14 +55,6 @@ OnBranch: 'on' WS+ 'branch';-AssociatedWithPullRequests- : 'associated' WS+ 'with' WS+ 'pull' WS+ 'requests'- ;--RequiredByPullRequests- : 'required' WS+ 'by' WS+ 'pull' WS+ 'requests'- ;-Contains: 'contains';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 109a8fea3c..e6d1ee28e5 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@@ -101,10 +101,6 @@ public class ActionCondition extends Criteria<Build> {return new PreviousIsCancelledCriteria();case ActionConditionLexer.PreviousIsTimedOut:return new PreviousIsTimedOutCriteria();- case ActionConditionLexer.AssociatedWithPullRequests:- return new AssociatedWithPullRequestsCriteria();- case ActionConditionLexer.RequiredByPullRequests:- return new RequiredByPullRequestsCriteria();default:throw new GeneralException("Unexpected operator: " + ctx.operator.getText());}@@ -115,7 +111,10 @@ public class ActionCondition extends Criteria<Build> {String fieldName = getValue(ctx.Quoted().getText());int operator = ctx.operator.getType();checkField(job, fieldName, operator);- return new ParamIsEmptyCriteria(fieldName);+ if (fieldName.equals(Build.NAME_PULL_REQUEST))+ return new PullRequestIsEmptyCriteria();+ else+ return new ParamIsEmptyCriteria(fieldName);}@Override@@ -171,6 +170,9 @@ public class ActionCondition extends Criteria<Build> {if (fieldName.equals(Build.NAME_ERROR_MESSAGE) || fieldName.equals(Build.NAME_LOG)) {if (operator != ActionConditionLexer.Contains)throw newOperatorException(fieldName, operator);+ } else if (fieldName.equals(Build.NAME_PULL_REQUEST)) {+ if (operator != ActionConditionLexer.IsEmpty)+ throw newOperatorException(fieldName, operator);} else if (job.getParamSpecMap().containsKey(fieldName)) {if (operator != ActionConditionLexer.IsEmpty && operator != ActionConditionLexer.Is)throw newOperatorException(fieldName, operator);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestIsEmptyCriteria.javasimilarity index 59%rename from server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.javarename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestIsEmptyCriteria.javaindex e1e1643446..289b2f7ab3 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestIsEmptyCriteria.java@@ -3,18 +3,18 @@ package io.onedev.server.buildspec.job.action.condition;import io.onedev.server.model.Build;import io.onedev.server.util.criteria.Criteria;-public class AssociatedWithPullRequestsCriteria extends Criteria<Build> {+public class PullRequestIsEmptyCriteria extends Criteria<Build> {private static final long serialVersionUID = 1L;@Overridepublic boolean matches(Build build) {- return !build.getVerifications().isEmpty();+ return build.getRequest() == null;}@Overridepublic String toStringWithoutParens() {- return ActionCondition.getRuleName(ActionConditionLexer.AssociatedWithPullRequests);+ return quote(Build.NAME_PULL_REQUEST) + " " + ActionCondition.getRuleName(ActionConditionLexer.IsEmpty);}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.javadeleted file mode 100644index c90c1be132..0000000000--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java+++ /dev/null@@ -1,20 +0,0 @@-package io.onedev.server.buildspec.job.action.condition;--import io.onedev.server.model.Build;-import io.onedev.server.util.criteria.Criteria;--public class RequiredByPullRequestsCriteria extends Criteria<Build> {-- private static final long serialVersionUID = 1L;-- @Override- public boolean matches(Build build) {- return build.getVerifications().stream().anyMatch(it->it.isRequired());- }-- @Override- public String toStringWithoutParens() {- return ActionCondition.getRuleName(ActionConditionLexer.RequiredByPullRequests);- }--}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.javaindex 4a04164e40..19c0609d0a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java@@ -100,7 +100,7 @@ public class BranchUpdateTrigger extends JobTrigger {return new SubmitReason() {@Override- public String getUpdatedRef() {+ public String getRefName() {return refUpdated.getRefName();}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.javaindex 9342bcae06..68433510cd 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java@@ -36,7 +36,7 @@ public class DependencyFinishedTrigger extends JobTrigger {return new SubmitReason() {@Override- public String getUpdatedRef() {+ public String getRefName() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.javaindex 553f50174b..b2af2667ff 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java@@ -94,7 +94,7 @@ public class PullRequestTrigger extends JobTrigger {return new SubmitReason() {@Override- public String getUpdatedRef() {+ public String getRefName() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.javaindex f791acf311..a935e75ab8 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java@@ -78,7 +78,7 @@ public class TagCreateTrigger extends JobTrigger {return new SubmitReason() {@Override- public String getUpdatedRef() {+ public String getRefName() {return refUpdated.getRefName();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 714220f8ea..ff5eae12e2 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -11,6 +11,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;@@ -32,7 +33,9 @@ public interface BuildManager extends EntityManager<Build> {Collection<Long> queryNumbersOfStreamPrevious(Build build, @Nullable Build.Status status, int limit);- Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName, Map<String, List<String>> params);+ Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,+ @Nullable String refName, @Nullable PullRequest request, @Nullable String triggerId,+ Map<String, List<String>> params);Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName);@@ -61,4 +64,7 @@ public interface BuildManager extends EntityManager<Build> {List<String> queryVersions(Project project, String matchWith, int count);Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project);++ void populateBuilds(Collection<PullRequest> requests);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex c2aaaf74c0..38268d3406 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -9,7 +9,6 @@ import javax.annotation.Nullable;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;@@ -50,16 +49,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void merge(PullRequest request, @Nullable String commitMessage);- /**- * Preview merge of this pull request.- *- * @param request- * pull request to preview merge of- * @return- * merge preview, or <tt>null</tt> if preview is being calculating- */- MergePreview previewMerge(PullRequest request);-void open(PullRequest request);void delete(PullRequest request);@@ -70,10 +59,10 @@ public interface PullRequestManager extends EntityManager<PullRequest> {int countOpen(Project targetProject);- void checkQuality(PullRequest request, List<User> unpreferableReviewers);+ void checkReviews(PullRequest request, List<User> unpreferableReviewers);List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,- int firstResult, int maxResults, boolean loadReviews, boolean loadVerifications);+ int firstResult, int maxResults, boolean loadReviews, boolean loadBuilds);int count(@Nullable Project targetProject, EntityCriteria<PullRequest> requestCriteria);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.javadeleted file mode 100644index 85ebc383bf..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.entitymanager;--import java.util.Collection;--import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestVerification;-import io.onedev.server.persistence.dao.EntityManager;--public interface PullRequestVerificationManager extends EntityManager<PullRequestVerification> {-- void saveVerifications(PullRequest request);-- void populateVerifications(Collection<PullRequest> requests);--}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex c241f8f8a2..7d8e328202 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -60,6 +60,7 @@ import io.onedev.server.model.BuildParam;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.Role;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;@@ -250,12 +251,14 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Overridepublic Collection<Build> query(Project project, ObjectId commitId, String jobName) {- return query(project, commitId, jobName, new HashMap<>());+ return query(project, commitId, jobName, null, null, null, new HashMap<>());}@Sessional@Override- public Collection<Build> query(Project project, ObjectId commitId, String jobName, Map<String, List<String>> params) {+ public Collection<Build> query(Project project, ObjectId commitId, String jobName,+ String refName, PullRequest request, String triggerId,+ Map<String, List<String>> params) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Build> query = builder.createQuery(Build.class);Root<Build> root = query.from(Build.class);@@ -265,7 +268,14 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementspredicates.add(builder.equal(root.get(Build.PROP_COMMIT), commitId.name()));if (jobName != null)predicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));-+ if (refName != null)+ predicates.add(builder.equal(root.get(Build.PROP_REF_NAME), refName));++ if (request != null)+ predicates.add(builder.equal(root.get(Build.PROP_PULL_REQUEST), request));+ if (triggerId != null)+ predicates.add(builder.equal(root.get(Build.PROP_TRIGGER_ID), triggerId));+for (Map.Entry<String, List<String>> entry: params.entrySet()) {if (!entry.getValue().isEmpty()) {for (String value: entry.getValue()) {@@ -849,4 +859,22 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements}}+ @Override+ public void populateBuilds(Collection<PullRequest> requests) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Build> query = builder.createQuery(Build.class);++ Root<Build> root = query.from(Build.class);+ query.select(root);+ root.join(Build.PROP_PULL_REQUEST);++ query.where(root.get(Build.PROP_PULL_REQUEST).in(requests));++ for (PullRequest request: requests)+ request.setBuilds(new ArrayList<>());++ for (Build build: getSession().createQuery(query).getResultList())+ build.getRequest().getBuilds().add(build);+ }+}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 e09ba01d0b..0677b38e1f 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@@ -31,7 +31,6 @@ import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.CommitBuilder;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.ObjectInserter;@@ -58,32 +57,25 @@ 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.LockUtils;-import io.onedev.server.OneDev;import io.onedev.server.GeneralException;-import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.JobManager;-import io.onedev.server.buildspec.job.SubmitReason;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;-import io.onedev.server.buildspec.job.trigger.JobTrigger;-import io.onedev.server.buildspec.job.trigger.PullRequestTrigger;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestAssignmentManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;-import io.onedev.server.entitymanager.PullRequestVerificationManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.build.BuildEvent;import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.event.pullrequest.PullRequestUpdated;-import io.onedev.server.event.pullrequest.PullRequestVerificationEvent;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;@@ -94,7 +86,6 @@ import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.PullRequestVerification;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;@@ -130,14 +121,11 @@ import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;-import io.onedev.server.util.MatrixRunner;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.reviewrequirement.ReviewRequirement;-import io.onedev.server.util.script.identity.JobIdentity;-import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.work.BatchWorkManager;import io.onedev.server.util.work.BatchWorker;@@ -146,9 +134,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);- private static final int UI_PREVIEW_PRIORITY = 10;-- private static final int BACKEND_PREVIEW_PRIORITY = 50;+ private static final int PREVIEW_CALC_PRIORITY = 50;private final PullRequestUpdateManager pullRequestUpdateManager;@@ -160,7 +146,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final PullRequestReviewManager pullRequestReviewManager;- private final PullRequestVerificationManager pullRequestVerificationManager;+ private final BuildManager buildManager;private final CommitInfoManager commitInfoManager;@@ -172,8 +158,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final TransactionManager transactionManager;- private final JobManager jobManager;-private final ExecutorService executorService;@Inject@@ -181,8 +165,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestPullRequestReviewManager pullRequestReviewManager, MarkdownManager markdownManager,BatchWorkManager batchWorkManager, ListenerRegistry listenerRegistry,SessionManager sessionManager, PullRequestChangeManager pullRequestChangeManager,- ExecutorService executorService, PullRequestVerificationManager pullRequestVerificationManager,- TransactionManager transactionManager, JobManager jobManager, ProjectManager projectManager,+ ExecutorService executorService, BuildManager buildManager,+ TransactionManager transactionManager, ProjectManager projectManager,CommitInfoManager commitInfoManager, PullRequestAssignmentManager pullRequestAssignmentManager) {super(dao);@@ -193,9 +177,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestthis.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;this.pullRequestChangeManager = pullRequestChangeManager;- this.pullRequestVerificationManager = pullRequestVerificationManager;+ this.buildManager = buildManager;this.executorService = executorService;- this.jobManager = jobManager;this.projectManager = projectManager;this.commitInfoManager = commitInfoManager;this.pullRequestAssignmentManager = pullRequestAssignmentManager;@@ -265,6 +248,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestchange.setRequest(request);change.setUser(user);pullRequestChangeManager.save(change);++ MergePreview mergePreview = request.getMergePreview();+ if (mergePreview != null && mergePreview.getMergeCommitHash() != null)+ listenerRegistry.post(new PullRequestMergePreviewCalculated(request));+checkAsync(Lists.newArrayList(request));}@@ -413,11 +401,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpullRequestUpdateManager.save(update);pullRequestReviewManager.saveReviews(request);- pullRequestVerificationManager.saveVerifications(request);for (PullRequestAssignment assignment: request.getAssignments())pullRequestAssignmentManager.save(assignment);+ MergePreview mergePreview = request.getMergePreview();+ if (mergePreview != null && mergePreview.getMergeCommitHash() != null)+ listenerRegistry.post(new PullRequestMergePreviewCalculated(request));+checkAsync(Lists.newArrayList(request));listenerRegistry.post(event);@@ -465,14 +456,58 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (request.isMergedIntoTarget()) {closeAsMerged(request, true);} else {- checkQuality(request, Lists.newArrayList());+ checkReviews(request, Lists.newArrayList());/** If the check method runs concurrently, below statements may fail. It will* not do any harm except that the transaction rolls back*/pullRequestReviewManager.saveReviews(request);- pullRequestVerificationManager.saveVerifications(request);++ Long requestId = request.getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ BatchWorker previewCalcWorker = new BatchWorker("request-" + requestId + "-previewMerge", 1) {++ @Override+ public void doWorks(Collection<Prioritized> works) {+ sessionManager.run(new Runnable() {++ @Override+ public void run() {+ Preconditions.checkState(works.size() == 1);+ PullRequest request = load(requestId);+ Project targetProject = request.getTargetProject();+ if (request.isOpen() && !request.isMergedIntoTarget()) {+ MergePreview mergePreview = request.getMergePreview();+ if (mergePreview == null) {+ mergePreview = new MergePreview(request.getTarget().getObjectName(),+ request.getLatestUpdate().getHeadCommitHash(), request.getMergeStrategy(), null);+ logger.debug("Calculating merge preview of pull request #{} in project '{}'...",+ request.getNumber(), targetProject.getName());+ ObjectId merged = mergePreview.getMergeStrategy().merge(request, "Merge preview of pull request #" + request.getNumber());+ if (merged != null)+ mergePreview.setMergeCommitHash(merged.name());+ mergePreview.syncRef(request);+ request.setLastMergePreview(mergePreview);+ dao.persist(request);+ listenerRegistry.post(new PullRequestMergePreviewCalculated(request));+ } else {+ mergePreview.syncRef(request);+ }+ }+ }++ });+ }++ };+ batchWorkManager.submit(previewCalcWorker, new Prioritized(PREVIEW_CALC_PRIORITY));+ }++ });}}}@@ -489,74 +524,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}- @Sessional- @Override- public MergePreview previewMerge(PullRequest request) {- if (!request.isNew()) {- MergePreview lastMergePreview = request.getLastMergePreview();- if (request.isOpen() && !request.isMergedIntoTarget()) {- if (lastMergePreview == null || !lastMergePreview.isUpToDate(request)) {- int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;- Long requestId = request.getId();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- batchWorkManager.submit(getMergePreviewer(requestId), new Prioritized(priority));- }-- });- return null;- } else {- lastMergePreview.syncRef(request);- return lastMergePreview;- }- } else {- return lastMergePreview;- }- } else {- return null;- }- }-- private BatchWorker getMergePreviewer(Long requestId) {- return new BatchWorker("request-" + requestId + "-previewMerge", 1) {-- @Override- public void doWorks(Collection<Prioritized> works) {- sessionManager.run(new Runnable() {-- @Override- public void run() {- Preconditions.checkState(works.size() == 1);- PullRequest request = load(requestId);- Project targetProject = request.getTargetProject();- MergePreview mergePreview = request.getLastMergePreview();- if (request.isOpen() && !request.isMergedIntoTarget()) {- if (mergePreview == null || !mergePreview.isUpToDate(request)) {- mergePreview = new MergePreview(request.getTarget().getObjectName(),- request.getLatestUpdate().getHeadCommitHash(), request.getMergeStrategy(), null);- logger.debug("Calculating merge preview of pull request #{} in project '{}'...",- request.getNumber(), targetProject.getName());- ObjectId merged = mergePreview.getMergeStrategy().merge(request, "Merge preview of pull request #" + request.getNumber());- if (merged != null)- mergePreview.setMergeCommitHash(merged.name());- mergePreview.syncRef(request);- request.setLastMergePreview(mergePreview);- dao.persist(request);- listenerRegistry.post(new PullRequestMergePreviewCalculated(request));- } else {- mergePreview.syncRef(request);- }- }- }-- });- }-- };- }-@Transactional@Listenpublic void on(EntityRemoved event) {@@ -702,7 +669,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}if (!(event instanceof PullRequestOpened|| event instanceof PullRequestMergePreviewCalculated- || event instanceof PullRequestVerificationEvent+ || event instanceof PullRequestBuildEvent|| minorChange)) {event.getRequest().setLastUpdate(event.getLastUpdate());}@@ -719,17 +686,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactionalpublic void on(BuildEvent event) {Build build = event.getBuild();- for (PullRequestVerification verification: build.getVerifications())- listenerRegistry.post(new PullRequestVerificationEvent(verification));- checkAsync(build.getVerifications()- .stream()- .map(it->it.getRequest())- .collect(Collectors.toList()));- }-- @Listen- public void on(PullRequestMergePreviewCalculated event) {- checkAsync(Lists.newArrayList(event.getRequest()));+ if (build.getRequest() != null) {+ MergePreview mergePreview = build.getRequest().getMergePreview();+ if (mergePreview != null && build.getCommitHash().equals(mergePreview.getMergeCommitHash()))+ listenerRegistry.post(new PullRequestBuildEvent(build));+ }}@Sessional@@ -778,7 +739,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Override- public void checkQuality(PullRequest request, List<User> unpreferableReviewers) {+ public void checkReviews(PullRequest request, List<User> unpreferableReviewers) {unpreferableReviewers = new ArrayList<>(unpreferableReviewers);unpreferableReviewers.remove(request.getSubmitter());unpreferableReviewers.add(request.getSubmitter());@@ -801,71 +762,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}}-- checkBuilds(request);}- private void checkBuilds(PullRequest request) {- Collection<PullRequestVerification> prevVerifications = new ArrayList<>(request.getVerifications());- request.getVerifications().clear();- MergePreview preview = request.getMergePreview();- if (preview != null && preview.getMergeCommitHash() != null) {- Project project = request.getTargetProject();- ObjectId commitId = ObjectId.fromString(preview.getMergeCommitHash());- ScriptIdentity.push(new JobIdentity(project, commitId));- try {- Collection<String> requiredJobNames;- BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- requiredJobNames = protection.getRequiredJobs(request.getTargetProject(), request.getTargetBranch(),- request.getTarget().getObjectId(), commitId, new HashMap<>());- BuildSpec buildSpec = project.getBuildSpec(commitId);- if (buildSpec != null) {- for (Job job: buildSpec.getJobs()) {- for (JobTrigger trigger: job.getTriggers()) {- if (trigger instanceof PullRequestTrigger) {- PullRequestTrigger pullRequestTrigger = (PullRequestTrigger) trigger;- PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = new PullRequestMergePreviewCalculated(request);- SubmitReason reason = pullRequestTrigger.matches(pullRequestMergePreviewCalculated, job);- if (reason != null) {- boolean required = requiredJobNames.contains(job.getName());- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(trigger.getParams(), null)) {-- @Override- public void run(Map<String, List<String>> paramMap) {- Build build = jobManager.submit(request.getTargetProject(),- commitId, job.getName(), paramMap, reason);-- PullRequestVerification verification = null;- for (PullRequestVerification prevVerification: prevVerifications) {- if (prevVerification.getBuild().equals(build)) {- verification = prevVerification;- break;- }- }- if (verification == null) {- verification = new PullRequestVerification();- verification.setRequest(request);- verification.setBuild(build);- }- verification.setRequired(required);- request.getVerifications().add(verification);- }-- }.run();- requiredJobNames.remove(job.getName());- }- }- }- }- }- if (!requiredJobNames.isEmpty())- throw new GeneralException("No pull request trigger to fire required builds: " + requiredJobNames);- } finally {- ScriptIdentity.pop();- }- }- }-private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update, List<User> unpreferableReviewers) {PullRequest request = update.getRequest();@@ -998,6 +896,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestEntityQuery<PullRequest> requestQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);+ query.distinct(true);Root<PullRequest> root = query.from(PullRequest.class);query.where(getPredicates(targetProject, requestQuery.getCriteria(), root, builder));@@ -1025,7 +924,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Overridepublic List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,- int firstResult, int maxResults, boolean loadReviews, boolean loadVerifiations) {+ int firstResult, int maxResults, boolean loadReviews, boolean loadBuilds) {CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, requestQuery);Query<PullRequest> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);@@ -1033,8 +932,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<PullRequest> requests = query.getResultList();if (!requests.isEmpty()) {- pullRequestReviewManager.populateReviews(requests);- pullRequestVerificationManager.populateVerifications(requests);+ if (loadReviews)+ pullRequestReviewManager.populateReviews(requests);+ if (loadBuilds)+ buildManager.populateBuilds(requests);}return requests;@@ -1050,7 +951,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcriteriaQuery.where(getPredicates(targetProject, requestCriteria, root, builder));- criteriaQuery.select(builder.count(root));+ criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.javaindex f2fb043ba3..bd5a291ffb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java@@ -18,7 +18,6 @@ import org.hibernate.criterion.Restrictions;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.entitymanager.PullRequestVerificationManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;@@ -43,18 +42,14 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRprivate final PullRequestChangeManager pullRequestChangeManager;- private final PullRequestVerificationManager pullRequestVerificationManager;-@Injectpublic DefaultPullRequestReviewManager(Dao dao,PullRequestManager pullRequestManager,- PullRequestChangeManager pullRequestChangeManager,- PullRequestVerificationManager pullRequestVerificationManager) {+ PullRequestChangeManager pullRequestChangeManager) {super(dao);this.pullRequestManager = pullRequestManager;this.pullRequestChangeManager = pullRequestChangeManager;- this.pullRequestVerificationManager = pullRequestVerificationManager;}@Transactional@@ -90,13 +85,12 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRrequest.getReviews().remove(review);request.setReviews(request.getReviews());- pullRequestManager.checkQuality(request, unpreferableReviewers);+ pullRequestManager.checkReviews(request, unpreferableReviewers);if (request.isNew()) {return request.getReview(reviewer) == null;} else {saveReviews(request);- pullRequestVerificationManager.saveVerifications(request);if (request.getReview(reviewer) == null) {PullRequestChange change = new PullRequestChange();change.setDate(new Date());diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.javadeleted file mode 100644index 432ee8e279..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.java+++ /dev/null@@ -1,77 +0,0 @@-package io.onedev.server.entitymanager.impl;--import java.util.ArrayList;-import java.util.Collection;-import java.util.stream.Collectors;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.Query;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;--import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.server.entitymanager.PullRequestVerificationManager;-import io.onedev.server.event.pullrequest.PullRequestVerificationEvent;-import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestVerification;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;--@Singleton-public class DefaultPullRequestVerificationManager extends AbstractEntityManager<PullRequestVerification>- implements PullRequestVerificationManager {-- private final ListenerRegistry listenerRegistry;-- @Inject- public DefaultPullRequestVerificationManager(Dao dao, ListenerRegistry listenerRegistry) {- super(dao);- this.listenerRegistry = listenerRegistry;- }-- @Transactional- @Override- public void saveVerifications(PullRequest request) {- Collection<Build> builds = request.getVerifications().stream()- .filter(it->!it.isNew()).map(it->it.getBuild()).collect(Collectors.toList());- if (!builds.isEmpty()) {- Query query = getSession().createQuery("delete from PullRequestVerification where request=:request and build not in (:builds)");- query.setParameter("request", request);- query.setParameter("builds", builds);- query.executeUpdate();- } else {- Query query = getSession().createQuery("delete from PullRequestVerification where request=:request");- query.setParameter("request", request);- query.executeUpdate();- }- for (PullRequestVerification build: request.getVerifications()) {- boolean isNew = build.isNew();- save(build);- if (isNew)- listenerRegistry.post(new PullRequestVerificationEvent(build));- }- }-- @Override- public void populateVerifications(Collection<PullRequest> requests) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<PullRequestVerification> query = builder.createQuery(PullRequestVerification.class);-- Root<PullRequestVerification> root = query.from(PullRequestVerification.class);- query.select(root);- root.join(PullRequestVerification.PROP_REQUEST);-- query.where(root.get(PullRequestVerification.PROP_REQUEST).in(requests));-- for (PullRequest request: requests)- request.setVerifications(new ArrayList<>());-- for (PullRequestVerification verification: getSession().createQuery(query).getResultList())- verification.getRequest().getVerifications().add(verification);- }--}diff --git a/server-core/src/main/java/io/onedev/server/event/Event.java b/server-core/src/main/java/io/onedev/server/event/Event.javaindex b2e4d16cb1..66a8157be5 100644--- a/server-core/src/main/java/io/onedev/server/event/Event.java+++ b/server-core/src/main/java/io/onedev/server/event/Event.java@@ -1,6 +1,7 @@package io.onedev.server.event;import java.util.Date;+import java.util.UUID;import javax.annotation.Nullable;@@ -12,6 +13,8 @@ import io.onedev.server.model.User;@JsonTypeInfo(property="@class", use=Id.CLASS)public abstract class Event {+ private final String uuid = UUID.randomUUID().toString();+private final User user;private final Date date;@@ -21,6 +24,10 @@ public abstract class Event {this.date = date;}+ public String getUuid() {+ return uuid;+ }+@Nullablepublic User getUser() {return user;diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.javanew file mode 100644index 0000000000..0e1015f8a3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java@@ -0,0 +1,33 @@+package io.onedev.server.event.pullrequest;++import java.util.Date;++import io.onedev.server.model.Build;++public class PullRequestBuildEvent extends PullRequestEvent {++ private final Build build;++ public PullRequestBuildEvent(Build build) {+ super(null, new Date(), build.getRequest());+ this.build = build;+ }++ public Build getBuild() {+ return build;+ }++ @Override+ public String getActivity(boolean withEntity) {+ String activity = build.getJobName() + " ";+ if (build.getVersion() != null)+ activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")";+ else+ activity = "build #" + build.getNumber();+ activity += " is " + build.getStatus().getDisplayName();+ if (withEntity)+ activity += " for pull request " + build.getRequest().getNumberAndTitle();+ return activity;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.javaindex c04fa0c76a..cf3ba84a63 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java@@ -2,9 +2,14 @@ package io.onedev.server.event.pullrequest;import java.util.Date;+import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.util.CommitAware;+import io.onedev.server.util.ProjectScopedCommit;-public class PullRequestMergePreviewCalculated extends PullRequestEvent {+public class PullRequestMergePreviewCalculated extends PullRequestEvent implements CommitAware {public PullRequestMergePreviewCalculated(PullRequest request) {super(null, new Date(), request);@@ -18,4 +23,13 @@ public class PullRequestMergePreviewCalculated extends PullRequestEvent {return activity;}+ @Override+ public ProjectScopedCommit getCommit() {+ MergePreview mergePreview = getRequest().getMergePreview();+ if (mergePreview != null && mergePreview.getMergeCommitHash() != null)+ return new ProjectScopedCommit(getProject(), ObjectId.fromString(mergePreview.getMergeCommitHash()));+ else+ return new ProjectScopedCommit(getProject(), ObjectId.zeroId());+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.javadeleted file mode 100644index 2e13efcd0c..0000000000--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java+++ /dev/null@@ -1,35 +0,0 @@-package io.onedev.server.event.pullrequest;--import java.util.Date;--import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequestVerification;--public class PullRequestVerificationEvent extends PullRequestEvent {-- private final PullRequestVerification verification;-- public PullRequestVerificationEvent(PullRequestVerification verification) {- super(null, new Date(), verification.getRequest());- this.verification = verification;- }-- public PullRequestVerification getVerification() {- return verification;- }-- @Override- public String getActivity(boolean withEntity) {- Build build = verification.getBuild();- String activity = build.getJobName() + " ";- if (build.getVersion() != null)- activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")";- else- activity = "build #" + build.getNumber();- activity += " is " + build.getStatus().getDisplayName();- if (withEntity)- activity += " for pull request " + verification.getRequest().getNumberAndTitle();- return activity;- }--}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 e624301a2f..f9d4b9f0ad 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@@ -2174,4 +2174,83 @@ public class DataMigrator {}}+ private void migrate44_abbreviate(Element element, int maxLen) {+ if (element != null) {+ String text = StringUtils.abbreviate(element.getText().trim(), maxLen);+ element.setText(text);+ }+ }++ // Migrate to 4.0.5+ private void migrate44(File dataDir, Stack<Integer> versions) {+ Map<String, String> verifications = new HashMap<>();+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("PullRequestVerifications.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ verifications.put(element.elementTextTrim("build"), element.elementTextTrim("request"));+ }+ }+ }++ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Builds.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.addElement("triggerId").setText(UUID.randomUUID().toString());+ String requestId = verifications.get(element.elementTextTrim("id"));+ if (requestId != null)+ element.addElement("request").setText(requestId);+ Element updatedRefElement = element.element("updatedRef");+ if (updatedRefElement != null)+ updatedRefElement.setName("refName");+ migrate44_abbreviate(element.element("errorMessage"), 12000);+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Issues.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrate44_abbreviate(element.element("description"), 14000);+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("CodeComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrate44_abbreviate(element.element("content"), 14000);+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("CodeCommentReplys.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrate44_abbreviate(element.element("content"), 14000);+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("IssueComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrate44_abbreviate(element.element("content"), 15000);+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrate44_abbreviate(element.element("description"), 15000);+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrate44_abbreviate(element.element("description"), 12000);+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequestComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrate44_abbreviate(element.element("content"), 14000);+ }+ dom.writeToFile(file, false);+ }+ }+ }+}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 0405a131c9..5ab1e05a94 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@@ -6,6 +6,8 @@ import static io.onedev.server.model.Build.PROP_FINISH_DATE;import static io.onedev.server.model.Build.PROP_JOB;import static io.onedev.server.model.Build.PROP_NUMBER;import static io.onedev.server.model.Build.PROP_PENDING_DATE;+import static io.onedev.server.model.Build.PROP_REF_NAME;+import static io.onedev.server.model.Build.PROP_TRIGGER_ID;import static io.onedev.server.model.Build.PROP_RUNNING_DATE;import static io.onedev.server.model.Build.PROP_STATUS;import static io.onedev.server.model.Build.PROP_SUBMITTER_NAME;@@ -61,8 +63,8 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;import io.onedev.server.GeneralException;+import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.VariableInterpolator;@@ -100,8 +102,10 @@ import io.onedev.server.web.util.WicketUtils;@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"), @Index(columnList="o_canceller_id"),+ @Index(columnList="o_request_id"),@Index(columnList=PROP_SUBMITTER_NAME), @Index(columnList=PROP_CANCELLER_NAME), @Index(columnList=PROP_COMMIT),- @Index(columnList=PROP_NUMBER), @Index(columnList=PROP_JOB), @Index(columnList=PROP_STATUS),+ @Index(columnList=PROP_NUMBER), @Index(columnList=PROP_JOB), @Index(columnList=PROP_STATUS),+ @Index(columnList=PROP_REF_NAME), @Index(columnList=PROP_TRIGGER_ID),@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE), @Index(columnList=PROP_RUNNING_DATE),@Index(columnList=PROP_FINISH_DATE), @Index(columnList=PROP_VERSION), @Index(columnList="o_numberScope_id"),@Index(columnList="o_project_id, " + PROP_COMMIT)},@@ -168,6 +172,12 @@ public class Build extends AbstractEntity implements Referenceable {public static final String NAME_COMMIT = "Commit";+ public static final String NAME_BRANCH = "Branch";++ public static final String NAME_TAG = "Tag";++ public static final String PROP_REF_NAME = "refName";+public static final String PROP_COMMIT = "commitHash";public static final String PROP_PARAMS = "params";@@ -180,21 +190,25 @@ public class Build extends AbstractEntity implements Referenceable {public static final String PROP_DEPENDENTS = "dependents";- public static final String PROP_VERIFICATIONS = "verifications";+ public static final String NAME_PULL_REQUEST = "Pull Request";++ public static final String PROP_PULL_REQUEST = "request";public static final String NAME_ERROR_MESSAGE = "Error Message";public static final String NAME_LOG = "Log";+ public static final String PROP_TRIGGER_ID = "triggerId";+public static final Set<String> ALL_FIELDS = Sets.newHashSet(NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_STATUS, NAME_SUBMITTER, NAME_CANCELLER,NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,- NAME_COMMIT, NAME_VERSION, NAME_DEPENDENCIES, NAME_DEPENDENTS, NAME_ERROR_MESSAGE,- NAME_LOG, NAME_IMAGE);+ NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT, NAME_VERSION, NAME_DEPENDENCIES,+ NAME_DEPENDENTS, NAME_ERROR_MESSAGE, NAME_LOG, NAME_IMAGE);public static final List<String> QUERY_FIELDS = Lists.newArrayList(- NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_VERSION, NAME_COMMIT, NAME_SUBMIT_DATE,- NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE);+ NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION, NAME_PULL_REQUEST,+ NAME_COMMIT, NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE);public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(NAME_JOB, PROP_JOB,@@ -216,11 +230,9 @@ public class Build extends AbstractEntity implements Referenceable {};- public static final String STATUS = "status";-public static final String ARTIFACTS_DIR = "artifacts";- private static final int MAX_ERROR_MESSAGE_LEN = 16380;+ private static final int MAX_ERROR_MESSAGE_LEN = 12000;public enum Status {// Most significant status comes first, refer to getOverallStatus@@ -262,6 +274,8 @@ public class Build extends AbstractEntity implements Referenceable {@Column(nullable=false)private String jobName;+ private String refName;+private String version;private long number;@@ -283,14 +297,15 @@ public class Build extends AbstractEntity implements Referenceable {private Date retryDate;- private String updatedRef;-@Column(nullable=false, length=1000)private String submitReason;@Column(length=MAX_ERROR_MESSAGE_LEN)private String errorMessage;+ @Column(nullable=false)+ private String triggerId;+@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<BuildParam> params = new ArrayList<>();@@ -303,8 +318,8 @@ public class Build extends AbstractEntity implements Referenceable {@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<BuildDependence> dependents= new ArrayList<>();- @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)- private Collection<PullRequestVerification> verifications = new ArrayList<>();+ @ManyToOne(fetch=FetchType.LAZY)+ private PullRequest request;private transient Map<String, List<String>> paramMap;@@ -545,22 +560,48 @@ public class Build extends AbstractEntity implements Referenceable {}@Nullable- public String getUpdatedRef() {- return updatedRef;+ public String getTriggerId() {+ return triggerId;+ }++ public void setTriggerId(String triggerId) {+ this.triggerId = triggerId;}- public void setUpdatedRef(String updatedRef) {- this.updatedRef = updatedRef;+ @Nullable+ public String getRefName() {+ return refName;}- public Collection<PullRequestVerification> getVerifications() {- return verifications;+ public void setRefName(String refName) {+ this.refName = refName;+ }++ @Nullable+ public String getBranch() {+ if (refName != null)+ return GitUtils.ref2branch(refName);+ else+ return null;}- public void setVerifications(Collection<PullRequestVerification> verifications) {- this.verifications = verifications;+ @Nullable+ public String getTag() {+ if (refName != null)+ return GitUtils.ref2tag(refName);+ else+ return null;}+ @Nullable+ public PullRequest getRequest() {+ return request;+ }++ public void setRequest(PullRequest request) {+ this.request = request;+ }+public Map<String, List<String>> getParamMap() {if (paramMap == null) {paramMap = new HashMap<>();@@ -986,18 +1027,14 @@ public class Build extends AbstractEntity implements Referenceable {branches = "**";if (project.isCommitOnBranches(getCommitId(), branches)) {return true;- } else {+ } else if (getRequest() != null) {PatternSet patternSet = PatternSet.parse(branches);PathMatcher matcher = new PathMatcher();- for (PullRequestVerification verification: getVerifications()) {- PullRequest request = verification.getRequest();- if (project.equals(request.getSourceProject())- && patternSet.matches(matcher, request.getTargetBranch())- && request.getSourceBranch() != null- && patternSet.matches(matcher, request.getSourceBranch())) {- return true;- }- }+ return project.equals(getRequest().getSourceProject())+ && patternSet.matches(matcher, getRequest().getTargetBranch())+ && getRequest().getSourceBranch() != null+ && patternSet.matches(matcher, getRequest().getSourceBranch());+ } else {return false;}}diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex c3cf3876eb..518be54276 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -107,7 +107,7 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSuppprivate String userName;- @Column(nullable=false, length=16384)+ @Column(nullable=false, length=14000)private String content;@Column(nullable=false)diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.javaindex 4e46a87f91..16acb83323 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java@@ -32,7 +32,7 @@ public class CodeCommentReply extends AbstractEntity {@Column(nullable=false)private Date date;- @Column(nullable=false, length=16384)+ @Column(nullable=false, length=14000)private String content;public CodeComment getComment() {diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex ce90c7a9e0..ca874beffe 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -172,7 +172,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt@Column(nullable=false)private String title;- @Column(length=16384)+ @Column(length=14000)private String description;@ManyToOne(fetch=FetchType.LAZY)diff --git a/server-core/src/main/java/io/onedev/server/model/IssueComment.java b/server-core/src/main/java/io/onedev/server/model/IssueComment.javaindex 9b9aa657b0..9ead8e0ec2 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueComment.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueComment.java@@ -32,7 +32,7 @@ public class IssueComment extends AbstractEntity {@Column(nullable=false)private Date date;- @Column(nullable=false, length=16384)+ @Column(nullable=false, length=15000)private String content;public Issue getIssue() {diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 0cd625c7be..f0d05dca73 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -191,7 +191,7 @@ public class Project extends AbstractEntity {@Column(nullable=false, unique=true)private String name;- @Column(length=16384)+ @Column(length=15000)private String description;@OneToMany(mappedBy="project")@@ -835,6 +835,12 @@ public class Project extends AbstractEntity {return optional.orNull();}+ @Nullable+ public String getRefName(String revision) {+ Ref ref = getRef(revision);+ return ref != null? ref.getName(): null;+ }+@Nullablepublic Ref getBranchRef(String revision) {Ref ref = getRef(revision);@@ -1414,7 +1420,7 @@ public class Project extends AbstractEntity {public boolean isBuildRequiredForPush(User user, String branch, ObjectId oldObjectId, ObjectId newObjectId,Map<String, String> gitEnvs) {- return getBranchProtection(branch, user).isBuildRequiredForPush(this, branch, oldObjectId, newObjectId, gitEnvs);+ return getBranchProtection(branch, user).isBuildRequiredForPush(this, oldObjectId, newObjectId, gitEnvs);}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex c6d3fa3c30..90948fbbdf 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -14,13 +14,14 @@ import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Date;+import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashSet;import java.util.List;import java.util.Map;-import java.util.Optional;import java.util.Stack;import java.util.UUID;+import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.persistence.CascadeType;@@ -54,11 +55,11 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.PullRequestInfoManager;import io.onedev.server.infomanager.UserInfoManager;+import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.LastUpdate;@@ -164,7 +165,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final String PROP_REVIEWS = "reviews";- public static final String PROP_VERIFICATIONS= "verifications";+ public static final String PROP_BUILDS = "builds";public static final String PROP_ASSIGNMENTS = "assignments";@@ -213,7 +214,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach@Column(nullable=false)private String title;- @Column(length=16384)+ @Column(length=12000)private String description;@ManyToOne(fetch=FetchType.LAZY)@@ -279,7 +280,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate Collection<PullRequestAssignment> assignments = new ArrayList<>();@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)- private Collection<PullRequestVerification> verifications = new ArrayList<>();+ private Collection<Build> builds = new ArrayList<>();@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestComment> comments = new ArrayList<>();@@ -299,8 +300,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate transient List<PullRequestReview> sortedReviews;- private transient Optional<MergePreview> mergePreviewOpt;-private transient Boolean valid;private transient Collection<Long> fixedIssueNumbers;@@ -309,6 +308,10 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate transient Collection<RevCommit> pendingCommits;+ private transient Collection<String> requiredJobs;++ private transient Collection<Build> currentBuilds;+@Column(length=MAX_CHECK_ERROR_LEN)private String checkError;@@ -455,14 +458,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, AttachsortedUpdates = null;}- public Collection<PullRequestVerification> getVerifications() {- return verifications;- }-- public void setVerifications(Collection<PullRequestVerification> verifications) {- this.verifications = verifications;- }-public Collection<PullRequestComment> getComments() {return comments;}@@ -555,9 +550,14 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach@JsonView(RestView.class)@Nullablepublic MergePreview getMergePreview() {- if (mergePreviewOpt == null)- mergePreviewOpt = Optional.ofNullable(OneDev.getInstance(PullRequestManager.class).previewMerge(this));- return mergePreviewOpt.orElse(null);+ if (isOpen()) {+ if (lastMergePreview != null && lastMergePreview.isUpToDate(this))+ return lastMergePreview;+ else+ return null;+ } else {+ return lastMergePreview;+ }}/**@@ -712,6 +712,28 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.assignments = assignments;}+ public Collection<Build> getBuilds() {+ return builds;+ }++ public void setBuilds(Collection<Build> builds) {+ this.builds = builds;+ }++ public Collection<Build> getCurrentBuilds() {+ if (currentBuilds == null) {+ MergePreview preview = getMergePreview();+ if (preview != null) {+ currentBuilds = builds.stream()+ .filter(it->it.getCommitHash().equals(preview.getMergeCommitHash()))+ .collect(Collectors.toList());+ } else {+ currentBuilds = new ArrayList<>();+ }+ }+ return currentBuilds;+ }+public String getUUID() {return uuid;}@@ -945,11 +967,15 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public boolean isRequiredBuildsSuccessful() {- for (PullRequestVerification verification: getVerifications()) {- if (verification.isRequired() && verification.getBuild().getStatus() != Build.Status.SUCCESSFUL)+ Collection<String> requiredJobs = new ArrayList<>(getRequiredJobs());+ for (Build build: getCurrentBuilds()) {+ if (requiredJobs.contains(build.getJobName()) && build.getStatus() != Build.Status.SUCCESSFUL)return false;}- return true;+ return getCurrentBuilds().stream()+ .map(it->it.getJobName())+ .collect(Collectors.toSet())+ .containsAll(requiredJobs);}public static class ComparingInfo implements Serializable {@@ -1113,4 +1139,24 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn "#" + getNumber() + " - " + getTitle();}+ public Collection<String> getRequiredJobs() {+ if (requiredJobs == null) {+ MergePreview preview = getMergePreview();+ if (preview != null && preview.getMergeCommitHash() != null) {+ BranchProtection protection = getTargetProject().getBranchProtection(getTargetBranch(), getSubmitter());+ ObjectId targetCommitId = getTarget().getObjectId(false);+ ObjectId mergeCommitId = getTargetProject().getObjectId(preview.getMergeCommitHash(), false);+ if (targetCommitId != null && mergeCommitId != null) {+ requiredJobs = protection.getRequiredJobs(getTargetProject(), targetCommitId,+ mergeCommitId, new HashMap<>());+ } else {+ requiredJobs = new HashSet<>();+ }+ } else {+ requiredJobs = new HashSet<>();+ }+ }+ return requiredJobs;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.javaindex eafe55d65e..f9e74b1cb2 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java@@ -31,7 +31,7 @@ public class PullRequestComment extends AbstractEntity {private String userName;- @Column(nullable=false, length=16384)+ @Column(nullable=false, length=14000)private String content;@Column(nullable=false)diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestVerification.java b/server-core/src/main/java/io/onedev/server/model/PullRequestVerification.javadeleted file mode 100644index 9969bde851..0000000000--- a/server-core/src/main/java/io/onedev/server/model/PullRequestVerification.java+++ /dev/null@@ -1,59 +0,0 @@-package io.onedev.server.model;--import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--@Entity-@Table(- indexes={@Index(columnList="o_request_id"), @Index(columnList="o_build_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_build_id"})})-public class PullRequestVerification extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- public static final String PROP_BUILD = "build";-- public static final String PROP_REQUEST = "request";-- public static final String PROP_REQUIRED = "required";-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private PullRequest request;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Build build;-- private boolean required;-- public Build getBuild() {- return build;- }-- public void setBuild(Build build) {- this.build = build;- }-- public PullRequest getRequest() {- return request;- }-- public void setRequest(PullRequest request) {- this.request = request;- }-- public boolean isRequired() {- return required;- }-- public void setRequired(boolean required) {- this.required = required;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 3b34cd7998..e6d303c70c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -11,7 +11,6 @@ import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.validation.Valid;-import javax.validation.constraints.NotNull;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;@@ -160,7 +159,6 @@ public class BranchProtection implements Serializable {}@Editable(order=700, description="Optionally specify path protection rules")- @NotNull(message="may not be empty")@Validpublic List<FileProtection> getFileProtections() {return fileProtections;@@ -298,17 +296,17 @@ public class BranchProtection implements Serializable {return false;}- public Collection<String> getRequiredJobs(Project project, String branch,- ObjectId oldObjectId, ObjectId newObjectId, Map<String, String> gitEnvs) {+ public Collection<String> getRequiredJobs(Project project, ObjectId oldObjectId, ObjectId newObjectId,+ Map<String, String> gitEnvs) {Collection<String> requiredJobs = new HashSet<>(getJobNames());for (String changedFile: project.getChangedFiles(oldObjectId, newObjectId, gitEnvs))requiredJobs.addAll(getFileProtection(changedFile).getJobNames());return requiredJobs;}- public boolean isBuildRequiredForPush(Project project, String branch, ObjectId oldObjectId,- ObjectId newObjectId, Map<String, String> gitEnvs) {- Collection<String> requiredJobNames = getRequiredJobs(project, branch, oldObjectId, newObjectId, gitEnvs);+ public boolean isBuildRequiredForPush(Project project, ObjectId oldObjectId, ObjectId newObjectId,+ Map<String, String> gitEnvs) {+ Collection<String> requiredJobNames = getRequiredJobs(project, oldObjectId, newObjectId, gitEnvs);Collection<Build> builds = OneDev.getInstance(BuildManager.class).query(project, newObjectId);for (Build build: builds) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.javaindex e0e7f41c94..a754a198a4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java@@ -94,7 +94,7 @@ public class MergePreview implements Serializable {public boolean isUpToDate(PullRequest request) {return getHeadCommitHash().equals(request.getLatestUpdate().getHeadCommitHash())- && getTargetHeadCommitHash().equals(request.getTarget().getObjectName())+ && getTargetHeadCommitHash().equals(request.getTarget().getObjectName(false))&& getMergeStrategy() == request.getMergeStrategy();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.javaindex b62780f456..2c78446084 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java@@ -16,7 +16,7 @@ public class ReviewResult implements Serializable {private Boolean approved = false;- @Column(length=16384)+ @Column(length=15000)private String comment;public String getCommit() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.javaindex 553895cdf7..827d361974 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java@@ -12,11 +12,11 @@ import io.onedev.server.util.CommentAware;public interface PullRequestChangeData extends Serializable {- abstract Component render(String componentId, PullRequestChange change);+ Component render(String componentId, PullRequestChange change);- abstract String getActivity(@Nullable PullRequest withRequest);+ String getActivity(@Nullable PullRequest withRequest);@Nullable- abstract CommentAware getCommentAware();+ CommentAware getCommentAware();}diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex f91e3deaae..00521757dc 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -27,7 +27,7 @@ import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.event.pullrequest.PullRequestUpdated;-import io.onedev.server.event.pullrequest.PullRequestVerificationEvent;+import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestAssignment;@@ -230,7 +230,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager|| changeData instanceof PullRequestReopenData) {notifyWatchers = true;}- } else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestVerificationEvent)) {+ } else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestBuildEvent)) {notifyWatchers = true;}diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex 936f5c7028..237e719326 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -110,15 +110,12 @@ public class DefaultPersistManager implements PersistManager {try ( Connection conn = getConnection();Statement stmt = conn.createStatement();) {for (String sql: sqls) {- logger.trace("Executing sql: " + sql);- if (failOnError) {+ try {stmt.execute(sql);- } else {- try {- stmt.execute(sql);- } catch (Exception e) {- logger.error("Error executing sql", e);- }+ } catch (Exception e) {+ logger.error("Error executing sql: " + sql, e);+ if (failOnError)+ throw e;}}} catch (SQLException e) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.javadeleted file mode 100644index 8335d085e3..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java+++ /dev/null@@ -1,48 +0,0 @@-package io.onedev.server.search.entity.build;--import javax.annotation.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Build;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestVerification;-import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;--public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {-- private static final long serialVersionUID = 1L;-- private final PullRequest request;-- private final String value;-- public AssociatedWithPullRequestCriteria(@Nullable Project project, String value) {- request = EntityQuery.getPullRequest(project, value);- this.value = value;- }-- @Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- Join<?, ?> join = root.join(Build.PROP_VERIFICATIONS, JoinType.LEFT);- join.on(builder.equal(join.get(PullRequestVerification.PROP_REQUEST), request));- return builder.equal(root.get(Build.PROP_PROJECT), request.getTargetProject());- }-- @Override- public boolean matches(Build build) {- return build.getProject().equals(request.getTargetProject())- && build.getVerifications().stream().anyMatch(it -> it.getRequest().equals(request));- }-- @Override- public String toStringWithoutParens() {- return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest) + " " + quote(value);- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.javanew file mode 100644index 0000000000..f0492ec62a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import org.eclipse.jgit.lib.Constants;++import io.onedev.server.model.Build;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.match.WildcardUtils;++public class BranchCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public BranchCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ Path<String> attribute = root.get(Build.PROP_REF_NAME);+ String normalized = Constants.R_HEADS + value.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);+ }++ @Override+ public boolean matches(Build build) {+ String branch = build.getBranch();+ return branch != null && WildcardUtils.matchString(value.toLowerCase(), branch.toLowerCase());+ }++ @Override+ public String toStringWithoutParens() {+ return quote(Build.NAME_BRANCH) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchIsEmptyCriteria.javanew file mode 100644index 0000000000..3da53723b3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchIsEmptyCriteria.java@@ -0,0 +1,36 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import org.eclipse.jgit.lib.Constants;++import io.onedev.server.model.Build;+import io.onedev.server.search.entity.EntityCriteria;++public class BranchIsEmptyCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ Path<String> attribute = root.get(Build.PROP_REF_NAME);+ return builder.or(+ builder.isNull(attribute),+ builder.not(builder.like(attribute, Constants.R_HEADS + "%")));+ }++ @Override+ public boolean matches(Build build) {+ return build.getBranch() == null;++ }++ @Override+ public String toStringWithoutParens() {+ return quote(Build.NAME_BRANCH) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 58e70139fb..1d45381505 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -7,9 +7,9 @@ query;criteria- : operator=(Successful|Failed|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe|AssociatedWithPullRequests|RequiredByPullRequests) #OperatorCriteria+ : operator=(Successful|Failed|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria| criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria- | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|AssociatedWithPullRequest|RequiredByPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -77,22 +77,6 @@ FixedIssue: 'fixed' WS+ 'issue';-AssociatedWithPullRequest- : 'associated' WS+ 'with' WS+ 'pull' WS+ 'request'- ;--RequiredByPullRequest- : 'required' WS+ 'by' WS+ 'pull' WS+ 'request'- ;--AssociatedWithPullRequests- : 'associated' WS+ 'with' WS+ 'pull' WS+ 'requests'- ;--RequiredByPullRequests- : 'required' WS+ 'by' WS+ 'pull' WS+ 'requests'- ;-OrderBy: 'order by';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 13bc7db3c9..2210d24587 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@@ -9,6 +9,9 @@ import static io.onedev.server.model.Build.NAME_PROJECT;import static io.onedev.server.model.Build.NAME_RUNNING_DATE;import static io.onedev.server.model.Build.NAME_SUBMIT_DATE;import static io.onedev.server.model.Build.NAME_VERSION;+import static io.onedev.server.model.Build.NAME_PULL_REQUEST;+import static io.onedev.server.model.Build.NAME_BRANCH;+import static io.onedev.server.model.Build.NAME_TAG;import static io.onedev.server.model.Build.ORDER_FIELDS;import static io.onedev.server.model.Build.QUERY_FIELDS;@@ -129,10 +132,6 @@ public class BuildQuery extends EntityQuery<Build> {if (!withCurrentUserCriteria)throw new GeneralException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CancelledByMeCriteria();- case BuildQueryLexer.AssociatedWithPullRequests:- return new AssociatedWithPullRequestsCriteria();- case BuildQueryLexer.RequiredByPullRequests:- return new RequiredByPullRequestsCriteria();default:throw new GeneralException("Unexpected operator: " + ctx.operator.getText());}@@ -151,10 +150,6 @@ public class BuildQuery extends EntityQuery<Build> {return new DependsOnCriteria(project, value);else if (ctx.DependenciesOf() != null)return new DependenciesOfCriteria(project, value);- else if (ctx.RequiredByPullRequest() != null)- return new RequiredByPullRequestCriteria(project, value);- else if (ctx.AssociatedWithPullRequest() != null)- return new AssociatedWithPullRequestCriteria(project, value);elsethrow new RuntimeException("Unexpected criteria: " + ctx.operator.getText());}@@ -171,6 +166,12 @@ public class BuildQuery extends EntityQuery<Build> {checkField(project, fieldName, operator);if (fieldName.equals(NAME_VERSION))return new VersionIsEmptyCriteria();+ else if (fieldName.equals(NAME_PULL_REQUEST))+ return new PullRequestIsEmptyCriteria();+ else if (fieldName.equals(NAME_BRANCH))+ return new BranchIsEmptyCriteria();+ else if (fieldName.equals(NAME_TAG))+ return new TagIsEmptyCriteria();elsereturn new ParamIsEmptyCriteria(fieldName);}@@ -208,6 +209,12 @@ public class BuildQuery extends EntityQuery<Build> {return new NumberCriteria(project, value, operator);case NAME_VERSION:return new VersionCriteria(value);+ case NAME_BRANCH:+ return new BranchCriteria(value);+ case NAME_TAG:+ return new TagCriteria(value);+ case NAME_PULL_REQUEST:+ return new PullRequestCriteria(project, value);default:return new ParamCriteria(fieldName, value);}@@ -282,13 +289,18 @@ public class BuildQuery extends EntityQuery<Build> {case BuildQueryLexer.Is:if (!fieldName.equals(NAME_PROJECT) && !fieldName.equals(NAME_COMMIT)&& !fieldName.equals(NAME_JOB) && !fieldName.equals(NAME_NUMBER)- && !fieldName.equals(NAME_VERSION) && !paramNames.contains(fieldName)) {+ && !fieldName.equals(NAME_PULL_REQUEST) && !fieldName.equals(NAME_VERSION)+ && !fieldName.equals(NAME_BRANCH) && !fieldName.equals(NAME_TAG)+ && !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);}break;case BuildQueryLexer.IsEmpty:- if (!fieldName.equals(NAME_VERSION) && !paramNames.contains(fieldName))+ if (!fieldName.equals(NAME_PULL_REQUEST) && !fieldName.equals(NAME_VERSION)+ && !fieldName.equals(NAME_BRANCH) && !fieldName.equals(NAME_TAG)+ && !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);+ }break;case BuildQueryLexer.IsLessThan:case BuildQueryLexer.IsGreaterThan:diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.javanew file mode 100644index 0000000000..2a2184999c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.search.entity.build;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;++public class PullRequestCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private final PullRequest request;++ private final String value;++ public PullRequestCriteria(@Nullable Project project, String value) {+ request = EntityQuery.getPullRequest(project, value);+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ Path<PullRequest> attribute = root.get(Build.PROP_PULL_REQUEST);+ return builder.equal(attribute, request);+ }++ @Override+ public boolean matches(Build build) {+ return build.getProject().equals(request.getTargetProject()) && request.equals(build.getRequest());+ }++ @Override+ public String toStringWithoutParens() {+ return quote(Build.NAME_PULL_REQUEST) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestIsEmptyCriteria.javasimilarity index 66%rename from server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestIsEmptyCriteria.javaindex 2b592bc371..bc7426f0f1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestIsEmptyCriteria.java@@ -5,26 +5,25 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.search.entity.EntityCriteria;-public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {+public class PullRequestIsEmptyCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- return builder.isNotEmpty(root.get(Build.PROP_VERIFICATIONS));+ return builder.isNull(root.get(Build.PROP_PULL_REQUEST));}@Overridepublic boolean matches(Build build) {- return !build.getVerifications().isEmpty();+ return build.getRequest() == null;}@Overridepublic String toStringWithoutParens() {- return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequests);+ return quote(Build.NAME_PULL_REQUEST) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.javadeleted file mode 100644index 8ab5a3b196..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.search.entity.build;--import javax.annotation.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Build;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestVerification;-import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;--public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {-- private static final long serialVersionUID = 1L;-- private final PullRequest request;-- private final String value;-- public RequiredByPullRequestCriteria(@Nullable Project project, String value) {- request = EntityQuery.getPullRequest(project, value);- this.value = value;- }-- @Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- Join<?, ?> join = root.join(Build.PROP_VERIFICATIONS, JoinType.LEFT);- join.on(builder.and(- builder.equal(join.get(PullRequestVerification.PROP_REQUEST), request),- builder.equal(join.get(PullRequestVerification.PROP_REQUIRED), true)));- return builder.equal(root.get(Build.PROP_PROJECT), request.getTargetProject());- }-- @Override- public boolean matches(Build build) {- return build.getProject().equals(request.getTargetProject())- && build.getVerifications().stream().anyMatch(it -> it.getRequest().equals(request) && it.isRequired());- }-- @Override- public String toStringWithoutParens() {- return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest) + " " + quote(value);- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.javadeleted file mode 100644index 63ab927a08..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.search.entity.build;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequestVerification;-import io.onedev.server.search.entity.EntityCriteria;--public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {-- private static final long serialVersionUID = 1L;-- @Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- Join<?, ?> join = root.join(Build.PROP_VERIFICATIONS, JoinType.LEFT);- join.on(builder.equal(join.get(PullRequestVerification.PROP_REQUIRED), true));- return join.isNotNull();- }-- @Override- public boolean matches(Build build) {- return build.getVerifications().stream().anyMatch(it->it.isRequired());- }-- @Override- public String toStringWithoutParens() {- return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequests);- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.javanew file mode 100644index 0000000000..64900182db--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import org.eclipse.jgit.lib.Constants;++import io.onedev.server.model.Build;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.match.WildcardUtils;++public class TagCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public TagCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ Path<String> attribute = root.get(Build.PROP_REF_NAME);+ String normalized = Constants.R_TAGS + value.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);+ }++ @Override+ public boolean matches(Build build) {+ String tag = build.getTag();+ return tag != null && WildcardUtils.matchString(value.toLowerCase(), tag.toLowerCase());+ }++ @Override+ public String toStringWithoutParens() {+ return quote(Build.NAME_TAG) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagIsEmptyCriteria.javanew file mode 100644index 0000000000..52e69b7e08--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagIsEmptyCriteria.java@@ -0,0 +1,35 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import org.eclipse.jgit.lib.Constants;++import io.onedev.server.model.Build;+import io.onedev.server.search.entity.EntityCriteria;++public class TagIsEmptyCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ Path<String> attribute = root.get(Build.PROP_REF_NAME);+ return builder.or(+ builder.isNull(attribute),+ builder.not(builder.like(attribute, Constants.R_TAGS + "%")));+ }++ @Override+ public boolean matches(Build build) {+ return build.getTag() == null;+ }++ @Override+ public String toStringWithoutParens() {+ return quote(Build.NAME_TAG) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex ca4390948e..81737a019a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestVerification;+import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.search.entity.EntityCriteria;public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {@@ -18,24 +18,27 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- Join<?, ?> join = root- .join(PullRequest.PROP_VERIFICATIONS, JoinType.LEFT)- .join(PullRequestVerification.PROP_BUILD, JoinType.INNER);- Path<?> status = join.get(Build.STATUS);+ Join<?, ?> join = root.join(PullRequest.PROP_BUILDS, JoinType.LEFT);+ Path<?> status = join.get(Build.PROP_STATUS);- join.on(builder.or(- builder.equal(status, Build.Status.FAILED),- builder.equal(status, Build.Status.CANCELLED),- builder.equal(status, Build.Status.TIMED_OUT)));+ Path<?> mergeCommit = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);+ Path<?> buildCommit = join.get(Build.PROP_COMMIT);++ join.on(builder.and(+ builder.equal(mergeCommit, buildCommit),+ builder.or(+ builder.equal(status, Build.Status.FAILED),+ builder.equal(status, Build.Status.CANCELLED),+ builder.equal(status, Build.Status.TIMED_OUT))));return join.isNotNull();}@Overridepublic boolean matches(PullRequest request) {- for (PullRequestVerification build: request.getVerifications()) {- if (build.getBuild().getStatus() == Build.Status.FAILED- || build.getBuild().getStatus() == Build.Status.CANCELLED- || build.getBuild().getStatus() == Build.Status.TIMED_OUT) {+ for (Build build: request.getCurrentBuilds()) {+ if (build.getStatus() == Build.Status.FAILED+ || build.getStatus() == Build.Status.CANCELLED+ || build.getStatus() == Build.Status.TIMED_OUT) {return true;}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex 9963a7c207..d748baad3d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java@@ -20,11 +20,8 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);- Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);- join.on(builder.and(- builder.isNotNull(userPath),- builder.isNull(approvedPath)));+ join.on(builder.isNull(approvedPath));return join.isNotNull();}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.javaindex 1487399509..cf2bf31ed6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestVerification;+import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.search.entity.EntityCriteria;public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {@@ -18,24 +18,28 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- Join<?, ?> join = root- .join(PullRequest.PROP_VERIFICATIONS, JoinType.LEFT)- .join(PullRequestVerification.PROP_BUILD, JoinType.INNER);- Path<?> status = join.get(Build.STATUS);- join.on(builder.or(- builder.equal(status, Build.Status.RUNNING),- builder.equal(status, Build.Status.PENDING),- builder.equal(status, Build.Status.WAITING)));+ Join<?, ?> join = root.join(PullRequest.PROP_BUILDS, JoinType.LEFT);+ Path<?> status = join.get(Build.PROP_STATUS);++ Path<?> mergeCommit = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);+ Path<?> buildCommit = join.get(Build.PROP_COMMIT);++ join.on(builder.and(+ builder.equal(mergeCommit, buildCommit),+ builder.or(+ builder.equal(status, Build.Status.RUNNING),+ builder.equal(status, Build.Status.PENDING),+ builder.equal(status, Build.Status.WAITING))));return join.isNotNull();}@Overridepublic boolean matches(PullRequest request) {- for (PullRequestVerification build: request.getVerifications()) {- if (build.getBuild().getStatus() == Build.Status.RUNNING- || build.getBuild().getStatus() == Build.Status.PENDING- || build.getBuild().getStatus() == Build.Status.WAITING) {+ for (Build build: request.getBuilds()) {+ if (build.getStatus() == Build.Status.RUNNING+ || build.getStatus() == Build.Status.PENDING+ || build.getStatus() == Build.Status.WAITING) {return true;}}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java b/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.javaindex 699a4a0c51..e249ececaa 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java@@ -86,6 +86,7 @@ public class ProjectAndRevision implements Serializable {return getCommit(true);}+ @Nullablepublic String getObjectName(boolean mustExist) {ObjectId objectId = getObjectId(mustExist);return objectId!=null?objectId.name():null;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 38fd607de4..ceaea8b106 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@@ -48,8 +48,7 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {if ("criteriaField".equals(spec.getLabel())) {List<String> fields = Lists.newArrayList(- Build.NAME_LOG,- Build.NAME_ERROR_MESSAGE);+ Build.NAME_LOG, Build.NAME_ERROR_MESSAGE, Build.NAME_PULL_REQUEST);JobAware jobAware = getComponent().findParent(JobAware.class);Job job = jobAware.getJob();fields.addAll(job.getParamSpecMap().keySet());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 139e5a1484..fcaa068f89 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,16 +19,16 @@ 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.OneDev;import io.onedev.server.GeneralException;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.BuildQueryLexer;import io.onedev.server.search.entity.build.BuildQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.DateUtils;-import io.onedev.server.model.Build;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -130,6 +130,18 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestBuildVersions(project, matchWith);elsereturn null;+ } else if (fieldName.equals(Build.NAME_BRANCH)) {+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestBranches(project, matchWith);+ else+ return null;+ } else if (fieldName.equals(Build.NAME_TAG)) {+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestTags(project, matchWith);+ else+ return null;+ } else if (fieldName.equals(Build.NAME_PULL_REQUEST)) {+ return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else {return null;}@@ -193,11 +205,12 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(Build.NAME_PROJECT)- || fieldName.equals(Build.NAME_VERSION)+ if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_VERSION)|| fieldName.equals(Build.NAME_JOB)) {hints.add("Use '*' for wildcard match");hints.add("Use '\\' to escape quotes");+ } else if (fieldName.equals(Build.NAME_BRANCH) || fieldName.equals(Build.NAME_TAG)) {+ hints.add("Use '*' for wildcard match");}}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex f4bf3193cc..0d9b81399e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -48,6 +48,9 @@<a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a><a wicket:id="copyHash" class="btn btn-xs btn-icon btn-light btn-hover-primary"><wicket:svg href="copy" class="icon"></wicket:svg></a></wicket:fragment>+ <wicket:fragment wicket:id="pullRequestFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment><wicket:fragment wicket:id="listParamsFrag"><div class="build-list-params"><form wicket:id="form">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 743297acd3..87bd12dd61 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@@ -29,6 +29,7 @@ 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.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;@@ -87,6 +88,7 @@ import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;@@ -567,6 +569,26 @@ public abstract class BuildListPanel extends Panel {}});+ columns.add(new AbstractColumn<Build, Void>(Model.of("Branch/Tag")) {++ @Override+ public String getCssClass() {+ return "branch-tag d-none d-lg-table-cell";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();+ if (build.getBranch() != null)+ cellItem.add(new Label(componentId, build.getBranch()));+ else if (build.getTag() != null)+ cellItem.add(new Label(componentId, build.getTag()));+ else+ cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));+ }+ });+columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_COMMIT)) {@Override@@ -594,6 +616,34 @@ public abstract class BuildListPanel extends Panel {}});+ columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_PULL_REQUEST)) {++ @Override+ public String getCssClass() {+ return "pull-request d-none d-xl-table-cell";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();+ if (build.getRequest() != null) {+ if (SecurityUtils.canReadCode(build.getProject())) {+ Fragment fragment = new Fragment(componentId, "pullRequestFrag", BuildListPanel.this);+ Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,+ PullRequestActivitiesPage.paramsOf(build.getRequest()));+ link.add(new Label("label", "#" + build.getRequest().getNumber()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "#" + build.getRequest().getNumber()));+ }+ } else {+ cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));+ }+ }+ });+for (String paramName: getListParams()) {columns.add(new AbstractColumn<Build, Void>(Model.of(paramName)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.htmlindex 1f29848c4d..ece6816a55 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html@@ -7,6 +7,22 @@<a wicket:id="commit"><span wicket:id="label"></span></a></div></div>+ <wicket:enclosure child="branch">+ <div>+ <div class="name">Branch</div>+ <div class="value">+ <span wicket:id="branch"></span>+ </div>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="tag">+ <div>+ <div class="name">Tag</div>+ <div class="value">+ <span wicket:id="tag"></span>+ </div>+ </div>+ </wicket:enclosure><div><div class="name">Job</div><div class="value">@@ -23,7 +39,7 @@<div class="name">Submitted At</div><div class="value"><span wicket:id="submitDate"></span></div></div>- <wicket:enclosure>+ <wicket:enclosure child="submitReason"><div><div class="name">Submit Reason</div><div class="value"><span wicket:id="submitReason"></span></div>@@ -56,17 +72,13 @@</div></wicket:enclosure></div>- <wicket:enclosure child="pullRequests">- <div class="pull-requests">- <div class="font-weight-bolder mb-3">Verifying Pull Requests</div>- <div class="body">- <div wicket:id="pullRequests" class="pull-request d-flex align-items-center mb-3">- <a wicket:id="title" class="title mr-4"><span wicket:id="label"></span></a>- <div wicket:id="status" class="ml-auto status"></div>- </div>+ <div wicket:id="pullRequest" class="pull-request">+ <div class="font-weight-bolder mb-3">Pull Request</div>+ <div class="body d-flex align-items-center">+ <a wicket:id="title" class="title mr-4"><span wicket:id="label"></span></a>+ <div wicket:id="status" class="ml-auto status"></div></div></div>- </wicket:enclosure><wicket:enclosure child="params"><div class="params properties"><div wicket:id="params">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 c560408389..700ca88d6b 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@@ -4,9 +4,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;-import io.onedev.server.web.component.entity.reference.ReferencePanel;import org.apache.wicket.Component;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.ComponentTag;@@ -19,6 +17,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -36,6 +35,7 @@ import io.onedev.server.util.Referenceable;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.WebSocketObserver;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;@@ -73,7 +73,22 @@ public abstract class BuildSidePanel extends Panel {};general.setOutputMarkupId(true);+add(general);++ if (getBuild().getRefName() != null) {+ String branch = GitUtils.ref2branch(getBuild().getRefName());+ general.add(new Label("branch", branch).setVisible(branch != null));+ } else {+ general.add(new WebMarkupContainer("branch").setVisible(false));+ }++ if (getBuild().getRefName() != null) {+ String tag = GitUtils.ref2tag(getBuild().getRefName());+ general.add(new Label("tag", tag).setVisible(tag != null));+ } else {+ general.add(new WebMarkupContainer("tag").setVisible(false));+ }CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = getBuild().getCommitHash();@@ -246,36 +261,40 @@ public abstract class BuildSidePanel extends Panel {dependencesContainer.setVisible(dependentsLink.isVisible() || dependenciesLink.isVisible());- add(new ListView<PullRequest>("pullRequests", new LoadableDetachableModel<List<PullRequest>>() {+ add(new WebMarkupContainer("pullRequest") {@Override- protected List<PullRequest> load() {- return getBuild().getVerifications()- .stream()- .map(it->it.getRequest())- .collect(Collectors.toList());- }-- }) {+ protected void onInitialize() {+ super.onInitialize();- @Override- protected void populateItem(ListItem<PullRequest> item) {- PullRequest request = item.getModelObject();-- Link<Void> link = new ViewStateAwarePageLink<Void>("title",- PullRequestActivitiesPage.class,- PullRequestActivitiesPage.paramsOf(request));- link.add(new Label("label", "#" + request.getNumber() + " " + request.getTitle()));- item.add(link);- item.add(new RequestStatusLabel("status", item.getModel()));+ PullRequest request = getBuild().getRequest();++ if (request != null) {+ Link<Void> link = new ViewStateAwarePageLink<Void>("title",+ PullRequestActivitiesPage.class,+ PullRequestActivitiesPage.paramsOf(request));+ link.add(new Label("label", "#" + request.getNumber() + " " + request.getTitle()));+ add(link);+ add(new RequestStatusLabel("status", new AbstractReadOnlyModel<PullRequest>() {++ @Override+ public PullRequest getObject() {+ return getBuild().getRequest();+ }++ }));+ } else {+ add(new WebMarkupContainer("title").add(new WebMarkupContainer("label")));+ add(new WebMarkupContainer("status"));+ }}@Overrideprotected void onConfigure() {- setVisible(!getModelObject().isEmpty() && SecurityUtils.canReadCode(getProject()));+ setVisible(getBuild().getRequest() != null && SecurityUtils.canReadCode(getProject()));}- });+ });add(new ReferencePanel("reference") {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 6d2d4a5550..2f0fa42b83 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@@ -60,6 +60,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.search.commit.CommitCriteria;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.MessageCriteria;@@ -637,7 +638,7 @@ public abstract class CommitListPanel extends Panel {item.add(new CopyToClipboardLink("copyHash", Model.of(commit.name())));getCommitIdsToQueryStatus().add(commit.copy());- CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy()) {+ CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy(), null) {@Overrideprotected String getCssClasses() {@@ -648,6 +649,11 @@ public abstract class CommitListPanel extends Panel {protected Project getProject() {return CommitListPanel.this.getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }};item.add(commitStatus);diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex 79c14691f3..94dcf8c371 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -3,6 +3,7 @@ package io.onedev.server.web.component.commit.status;import java.util.ArrayList;import java.util.Collection;import java.util.List;+import java.util.UUID;import javax.annotation.Nullable;@@ -25,6 +26,7 @@ import io.onedev.server.buildspec.job.Job;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.job.joblist.JobListPanel;@@ -37,6 +39,8 @@ public abstract class CommitStatusPanel extends Panel {private final ObjectId commitId;+ private final String refName;+private final IModel<List<Job>> jobsModel = new LoadableDetachableModel<List<Job>>() {@Override@@ -64,12 +68,16 @@ public abstract class CommitStatusPanel extends Panel {};- public CommitStatusPanel(String id, ObjectId commitId) {+ public CommitStatusPanel(String id, ObjectId commitId, @Nullable String refName) {super(id);this.commitId = commitId;+ this.refName = refName;}protected abstract Project getProject();++ @Nullable+ protected abstract PullRequest getPullRequest();@Overrideprotected void onInitialize() {@@ -79,7 +87,8 @@ public abstract class CommitStatusPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new JobListPanel(id, commitId, jobsModel.getObject()) {+ return new JobListPanel(id, commitId, UUID.randomUUID().toString(),+ refName, jobsModel.getObject()) {@Overrideprotected Project getProject() {@@ -90,6 +99,11 @@ public abstract class CommitStatusPanel extends Panel {protected void onRunJob(AjaxRequestTarget target) {dropdown.close();}++ @Override+ protected PullRequest getPullRequest() {+ return CommitStatusPanel.this.getPullRequest();+ }};}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.javaindex 7a5a411c6a..e84fb2b31d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java@@ -22,6 +22,7 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.web.component.commit.message.CommitMessagePanel;import io.onedev.server.web.component.commit.status.CommitStatusPanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;@@ -75,7 +76,7 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {item.add(new ContributorPanel("contribution", commit.getAuthorIdent(), commit.getCommitterIdent()));- CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy()) {+ CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy(), null) {@Overrideprotected String getCssClasses() {@@ -86,6 +87,11 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {protected Project getProject() {return getIssue().getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }};item.add(commitStatus);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 7e95c89137..1834cd6fad 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@@ -374,10 +374,10 @@ public abstract class IssueListPanel extends Panel {setResponsePage(NewIssuePage.class, NewIssuePage.paramsOf(project));}- };+ }.add(AttributeAppender.append("class", "no-current"));}- }.add(AttributeAppender.append("class", "no-current")));+ });} else {add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.htmlnew file mode 100644index 0000000000..b3e3e980fb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.html@@ -0,0 +1,27 @@+<wicket:panel>+ <form wicket:id="form" class="job-option-edit">+ <div class="modal-header">+ <h5 class="modal-title">Specify Build Options</h5>+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>+ </div>+ <div class="modal-body">+ <wicket:enclosure child="refNames">+ <div class="form-group">+ <label class="control-label">Build On Behalf Of</label>+ <div class="d-flex flex-wrap mb-3">+ <label wicket:id="refNames" class="checkbox flex-shrink-0 mr-3 mb-2">+ <input wicket:id="check" type="checkbox"> <wicket:container wicket:id="label"></wicket:container>+ </label>+ <div class="form-text text-muted">For each selected branch/tag, a separate build will be+ generated with branch/tag set to corresponding value</div>+ </div>+ </div>+ </wicket:enclosure>+ <div wicket:id="paramEditor"></div>+ </div>+ <div class="modal-footer">+ <button wicket:id="ok" class="btn btn-primary">Ok</button>+ <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.javanew file mode 100644index 0000000000..8e9e06edc5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java@@ -0,0 +1,131 @@+package io.onedev.server.web.component.job;++import java.io.Serializable;+import java.util.Collection;+import java.util.HashSet;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.git.GitUtils;+import io.onedev.server.web.editable.BeanContext;++@SuppressWarnings("serial")+abstract class BuildOptionContentPanel extends Panel {++ private final List<String> refNames;++ private final Serializable paramBean;++ private final Collection<String> selectedRefNames = new HashSet<>();++ public BuildOptionContentPanel(String id, List<String> refNames, Serializable paramBean) {+ super(id);+ this.refNames = refNames;+ this.paramBean = paramBean;++ if (refNames.size() == 1)+ selectedRefNames.addAll(refNames);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };+ form.setOutputMarkupId(true);++ form.add(new ListView<String>("refNames", refNames) {++ @Override+ protected void populateItem(ListItem<String> item) {+ String refName = item.getModelObject();+ item.add(new CheckBox("check", new IModel<Boolean>() {++ @Override+ public void detach() {+ }++ @Override+ public Boolean getObject() {+ return selectedRefNames.contains(refName);+ }++ @Override+ public void setObject(Boolean object) {+ if (object)+ selectedRefNames.add(refName);+ else+ selectedRefNames.remove(refName);+ }++ }));++ String branch = GitUtils.ref2branch(refName);+ if (branch != null)+ item.add(new Label("label", branch));+ else+ item.add(new Label("label", GitUtils.ref2tag(refName)));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(refNames.size() > 1);+ }++ });++ form.add(BeanContext.edit("paramEditor", paramBean));++ form.add(new AjaxButton("ok") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ onSave(target, selectedRefNames, paramBean);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ BuildOptionContentPanel.this.onCancel(target);+ }++ });+ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ BuildOptionContentPanel.this.onCancel(target);+ }++ });+ add(form);+ }++ protected abstract void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,+ Serializable populatedParamBean);++ protected abstract void onCancel(AjaxRequestTarget target);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.javanew file mode 100644index 0000000000..a0904fc011--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java@@ -0,0 +1,53 @@+package io.onedev.server.web.component.job;++import java.io.Serializable;+import java.util.Collection;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.util.script.identity.ScriptIdentityAware;+import io.onedev.server.web.component.modal.ModalPanel;++@SuppressWarnings("serial")+public abstract class BuildOptionModalPanel extends ModalPanel+ implements InputContext, ScriptIdentityAware {++ private final List<String> refNames;++ private final Serializable paramBean;++ public BuildOptionModalPanel(AjaxRequestTarget target, List<String> refNames, Serializable paramBean) {+ super(target);+ this.refNames = refNames;+ this.paramBean = paramBean;+ }++ @Override+ protected Component newContent(String id) {+ return new BuildOptionContentPanel(id, refNames, paramBean) {++ @Override+ protected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,+ Serializable populatedParamBean) {+ BuildOptionModalPanel.this.onSave(target, selectedRefNames, populatedParamBean);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close();+ BuildOptionModalPanel.this.onCancel(target);+ }++ };+ }++ protected abstract void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,+ Serializable populatedParamBean);++ protected void onCancel(AjaxRequestTarget target) {+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex f2af4ea87b..60123133f2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -2,15 +2,21 @@ package io.onedev.server.web.component.job;import java.io.Serializable;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;+import java.util.stream.Collectors;++import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;@@ -19,40 +25,68 @@ import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.buildspec.job.SubmitReason;import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.git.RefInfo;+import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;-import io.onedev.server.util.script.identity.ScriptIdentityAware;-import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;@SuppressWarnings("serial")public abstract class RunJobLink extends AjaxLink<Void> {+ private final String refName;+private final ObjectId commitId;private final String jobName;- public RunJobLink(String componentId, ObjectId commitId, String jobName) {+ private final String triggerId;++ public RunJobLink(String componentId, ObjectId commitId, String jobName,+ String triggerId, @Nullable String refName) {super(componentId);this.commitId = commitId;this.jobName = jobName;+ this.refName = refName;+ this.triggerId = triggerId;}protected abstract Project getProject();+ @Nullable+ protected abstract PullRequest getPullRequest();+@Overridepublic void onClick(AjaxRequestTarget target) {BuildSpec buildSpec = Preconditions.checkNotNull(getProject().getBuildSpec(commitId));+ Collection<ObjectId> descendants = OneDev.getInstance(CommitInfoManager.class)+ .getDescendants(getProject(), Sets.newHashSet(commitId));+ descendants.add(commitId);++ List<RefInfo> refs = new ArrayList<>();+ refs.addAll(getProject().getBranchRefInfos());+ refs.addAll(getProject().getTagRefInfos());++ List<String> refNames;++ if (refName != null) {+ refNames = Lists.newArrayList(refName);+ } else {+ refNames = refs.stream()+ .filter(it->descendants.contains(it.getPeeledObj()))+ .map(it->it.getRef().getName())+ .collect(Collectors.toList());+ }+Job job = Preconditions.checkNotNull(buildSpec.getJobMap().get(jobName));- if (!job.getParamSpecs().isEmpty()) {+ if (refNames.size() > 1 || !job.getParamSpecs().isEmpty()) {Serializable paramBean;try {paramBean = ParamSupply.defineBeanClass(job.getParamSpecs()).newInstance();@@ -60,33 +94,42 @@ public abstract class RunJobLink extends AjaxLink<Void> {throw new RuntimeException(e);}- new ParamEditModalPanel(target, paramBean) {+ new BuildOptionModalPanel(target, refNames, paramBean) {@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,+ Serializable populatedParamBean) {Map<String, List<String>> paramMap = ParamSupply.getParamMap(- job, bean, job.getParamSpecMap().keySet());- SubmitReason reason = new SubmitReason() {-- @Override- public String getUpdatedRef() {- return null;- }-- @Override- public PullRequest getPullRequest() {- return null;- }-- @Override- public String getDescription() {- return "Submitted manually";- }-- };- Build build = OneDev.getInstance(JobManager.class).submit(getProject(), commitId,- job.getName(), paramMap, reason);- setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));+ job, populatedParamBean, job.getParamSpecMap().keySet());+ List<Build> builds = new ArrayList<>();+ if (selectedRefNames.isEmpty())+ selectedRefNames.add(null);+ for (String refName: selectedRefNames) {+ SubmitReason reason = new SubmitReason() {++ @Override+ public String getRefName() {+ return refName;+ }++ @Override+ public PullRequest getPullRequest() {+ return RunJobLink.this.getPullRequest();+ }++ @Override+ public String getDescription() {+ return "Submitted manually";+ }++ };+ builds.add(getJobManager().submit(getProject(), commitId, job.getName(),+ triggerId, paramMap, reason));+ }+ if (builds.size() == 1)+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));+ else+ close();}@Override@@ -109,13 +152,16 @@ public abstract class RunJobLink extends AjaxLink<Void> {SubmitReason reason = new SubmitReason() {@Override- public String getUpdatedRef() {- return null;+ public String getRefName() {+ if (refNames.isEmpty())+ return null;+ else+ return refNames.iterator().next();}@Overridepublic PullRequest getPullRequest() {- return null;+ return RunJobLink.this.getPullRequest();}@Override@@ -124,24 +170,20 @@ public abstract class RunJobLink extends AjaxLink<Void> {}};- Build build = OneDev.getInstance(JobManager.class).submit(getProject(), commitId,- job.getName(), new HashMap<>(), reason);+ Build build = getJobManager().submit(getProject(), commitId, job.getName(),+ triggerId, new HashMap<>(), reason);setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build));}}++ private JobManager getJobManager() {+ return OneDev.getInstance(JobManager.class);+ }@Overrideprotected void onConfigure() {super.onConfigure();setVisible(SecurityUtils.canRunJob(getProject(), jobName));}-- private abstract class ParamEditModalPanel extends BeanEditModalPanel implements InputContext, ScriptIdentityAware {-- public ParamEditModalPanel(AjaxRequestTarget target, Serializable bean) {- super(target, bean);- }-- }}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.javaindex fc44ca9042..f71e208597 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java@@ -5,6 +5,8 @@ import java.util.Collection;import java.util.Comparator;import java.util.List;+import javax.annotation.Nullable;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.head.CssHeaderItem;@@ -27,6 +29,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;@@ -39,6 +42,10 @@ public abstract class JobListPanel extends Panel {private final ObjectId commitId;+ private final String triggerId;++ private final String refName;+private final List<Job> jobs;private final IModel<List<Job>> accessibleJobsModel = new LoadableDetachableModel<List<Job>>() {@@ -55,14 +62,20 @@ public abstract class JobListPanel extends Panel {};- public JobListPanel(String id, ObjectId commitId, List<Job> jobs) {+ public JobListPanel(String id, ObjectId commitId, String triggerId,+ @Nullable String refName, List<Job> jobs) {super(id);this.commitId = commitId;+ this.triggerId = triggerId;+ this.refName = refName;this.jobs = jobs;}protected abstract Project getProject();+ @Nullable+ protected abstract PullRequest getPullRequest();+protected abstract void onRunJob(AjaxRequestTarget target);@Override@@ -96,7 +109,7 @@ public abstract class JobListPanel extends Panel {defLink.add(new Label("label", job.getName()));jobItem.add(defLink);- jobItem.add(new RunJobLink("run", commitId, job.getName()) {+ jobItem.add(new RunJobLink("run", commitId, job.getName(), triggerId, refName) {@Overridepublic void onClick(AjaxRequestTarget target) {@@ -108,6 +121,11 @@ public abstract class JobListPanel extends Panel {protected Project getProject() {return JobListPanel.this.getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return JobListPanel.this.getPullRequest();+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.javaindex 3086ac28c3..1da086aed0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java@@ -1,9 +1,8 @@package io.onedev.server.web.component.pullrequest.build;-import static io.onedev.server.model.Build.NAME_JOB;+import static io.onedev.server.model.Build.*;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;-import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;import static io.onedev.server.util.criteria.Criteria.quote;@@ -36,7 +35,7 @@ import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestVerification;+import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;@@ -60,23 +59,25 @@ public abstract class PullRequestJobsPanel extends Panel {@Overrideprotected List<JobBuildInfo> load() {+ List<JobBuildInfo> listOfJobBuildInfo = new ArrayList<>();PullRequest request = getPullRequest();- Map<String, List<PullRequestVerification>> map = new HashMap<>();- for (PullRequestVerification verification: request.getVerifications()) {- String jobName = verification.getBuild().getJobName();- List<PullRequestVerification> list = map.get(jobName);+ Map<String, List<Build>> map = new HashMap<>();+ for (Build build: request.getCurrentBuilds()) {+ String jobName = build.getJobName();+ List<Build> list = map.get(jobName);if (list == null) {list = new ArrayList<>();map.put(jobName, list);}- list.add(verification);+ list.add(build);}- List<JobBuildInfo> listOfJobBuildInfo = new ArrayList<>();- for (Map.Entry<String, List<PullRequestVerification>> entry: map.entrySet()) {- if (SecurityUtils.canAccess(getPullRequest().getTargetProject(), entry.getKey())) {- List<Build> builds = entry.getValue().stream().map(it->it.getBuild()).collect(Collectors.toList());+ for (Map.Entry<String, List<Build>> entry: map.entrySet()) {+ String jobName = entry.getKey();+ if (SecurityUtils.canAccess(getPullRequest().getTargetProject(), jobName)) {+ List<Build> builds = new ArrayList<>(entry.getValue());Collections.sort(builds);- listOfJobBuildInfo.add(new JobBuildInfo(entry.getKey(), entry.getValue().iterator().next().isRequired(), builds));+ boolean required = getPullRequest().getRequiredJobs().contains(jobName);+ listOfJobBuildInfo.add(new JobBuildInfo(jobName, required, builds));}}Collections.sort(listOfJobBuildInfo, new Comparator<JobBuildInfo>() {@@ -117,12 +118,19 @@ public abstract class PullRequestJobsPanel extends Panel {@Overrideprotected Component newListLink(String componentId) {- String query = ""- + getRuleName(AssociatedWithPullRequest) + " " + quote("#" + getPullRequest().getNumber())- + " " + getRuleName(And) + " "- + quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);- return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getPullRequest().getTargetProject(), query, 0));+ MergePreview mergePreview = getPullRequest().getMergePreview();+ if (mergePreview != null && mergePreview.getMergeCommitHash() != null) {+ String query = ""+ + quote(NAME_PULL_REQUEST) + " " + getRuleName(Is) + " " + quote("#" + getPullRequest().getNumber())+ + " " + getRuleName(And) + " "+ + quote(NAME_COMMIT) + " " + getRuleName(Is) + " " + quote(mergePreview.getMergeCommitHash())+ + " " + getRuleName(And) + " "+ + quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);+ return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,+ ProjectBuildsPage.paramsOf(getPullRequest().getTargetProject(), query, 0));+ } else {+ return super.newListLink(componentId);+ }}};@@ -150,7 +158,7 @@ public abstract class PullRequestJobsPanel extends Panel {item.add(link);if (jobBuilds.isRequired())- link.add(new Label("name", HtmlEscape.escapeHtml5(jobName) + " ∗").setEscapeModelStrings(false));+ link.add(new Label("name", HtmlEscape.escapeHtml5(jobName) + " <span class='text-danger'>*</span>").setEscapeModelStrings(false));elselink.add(new Label("name", jobName));item.add(link);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex bb085149f6..7c9924a2e5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -738,12 +738,17 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sprivate void newCommitStatus(@Nullable AjaxRequestTarget target) {Component commitStatus;if (resolvedRevision != null) {- commitStatus = new CommitStatusPanel("buildStatus", resolvedRevision) {+ commitStatus = new CommitStatusPanel("buildStatus", resolvedRevision, getRefName()) {@Overrideprotected Project getProject() {return ProjectBlobPage.this.getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return ProjectBlobPage.this.getPullRequest();+ }};} else {@@ -1157,6 +1162,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sreturn state.blobIdent.revision == null || getProject().getBranchRef(state.blobIdent.revision) != null;}+ @Override+ public String getRefName() {+ if (state.blobIdent.revision != null)+ return getProject().getRefName(state.blobIdent.revision);+ else+ return null;+ }+@Overridepublic RevCommit getCommit() {if (resolvedRevision != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex b7115ae26f..0f29886ec0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -74,6 +74,9 @@ public interface BlobRenderContext extends Serializable {boolean isOnBranch();+ @Nullable+ String getRefName();+void pushState(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position);void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex 62cd6e7b7a..19e18ce268 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.blob.render.renderers.buildspec;+import java.util.UUID;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.behavior.AttributeAppender;@@ -20,6 +22,7 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.git.Blob;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.job.RunJobLink;@@ -56,13 +59,19 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());nav.add(new Label("jobName", job.getName()));nav.add(AttributeAppender.append("data-name", job.getName()));- nav.add(new RunJobLink("run", context.getCommit().copy(), job.getName()) {+ nav.add(new RunJobLink("run", context.getCommit().copy(), job.getName(),+ UUID.randomUUID().toString(), getContext().getRefName()) {@Overrideprotected Project getProject() {return context.getProject();}+ @Override+ protected PullRequest getPullRequest() {+ return context.getPullRequest();+ }+});navsView.add(nav);jobsView.add(BeanContext.view(jobsView.newChildId(), job));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 5c9bcc860f..727003b619 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -503,12 +503,17 @@ public class ProjectBranchesPage extends ProjectPage {link.add(new Label("name", branch));fragment.add(link);- fragment.add(new CommitStatusPanel("buildStatus", ref.getRef().getObjectId()) {+ fragment.add(new CommitStatusPanel("buildStatus", ref.getRef().getObjectId(), ref.getRef().getName()) {@Overrideprotected Project getProject() {return ProjectBranchesPage.this.getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex e86e8318ab..eac7511070 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -46,6 +46,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;@@ -313,7 +314,8 @@ public abstract class BuildDetailPage extends ProjectPage@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new JobListPanel(id, getBuild().getCommitId(), downstreamJobsModel.getObject()) {+ return new JobListPanel(id, getBuild().getCommitId(), getBuild().getTriggerId(),+ getBuild().getRefName(), downstreamJobsModel.getObject()) {@Overrideprotected Project getProject() {@@ -324,6 +326,11 @@ public abstract class BuildDetailPage extends ProjectPageprotected void onRunJob(AjaxRequestTarget target) {dropdown.close();}++ @Override+ protected PullRequest getPullRequest() {+ return getBuild().getRequest();+ }};}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 0738f4e42e..b252d68b6c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -7,6 +7,7 @@ import java.util.Comparator;import java.util.HashMap;import java.util.List;import java.util.Map;+import java.util.UUID;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -51,6 +52,7 @@ import io.onedev.server.buildspec.job.Job;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;@@ -105,6 +107,8 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {private static final String PARAM_MARK = "mark";+ private static final String PARAM_REQUEST = "request";+private State state;private ObjectId resolvedRevision;@@ -150,6 +154,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {state.pathFilter = params.get(PARAM_PATH_FILTER).toString();state.blameFile = params.get(PARAM_BLAME_FILE).toString();state.commentId = params.get(PARAM_COMMENT).toOptionalLong();+ state.requestId = params.get(PARAM_REQUEST).toOptionalLong();state.mark = Mark.fromString(params.get(PARAM_MARK).toString());resolvedRevision = getProject().getRevCommit(state.revision, true).copy();@@ -391,12 +396,20 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {detailLink.setOutputMarkupId(true);item.add(detailLink);- item.add(new RunJobLink("run", commitId, job.getName()) {+ item.add(new RunJobLink("run", commitId, job.getName(), UUID.randomUUID().toString(), null) {@Overrideprotected Project getProject() {return CommitDetailPage.this.getProject();}++ @Override+ protected PullRequest getPullRequest() {+ if (state.requestId != null)+ return OneDev.getInstance(PullRequestManager.class).load(state.requestId);+ else+ return null;+ }});}@@ -590,6 +603,8 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {params.set(PARAM_BLAME_FILE, state.blameFile);if (state.commentId != null)params.set(PARAM_COMMENT, state.commentId);+ if (state.requestId != null)+ params.set(PARAM_REQUEST, state.requestId);if (state.mark != null)params.set(PARAM_MARK, state.mark.toString());return params;@@ -626,6 +641,9 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {@Nullablepublic Long commentId;+ @Nullable+ public Long requestId;+public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 520a3176db..070363c0b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -230,7 +230,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {update.setHeadCommitHash(source.getObjectName());update.setTargetHeadCommitHash(request.getTarget().getObjectName());- OneDev.getInstance(PullRequestManager.class).checkQuality(request, Lists.newArrayList());+ OneDev.getInstance(PullRequestManager.class).checkReviews(request, Lists.newArrayList());if (SecurityUtils.canWriteCode(target.getProject())) {PullRequestAssignment assignment = new PullRequestAssignment();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 0de96f4378..1f005947a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -76,6 +76,11 @@<div wicket:id="unfinishedBuilds" class="unfinished-builds text-warning"><wicket:svg href="clock-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">required builds</a> are not finished yet</div>+ <wicket:enclosure child="untriggeredJobs">+ <div class="untriggered-builds text-warning">+ <wicket:svg href="warning" class="icon"></wicket:svg> <span wicket:id="untriggeredJobs"></span>+ </div>+ </wicket:enclosure><div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers text-info"><wicket:svg href="info-circle-o" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission</div>@@ -115,7 +120,7 @@</span></div><div wicket:id="jobs" class="body"></div>- <div wicket:id="jobsHelp" class="font-size-sm text-muted form-text">Jobs marked with ∗ are required to be successful</div>+ <div wicket:id="jobsHelp" class="font-size-sm text-muted form-text">Jobs marked with <span class="text-danger">*</span> are required to be successful</div></div></wicket:enclosure><wicket:enclosure child="assignments">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex c9b6ae1984..c54b6ff1bb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -14,7 +14,6 @@ import java.util.stream.Stream;import javax.persistence.EntityNotFoundException;-import io.onedev.server.web.component.entity.reference.ReferencePanel;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.Page;@@ -60,10 +59,10 @@ import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.PullRequestVerification;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;@@ -81,6 +80,7 @@ import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.entity.nav.EntityNavPanel;+import io.onedev.server.web.component.entity.reference.ReferencePanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;@@ -545,18 +545,47 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();- Stream<PullRequestVerification> stream = getPullRequest().getVerifications().stream();+ Stream<Build> stream = getPullRequest().getCurrentBuilds().stream();setVisible(getPullRequest().isOpen() && !hasUnsuccessfulRequiredBuilds()- && stream.anyMatch(it-> it.isRequired() && !it.getBuild().isFinished()));+ && stream.anyMatch(it-> getPullRequest().getRequiredJobs().contains(it.getJobName()) && !it.isFinished()));}});++ summaryContainer.add(new Label("untriggeredJobs", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ Collection<String> requiredJobs = new ArrayList<>(getPullRequest().getRequiredJobs());+ requiredJobs.removeAll(getPullRequest().getCurrentBuilds().stream().map(it->it.getJobName()).collect(Collectors.toSet()));+ if (requiredJobs.size() > 1) {+ return "Jobs \"" + StringUtils.join(requiredJobs, ", ") + "\" are required to be successful, "+ + "however no applicable pull request trigger is defined for these jobs in build spec";+ } else if (requiredJobs.size() == 1) {+ return "Job '" + requiredJobs.iterator().next() + "' is required to be successful, "+ + "however no applicable pull request trigger is defined for this job in build spec";+ } else {+ return null;+ }+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().isOpen() && getDefaultModelObject() != null);+ }++ });+summaryContainer.add(new WebMarkupContainer("mergeableByCodeWriters") {@Overrideprotected void onConfigure() {super.onConfigure();setVisible(getPullRequest().isOpen() && !SecurityUtils.canWriteCode(getProject())+ && getPullRequest().getMergePreview() != null && getPullRequest().getMergePreview().getMergeCommitHash() != null&& getPullRequest().isAllReviewsApproved() && getPullRequest().isRequiredBuildsSuccessful());}@@ -633,8 +662,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}private boolean hasUnsuccessfulRequiredBuilds() {- return getPullRequest().getVerifications().stream().anyMatch(- it-> it.isRequired() && it.getBuild().isFinished() && !it.getBuild().isSuccessful());+ return getPullRequest().getCurrentBuilds().stream().anyMatch(+ it-> getPullRequest().getRequiredJobs().contains(it.getJobName()) && it.isFinished() && !it.isSuccessful());}private WebMarkupContainer newMoreInfoContainer() {@@ -668,8 +697,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsuper.onConfigure();boolean hasHiddenJobs = false;- for (String jobName: getPullRequest().getVerifications().stream()- .map(it->it.getBuild().getJobName()).collect(Collectors.toSet())) {+ for (String jobName: getPullRequest().getCurrentBuilds().stream()+ .map(it->it.getJobName()).collect(Collectors.toSet())) {if (!SecurityUtils.canAccess(getProject(), jobName)) {hasHiddenJobs = true;break;@@ -689,7 +718,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getPullRequest().getVerifications().isEmpty());+ setVisible(!getPullRequest().getCurrentBuilds().isEmpty());}});@@ -700,11 +729,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsuper.onConfigure();boolean hasVisibleRequiredJobs = false;- for (String jobName: getPullRequest().getVerifications().stream()- .filter(it->it.isRequired())- .map(it->it.getBuild().getJobName())- .collect(Collectors.toSet())) {- if (SecurityUtils.canAccess(getProject(), jobName)) {+ for (Build build: getPullRequest().getCurrentBuilds()) {+ if (getPullRequest().getRequiredJobs().contains(build.getJobName())+ && SecurityUtils.canAccess(getProject(), build.getJobName())) {hasVisibleRequiredJobs = true;break;}@@ -1158,11 +1185,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();MergePreview preview = request.getMergePreview();return request.isOpen()- && request.isAllReviewsApproved()- && request.isRequiredBuildsSuccessful()&& request.getCheckError() == null&& preview != null&& preview.getMergeCommitHash() != null+ && request.isAllReviewsApproved()+ && request.isRequiredBuildsSuccessful()&& SecurityUtils.canWriteCode(request.getTargetProject());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex a5d1db0e02..c841cf244b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -90,7 +90,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {});- CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy()) {+ CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy(), null) {@Overrideprotected String getCssClasses() {@@ -101,6 +101,11 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {protected Project getProject() {return getUpdate().getRequest().getTarget().getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return getUpdate().getRequest();+ }};item.add(commitStatus);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.javaindex f29aa52d91..fcdf2a3899 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java@@ -96,15 +96,21 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParamcommitState = new CommitDetailPage.State();commitState.revision = preview.getMergeCommitHash();+ commitState.requestId = getPullRequest().getId();params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);fragment.add(new ViewStateAwarePageLink<Void>("mergedCommit", CommitDetailPage.class, params));- fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMergeCommitHash())) {+ fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMergeCommitHash()), null) {@Overrideprotected Project getProject() {return MergePreviewPage.this.getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return MergePreviewPage.this.getPullRequest();+ }});fragment.add(new WebMarkupContainer("outDated") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex cada2c134e..b7f3335904 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -52,6 +52,7 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;@@ -298,12 +299,17 @@ public class ProjectTagsPage extends ProjectPage {link.add(new Label("name", tagName));fragment.add(link);- fragment.add(new CommitStatusPanel("buildStatus", ref.getPeeledObj().copy()) {+ fragment.add(new CommitStatusPanel("buildStatus", ref.getPeeledObj().copy(), ref.getRef().getName()) {@Overrideprotected Project getProject() {return ProjectTagsPage.this.getProject();}++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.cssindex e8d5320062..ddd2a5538b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css@@ -8,7 +8,7 @@}.SimplePage .main {padding: 1.75rem;- width: 400px;+ width: 450px;margin: auto;}.SimplePage.GeneralErrorPage .main {diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex dc5c395394..3ae286dc36 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.4</version>+ <version>4.0.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 773becef95..74f31c49d1 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.4</version>+ <version>4.0.5</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex 1edae99234..5a201c6cd8 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.4</version>+ <version>4.0.5</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 c46428e281..201a7e32e3 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.4</version>+ <version>4.0.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 0b13fdc95c..713c2073cf 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.4</version>+ <version>4.0.5</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 2a5f64ae30..a031795ea1 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.4</version>+ <version>4.0.5</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xmlindex 125b549b77..17eea76c61 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.4</version>+ <version>4.0.5</version></parent><properties><moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex ea110d03c8..6e29b771da 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.4</version>+ <version>4.0.5</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xmlindex 35529a55dc..61c2f13b72 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.4</version>+ <version>4.0.5</version></parent><properties><moduleClass>io.onedev.server.plugin.report.html.HtmlReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 4c6fb1aefa..e38872598a 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.4</version>+ <version>4.0.5</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 5e50adfc45..2a2b894713 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.4</version>+ <version>4.0.5</version></parent><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex de245a1552..63706b7bee 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.4</version>+ <version>4.0.5</version></parent><dependencies><dependency>