Skip to content

The Unified and Autonomous Development Platform

Job trigger to build against pull request merge preview

Robin Shen4d8cf4c905a6
diff --git a/core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java
index c8e1f63846..dea0e518f0 100644
--- a/core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java
+++ b/core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java
@@ -11,13 +11,10 @@ import org.joda.time.DateTime;
import com.google.common.collect.Lists;
import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;
-import io.onedev.server.event.pullrequest.PullRequestDeleted;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Issue;
@@ -254,19 +251,19 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implement
@Listen
public void on(IssueEvent event) {
- if (event.getUser() != null && !(event instanceof IssueDeleted))
+ if (event.getUser() != null)
visitIssue(event.getUser(), event.getIssue());
}
@Listen
public void on(CodeCommentEvent event) {
- if (event.getUser() != null && !(event instanceof CodeCommentDeleted))
+ if (event.getUser() != null)
visitCodeComment(event.getUser(), event.getComment());
}
@Listen
public void on(PullRequestEvent event) {
- if (event.getUser() != null && !(event instanceof PullRequestDeleted)) {
+ if (event.getUser() != null) {
if (!(event instanceof PullRequestCodeCommentEvent)) {
visitPullRequest(event.getUser(), event.getRequest());
} else if (!((PullRequestCodeCommentEvent) event).isDerived()) {
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
index 2342ab2628..f487632390 100644
--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
@@ -44,7 +44,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.CommitAware;
+import io.onedev.server.event.BuildCommitsAware;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.event.build.BuildQueueing;
@@ -374,9 +374,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
@Sessional
@Listen
public void on(ProjectEvent event) {
- if (event instanceof CommitAware) {
- ObjectId commitId = ((CommitAware) event).getCommitId();
- if (!commitId.equals(ObjectId.zeroId())) {
+ if (event instanceof BuildCommitsAware) {
+ for (ObjectId commitId: ((BuildCommitsAware) event).getBuildCommits()) {
try {
CISpec ciSpec = event.getProject().getCISpec(commitId);
if (ciSpec != null) {
diff --git a/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java
index 4378a635a1..1a5699c875 100644
--- a/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java
@@ -4,6 +4,7 @@ import io.onedev.commons.utils.PathUtils;
import io.onedev.server.ci.job.Job;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
+import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.web.editable.annotation.BranchPatterns;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -29,14 +30,17 @@ public class PullRequestTrigger extends JobTrigger {
@Override
public boolean matches(ProjectEvent event, Job job) {
- if (event instanceof PullRequestMergePreviewCalculated) {
+ String branch;
+ if (event instanceof PullRequestOpened) {
+ PullRequestOpened pullRequestOpened = (PullRequestOpened) event;
+ branch = pullRequestOpened.getRequest().getTargetBranch();
+ } else if (event instanceof PullRequestMergePreviewCalculated) {
PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = (PullRequestMergePreviewCalculated) event;
- if (getTargetBranches() == null
- || PathUtils.matchChildAware(getTargetBranches(), pullRequestMergePreviewCalculated.getRequest().getTargetBranch())) {
- return true;
- }
- }
- return false;
+ branch = pullRequestMergePreviewCalculated.getRequest().getTargetBranch();
+ } else {
+ branch = null;
+ }
+ return branch != null && (getTargetBranches() == null || PathUtils.matchChildAware(getTargetBranches(), branch));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 3676e98492..e822c047b9 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -78,6 +78,5 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
int count(Project targetProject, User user, EntityCriteria<PullRequest> requestCriteria);
List<PullRequest> query(Project targetProject, String term, int count);
-
- void delete(User user, PullRequest request);
+
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 3c6accf526..65a3f3ed6e 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -24,13 +24,10 @@ import org.hibernate.query.Query;
import com.google.common.base.Preconditions;
import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.build.BuildDeleted;
import io.onedev.server.event.build.BuildSubmitted;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
@@ -61,20 +58,13 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
private final StorageManager storageManager;
- private final ListenerRegistry listenerRegistry;
-
- private final UserManager userManager;
-
@Inject
public DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,
- BuildDependenceManager buildDependenceManager, ListenerRegistry listenerRegistry,
- StorageManager storageManager, UserManager userManager) {
+ BuildDependenceManager buildDependenceManager, StorageManager storageManager) {
super(dao);
this.buildParamManager = buildParamManager;
this.buildDependenceManager = buildDependenceManager;
this.storageManager = storageManager;
- this.listenerRegistry = listenerRegistry;
- this.userManager = userManager;
}
@Transactional
@@ -86,7 +76,6 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));
super.delete(build);
- listenerRegistry.post(new BuildDeleted(userManager.getCurrent(), build));
}
@Sessional
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 29b8c6e1ad..4686b58cea 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -42,7 +42,6 @@ import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.event.codecomment.CodeCommentCreated;
-import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.codecomment.CodeCommentUpdated;
import io.onedev.server.git.GitUtils;
@@ -107,8 +106,7 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- if (!(event instanceof CodeCommentDeleted))
- event.getComment().setUpdateDate(event.getDate());
+ event.getComment().setUpdateDate(event.getDate());
}
@Sessional
@@ -309,7 +307,6 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Override
public void delete(User user, CodeComment comment) {
delete(comment);
- listenerRegistry.post(new CodeCommentDeleted(user, comment));
}
@Transactional
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 4406c4da43..6b66b086e9 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -34,9 +34,7 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueQuerySettingManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.issue.IssueCommitted;
-import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.model.Issue;
@@ -83,20 +81,16 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
private final ProjectManager projectManager;
- private final UserManager userManager;
-
@Inject
public DefaultIssueManager(Dao dao, IssueFieldEntityManager issueFieldEntityManager,
IssueQuerySettingManager issueQuerySettingManager, SettingManager settingManager,
- ListenerRegistry listenerRegistry, ProjectManager projectManager,
- UserManager userManager) {
+ ListenerRegistry listenerRegistry, ProjectManager projectManager) {
super(dao);
this.issueFieldEntityManager = issueFieldEntityManager;
this.issueQuerySettingManager = issueQuerySettingManager;
this.listenerRegistry = listenerRegistry;
this.settingManager = settingManager;
this.projectManager = projectManager;
- this.userManager = userManager;
}
@Sessional
@@ -184,7 +178,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Transactional
@Listen
public void on(IssueEvent event) {
- if (!(event instanceof IssueDeleted) && !(event instanceof IssueCommitted))
+ if (!(event instanceof IssueCommitted))
event.getIssue().setUpdateDate(event.getDate());
}
@@ -480,10 +474,4 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
}
- @Override
- public void delete(Issue issue) {
- super.delete(issue);
- listenerRegistry.post(new IssueDeleted(userManager.getCurrent(), issue));
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 90cde2cbc5..3ef10cb66f 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -73,7 +73,6 @@ 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.PullRequestDeleted;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestOpened;
@@ -615,8 +614,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Transactional
@Listen
public void on(PullRequestEvent event) {
- if (!(event instanceof PullRequestDeleted) && !(event instanceof PullRequestMergePreviewCalculated)
- && !(event instanceof PullRequestBuildEvent))
+ if (!(event instanceof PullRequestMergePreviewCalculated) && !(event instanceof PullRequestBuildEvent))
event.getRequest().setUpdateDate(event.getDate());
}
@@ -632,8 +630,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
Build build = event.getBuild();
for (PullRequest request: queryOpenByCommit(build.getCommitHash())) {
listenerRegistry.post(new PullRequestBuildEvent(request, build));
- if (build.isFinished())
- checkAsync(request);
+ checkAsync(request);
}
}
@@ -642,24 +639,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
checkAsync(event.getRequest());
}
- private Runnable newCheckStatusRunnable(Long requestId, Subject subject) {
- return new Runnable() {
-
- @Override
- public void run() {
- try {
- ThreadContext.bind(subject);
- check(load(requestId));
- } catch (Exception e) {
- logger.error("Error checking pull request status", e);
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- };
- }
-
@Sessional
protected void checkAsync(PullRequest request) {
Long requestId = request.getId();
@@ -668,7 +647,21 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Override
public void run() {
- dao.getSessionManager().runAsync(newCheckStatusRunnable(requestId, subject));
+ dao.getSessionManager().runAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ ThreadContext.bind(subject);
+ check(load(requestId));
+ } catch (Exception e) {
+ logger.error("Error checking pull request status", e);
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ });
}
});
@@ -682,7 +675,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());
if (branchProtection.getJobNames() != null)
- checkBuilds(request, branchProtection.getJobNames(), branchProtection.isBuildMerges());
+ checkBuilds(request, branchProtection.getJobNames());
Set<FileProtection> checkedFileProtections = new HashSet<>();
for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {
@@ -709,17 +702,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
}
- private void checkBuilds(PullRequest request, List<String> jobNames, boolean buildMerges) {
+ private void checkBuilds(PullRequest request, List<String> jobNames) {
String commit;
- if (buildMerges) {
- MergePreview preview = request.getMergePreview();
- if (preview != null && preview.getMerged() != null)
- commit = preview.getMerged();
- else
- commit = null;
- } else {
- commit = request.getHeadCommitHash();
- }
+ MergePreview preview = request.getMergePreview();
+ if (preview != null && preview.getMerged() != null)
+ commit = preview.getMerged();
+ else
+ commit = null;
Map<String, Build> builds = new HashMap<>();
if (commit != null) {
@@ -1069,11 +1058,4 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
return requests;
}
- @Transactional
- @Override
- public void delete(User user, PullRequest request) {
- delete(request);
- listenerRegistry.post(new PullRequestDeleted(user, request));
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/BuildCommitsAware.java b/core/src/main/java/io/onedev/server/event/BuildCommitsAware.java
new file mode 100644
index 0000000000..767be0fe4b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/BuildCommitsAware.java
@@ -0,0 +1,11 @@
+package io.onedev.server.event;
+
+import java.util.Collection;
+
+import org.eclipse.jgit.lib.ObjectId;
+
+public interface BuildCommitsAware {
+
+ Collection<ObjectId> getBuildCommits();
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/CommitAware.java b/core/src/main/java/io/onedev/server/event/CommitAware.java
deleted file mode 100644
index 9299e55b55..0000000000
--- a/core/src/main/java/io/onedev/server/event/CommitAware.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.onedev.server.event;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-public interface CommitAware {
-
- ObjectId getCommitId();
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/RefUpdated.java b/core/src/main/java/io/onedev/server/event/RefUpdated.java
index 040b774adb..b908dd68ed 100644
--- a/core/src/main/java/io/onedev/server/event/RefUpdated.java
+++ b/core/src/main/java/io/onedev/server/event/RefUpdated.java
@@ -1,10 +1,14 @@
package io.onedev.server.event;
+import java.util.Collection;
+
import org.eclipse.jgit.lib.ObjectId;
+import com.google.common.collect.Sets;
+
import io.onedev.server.model.Project;
-public class RefUpdated extends ProjectEvent implements CommitAware {
+public class RefUpdated extends ProjectEvent implements BuildCommitsAware {
private final String refName;
@@ -32,8 +36,11 @@ public class RefUpdated extends ProjectEvent implements CommitAware {
}
@Override
- public ObjectId getCommitId() {
- return newCommitId;
+ public Collection<ObjectId> getBuildCommits() {
+ if (!newCommitId.equals(ObjectId.zeroId()))
+ return Sets.newHashSet(newCommitId);
+ else
+ return Sets.newHashSet();
}
}
diff --git a/core/src/main/java/io/onedev/server/event/build/BuildDeleted.java b/core/src/main/java/io/onedev/server/event/build/BuildDeleted.java
deleted file mode 100644
index 0317b4f441..0000000000
--- a/core/src/main/java/io/onedev/server/event/build/BuildDeleted.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.onedev.server.event.build;
-
-import java.util.Date;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.model.User;
-
-public class BuildDeleted extends BuildEvent {
-
- public BuildDeleted(User user, Build build) {
- super(user, new Date(), build);
- }
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
index 564289de94..4f22b696c1 100644
--- a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
+++ b/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
@@ -1,15 +1,18 @@
package io.onedev.server.event.build;
+import java.util.Collection;
import java.util.Date;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.event.CommitAware;
+import com.google.common.collect.Sets;
+
+import io.onedev.server.event.BuildCommitsAware;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
-public class BuildEvent extends ProjectEvent implements CommitAware {
+public class BuildEvent extends ProjectEvent implements BuildCommitsAware {
private Build build;
@@ -27,8 +30,8 @@ public class BuildEvent extends ProjectEvent implements CommitAware {
}
@Override
- public ObjectId getCommitId() {
- return ObjectId.fromString(build.getCommitHash());
+ public Collection<ObjectId> getBuildCommits() {
+ return Sets.newHashSet(ObjectId.fromString(build.getCommitHash()));
}
}
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentDeleted.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentDeleted.java
deleted file mode 100644
index 9e4c2e9549..0000000000
--- a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentDeleted.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.onedev.server.event.codecomment;
-
-import java.util.Date;
-
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.User;
-
-public class CodeCommentDeleted extends CodeCommentEvent {
-
- public CodeCommentDeleted(User user, CodeComment comment) {
- super(user, new Date(), comment, null);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueDeleted.java b/core/src/main/java/io/onedev/server/event/issue/IssueDeleted.java
deleted file mode 100644
index b1dc63ec8b..0000000000
--- a/core/src/main/java/io/onedev/server/event/issue/IssueDeleted.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.onedev.server.event.issue;
-
-import java.util.Date;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.User;
-
-public class IssueDeleted extends IssueEvent {
-
- public IssueDeleted(User user, Issue issue) {
- super(user, new Date(), issue);
- }
-
- @Override
- public boolean affectsBoards() {
- return true;
- }
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestDeleted.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestDeleted.java
deleted file mode 100644
index 0d44cce564..0000000000
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestDeleted.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.onedev.server.event.pullrequest;
-
-import java.util.Date;
-
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-
-public class PullRequestDeleted extends PullRequestEvent {
-
- public PullRequestDeleted(User user, PullRequest request) {
- super(user, new Date(), request);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
index 71c5987a42..4f5b9991d1 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
@@ -1,15 +1,18 @@
package io.onedev.server.event.pullrequest;
+import java.util.Collection;
import java.util.Date;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.event.CommitAware;
+import com.google.common.collect.Sets;
+
+import io.onedev.server.event.BuildCommitsAware;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-public abstract class PullRequestEvent extends ProjectEvent implements CommitAware {
+public abstract class PullRequestEvent extends ProjectEvent implements BuildCommitsAware {
private final PullRequest request;
@@ -23,8 +26,8 @@ public abstract class PullRequestEvent extends ProjectEvent implements CommitAwa
}
@Override
- public ObjectId getCommitId() {
- return request.getHeadCommit();
+ public Collection<ObjectId> getBuildCommits() {
+ return Sets.newHashSet(request.getHeadCommit().copy());
}
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
index 990818f252..863a08bbec 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
@@ -1,21 +1,24 @@
package io.onedev.server.event.pullrequest;
+import java.util.Collection;
import java.util.Date;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.event.CommitAware;
import io.onedev.server.model.PullRequest;
-public class PullRequestMergePreviewCalculated extends PullRequestEvent implements CommitAware {
+public class PullRequestMergePreviewCalculated extends PullRequestEvent {
public PullRequestMergePreviewCalculated(PullRequest request) {
super(null, new Date(), request);
}
@Override
- public ObjectId getCommitId() {
- return ObjectId.fromString(getRequest().getMergePreview().getMerged());
+ public Collection<ObjectId> getBuildCommits() {
+ Collection<ObjectId> commitIds = super.getBuildCommits();
+ if (getRequest().getMergePreview().getMerged() != null)
+ commitIds.add(ObjectId.fromString(getRequest().getMergePreview().getMerged()));
+ return commitIds;
}
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
index 941ecef3b9..95c772d8f3 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
@@ -1,7 +1,12 @@
package io.onedev.server.event.pullrequest;
+import java.util.Collection;
+
+import org.eclipse.jgit.lib.ObjectId;
+
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.pullrequest.MergePreview;
public class PullRequestOpened extends PullRequestEvent implements MarkdownAware {
@@ -14,4 +19,13 @@ public class PullRequestOpened extends PullRequestEvent implements MarkdownAware
return getRequest().getDescription();
}
+ @Override
+ public Collection<ObjectId> getBuildCommits() {
+ Collection<ObjectId> commitIds = super.getBuildCommits();
+ MergePreview preview = getRequest().getMergePreview();
+ if (preview != null && preview.getMerged() != null)
+ commitIds.add(ObjectId.fromString(preview.getMerged()));
+ return commitIds;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java
index a0562c0c34..8528cceae9 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -630,19 +630,22 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
return commits;
}
- @Nullable
public String getCommitMessage() {
- if (mergeStrategy == MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS) {
- String commitMessage = getTitle() + "\n\n";
- if (getDescription() != null)
- commitMessage += getDescription() + "\n\n";
- commitMessage += String.format("Squash pull request #%d of project '%s'",
- getNumber(), getTargetProject().getName());
- return commitMessage;
- } else if (mergeStrategy == MergeStrategy.CREATE_MERGE_COMMIT || mergeStrategy == MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY) {
- return String.format("Merge pull request #%d of project '%s'", getNumber(), getTargetProject().getName());
+ if (isNew()) {
+ return "Pull request merge preview";
} else {
- throw new IllegalStateException("Unexpected merge strategy: " + mergeStrategy);
+ if (mergeStrategy == MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS) {
+ String commitMessage = getTitle() + "\n\n";
+ if (getDescription() != null)
+ commitMessage += getDescription() + "\n\n";
+ commitMessage += String.format("Squash pull request #%d of project '%s'",
+ getNumber(), getTargetProject().getName());
+ return commitMessage;
+ } else if (mergeStrategy == MergeStrategy.CREATE_MERGE_COMMIT || mergeStrategy == MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY) {
+ return String.format("Merge pull request #%d of project '%s'", getNumber(), getTargetProject().getName());
+ } else {
+ throw new IllegalStateException("Unexpected merge strategy: " + mergeStrategy);
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
index 7edc1fedd3..6762780fb1 100644
--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
@@ -17,8 +17,8 @@ import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.util.usermatcher.Anyone;
import io.onedev.server.util.usermatcher.UserMatcher;
import io.onedev.server.web.editable.annotation.BranchPatterns;
-import io.onedev.server.web.editable.annotation.JobChoice;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.JobChoice;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@Editable
@@ -42,8 +42,6 @@ public class BranchProtection implements Serializable {
private List<String> jobNames = new ArrayList<>();
- private boolean buildMerges;
-
private List<FileProtection> fileProtections = new ArrayList<>();
public boolean isEnabled() {
@@ -127,16 +125,6 @@ public class BranchProtection implements Serializable {
this.jobNames = jobNames;
}
- @Editable(order=600, name="Build Merged Commits", description="If checked, builds of merged commits "
- + "(instead of head commits) are required when pull request is involved")
- public boolean isBuildMerges() {
- return buildMerges;
- }
-
- public void setBuildMerges(boolean buildMerges) {
- this.buildMerges = buildMerges;
- }
-
@Editable(order=700, description="Optionally specify additional users to review particular paths. For each changed file, "
+ "the first matched file protection setting will be used")
@NotNull(message="may not be empty")
diff --git a/core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
index b896e58d23..9a4671e8bf 100644
--- a/core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -10,7 +10,6 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.codecomment.CodeCommentCreated;
-import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.codecomment.CodeCommentReplied;
import io.onedev.server.model.User;
@@ -37,7 +36,7 @@ public class CodeCommentNotificationManager {
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- if (event.getRequest() == null && !(event instanceof CodeCommentDeleted)) {
+ if (event.getRequest() == null) {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
String rendered = markdownManager.render(markdown);
diff --git a/core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 36b1166613..4f9306f4fd 100644
--- a/core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -16,7 +16,6 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommented;
-import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.model.Group;
@@ -59,108 +58,106 @@ public class IssueNotificationManager {
@Transactional
@Listen
public void on(IssueEvent event) {
- if (!(event instanceof IssueDeleted)) {
- Issue issue = event.getIssue();
- User user = event.getUser();
+ Issue issue = event.getIssue();
+ User user = event.getUser();
- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
- @Override
- protected Issue getEntity() {
- return issue;
- }
+ @Override
+ protected Issue getEntity() {
+ return issue;
+ }
- @Override
- protected Collection<? extends QuerySetting<?>> getQuerySettings() {
- return issue.getProject().getIssueQuerySettings();
- }
+ @Override
+ protected Collection<? extends QuerySetting<?>> getQuerySettings() {
+ return issue.getProject().getIssueQuerySettings();
+ }
- @Override
- protected EntityQuery<Issue> parse(String queryString) {
- return IssueQuery.parse(issue.getProject(), queryString, true);
- }
+ @Override
+ protected EntityQuery<Issue> parse(String queryString) {
+ return IssueQuery.parse(issue.getProject(), queryString, true);
+ }
- @Override
- protected NamedQuery getSavedProjectQuery(String name) {
- return issue.getProject().getIssueSetting().getSavedQuery(name);
- }
-
- }.getWatches().entrySet()) {
- watch(issue, entry.getKey(), entry.getValue());
+ @Override
+ protected NamedQuery getSavedProjectQuery(String name) {
+ return issue.getProject().getIssueSetting().getSavedQuery(name);
}
- if (user != null)
- watch(issue, user, true);
-
- Collection<User> notifiedUsers = new HashSet<>();
- if (event instanceof MarkdownAware) {
- MarkdownAware markdownAware = (MarkdownAware) event;
- String markdown = markdownAware.getMarkdown();
- if (markdown != null) {
- String rendered = markdownManager.render(markdown);
- Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);
- if (!mentionUsers.isEmpty()) {
- for (User mentionedUser: mentionUsers)
- watch(issue, mentionedUser, true);
-
- String url;
- if (event instanceof IssueOpened)
- url = urlManager.urlFor(((IssueOpened)event).getIssue());
- else if (event instanceof IssueCommented)
- url = urlManager.urlFor(((IssueCommented)event).getComment());
- else if (event instanceof IssueChangeEvent)
- url = urlManager.urlFor(((IssueChangeEvent)event).getChange());
- else
- url = urlManager.urlFor(event.getIssue());
-
- String subject = String.format("You are mentioned in issue #%d - %s",
- issue.getNumber(), issue.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
-
- mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),
- subject, body);
- notifiedUsers.addAll(mentionUsers);
- }
- }
- }
+ }.getWatches().entrySet()) {
+ watch(issue, entry.getKey(), entry.getValue());
+ }
+
+ if (user != null)
+ watch(issue, user, true);
+
+ Collection<User> notifiedUsers = new HashSet<>();
+ if (event instanceof MarkdownAware) {
+ MarkdownAware markdownAware = (MarkdownAware) event;
+ String markdown = markdownAware.getMarkdown();
+ if (markdown != null) {
+ String rendered = markdownManager.render(markdown);
+ Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);
+ if (!mentionUsers.isEmpty()) {
+ for (User mentionedUser: mentionUsers)
+ watch(issue, mentionedUser, true);
- Map<String, Group> newGroups = event.getNewGroups();
- Map<String, User> newUsers = event.getNewUsers();
-
- for (Group group: newGroups.values()) {
- for (User member: group.getMembers())
- watch(issue, member, true);
- }
- String url = urlManager.urlFor(issue);
- for (Map.Entry<String, User> entry: newUsers.entrySet()) {
- String subject = String.format("You are now \"%s\" of issue #%d: %s",
- entry.getKey(), issue.getNumber(), issue.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());
- notifiedUsers.add(entry.getValue());
- }
+ String url;
+ if (event instanceof IssueOpened)
+ url = urlManager.urlFor(((IssueOpened)event).getIssue());
+ else if (event instanceof IssueCommented)
+ url = urlManager.urlFor(((IssueCommented)event).getComment());
+ else if (event instanceof IssueChangeEvent)
+ url = urlManager.urlFor(((IssueChangeEvent)event).getChange());
+ else
+ url = urlManager.urlFor(event.getIssue());
- Collection<User> usersToNotify = new HashSet<>();
-
- for (IssueWatch watch: issue.getWatches()) {
- Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
- if (watch.isWatching()
- && !userInfoManager.isNotified(watch.getUser(), watch.getIssue())
- && !watch.getUser().equals(event.getUser())
- && (visitDate == null || visitDate.getTime()<event.getDate().getTime())
- && !notifiedUsers.contains(watch.getUser())) {
- usersToNotify.add(watch.getUser());
- userInfoManager.setIssueNotified(watch.getUser(), watch.getIssue(), true);
- issueWatchManager.save(watch);
+ String subject = String.format("You are mentioned in issue #%d - %s",
+ issue.getNumber(), issue.getTitle());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+
+ mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ subject, body);
+ notifiedUsers.addAll(mentionUsers);
}
}
+ }
- if (!usersToNotify.isEmpty()) {
- String subject = String.format("New activities in issue #%d - %s", issue.getNumber(), issue.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
- }
+ Map<String, Group> newGroups = event.getNewGroups();
+ Map<String, User> newUsers = event.getNewUsers();
+
+ for (Group group: newGroups.values()) {
+ for (User member: group.getMembers())
+ watch(issue, member, true);
}
+ String url = urlManager.urlFor(issue);
+ for (Map.Entry<String, User> entry: newUsers.entrySet()) {
+ String subject = String.format("You are now \"%s\" of issue #%d: %s",
+ entry.getKey(), issue.getNumber(), issue.getTitle());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());
+ notifiedUsers.add(entry.getValue());
+ }
+
+ Collection<User> usersToNotify = new HashSet<>();
+
+ for (IssueWatch watch: issue.getWatches()) {
+ Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
+ if (watch.isWatching()
+ && !userInfoManager.isNotified(watch.getUser(), watch.getIssue())
+ && !watch.getUser().equals(event.getUser())
+ && (visitDate == null || visitDate.getTime()<event.getDate().getTime())
+ && !notifiedUsers.contains(watch.getUser())) {
+ usersToNotify.add(watch.getUser());
+ userInfoManager.setIssueNotified(watch.getUser(), watch.getIssue(), true);
+ issueWatchManager.save(watch);
+ }
+ }
+
+ if (!usersToNotify.isEmpty()) {
+ String subject = String.format("New activities in issue #%d - %s", issue.getNumber(), issue.getTitle());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
+ }
}
private void watch(Issue issue, User user, boolean watching) {
diff --git a/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 82f2ef7aa0..1e420938f5 100644
--- a/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -20,13 +20,12 @@ import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.MarkdownAware;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;
import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
-import io.onedev.server.event.pullrequest.PullRequestDeleted;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
@@ -38,9 +37,9 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;
import io.onedev.server.persistence.PersistListener;
@@ -78,150 +77,148 @@ public class PullRequestNotificationManager implements PersistListener {
@Transactional
@Listen
public void on(PullRequestEvent event) {
- if (!(event instanceof PullRequestDeleted)) {
- PullRequest request = event.getRequest();
- User user = event.getUser();
-
- for(Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {
+ PullRequest request = event.getRequest();
+ User user = event.getUser();
+
+ for(Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {
- @Override
- protected PullRequest getEntity() {
- return request;
- }
+ @Override
+ protected PullRequest getEntity() {
+ return request;
+ }
- @Override
- protected Collection<? extends QuerySetting<?>> getQuerySettings() {
- return request.getTargetProject().getPullRequestQuerySettings();
- }
+ @Override
+ protected Collection<? extends QuerySetting<?>> getQuerySettings() {
+ return request.getTargetProject().getPullRequestQuerySettings();
+ }
- @Override
- protected EntityQuery<PullRequest> parse(String queryString) {
- return PullRequestQuery.parse(request.getTargetProject(), queryString, true);
- }
+ @Override
+ protected EntityQuery<PullRequest> parse(String queryString) {
+ return PullRequestQuery.parse(request.getTargetProject(), queryString, true);
+ }
- @Override
- protected NamedQuery getSavedProjectQuery(String name) {
- return request.getTargetProject().getSavedPullRequestQuery(name);
- }
-
- }.getWatches().entrySet()) {
- watch(request, entry.getKey(), entry.getValue());
- };
-
- if (user != null)
- watch(request, user, true);
-
- Collection<User> notifiedUsers = new HashSet<>();
- if (event instanceof MarkdownAware && (!(event instanceof PullRequestCodeCommentEvent) || !((PullRequestCodeCommentEvent)event).isDerived())) {
- MarkdownAware markdownAware = (MarkdownAware) event;
- String markdown = markdownAware.getMarkdown();
- if (markdown != null) {
- String rendered = markdownManager.render(markdown);
- Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);
- if (!mentionUsers.isEmpty()) {
- for (User mentionedUser: mentionUsers)
- watch(request, mentionedUser, true);
-
- String url;
- if (event instanceof PullRequestCommentCreated)
- url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());
- else if (event instanceof PullRequestChangeEvent)
- url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());
- else if (event instanceof PullRequestCodeCommentCreated)
- url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), request);
- else if (event instanceof PullRequestCodeCommentReplied)
- url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply(), request);
- else
- url = urlManager.urlFor(request);
-
- String subject = String.format("You are mentioned in pull request #%d - %s",
- request.getNumber(), request.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
-
- mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),
- subject, body);
- notifiedUsers.addAll(mentionUsers);
- }
- }
- }
+ @Override
+ protected NamedQuery getSavedProjectQuery(String name) {
+ return request.getTargetProject().getSavedPullRequestQuery(name);
+ }
- if (event instanceof PullRequestChangeEvent) {
- PullRequestChangeEvent actionEvent = (PullRequestChangeEvent) event;
- PullRequestChangeData actionData = actionEvent.getChange().getData();
- String subject = null;
- if (actionData instanceof PullRequestApproveData) {
- subject = String.format(user.getDisplayName() + " approved pull request #%d - %s",
- request.getNumber(), request.getTitle());
- } else if (actionData instanceof PullRequestRequestedForChangesData) {
- subject = String.format(user.getDisplayName() + " requested changes for pull request #%d - %s",
+ }.getWatches().entrySet()) {
+ watch(request, entry.getKey(), entry.getValue());
+ };
+
+ if (user != null)
+ watch(request, user, true);
+
+ Collection<User> notifiedUsers = new HashSet<>();
+ if (event instanceof MarkdownAware && (!(event instanceof PullRequestCodeCommentEvent) || !((PullRequestCodeCommentEvent)event).isDerived())) {
+ MarkdownAware markdownAware = (MarkdownAware) event;
+ String markdown = markdownAware.getMarkdown();
+ if (markdown != null) {
+ String rendered = markdownManager.render(markdown);
+ Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);
+ if (!mentionUsers.isEmpty()) {
+ for (User mentionedUser: mentionUsers)
+ watch(request, mentionedUser, true);
+
+ String url;
+ if (event instanceof PullRequestCommentCreated)
+ url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());
+ else if (event instanceof PullRequestChangeEvent)
+ url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());
+ else if (event instanceof PullRequestCodeCommentCreated)
+ url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), request);
+ else if (event instanceof PullRequestCodeCommentReplied)
+ url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply(), request);
+ else
+ url = urlManager.urlFor(request);
+
+ String subject = String.format("You are mentioned in pull request #%d - %s",
request.getNumber(), request.getTitle());
- }
- if (request.getSubmitter() != null && subject != null) {
- String url = urlManager.urlFor(request);
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
- notifiedUsers.add(request.getSubmitter());
+
+ mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ subject, body);
+ notifiedUsers.addAll(mentionUsers);
}
- } else if (event instanceof PullRequestMergePreviewCalculated && request.getMergePreview() != null
- && request.getMergePreview().getMerged() == null) {
- String subject = String.format("Merge conflicts in pull request #%d - %s",
+ }
+ }
+
+ if (event instanceof PullRequestChangeEvent) {
+ PullRequestChangeEvent actionEvent = (PullRequestChangeEvent) event;
+ PullRequestChangeData actionData = actionEvent.getChange().getData();
+ String subject = null;
+ if (actionData instanceof PullRequestApproveData) {
+ subject = String.format(user.getDisplayName() + " approved pull request #%d - %s",
+ request.getNumber(), request.getTitle());
+ } else if (actionData instanceof PullRequestRequestedForChangesData) {
+ subject = String.format(user.getDisplayName() + " requested changes for pull request #%d - %s",
request.getNumber(), request.getTitle());
+ }
+ if (request.getSubmitter() != null && subject != null) {
String url = urlManager.urlFor(request);
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
notifiedUsers.add(request.getSubmitter());
- } else if (event instanceof PullRequestBuildEvent) {
- Build build = ((PullRequestBuildEvent) event).getBuild();
- if (build.getStatus() == Build.Status.IN_ERROR
- || build.getStatus() == Build.Status.FAILED
- || build.getStatus() == Build.Status.CANCELLED
- || build.getStatus() == Build.Status.TIMED_OUT) {
- String subject = String.format("Failed to build pull request #%d - %s",
- request.getNumber(), request.getTitle());
- String url = urlManager.urlFor(request);
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
- notifiedUsers.add(request.getSubmitter());
- }
}
-
- boolean notifyWatchers = false;
- if (event instanceof PullRequestChangeEvent) {
- PullRequestChangeData actionData = ((PullRequestChangeEvent) event).getChange().getData();
- if (actionData instanceof PullRequestApproveData || actionData instanceof PullRequestRequestedForChangesData
- || actionData instanceof PullRequestMergeData || actionData instanceof PullRequestDiscardData
- || actionData instanceof PullRequestReopenData) {
- notifyWatchers = true;
- }
- } else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestBuildEvent)) {
+ } else if (event instanceof PullRequestMergePreviewCalculated && request.getMergePreview() != null
+ && request.getMergePreview().getMerged() == null) {
+ String subject = String.format("Merge conflicts in pull request #%d - %s",
+ request.getNumber(), request.getTitle());
+ String url = urlManager.urlFor(request);
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
+ notifiedUsers.add(request.getSubmitter());
+ } else if (event instanceof PullRequestBuildEvent) {
+ Build build = ((PullRequestBuildEvent) event).getBuild();
+ if (build.getStatus() == Build.Status.IN_ERROR
+ || build.getStatus() == Build.Status.FAILED
+ || build.getStatus() == Build.Status.CANCELLED
+ || build.getStatus() == Build.Status.TIMED_OUT) {
+ String subject = String.format("Failed to build pull request #%d - %s",
+ request.getNumber(), request.getTitle());
+ String url = urlManager.urlFor(request);
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
+ notifiedUsers.add(request.getSubmitter());
+ }
+ }
+
+ boolean notifyWatchers = false;
+ if (event instanceof PullRequestChangeEvent) {
+ PullRequestChangeData actionData = ((PullRequestChangeEvent) event).getChange().getData();
+ if (actionData instanceof PullRequestApproveData || actionData instanceof PullRequestRequestedForChangesData
+ || actionData instanceof PullRequestMergeData || actionData instanceof PullRequestDiscardData
+ || actionData instanceof PullRequestReopenData) {
notifyWatchers = true;
}
+ } else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestBuildEvent)) {
+ notifyWatchers = true;
+ }
+
+ if (notifyWatchers) {
+ Collection<User> usersToNotify = new HashSet<>();
- if (notifyWatchers) {
- Collection<User> usersToNotify = new HashSet<>();
-
- for (PullRequestWatch watch: request.getWatches()) {
- Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
- if (watch.isWatching()
- && !userInfoManager.isNotified(watch.getUser(), watch.getRequest())
- && !watch.getUser().equals(event.getUser())
- && (visitDate == null || visitDate.getTime()<event.getDate().getTime())
- && (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))
- && !notifiedUsers.contains(watch.getUser())) {
- usersToNotify.add(watch.getUser());
- userInfoManager.setPullRequestNotified(watch.getUser(), watch.getRequest(), true);
- pullRequestWatchManager.save(watch);
- }
+ for (PullRequestWatch watch: request.getWatches()) {
+ Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
+ if (watch.isWatching()
+ && !userInfoManager.isNotified(watch.getUser(), watch.getRequest())
+ && !watch.getUser().equals(event.getUser())
+ && (visitDate == null || visitDate.getTime()<event.getDate().getTime())
+ && (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))
+ && !notifiedUsers.contains(watch.getUser())) {
+ usersToNotify.add(watch.getUser());
+ userInfoManager.setPullRequestNotified(watch.getUser(), watch.getRequest(), true);
+ pullRequestWatchManager.save(watch);
}
+ }
- if (!usersToNotify.isEmpty()) {
- String url = urlManager.urlFor(request);
- String subject = String.format("New activities in pull request #%d - %s", request.getNumber(), request.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
- }
- }
- }
+ if (!usersToNotify.isEmpty()) {
+ String url = urlManager.urlFor(request);
+ String subject = String.format("New activities in pull request #%d - %s", request.getNumber(), request.getTitle());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
+ }
+ }
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.html
rename to core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.java
similarity index 61%
rename from core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.java
rename to core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.java
index 0366059cd6..3c5254f6ad 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.java
@@ -4,24 +4,40 @@ import java.util.Collection;
import java.util.List;
import org.apache.wicket.Component;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.eclipse.jgit.lib.ObjectId;
+import com.google.common.collect.Lists;
+
+import io.onedev.server.OneDev;
+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.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.websocket.PageDataChanged;
@SuppressWarnings("serial")
-public class OverallStatusPanel extends GenericPanel<List<Build>> {
+public abstract class CommitStatusPanel extends GenericPanel<List<Build>> {
+
+ public CommitStatusPanel(String id) {
+ super(id);
+ setModel(new LoadableDetachableModel<List<Build>>() {
- public OverallStatusPanel(String id, IModel<List<Build>> model) {
- super(id, model);
+ @Override
+ protected List<Build> load() {
+ return OneDev.getInstance(BuildManager.class).query(getProject(), getCommitId().name());
+ }
+
+ });
}
private boolean hasStatus(Collection<Build> builds, Build.Status status) {
@@ -50,20 +66,22 @@ public class OverallStatusPanel extends GenericPanel<List<Build>> {
@Override
protected Component newContent(String id, FloatingPanel floating) {
- return new StatusListPanel(id, OverallStatusPanel.this.getModel());
+ return new StatusListPanel(id, CommitStatusPanel.this.getModel());
}
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- Collection<Build> builds = OverallStatusPanel.this.getModelObject();
+ Collection<Build> builds = CommitStatusPanel.this.getModelObject();
String cssClass = "fa fa-fw overall-build-status build-status build-status-";
String title = "";
for (Build.Status status: Build.Status.values()) {
if (hasStatus(builds, status)) {
cssClass += status.name().toLowerCase();
+ if (status == Status.RUNNING)
+ cssClass += " fa-spin";
if (status != Status.SUCCESSFUL)
title = "Some builds are ";
else
@@ -78,6 +96,25 @@ public class OverallStatusPanel extends GenericPanel<List<Build>> {
});
+ add(new WebSocketObserver() {
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {
+ handler.add(component);
+ }
+
+ @Override
+ public void onConnectionOpened(IPartialPageRequestHandler handler) {
+ handler.add(component);
+ }
+
+ @Override
+ public Collection<String> getObservables() {
+ return Lists.newArrayList("commit-status:" + getCommitId().name());
+ }
+
+ });
+
setOutputMarkupPlaceholderTag(true);
}
@@ -93,4 +130,8 @@ public class OverallStatusPanel extends GenericPanel<List<Build>> {
response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));
}
+ protected abstract Project getProject();
+
+ protected abstract ObjectId getCommitId();
+
}
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 6e3a3152e7..641e4f0b3b 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -49,14 +49,11 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
import io.onedev.server.OneException;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.git.command.RevListCommand;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.ProjectAndRevision;
import io.onedev.server.search.commit.CommitCriteria;
@@ -68,7 +65,7 @@ import io.onedev.server.util.Constants;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.CommitQueryBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.build.status.OverallStatusPanel;
+import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.commit.graph.CommitGraphResourceReference;
import io.onedev.server.web.component.commit.graph.CommitGraphUtils;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
@@ -586,14 +583,19 @@ public abstract class CommitListPanel extends Panel {
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
- item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new CommitStatusPanel("buildStatus") {
@Override
- protected List<Build> load() {
- return OneDev.getInstance(BuildManager.class).query(getProject(), commit.name());
+ protected Project getProject() {
+ return CommitListPanel.this.getProject();
+ }
+
+ @Override
+ protected ObjectId getCommitId() {
+ return commit.copy();
}
- }));
+ });
item.add(AttributeAppender.append("class", "commit clearfix"));
} else {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index e7c3ba9f8d..b09cc7ab21 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -54,12 +54,10 @@ import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.BranchProtection;
@@ -72,7 +70,7 @@ import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;
import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
-import io.onedev.server.web.component.build.status.OverallStatusPanel;
+import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -456,14 +454,19 @@ public class ProjectBranchesPage extends ProjectPage {
RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId(), true);
String lastCommitHash = lastCommit.name();
- item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new CommitStatusPanel("buildStatus") {
@Override
- protected List<Build> load() {
- return OneDev.getInstance(BuildManager.class).query(getProject(), lastCommitHash);
+ protected Project getProject() {
+ return ProjectBranchesPage.this.getProject();
+ }
+
+ @Override
+ protected ObjectId getCommitId() {
+ return ObjectId.fromString(lastCommitHash);
}
- }));
+ });
item.add(new AjaxLink<Void>("makeDefault") {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index d32de92e19..c0bd61924d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -39,12 +39,10 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
-import io.onedev.server.model.Build;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -55,7 +53,7 @@ import io.onedev.server.util.CommitMessageTransformer;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.branch.create.CreateBranchLink;
-import io.onedev.server.web.component.build.status.OverallStatusPanel;
+import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.createtag.CreateTagLink;
import io.onedev.server.web.component.diff.revision.CommentSupport;
@@ -220,14 +218,19 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));
add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));
- add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ add(new CommitStatusPanel("buildStatus") {
@Override
- protected List<Build> load() {
- return OneDev.getInstance(BuildManager.class).query(getProject(), getCommit().name());
+ protected Project getProject() {
+ return CommitDetailPage.this.getProject();
+ }
+
+ @Override
+ protected ObjectId getCommitId() {
+ return CommitDetailPage.this.getCommit().copy();
}
- }));
+ });
add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));
add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(getCommit().name()))));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index f6c4d72a7a..118d9903f8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -103,7 +103,7 @@
</wicket:enclosure>
<wicket:enclosure child="builds">
<div class="builds">
- <div wicket:id="buildsTitle" class="head">Builds</div>
+ <div class="head">Builds</div>
<div class="body">
<div wicket:id="builds"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index c0f6b56838..912cd48461 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -75,7 +75,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.PullRequestWatch;
-import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.pullrequest.MergePreview;
@@ -452,12 +451,6 @@ public abstract class PullRequestDetailPage extends ProjectPage {
fragment.add(newMergeStrategyContainer());
fragment.add(new ReviewListPanel("reviews", requestModel));
- BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());
- if (protection != null && !protection.getJobNames().isEmpty() && protection.isBuildMerges()) {
- fragment.add(new Label("buildsTitle", "Builds (On Merged Commit)"));
- } else {
- fragment.add(new Label("buildsTitle", "Builds"));
- }
fragment.add(new PullRequestBuildStatusListPanel("builds", requestModel));
fragment.add(new EntityWatchesPanel("watches") {
@@ -511,7 +504,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {
@Override
public void onClick() {
PullRequest request = getPullRequest();
- getPullRequestManager().delete(SecurityUtils.getUser(), request);
+ getPullRequestManager().delete(request);
Session.get().success("Pull request #" + request.getNumber() + " is deleted");
PageParameters params = ProjectPullRequestsPage.paramsOf(
getProject(),
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index f2779560dc..2b71986538 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -15,26 +15,24 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.build.status.OverallStatusPanel;
+import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
@@ -87,14 +85,19 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
};
item.add(new CommitMessagePanel("message", projectModel, item.getModel()));
- item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new CommitStatusPanel("buildStatus") {
+
+ @Override
+ protected Project getProject() {
+ return projectModel.getObject();
+ }
@Override
- protected List<Build> load() {
- return OneDev.getInstance(BuildManager.class).query(projectModel.getObject(), commit.name());
+ protected ObjectId getCommitId() {
+ return commit.copy();
}
- }));
+ });
CommitDetailPage.State commitState = new CommitDetailPage.State();
commitState.revision = commit.name();
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
index f4a56ace37..6bbad0c8ed 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
@@ -2,7 +2,6 @@ package io.onedev.server.web.page.project.pullrequests.detail.mergepreview;
import java.io.Serializable;
import java.util.Collection;
-import java.util.List;
import javax.annotation.Nullable;
@@ -18,21 +17,20 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.build.status.OverallStatusPanel;
+import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
@@ -115,14 +113,19 @@ public class MergePreviewPage extends PullRequestDetailPage {
fragment.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMerged())));
fragment.add(new WebMarkupContainer("copyMergedCommit").add(new CopyClipboardBehavior(Model.of(preview.getMerged()))));
- fragment.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ fragment.add(new CommitStatusPanel("buildStatus") {
@Override
- protected List<Build> load() {
- return OneDev.getInstance(BuildManager.class).query(getProject(), preview.getMerged());
+ protected Project getProject() {
+ return MergePreviewPage.this.getProject();
+ }
+
+ @Override
+ protected ObjectId getCommitId() {
+ return ObjectId.fromString(preview.getMerged());
}
- }));
+ });
fragment.add(new WebMarkupContainer("outDated") {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index 8efb84a9c6..b2c0fa23d3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -29,25 +29,23 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTag;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.TagProtection;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.ajaxlistener.ConfirmListener;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.build.status.OverallStatusPanel;
+import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.ArchiveMenuLink;
@@ -289,14 +287,19 @@ public class ProjectTagsPage extends ProjectPage {
item.add(link);
String tagCommitHash = ref.getPeeledObj().name();
- item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new CommitStatusPanel("buildStatus") {
@Override
- protected List<Build> load() {
- return OneDev.getInstance(BuildManager.class).query(getProject(), tagCommitHash);
+ protected Project getProject() {
+ return ProjectTagsPage.this.getProject();
+ }
+
+ @Override
+ protected ObjectId getCommitId() {
+ return ObjectId.fromString(tagCommitHash);
}
- }));
+ });
if (ref.getObj() instanceof RevTag) {
RevTag revTag = (RevTag) ref.getObj();
diff --git a/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
index 68898892d3..4e1479373b 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
@@ -4,7 +4,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.server.event.build.BuildDeleted;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.model.Build;
import io.onedev.server.web.util.WicketUtils;
@@ -21,8 +20,8 @@ public class BuildEventBroadcaster {
@Listen
public void on(BuildEvent event) {
- if (!(event instanceof BuildDeleted))
- webSocketManager.notifyObservableChange(Build.getWebSocketObservable(event.getBuild().getId()), WicketUtils.getPageKey());
+ webSocketManager.notifyObservableChange(Build.getWebSocketObservable(event.getBuild().getId()), WicketUtils.getPageKey());
+ webSocketManager.notifyObservableChange("commit-status:" + event.getBuild().getCommitHash(), WicketUtils.getPageKey());
}
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
index 03f59b379d..1f7ffde5d3 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
@@ -4,7 +4,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.BoardSpec;
@@ -22,8 +21,7 @@ public class IssueEventBroadcaster {
@Listen
public void on(IssueEvent event) {
- if (!(event instanceof IssueDeleted))
- webSocketManager.notifyObservableChange(Issue.getWebSocketObservable(event.getIssue().getId()), WicketUtils.getPageKey());
+ webSocketManager.notifyObservableChange(Issue.getWebSocketObservable(event.getIssue().getId()), WicketUtils.getPageKey());
if (event.affectsBoards())
webSocketManager.notifyObservableChange(BoardSpec.getWebSocketObservable(event.getIssue().getProject().getId()), null);
}
diff --git a/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
index ce1a862700..120ac5a354 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
@@ -4,7 +4,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.server.event.pullrequest.PullRequestDeleted;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.model.PullRequest;
import io.onedev.server.web.util.WicketUtils;
@@ -21,10 +20,8 @@ public class PullRequestEventBroadcaster {
@Listen
public void on(PullRequestEvent event) {
- if (!(event instanceof PullRequestDeleted)) {
- PageKey sourcePageKey = WicketUtils.getPageKey();
- webSocketManager.notifyObservableChange(PullRequest.getWebSocketObservable(event.getRequest().getId()), sourcePageKey);
- }
+ PageKey sourcePageKey = WicketUtils.getPageKey();
+ webSocketManager.notifyObservableChange(PullRequest.getWebSocketObservable(event.getRequest().getId()), sourcePageKey);
}
}
\ No newline at end of file
diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
index 4b634c2430..0bb54afc0a 100644
--- a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
@@ -190,7 +190,7 @@ public class BuildArtifactsPage extends BuildDetailPage {
fragment.add(link);
return fragment;
- }
+ }
});
} else {