Skip to content

The Unified and Autonomous Development Platform

Add pull request verification event handling logic

robin shene1c0736b7120
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestMergePreviewCalculated.java
similarity index 75%
rename from core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestMergePreviewCalculated.java
index b94d3ee580..98c101cef3 100644
--- a/core/src/main/java/com/gitplex/server/event/pullrequest/MergePreviewCalculated.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestMergePreviewCalculated.java
@@ -7,11 +7,11 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="merge preview calculated")
-public class MergePreviewCalculated extends PullRequestEvent {
+public class PullRequestMergePreviewCalculated extends PullRequestEvent {
private Date date;
- public MergePreviewCalculated(PullRequest request) {
+ public PullRequestMergePreviewCalculated(PullRequest request) {
super(request);
date = new Date();
}
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationEvent.java
new file mode 100644
index 0000000000..c6fcbbe40c
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationEvent.java
@@ -0,0 +1,27 @@
+package com.gitplex.server.event.pullrequest;
+
+import java.util.Date;
+
+import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.model.User;
+
+public abstract class PullRequestVerificationEvent extends PullRequestEvent {
+
+ private Date date;
+
+ public PullRequestVerificationEvent(PullRequest request) {
+ super(request);
+ date = new Date();
+ }
+
+ @Override
+ public User getUser() {
+ return null;
+ }
+
+ @Override
+ public Date getDate() {
+ return date;
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationFailed.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationFailed.java
new file mode 100644
index 0000000000..3299acc6d9
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationFailed.java
@@ -0,0 +1,13 @@
+package com.gitplex.server.event.pullrequest;
+
+import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.util.editable.annotation.Editable;
+
+@Editable(name="there are failed verifications")
+public class PullRequestVerificationFailed extends PullRequestVerificationEvent {
+
+ public PullRequestVerificationFailed(PullRequest request) {
+ super(request);
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationInError.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationInError.java
new file mode 100644
index 0000000000..6b1eac810d
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationInError.java
@@ -0,0 +1,13 @@
+package com.gitplex.server.event.pullrequest;
+
+import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.util.editable.annotation.Editable;
+
+@Editable(name="there are verification errors in")
+public class PullRequestVerificationInError extends PullRequestVerificationEvent {
+
+ public PullRequestVerificationInError(PullRequest request) {
+ super(request);
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java
new file mode 100644
index 0000000000..5f6f0c80e9
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java
@@ -0,0 +1,13 @@
+package com.gitplex.server.event.pullrequest;
+
+import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.util.editable.annotation.Editable;
+
+@Editable(name="there are running verifications")
+public class PullRequestVerificationRunning extends PullRequestVerificationEvent {
+
+ public PullRequestVerificationRunning(PullRequest request) {
+ super(request);
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationSucceeded.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationSucceeded.java
new file mode 100644
index 0000000000..4cadc26e42
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationSucceeded.java
@@ -0,0 +1,13 @@
+package com.gitplex.server.event.pullrequest;
+
+import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.util.editable.annotation.Editable;
+
+@Editable(name="there are successful verifications")
+public class PullRequestVerificationSucceeded extends PullRequestVerificationEvent {
+
+ public PullRequestVerificationSucceeded(PullRequest request) {
+ super(request);
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
index 6788c9ef85..8a717dd4c5 100644
--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
@@ -19,7 +19,6 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.manager.ProjectManager;
-import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
@@ -43,13 +42,10 @@ public class GitPreReceiveCallback extends HttpServlet {
private final UserManager userManager;
- private final ReviewManager reviewManager;
-
@Inject
- public GitPreReceiveCallback(ProjectManager projectManager, UserManager userManager, ReviewManager reviewManager) {
+ public GitPreReceiveCallback(ProjectManager projectManager, UserManager userManager) {
this.projectManager = projectManager;
this.userManager = userManager;
- this.reviewManager = reviewManager;
}
private void error(Output output, String refName, String... messages) {
@@ -131,9 +127,9 @@ public class GitPreReceiveCallback extends HttpServlet {
if (protection != null && protection.isNoForcedPush())
error(output, refName, "Can not force-push to this branch according to branch protection setting");
} else {
- if (!reviewManager.canPush(user, project, branchName, oldObjectId, newObjectId)) {
+ if (projectManager.isPushNeedsQualityCheck(user, project, branchName, oldObjectId, newObjectId)) {
error(output, refName,
- "Your changes need to be reviewed. Please submit pull request instead");
+ "Your changes need to be reviewed/verified. Please submit pull request instead");
}
}
}
diff --git a/core/src/main/java/com/gitplex/server/manager/ProjectManager.java b/core/src/main/java/com/gitplex/server/manager/ProjectManager.java
index 4ac31f7bc5..c1edc67dfe 100644
--- a/core/src/main/java/com/gitplex/server/manager/ProjectManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/ProjectManager.java
@@ -4,6 +4,7 @@ import java.util.Collection;
import javax.annotation.Nullable;
+import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import com.gitplex.server.model.Project;
@@ -36,4 +37,34 @@ public interface ProjectManager extends EntityManager<Project> {
Collection<ProjectFacade> getAccessibleProjects(@Nullable User user);
+ /**
+ * Check if specified user can modify specified file in specified branch.
+ *
+ * @param user
+ * user to be checked
+ * @param branch
+ * branch to be checked
+ * @param file
+ * file to be checked
+ * @return
+ * result of the check.
+ */
+ boolean isModificationNeedsQualityCheck(User user, Project project, String branch, String file);
+
+ /**
+ * Check if specified user can push specified commit to specified ref.
+ *
+ * @param user
+ * user to be checked
+ * @param branchName
+ * branchName to be checked
+ * @param oldObjectId
+ * old object id of the ref
+ * @param newObjectId
+ * new object id of the ref
+ * @return
+ * result of the check
+ */
+ boolean isPushNeedsQualityCheck(User user, Project project, String branchName, ObjectId oldObjectId, ObjectId newObjectId);
+
}
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
index f85b363c87..cf1a2162ed 100644
--- a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
@@ -4,12 +4,13 @@ import java.util.Collection;
import javax.annotation.Nullable;
-import com.gitplex.server.model.User;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.ProjectAndBranch;
+import com.gitplex.server.model.User;
import com.gitplex.server.model.support.MergePreview;
+import com.gitplex.server.model.support.ProjectAndBranch;
import com.gitplex.server.persistence.dao.EntityManager;
+import com.gitplex.server.util.QualityCheckStatus;
public interface PullRequestManager extends EntityManager<PullRequest> {
@@ -28,6 +29,8 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
@Nullable
PullRequest findLatest(Project project, User submitter);
+
+ Collection<PullRequest> findOpenByVerifyCommit(String commitHash);
void discard(PullRequest request, @Nullable String note);
@@ -65,4 +68,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
int countOpen(Project project);
+ QualityCheckStatus checkQuality(PullRequest request);
+
}
diff --git a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java b/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
index 6736959b59..1e10d6fe99 100644
--- a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
@@ -4,14 +4,10 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.gitplex.server.model.User;
-import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.Review;
+import com.gitplex.server.model.User;
import com.gitplex.server.persistence.dao.EntityManager;
-import com.gitplex.server.util.ReviewStatus;
public interface ReviewManager extends EntityManager<Review> {
@@ -33,36 +29,4 @@ public interface ReviewManager extends EntityManager<Review> {
void delete(User user, PullRequest request);
- ReviewStatus checkRequest(PullRequest request);
-
- /**
- * Check if specified user can modify specified file in specified branch.
- *
- * @param user
- * user to be checked
- * @param branch
- * branch to be checked
- * @param file
- * file to be checked
- * @return
- * result of the check.
- */
- boolean canModify(User user, Project project, String branch, String file);
-
- /**
- * Check if specified user can push specified commit to specified ref.
- *
- * @param user
- * user to be checked
- * @param branchName
- * branchName to be checked
- * @param oldObjectId
- * old object id of the ref
- * @param newObjectId
- * new object id of the ref
- * @return
- * result of the check
- */
- boolean canPush(User user, Project project, String branchName, ObjectId oldObjectId, ObjectId newObjectId);
-
}
diff --git a/core/src/main/java/com/gitplex/server/manager/VerificationManager.java b/core/src/main/java/com/gitplex/server/manager/VerificationManager.java
index 82a1793e2b..b5fdd7e85f 100644
--- a/core/src/main/java/com/gitplex/server/manager/VerificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/VerificationManager.java
@@ -8,10 +8,10 @@ import com.gitplex.server.util.Verification;
public interface VerificationManager {
- void saveVerification(Project project, String commit, String context, Verification verification);
+ void saveVerification(Project project, String commit, String name, Verification verification);
Map<String, Verification> getVerifications(Project project, String commit);
- Collection<String> getVerificationContexts(Project project);
+ Collection<String> getVerificationNames(Project project);
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
index ea51630295..06f27b8bb4 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
@@ -18,7 +18,7 @@ import org.hibernate.criterion.Restrictions;
import com.gitplex.launcher.loader.Listen;
import com.gitplex.server.event.MarkdownAware;
-import com.gitplex.server.event.pullrequest.MergePreviewCalculated;
+import com.gitplex.server.event.pullrequest.PullRequestMergePreviewCalculated;
import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;
import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;
@@ -26,6 +26,8 @@ import com.gitplex.server.event.pullrequest.PullRequestEvent;
import com.gitplex.server.event.pullrequest.PullRequestOpened;
import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
import com.gitplex.server.event.pullrequest.PullRequestUpdated;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationEvent;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationRunning;
import com.gitplex.server.manager.BranchWatchManager;
import com.gitplex.server.manager.MailManager;
import com.gitplex.server.manager.MarkdownManager;
@@ -99,7 +101,7 @@ public class DefaultNotificationManager implements NotificationManager {
for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {
pullRequestTaskManager.delete(task);
}
- } else if (event instanceof MergePreviewCalculated) {
+ } else if (event instanceof PullRequestMergePreviewCalculated) {
if (request.getSubmitter() != null && request.getMergePreview() != null) {
if (request.getMergePreview().getMerged() != null) {
EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);
@@ -262,7 +264,8 @@ public class DefaultNotificationManager implements NotificationManager {
|| type == Type.DISCARDED || type == Type.WITHDRAWED_REVIEW) {
notifyWatchers = true;
}
- } else if (!(event instanceof MergePreviewCalculated)) {
+ } else if (!(event instanceof PullRequestMergePreviewCalculated)
+ && !(event instanceof PullRequestVerificationRunning)) {
notifyWatchers = true;
}
@@ -306,7 +309,9 @@ public class DefaultNotificationManager implements NotificationManager {
} else {
if (event.getUser() != null) {
activity = event.getUser().getDisplayName() + " " + activity;
- } else if (event instanceof PullRequestUpdated || event instanceof MergePreviewCalculated) {
+ } else if (event instanceof PullRequestUpdated
+ || event instanceof PullRequestMergePreviewCalculated
+ || event instanceof PullRequestVerificationEvent) {
activity = StringUtils.capitalize(activity);
} else {
activity = "GitPlex " + activity;
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
index 3c6aa98e52..351653ec2b 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
@@ -7,6 +7,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;
@@ -19,6 +20,9 @@ import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.hibernate.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,10 +39,12 @@ import com.gitplex.server.manager.CacheManager;
import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.User;
import com.gitplex.server.model.UserAuthorization;
import com.gitplex.server.model.support.BranchProtection;
+import com.gitplex.server.model.support.FileProtection;
import com.gitplex.server.model.support.TagProtection;
import com.gitplex.server.persistence.annotation.Transactional;
import com.gitplex.server.persistence.dao.AbstractEntityManager;
@@ -47,6 +53,7 @@ import com.gitplex.server.security.ProjectPrivilege;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.util.facade.GroupAuthorizationFacade;
import com.gitplex.server.util.facade.MembershipFacade;
import com.gitplex.server.util.facade.ProjectFacade;
@@ -65,6 +72,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
private final UserAuthorizationManager userAuthorizationManager;
+ private final VerificationManager verificationManager;
+
private final CacheManager cacheManager;
private final String gitReceiveHook;
@@ -73,12 +82,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Inject
public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry,
- UserAuthorizationManager userAuthorizationManager, CacheManager cacheManager) {
+ UserAuthorizationManager userAuthorizationManager, VerificationManager verificationManager,
+ CacheManager cacheManager) {
super(dao);
this.commitInfoManager = commitInfoManager;
this.listenerRegistry = listenerRegistry;
this.userAuthorizationManager = userAuthorizationManager;
+ this.verificationManager = verificationManager;
this.cacheManager = cacheManager;
try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {
@@ -314,4 +325,62 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
return projects;
}
+ private Set<String> getChangedFiles(Project project, ObjectId oldObjectId, ObjectId newObjectId) {
+ Set<String> changedFiles = new HashSet<>();
+ try (TreeWalk treeWalk = new TreeWalk(project.getRepository())) {
+ treeWalk.setFilter(TreeFilter.ANY_DIFF);
+ treeWalk.setRecursive(true);
+ RevCommit oldCommit = project.getRevCommit(oldObjectId);
+ RevCommit newCommit = project.getRevCommit(newObjectId);
+ treeWalk.addTree(oldCommit.getTree());
+ treeWalk.addTree(newCommit.getTree());
+ while (treeWalk.next()) {
+ changedFiles.add(treeWalk.getPathString());
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return changedFiles;
+ }
+
+ @Override
+ public boolean isModificationNeedsQualityCheck(User user, Project project, String branch, String file) {
+ BranchProtection branchProtection = project.getBranchProtection(branch);
+ if (branchProtection != null) {
+ if (branchProtection.getReviewAppointment(project) != null
+ && !branchProtection.getReviewAppointment(project).matches(user)) {
+ return true;
+ }
+ if (!branchProtection.getVerifications().isEmpty())
+ return true;
+
+ FileProtection fileProtection = branchProtection.getFileProtection(file);
+ if (fileProtection != null && !fileProtection.getReviewAppointment(project).matches(user))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isPushNeedsQualityCheck(User user, Project project, String branch, ObjectId oldObjectId, ObjectId newObjectId) {
+ BranchProtection branchProtection = project.getBranchProtection(branch);
+ if (branchProtection != null) {
+ if (branchProtection.getReviewAppointment(project) != null
+ && !branchProtection.getReviewAppointment(project).matches(user)) {
+ return true;
+ }
+
+ Map<String, Verification> verifications = verificationManager.getVerifications(project, newObjectId.name());
+ if (!verifications.keySet().containsAll(branchProtection.getVerifications()))
+ return true;
+
+ for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId)) {
+ FileProtection fileProtection = branchProtection.getFileProtection(changedFile);
+ if (fileProtection != null && !fileProtection.getReviewAppointment(project).matches(user))
+ return true;
+ }
+ }
+ return false;
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index f849926549..dbf5d80d74 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -43,9 +43,11 @@ import com.gitplex.launcher.loader.Listen;
import com.gitplex.launcher.loader.ListenerRegistry;
import com.gitplex.server.GitPlex;
import com.gitplex.server.event.RefUpdated;
-import com.gitplex.server.event.pullrequest.MergePreviewCalculated;
+import com.gitplex.server.event.pullrequest.PullRequestMergePreviewCalculated;
import com.gitplex.server.event.pullrequest.PullRequestOpened;
import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationEvent;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationRunning;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.manager.BatchWorkManager;
import com.gitplex.server.manager.MarkdownManager;
@@ -75,7 +77,9 @@ import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.persistence.dao.EntityRemoved;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.BatchWorker;
-import com.gitplex.server.util.ReviewStatus;
+import com.gitplex.server.util.QualityCheckStatus;
+import com.gitplex.server.util.QualityCheckStatusImpl;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.util.concurrent.Prioritized;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
@@ -417,21 +421,31 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
closeAsMerged(request, true, null);
} else {
MergePreview mergePreview = request.getMergePreview();
- ReviewStatus reviewStatus = request.getReviewStatus();
+ QualityCheckStatus qualityCheckStatus = request.getQualityCheckStatus();
for (ReviewInvitation invitation: request.getReviewInvitations()) {
- if (reviewStatus.getAwaitingReviewers().contains(invitation.getUser()))
+ if (qualityCheckStatus.getAwaitingReviewers().contains(invitation.getUser()))
reviewInvitationManager.save(invitation);
}
- boolean hasDisapprovals = false;
- for (Review review: reviewStatus.getEffectiveReviews().values()) {
+ boolean hasDisapprovedReviews = false;
+ for (Review review: qualityCheckStatus.getEffectiveReviews().values()) {
if (!review.isApproved()) {
- hasDisapprovals = true;
+ hasDisapprovedReviews = true;
break;
}
}
- if (!hasDisapprovals && reviewStatus.getAwaitingReviewers().isEmpty()
+ boolean hasUnsuccessVerifications = false;
+ for (Verification verification: qualityCheckStatus.getEffectiveVerifications().values()) {
+ if (verification.getStatus() != Verification.Status.SUCCESS) {
+ hasUnsuccessVerifications = true;
+ break;
+ }
+ }
+
+ if (!hasDisapprovedReviews && !hasUnsuccessVerifications
+ && qualityCheckStatus.getAwaitingReviewers().isEmpty()
+ && qualityCheckStatus.getAwaitingVerifications().isEmpty()
&& mergePreview != null && mergePreview.getMerged() != null) {
merge(request);
}
@@ -524,7 +538,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
dao.persist(request);
- listenerRegistry.post(new MergePreviewCalculated(request));
+ listenerRegistry.post(new PullRequestMergePreviewCalculated(request));
logger.info("Merge preview of pull request #{} in project '{}' is calculated.",
request.getNumber(), request.getTargetProject());
}
@@ -650,7 +664,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
@Listen
- public void on(MergePreviewCalculated event) {
+ public void on(PullRequestVerificationEvent event) {
+ if (!(event instanceof PullRequestVerificationRunning))
+ checkAsync(event.getRequest());
+ }
+
+ @Listen
+ public void on(PullRequestMergePreviewCalculated event) {
checkAsync(event.getRequest());
}
@@ -699,4 +719,22 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
save(request);
}
+ @Transactional
+ @Override
+ public QualityCheckStatus checkQuality(PullRequest request) {
+ return new QualityCheckStatusImpl(request);
+ }
+
+ @Transactional
+ @Override
+ public Collection<PullRequest> findOpenByVerifyCommit(String commitHash) {
+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
+ criteria.add(PullRequest.CriterionHelper.ofOpen());
+ Criterion verifyCommitCriterion = Restrictions.or(
+ Restrictions.eq("headCommitHash", commitHash),
+ Restrictions.eq("lastMergePreview.merged", commitHash));
+ criteria.add(verifyCommitCriterion);
+ return findAll(criteria);
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java
index a64570e43d..ef8f66ac31 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java
@@ -88,8 +88,9 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR
lastEvent.setDate(event.getDate());
lastEvent.setType(EditableUtils.getName(event.getClass()));
request.setLastEvent(lastEvent);
- pullRequestManager.save(request);
}
+ request.setHeadCommitHash(update.getHeadCommitHash());
+ pullRequestManager.save(request);
}
@Sessional
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java
index 8932a1cfc0..d4e316834a 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewInvitationManager.java
@@ -43,8 +43,8 @@ public class DefaultReviewInvitationManager extends AbstractEntityManager<Review
save(invitation);
User reviewer = invitation.getUser();
- if (request.getReviewStatus().getAwaitingReviewers().contains(reviewer)
- || request.getReviewStatus().getEffectiveReviews().containsKey(reviewer)) {
+ if (request.getQualityCheckStatus().getAwaitingReviewers().contains(reviewer)
+ || request.getQualityCheckStatus().getEffectiveReviews().containsKey(reviewer)) {
return false;
} else {
PullRequestStatusChange statusChange = new PullRequestStatusChange();
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
index 5ca8e2530c..b025babc68 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
@@ -1,65 +1,33 @@
package com.gitplex.server.manager.impl;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.Permission;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.treewalk.TreeWalk;
-import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.manager.PullRequestStatusChangeManager;
import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.manager.UserManager;
-import com.gitplex.server.model.Group;
-import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestStatusChange.Type;
-import com.gitplex.server.model.PullRequestUpdate;
import com.gitplex.server.model.Review;
-import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.model.User;
-import com.gitplex.server.model.support.BranchProtection;
-import com.gitplex.server.model.support.FileProtection;
import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.annotation.Transactional;
import com.gitplex.server.persistence.dao.AbstractEntityManager;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityCriteria;
-import com.gitplex.server.security.ProjectPrivilege;
-import com.gitplex.server.security.SecurityUtils;
-import com.gitplex.server.security.permission.ProjectPermission;
-import com.gitplex.server.util.ReviewStatus;
-import com.gitplex.server.util.facade.ProjectFacade;
-import com.gitplex.server.util.facade.UserFacade;
-import com.gitplex.server.util.reviewappointment.ReviewAppointment;
@Singleton
public class DefaultReviewManager extends AbstractEntityManager<Review> implements ReviewManager {
- private static final int MAX_CONTRIBUTION_FILES = 100;
-
private final UserManager userManager;
private final PullRequestManager pullRequestManager;
@@ -76,12 +44,6 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;
}
- @Transactional
- @Override
- public ReviewStatus checkRequest(PullRequest request) {
- return new ReviewStatusImpl(request);
- }
-
@Transactional
@Override
public void save(Review review) {
@@ -135,311 +97,6 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
pullRequestManager.save(request);
}
- @Override
- public boolean canModify(User user, Project project, String branch, String file) {
- BranchProtection branchProtection = project.getBranchProtection(branch);
- if (branchProtection != null) {
- if (branchProtection.getReviewAppointment(project) != null
- && !branchProtection.getReviewAppointment(project).matches(user)) {
- return false;
- }
- FileProtection fileProtection = branchProtection.getFileProtection(file);
- if (fileProtection != null && !fileProtection.getReviewAppointment(project).matches(user))
- return false;
- }
- return true;
- }
-
- private Set<String> getChangedFiles(Project project, ObjectId oldObjectId, ObjectId newObjectId) {
- Set<String> changedFiles = new HashSet<>();
- try (TreeWalk treeWalk = new TreeWalk(project.getRepository())) {
- treeWalk.setFilter(TreeFilter.ANY_DIFF);
- treeWalk.setRecursive(true);
- RevCommit oldCommit = project.getRevCommit(oldObjectId);
- RevCommit newCommit = project.getRevCommit(newObjectId);
- treeWalk.addTree(oldCommit.getTree());
- treeWalk.addTree(newCommit.getTree());
- while (treeWalk.next()) {
- changedFiles.add(treeWalk.getPathString());
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return changedFiles;
- }
-
- @Override
- public boolean canPush(User user, Project project, String branch, ObjectId oldObjectId, ObjectId newObjectId) {
- BranchProtection branchProtection = project.getBranchProtection(branch);
- if (branchProtection != null) {
- if (branchProtection.getReviewAppointment(project) != null
- && !branchProtection.getReviewAppointment(project).matches(user)) {
- return false;
- }
-
- for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId)) {
- FileProtection fileProtection = branchProtection.getFileProtection(changedFile);
- if (fileProtection != null && !fileProtection.getReviewAppointment(project).matches(user))
- return false;
- }
- }
- return true;
- }
-
- private static class ReviewStatusImpl implements ReviewStatus {
-
- private final PullRequest request;
-
- private final List<User> awaitingReviewers = new ArrayList<>();
-
- private final Map<User, Review> effectiveReviews = new HashMap<>();
-
- @Override
- public List<User> getAwaitingReviewers() {
- return awaitingReviewers;
- }
-
- @Override
- public Map<User, Review> getEffectiveReviews() {
- return effectiveReviews;
- }
-
- @Nullable
- private ReviewInvitation getInvitation(Long userId) {
- for (ReviewInvitation invitation: request.getReviewInvitations()) {
- if (invitation.getUser().getId().equals(userId))
- return invitation;
- }
- return null;
- }
-
- @Nullable
- private Review getReviewAfter(Long userId, PullRequestUpdate update) {
- for (Review review: update.getRequest().getReviews()) {
- if (review.getUser().getId().equals(userId) && review.getUpdate() != null
- && review.getUpdate().getId()>=update.getId()) {
- return review;
- }
- }
- return null;
- }
-
- public ReviewStatusImpl(PullRequest request) {
- this.request = request;
-
- for (ReviewInvitation invitation: request.getReviewInvitations()) {
- if (!invitation.getUser().equals(request.getSubmitter())
- && invitation.getType() == ReviewInvitation.Type.MANUAL) {
- UserFacade user = invitation.getUser().getFacade();
- Review effectiveReview = getReviewAfter(user.getId(), request.getLatestUpdate());
- if (effectiveReview == null)
- awaitingReviewers.add(invitation.getUser());
- else
- effectiveReviews.put(invitation.getUser(), effectiveReview);
- }
- }
-
- BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch());
- if (branchProtection != null) {
- ReviewAppointment appointment = branchProtection.getReviewAppointment(request.getTargetProject());
- if (appointment != null)
- checkReviews(appointment, request.getLatestUpdate());
-
- Set<FileProtection> checkedFileProtections = new HashSet<>();
- for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {
- if (checkedFileProtections.containsAll(branchProtection.getFileProtections()))
- break;
- PullRequestUpdate update = request.getSortedUpdates().get(i);
- for (String file: update.getChangedFiles()) {
- FileProtection fileProtection = branchProtection.getFileProtection(file);
- if (fileProtection != null && !checkedFileProtections.contains(fileProtection)) {
- checkedFileProtections.add(fileProtection);
- checkReviews(fileProtection.getReviewAppointment(request.getTargetProject()), update);
- }
- }
- }
- }
-
- ProjectFacade project = request.getTargetProject().getFacade();
- Permission writePermission = new ProjectPermission(project, ProjectPrivilege.WRITE);
- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writePermission)) {
- Collection<UserFacade> writers = SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.WRITE);
- checkReviews(writers, 1, request.getLatestUpdate());
- }
-
- }
-
- private boolean isAwaitingReviewer(Long userId) {
- for (User user: awaitingReviewers) {
- if (user.getId().equals(userId))
- return true;
- }
- return false;
- }
-
- private void checkReviews(ReviewAppointment appointment, PullRequestUpdate update) {
- for (User user: appointment.getUsers()) {
- if (!user.equals(request.getSubmitter()) && !isAwaitingReviewer(user.getId())) {
- Review effectiveReview = getReviewAfter(user.getId(), update);
- if (effectiveReview == null) {
- awaitingReviewers.add(user);
- inviteReviewer(user.getId());
- } else {
- effectiveReviews.put(user, effectiveReview);
- }
- }
- }
-
- for (Map.Entry<Group, Integer> entry: appointment.getGroups().entrySet()) {
- Group group = entry.getKey();
- int requiredCount = entry.getValue();
- checkReviews(getFacades(group.getMembers()), requiredCount, update);
- }
- }
-
- private Collection<UserFacade> getFacades(Collection<User> users) {
- Collection<UserFacade> facades = new HashSet<>();
- for (User user: users)
- facades.add(user.getFacade());
- return facades;
- }
-
- private void checkReviews(Collection<UserFacade> users, int requiredCount, PullRequestUpdate update) {
- if (requiredCount == 0)
- requiredCount = users.size();
-
- int effectiveCount = 0;
- Set<UserFacade> potentialReviewers = new HashSet<>();
- for (UserFacade user: users) {
- if (user.getId().equals(request.getSubmitter().getId())) {
- effectiveCount++;
- } else if (isAwaitingReviewer(user.getId())) {
- requiredCount--;
- } else {
- Review effectiveReview = getReviewAfter(user.getId(), update);
- if (effectiveReview != null) {
- effectiveCount++;
- } else {
- potentialReviewers.add(user);
- }
- }
- if (effectiveCount >= requiredCount)
- break;
- }
-
- int missingCount = requiredCount - effectiveCount;
- Set<UserFacade> reviewers = new HashSet<>();
-
- List<UserFacade> candidateReviewers = new ArrayList<>();
- for (UserFacade user: potentialReviewers) {
- ReviewInvitation invitation = getInvitation(user.getId());
- if (invitation != null && invitation.getType() != ReviewInvitation.Type.EXCLUDE)
- candidateReviewers.add(user);
- }
-
- sortByContributions(candidateReviewers, update);
- for (UserFacade user: candidateReviewers) {
- reviewers.add(user);
- if (reviewers.size() == missingCount)
- break;
- }
-
- if (reviewers.size() < missingCount) {
- candidateReviewers = new ArrayList<>();
- for (UserFacade user: potentialReviewers) {
- ReviewInvitation invitation = getInvitation(user.getId());
- if (invitation == null)
- candidateReviewers.add(user);
- }
- sortByContributions(candidateReviewers, update);
- for (UserFacade user: candidateReviewers) {
- reviewers.add(user);
- if (reviewers.size() == missingCount)
- break;
- }
- }
- if (reviewers.size() < missingCount) {
- List<ReviewInvitation> excludedInvitations = new ArrayList<>();
- for (UserFacade user: potentialReviewers) {
- ReviewInvitation invitation = getInvitation(user.getId());
- if (invitation != null && invitation.getType() == ReviewInvitation.Type.EXCLUDE)
- excludedInvitations.add(invitation);
- }
- excludedInvitations.sort(Comparator.comparing(ReviewInvitation::getDate));
-
- for (ReviewInvitation invitation: excludedInvitations) {
- reviewers.add(invitation.getUser().getFacade());
- if (reviewers.size() == missingCount)
- break;
- }
- }
- if (reviewers.size() < missingCount) {
- String errorMessage = String.format("Impossible to provide required number of reviewers "
- + "(candidates: %s, required number of reviewers: %d, pull request: #%d)",
- reviewers, missingCount, update.getRequest().getNumber());
- throw new RuntimeException(errorMessage);
- }
-
- UserManager userManager = GitPlex.getInstance(UserManager.class);
- for (UserFacade user: reviewers) {
- awaitingReviewers.add(userManager.load(user.getId()));
- inviteReviewer(user.getId());
- }
- }
-
- private void sortByContributions(List<UserFacade> users, PullRequestUpdate update) {
- CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);
- Map<UserFacade, Integer> contributions = new HashMap<>();
- for (UserFacade user: users)
- contributions.put(user, 0);
-
- int count = 0;
- for (String file: update.getChangedFiles()) {
- int addedContributions = addContributions(contributions, commitInfoManager, file, update);
- while (addedContributions == 0) {
- if (file.contains("/")) {
- file = StringUtils.substringBeforeLast(file, "/");
- addedContributions = addContributions(contributions, commitInfoManager, file, update);
- } else {
- addContributions(contributions, commitInfoManager, "", update);
- break;
- }
- }
- if (++count >= MAX_CONTRIBUTION_FILES)
- break;
- }
-
- users.sort((user1, user2)-> contributions.get(user2) - contributions.get(user1));
- }
-
- private int addContributions(Map<UserFacade, Integer> contributions, CommitInfoManager commitInfoManager,
- String file, PullRequestUpdate update) {
- int addedContributions = 0;
- for (Map.Entry<UserFacade, Integer> entry: contributions.entrySet()) {
- UserFacade user = entry.getKey();
- int fileContribution = commitInfoManager.getContributions(
- update.getRequest().getTargetProject().getFacade(), user, file);
- entry.setValue(entry.getValue() + fileContribution);
- addedContributions += fileContribution;
- }
- return addedContributions;
- }
-
- private void inviteReviewer(Long userId) {
- ReviewInvitation invitation = getInvitation(userId);
- if (invitation != null) {
- invitation.setType(ReviewInvitation.Type.RULE);
- } else {
- invitation = new ReviewInvitation();
- invitation.setRequest(request);
- invitation.setUser(GitPlex.getInstance(UserManager.class).load(userId));
- invitation.setType(ReviewInvitation.Type.RULE);
- request.getReviewInvitations().add(invitation);
- }
- }
-
- }
-
@Override
public Review find(PullRequest request, User user, String commit) {
EntityCriteria<Review> criteria = EntityCriteria.of(Review.class);
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
index 0c9f2fdfd7..0f6b33203d 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
@@ -15,14 +15,23 @@ import javax.inject.Singleton;
import org.apache.commons.lang.SerializationUtils;
import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationEvent;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationFailed;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationInError;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationRunning;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationSucceeded;
+import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.Project;
+import com.gitplex.server.model.PullRequest;
import com.gitplex.server.persistence.annotation.Transactional;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityRemoved;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.util.Verification;
+import com.gitplex.server.util.Verification.Status;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
@@ -43,22 +52,30 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
private static final String VERIFICATIONS_STORE = "verifications";
- private static final String VERIFICATION_CONTEXTS_KEY = "verificationContexts";
+ private static final String VERIFICATION_NAMES_KEY = "verificationNames";
- private static final long MAX_VERIFICATION_CONTEXTS = 1000;
+ private static final long MAX_VERIFICATION_NAMES = 1000;
private final StorageManager storageManager;
+ private final PullRequestManager pullRequestManager;
+
+ private final ListenerRegistry listenerRegistry;
+
private final Dao dao;
@Inject
- public DefaultVerificationManager(Dao dao, StorageManager storageManager) {
+ public DefaultVerificationManager(Dao dao, StorageManager storageManager, PullRequestManager pullRequestManager,
+ ListenerRegistry listenerRegistry) {
this.dao = dao;
this.storageManager = storageManager;
+ this.pullRequestManager = pullRequestManager;
+ this.listenerRegistry = listenerRegistry;
}
+ @Transactional
@Override
- public void saveVerification(Project project, String commit, String context, Verification verification) {
+ public void saveVerification(Project project, String commit, String name, Verification verification) {
Environment env = getEnv(project.getId().toString());
Store defaultStore = getStore(env, DEFAULT_STORE);
Store verificationsStore = getStore(env, VERIFICATIONS_STORE);
@@ -67,25 +84,25 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
@SuppressWarnings("unchecked")
@Override
public void execute(Transaction txn) {
- ByteIterable key = new StringByteIterable(VERIFICATION_CONTEXTS_KEY);
+ ByteIterable key = new StringByteIterable(VERIFICATION_NAMES_KEY);
byte[] bytes = getBytes(defaultStore.get(txn, key));
- Map<String, Date> verificationContexts;
+ Map<String, Date> verificationNames;
if (bytes != null)
- verificationContexts = (Map<String, Date>) SerializationUtils.deserialize(bytes);
+ verificationNames = (Map<String, Date>) SerializationUtils.deserialize(bytes);
else
- verificationContexts = new HashMap<>();
+ verificationNames = new HashMap<>();
- verificationContexts.put(context, verification.getDate());
+ verificationNames.put(name, verification.getDate());
- if (verificationContexts.size() > MAX_VERIFICATION_CONTEXTS) {
- List<String> contextList = new ArrayList<>(verificationContexts.keySet());
- contextList.sort((o1, o2)->verificationContexts.get(o1).compareTo(verificationContexts.get(o2)));
- for (int i=0; i<contextList.size()-MAX_VERIFICATION_CONTEXTS; i++)
- verificationContexts.remove(contextList.get(i));
+ if (verificationNames.size() > MAX_VERIFICATION_NAMES) {
+ List<String> nameList = new ArrayList<>(verificationNames.keySet());
+ nameList.sort((o1, o2)->verificationNames.get(o1).compareTo(verificationNames.get(o2)));
+ for (int i=0; i<nameList.size()-MAX_VERIFICATION_NAMES; i++)
+ verificationNames.remove(nameList.get(i));
}
defaultStore.put(txn, key,
- new ArrayByteIterable(SerializationUtils.serialize((Serializable) verificationContexts)));
+ new ArrayByteIterable(SerializationUtils.serialize((Serializable) verificationNames)));
key = new StringByteIterable(commit);
bytes = getBytes(verificationsStore.get(txn, key));
@@ -95,12 +112,30 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
else
verifications = new HashMap<>();
- verifications.put(context, verification);
+ verifications.put(name, verification);
verificationsStore.put(txn, key, new ArrayByteIterable(SerializationUtils.serialize((Serializable) verifications)));
}
});
+
+ for (PullRequest request: pullRequestManager.findOpenByVerifyCommit(commit)) {
+ PullRequestVerificationEvent event;
+ if (verification.getStatus() == Status.ERROR)
+ event = new PullRequestVerificationInError(request);
+ else if (verification.getStatus() == Status.FAILURE)
+ event = new PullRequestVerificationFailed(request);
+ else if (verification.getStatus() == Status.RUNNING)
+ event = new PullRequestVerificationRunning(request);
+ else
+ event = new PullRequestVerificationSucceeded(request);
+
+ listenerRegistry.post(event);
+
+ request.setLastEvent(event);
+ pullRequestManager.save(request);
+ }
+
}
@Override
@@ -116,7 +151,7 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
if (bytes != null)
return (Map<String, Verification>) SerializationUtils.deserialize(bytes);
else
- return null;
+ return new HashMap<>();
}
});
@@ -151,7 +186,7 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
}
@Override
- public Collection<String> getVerificationContexts(Project project) {
+ public Collection<String> getVerificationNames(Project project) {
Environment env = getEnv(project.getId().toString());
Store store = getStore(env, DEFAULT_STORE);
return env.computeInTransaction(new TransactionalComputable<Collection<String>>() {
@@ -159,7 +194,7 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
@SuppressWarnings("unchecked")
@Override
public Collection<String> compute(Transaction txn) {
- byte[] bytes = getBytes(store.get(txn, new StringByteIterable(VERIFICATION_CONTEXTS_KEY)));
+ byte[] bytes = getBytes(store.get(txn, new StringByteIterable(VERIFICATION_NAMES_KEY)));
if (bytes != null)
return ((Map<String, Date>) SerializationUtils.deserialize(bytes)).keySet();
else
diff --git a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
index 6efa4be2fb..328888bd99 100644
--- a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
@@ -308,7 +308,10 @@ public class DatabaseMigrator {
|| file.getName().startsWith("TeamMemberships.xml")
|| file.getName().startsWith("TeamAuthorizations.xml")
|| file.getName().startsWith("OrganizationMemberships.xml")
- || file.getName().startsWith("UserAuthorizations.xml")) {
+ || file.getName().startsWith("UserAuthorizations.xml")
+ || file.getName().startsWith("PullRequest")
+ || file.getName().startsWith("Review")
+ || file.getName().startsWith("ReviewInvitation")) {
FileUtils.deleteFile(file);
} else if (file.getName().startsWith("Configs.xml")) {
VersionedDocument dom = VersionedDocument.fromFile(file);
diff --git a/core/src/main/java/com/gitplex/server/model/Project.java b/core/src/main/java/com/gitplex/server/model/Project.java
index 0978aadac3..bdfe0e9e56 100644
--- a/core/src/main/java/com/gitplex/server/model/Project.java
+++ b/core/src/main/java/com/gitplex/server/model/Project.java
@@ -867,4 +867,10 @@ public class Project extends AbstractEntity {
}
return lastCommitOptional.orNull();
}
+
+ @Override
+ public String toString() {
+ return getName();
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.java
index 3f2f454846..46dbb9fdb2 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java
@@ -38,9 +38,9 @@ import org.hibernate.criterion.Restrictions;
import com.fasterxml.jackson.annotation.JsonView;
import com.gitplex.server.GitPlex;
import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationEvent;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.manager.PullRequestManager;
-import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.manager.VisitManager;
import com.gitplex.server.model.support.CloseInfo;
import com.gitplex.server.model.support.LastEvent;
@@ -48,7 +48,7 @@ import com.gitplex.server.model.support.MergePreview;
import com.gitplex.server.model.support.MergeStrategy;
import com.gitplex.server.model.support.ProjectAndBranch;
import com.gitplex.server.security.SecurityUtils;
-import com.gitplex.server.util.ReviewStatus;
+import com.gitplex.server.util.QualityCheckStatus;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.util.editable.EditableUtils;
import com.gitplex.server.util.jackson.RestView;
@@ -66,7 +66,10 @@ import com.google.common.base.Preconditions;
@Index(columnList="title"), @Index(columnList="uuid"),
@Index(columnList="numberStr"), @Index(columnList="noSpaceTitle"),
@Index(columnList="number"), @Index(columnList="g_targetProject_id"),
- @Index(columnList="g_sourceProject_id"), @Index(columnList="g_submitter_id")},
+ @Index(columnList="g_sourceProject_id"), @Index(columnList="g_submitter_id"),
+ @Index(columnList="headCommitHash"), @Index(columnList="PREVIEW_REQUEST_HEAD"),
+ @Index(columnList="closeDate"), @Index(columnList="closeStatus"),
+ @Index(columnList="g_closedBy_id"), @Index(columnList="closedByName")},
uniqueConstraints={@UniqueConstraint(columnNames={"g_targetProject_id", "number"})})
public class PullRequest extends AbstractEntity {
@@ -108,6 +111,9 @@ public class PullRequest extends AbstractEntity {
@Column(nullable=false)
private String baseCommitHash;
+ @Column(nullable=false)
+ private String headCommitHash;
+
@Embedded
private LastEvent lastEvent;
@@ -170,7 +176,7 @@ public class PullRequest extends AbstractEntity {
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
private Collection<PullRequestWatch> watches = new ArrayList<>();
- private transient ReviewStatus reviewStatus;
+ private transient QualityCheckStatus qualityStatus;
private transient Boolean mergedIntoTarget;
@@ -309,9 +315,13 @@ public class PullRequest extends AbstractEntity {
}
public String getHeadCommitHash() {
- return getLatestUpdate().getHeadCommitHash();
+ return headCommitHash;
}
+ public void setHeadCommitHash(String headCommitHash) {
+ this.headCommitHash = headCommitHash;
+ }
+
public RevCommit getBaseCommit() {
return getTargetProject().getRevCommit(ObjectId.fromString(getBaseCommitHash()));
}
@@ -405,14 +415,14 @@ public class PullRequest extends AbstractEntity {
this.watches = watches;
}
- public ReviewStatus getReviewStatus() {
- if (reviewStatus == null)
- reviewStatus = GitPlex.getInstance(ReviewManager.class).checkRequest(this);
- return reviewStatus;
+ public QualityCheckStatus getQualityCheckStatus() {
+ if (qualityStatus == null)
+ qualityStatus = GitPlex.getInstance(PullRequestManager.class).checkQuality(this);
+ return qualityStatus;
}
- public void clearReviewStatus() {
- reviewStatus = null;
+ public void clearQualityStatus() {
+ qualityStatus = null;
}
@Nullable
@@ -659,7 +669,7 @@ public class PullRequest extends AbstractEntity {
String commitMessage = getTitle() + "\n\n";
if (getDescription() != null)
commitMessage += getDescription() + "\n\n";
- commitMessage += "This commit is created as result of accepting pull request #" + getNumber();
+ commitMessage += "Merged commit of pull request #" + getNumber();
return commitMessage;
}
@@ -722,6 +732,14 @@ public class PullRequest extends AbstractEntity {
setLastCodeCommentEventDate(event.getDate());
}
+ public void setLastEvent(PullRequestVerificationEvent event) {
+ LastEvent lastEvent = new LastEvent();
+ lastEvent.setDate(event.getDate());
+ lastEvent.setType(EditableUtils.getName(event.getClass()));
+ lastEvent.setUser(event.getUser());
+ setLastEvent(lastEvent);
+ }
+
@Nullable
public ObjectId getSourceHead() {
ProjectAndBranch projectAndBranch = getSource();
diff --git a/core/src/main/java/com/gitplex/server/model/support/BranchProtection.java b/core/src/main/java/com/gitplex/server/model/support/BranchProtection.java
index 1cca02dbe7..c6b4a284d5 100644
--- a/core/src/main/java/com/gitplex/server/model/support/BranchProtection.java
+++ b/core/src/main/java/com/gitplex/server/model/support/BranchProtection.java
@@ -18,6 +18,7 @@ import com.gitplex.server.model.Group;
import com.gitplex.server.util.PathUtils;
import com.gitplex.server.util.editable.annotation.BranchPattern;
import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.VerificationChoice;
import com.gitplex.server.util.reviewappointment.ReviewAppointment;
@Editable
@@ -33,6 +34,10 @@ public class BranchProtection implements Serializable {
private String reviewAppointmentExpr;
+ private List<String> verifications = new ArrayList<>();
+
+ private boolean verifyMerges;
+
private transient Optional<ReviewAppointment> reviewAppointmentOpt;
private List<FileProtection> fileProtections = new ArrayList<>();
@@ -67,7 +72,7 @@ public class BranchProtection implements Serializable {
this.noDeletion = noDeletion;
}
- @Editable(order=400, name="Reviewers", description="Optionally specify required reviewers for changes of "
+ @Editable(order=400, name="Required Reviewers", description="Optionally specify required reviewers for changes of "
+ "specified branch. Note that the user submitting the change is considered to reviewed the change "
+ "automatically")
@com.gitplex.server.util.editable.annotation.ReviewAppointment
@@ -79,7 +84,27 @@ public class BranchProtection implements Serializable {
this.reviewAppointmentExpr = reviewAppointmentExpr;
}
- @Editable(order=500, description="Optionally specify additional users to review particular paths. For each changed file, "
+ @Editable(order=500, name="Required Verifications", description="Optionally specify required verifications")
+ @VerificationChoice
+ public List<String> getVerifications() {
+ return verifications;
+ }
+
+ public void setVerifications(List<String> verifications) {
+ this.verifications = verifications;
+ }
+
+ @Editable(order=600, name="Verify Merged Commit", description="For required verifications specified above, this option determines whether or "
+ + "not to verify merged commits of relevant pull requests")
+ public boolean isVerifyMerges() {
+ return verifyMerges;
+ }
+
+ public void setVerifyMerges(boolean verifyMerges) {
+ this.verifyMerges = verifyMerges;
+ }
+
+ @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
public List<FileProtection> getFileProtections() {
diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
index 2e205b1204..843c68e7af 100644
--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
@@ -10,7 +10,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.CacheManager;
-import com.gitplex.server.manager.ReviewManager;
+import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Project;
@@ -168,11 +168,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canModify(Project project, String branch, String file) {
- return canWrite(project) && GitPlex.getInstance(ReviewManager.class).canModify(getUser(), project, branch, file);
+ return canWrite(project) && !GitPlex.getInstance(ProjectManager.class).isModificationNeedsQualityCheck(getUser(), project, branch, file);
}
public static boolean canPush(Project project, String branchName, ObjectId oldObjectId, ObjectId newObjectId) {
- return canWrite(project) && GitPlex.getInstance(ReviewManager.class).canPush(getUser(), project, branchName,
+ return canWrite(project) && !GitPlex.getInstance(ProjectManager.class).isPushNeedsQualityCheck(getUser(), project, branchName,
oldObjectId, newObjectId);
}
diff --git a/core/src/main/java/com/gitplex/server/util/ReviewStatus.java b/core/src/main/java/com/gitplex/server/util/QualityCheckStatus.java
similarity index 63%
rename from core/src/main/java/com/gitplex/server/util/ReviewStatus.java
rename to core/src/main/java/com/gitplex/server/util/QualityCheckStatus.java
index 91b07a942a..b635caf60a 100644
--- a/core/src/main/java/com/gitplex/server/util/ReviewStatus.java
+++ b/core/src/main/java/com/gitplex/server/util/QualityCheckStatus.java
@@ -6,10 +6,14 @@ import java.util.Map;
import com.gitplex.server.model.User;
import com.gitplex.server.model.Review;
-public interface ReviewStatus {
+public interface QualityCheckStatus {
List<User> getAwaitingReviewers();
Map<User, Review> getEffectiveReviews();
+ List<String> getAwaitingVerifications();
+
+ Map<String, Verification> getEffectiveVerifications();
+
}
diff --git a/core/src/main/java/com/gitplex/server/util/QualityCheckStatusImpl.java b/core/src/main/java/com/gitplex/server/util/QualityCheckStatusImpl.java
new file mode 100644
index 0000000000..44a37a3194
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/QualityCheckStatusImpl.java
@@ -0,0 +1,337 @@
+package com.gitplex.server.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.Permission;
+
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.manager.UserManager;
+import com.gitplex.server.manager.VerificationManager;
+import com.gitplex.server.model.Group;
+import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.model.PullRequestUpdate;
+import com.gitplex.server.model.Review;
+import com.gitplex.server.model.ReviewInvitation;
+import com.gitplex.server.model.User;
+import com.gitplex.server.model.support.BranchProtection;
+import com.gitplex.server.model.support.FileProtection;
+import com.gitplex.server.model.support.MergePreview;
+import com.gitplex.server.security.ProjectPrivilege;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.permission.ProjectPermission;
+import com.gitplex.server.util.facade.ProjectFacade;
+import com.gitplex.server.util.facade.UserFacade;
+import com.gitplex.server.util.reviewappointment.ReviewAppointment;
+
+public class QualityCheckStatusImpl implements QualityCheckStatus {
+
+ private static final int MAX_CONTRIBUTION_FILES = 100;
+
+ private final PullRequest request;
+
+ private final List<User> awaitingReviewers = new ArrayList<>();
+
+ private final Map<User, Review> effectiveReviews = new HashMap<>();
+
+ private final List<String> awaitingVerifications = new ArrayList<>();
+
+ private final Map<String, Verification> effectiveVerifications = new HashMap<>();
+
+ @Override
+ public List<User> getAwaitingReviewers() {
+ return awaitingReviewers;
+ }
+
+ @Override
+ public Map<User, Review> getEffectiveReviews() {
+ return effectiveReviews;
+ }
+
+ @Nullable
+ private ReviewInvitation getInvitation(Long userId) {
+ for (ReviewInvitation invitation: request.getReviewInvitations()) {
+ if (invitation.getUser().getId().equals(userId))
+ return invitation;
+ }
+ return null;
+ }
+
+ @Nullable
+ private Review getReviewAfter(Long userId, PullRequestUpdate update) {
+ for (Review review: update.getRequest().getReviews()) {
+ if (review.getUser().getId().equals(userId) && review.getUpdate() != null
+ && review.getUpdate().getId()>=update.getId()) {
+ return review;
+ }
+ }
+ return null;
+ }
+
+ public QualityCheckStatusImpl(PullRequest request) {
+ this.request = request;
+
+ for (ReviewInvitation invitation: request.getReviewInvitations()) {
+ if (!invitation.getUser().equals(request.getSubmitter())
+ && invitation.getType() == ReviewInvitation.Type.MANUAL) {
+ UserFacade user = invitation.getUser().getFacade();
+ Review effectiveReview = getReviewAfter(user.getId(), request.getLatestUpdate());
+ if (effectiveReview == null)
+ awaitingReviewers.add(invitation.getUser());
+ else
+ effectiveReviews.put(invitation.getUser(), effectiveReview);
+ }
+ }
+
+ BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch());
+ if (branchProtection != null) {
+ ReviewAppointment appointment = branchProtection.getReviewAppointment(request.getTargetProject());
+ if (appointment != null)
+ checkReviews(appointment, request.getLatestUpdate());
+
+ if (branchProtection.getVerifications() != null)
+ checkVerifications(branchProtection.getVerifications(), branchProtection.isVerifyMerges());
+
+ Set<FileProtection> checkedFileProtections = new HashSet<>();
+ for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {
+ if (checkedFileProtections.containsAll(branchProtection.getFileProtections()))
+ break;
+ PullRequestUpdate update = request.getSortedUpdates().get(i);
+ for (String file: update.getChangedFiles()) {
+ FileProtection fileProtection = branchProtection.getFileProtection(file);
+ if (fileProtection != null && !checkedFileProtections.contains(fileProtection)) {
+ checkedFileProtections.add(fileProtection);
+ checkReviews(fileProtection.getReviewAppointment(request.getTargetProject()), update);
+ }
+ }
+ }
+ }
+
+ ProjectFacade project = request.getTargetProject().getFacade();
+ Permission writePermission = new ProjectPermission(project, ProjectPrivilege.WRITE);
+ if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writePermission)) {
+ Collection<UserFacade> writers = SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.WRITE);
+ checkReviews(writers, 1, request.getLatestUpdate());
+ }
+
+ }
+
+ private boolean isAwaitingReviewer(Long userId) {
+ for (User user: awaitingReviewers) {
+ if (user.getId().equals(userId))
+ return true;
+ }
+ return false;
+ }
+
+ private void checkVerifications(List<String> verificationNames, boolean verifyMerges) {
+ String commit;
+ if (verifyMerges) {
+ MergePreview preview = request.getMergePreview();
+ if (preview != null && preview.getMerged() != null) {
+ commit = preview.getMerged();
+ } else {
+ commit = null;
+ }
+ } else {
+ commit = request.getHeadCommitHash();
+ }
+
+ Map<String, Verification> verifications;
+ if (commit != null) {
+ verifications = GitPlex.getInstance(VerificationManager.class)
+ .getVerifications(request.getTargetProject(), commit);
+ } else {
+ verifications = new HashMap<>();
+ }
+ for (String verificationName: verificationNames) {
+ Verification verification = verifications.get(verificationName);
+ if (verification != null)
+ effectiveVerifications.put(verificationName, verification);
+ else
+ awaitingVerifications.add(verificationName);
+ }
+ }
+
+ private void checkReviews(ReviewAppointment appointment, PullRequestUpdate update) {
+ for (User user: appointment.getUsers()) {
+ if (!user.equals(request.getSubmitter()) && !isAwaitingReviewer(user.getId())) {
+ Review effectiveReview = getReviewAfter(user.getId(), update);
+ if (effectiveReview == null) {
+ awaitingReviewers.add(user);
+ inviteReviewer(user.getId());
+ } else {
+ effectiveReviews.put(user, effectiveReview);
+ }
+ }
+ }
+
+ for (Map.Entry<Group, Integer> entry: appointment.getGroups().entrySet()) {
+ Group group = entry.getKey();
+ int requiredCount = entry.getValue();
+ checkReviews(getFacades(group.getMembers()), requiredCount, update);
+ }
+ }
+
+ private Collection<UserFacade> getFacades(Collection<User> users) {
+ Collection<UserFacade> facades = new HashSet<>();
+ for (User user: users)
+ facades.add(user.getFacade());
+ return facades;
+ }
+
+ private void checkReviews(Collection<UserFacade> users, int requiredCount, PullRequestUpdate update) {
+ if (requiredCount == 0)
+ requiredCount = users.size();
+
+ int effectiveCount = 0;
+ Set<UserFacade> potentialReviewers = new HashSet<>();
+ for (UserFacade user: users) {
+ if (user.getId().equals(request.getSubmitter().getId())) {
+ effectiveCount++;
+ } else if (isAwaitingReviewer(user.getId())) {
+ requiredCount--;
+ } else {
+ Review effectiveReview = getReviewAfter(user.getId(), update);
+ if (effectiveReview != null) {
+ effectiveCount++;
+ } else {
+ potentialReviewers.add(user);
+ }
+ }
+ if (effectiveCount >= requiredCount)
+ break;
+ }
+
+ int missingCount = requiredCount - effectiveCount;
+ Set<UserFacade> reviewers = new HashSet<>();
+
+ List<UserFacade> candidateReviewers = new ArrayList<>();
+ for (UserFacade user: potentialReviewers) {
+ ReviewInvitation invitation = getInvitation(user.getId());
+ if (invitation != null && invitation.getType() != ReviewInvitation.Type.EXCLUDE)
+ candidateReviewers.add(user);
+ }
+
+ sortByContributions(candidateReviewers, update);
+ for (UserFacade user: candidateReviewers) {
+ reviewers.add(user);
+ if (reviewers.size() == missingCount)
+ break;
+ }
+
+ if (reviewers.size() < missingCount) {
+ candidateReviewers = new ArrayList<>();
+ for (UserFacade user: potentialReviewers) {
+ ReviewInvitation invitation = getInvitation(user.getId());
+ if (invitation == null)
+ candidateReviewers.add(user);
+ }
+ sortByContributions(candidateReviewers, update);
+ for (UserFacade user: candidateReviewers) {
+ reviewers.add(user);
+ if (reviewers.size() == missingCount)
+ break;
+ }
+ }
+ if (reviewers.size() < missingCount) {
+ List<ReviewInvitation> excludedInvitations = new ArrayList<>();
+ for (UserFacade user: potentialReviewers) {
+ ReviewInvitation invitation = getInvitation(user.getId());
+ if (invitation != null && invitation.getType() == ReviewInvitation.Type.EXCLUDE)
+ excludedInvitations.add(invitation);
+ }
+ excludedInvitations.sort(Comparator.comparing(ReviewInvitation::getDate));
+
+ for (ReviewInvitation invitation: excludedInvitations) {
+ reviewers.add(invitation.getUser().getFacade());
+ if (reviewers.size() == missingCount)
+ break;
+ }
+ }
+ if (reviewers.size() < missingCount) {
+ String errorMessage = String.format("Impossible to provide required number of reviewers "
+ + "(candidates: %s, required number of reviewers: %d, pull request: #%d)",
+ reviewers, missingCount, update.getRequest().getNumber());
+ throw new RuntimeException(errorMessage);
+ }
+
+ UserManager userManager = GitPlex.getInstance(UserManager.class);
+ for (UserFacade user: reviewers) {
+ awaitingReviewers.add(userManager.load(user.getId()));
+ inviteReviewer(user.getId());
+ }
+ }
+
+ private void sortByContributions(List<UserFacade> users, PullRequestUpdate update) {
+ CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);
+ Map<UserFacade, Integer> contributions = new HashMap<>();
+ for (UserFacade user: users)
+ contributions.put(user, 0);
+
+ int count = 0;
+ for (String file: update.getChangedFiles()) {
+ int addedContributions = addContributions(contributions, commitInfoManager, file, update);
+ while (addedContributions == 0) {
+ if (file.contains("/")) {
+ file = StringUtils.substringBeforeLast(file, "/");
+ addedContributions = addContributions(contributions, commitInfoManager, file, update);
+ } else {
+ addContributions(contributions, commitInfoManager, "", update);
+ break;
+ }
+ }
+ if (++count >= MAX_CONTRIBUTION_FILES)
+ break;
+ }
+
+ users.sort((user1, user2)-> contributions.get(user2) - contributions.get(user1));
+ }
+
+ private int addContributions(Map<UserFacade, Integer> contributions, CommitInfoManager commitInfoManager,
+ String file, PullRequestUpdate update) {
+ int addedContributions = 0;
+ for (Map.Entry<UserFacade, Integer> entry: contributions.entrySet()) {
+ UserFacade user = entry.getKey();
+ int fileContribution = commitInfoManager.getContributions(
+ update.getRequest().getTargetProject().getFacade(), user, file);
+ entry.setValue(entry.getValue() + fileContribution);
+ addedContributions += fileContribution;
+ }
+ return addedContributions;
+ }
+
+ private void inviteReviewer(Long userId) {
+ ReviewInvitation invitation = getInvitation(userId);
+ if (invitation != null) {
+ invitation.setType(ReviewInvitation.Type.RULE);
+ } else {
+ invitation = new ReviewInvitation();
+ invitation.setRequest(request);
+ invitation.setUser(GitPlex.getInstance(UserManager.class).load(userId));
+ invitation.setType(ReviewInvitation.Type.RULE);
+ request.getReviewInvitations().add(invitation);
+ }
+ }
+
+ @Override
+ public List<String> getAwaitingVerifications() {
+ return awaitingVerifications;
+ }
+
+ @Override
+ public Map<String, Verification> getEffectiveVerifications() {
+ return effectiveVerifications;
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/gitplex/server/util/Verification.java b/core/src/main/java/com/gitplex/server/util/Verification.java
index 8872cc9f99..d66e2264cc 100644
--- a/core/src/main/java/com/gitplex/server/util/Verification.java
+++ b/core/src/main/java/com/gitplex/server/util/Verification.java
@@ -9,7 +9,7 @@ public class Verification implements Serializable {
private static final long serialVersionUID = 1L;
- public enum Status {SUCCESS, FAILURE, ERROR, PENDING};
+ public enum Status {SUCCESS, FAILURE, ERROR, RUNNING};
private final Status status;
diff --git a/core/src/main/java/com/gitplex/server/util/editable/annotation/VerificationChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/VerificationChoice.java
new file mode 100644
index 0000000000..ecf8bfd3d3
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/VerificationChoice.java
@@ -0,0 +1,11 @@
+package com.gitplex.server.util.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface VerificationChoice {
+}
diff --git a/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java b/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java
index ac77b870c7..92968ad85d 100644
--- a/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java
@@ -63,8 +63,10 @@ public class CommitStatusResource {
if (!SecurityUtils.canWrite(project))
throw new UnauthorizedException();
- Verification verification = new Verification(
- Verification.Status.valueOf(commitStatus.get("state").toUpperCase()),
+ String state = commitStatus.get("state").toUpperCase();
+ if (state.equals("PENDING"))
+ state = "RUNNING";
+ Verification verification = new Verification(Verification.Status.valueOf(state),
new Date(), commitStatus.get("description"), commitStatus.get("target_url"));
String context = commitStatus.get("context");
if (context == null)
diff --git a/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java b/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java
index 600f7632cb..f95c522b1b 100644
--- a/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java
@@ -127,14 +127,27 @@ public class PullRequestResource {
}
Map<String, Object> headMap = new HashMap<>();
- if (request.getSourceBranch() != null)
+ if (request.getSourceBranch() != null) {
headMap.put("ref", request.getSourceBranch());
+ headMap.put("label", request.getSourceBranch());
+ }
headMap.put("sha", request.getHeadCommitHash());
+ if (request.getSourceProject() != null) {
+ Map<String, Object> repoMap = new HashMap<>();
+ repoMap.put("id", "1000000");
+ repoMap.put("name", request.getSourceProject().getName());
+ headMap.put("repo", repoMap);
+ }
requestMap.put("head", headMap);
Map<String, Object> baseMap = new HashMap<>();
baseMap.put("ref", request.getTargetBranch());
baseMap.put("sha", request.getBaseCommitHash());
+ Map<String, Object> repoMap = new HashMap<>();
+ repoMap.put("id", "1000000");
+ repoMap.put("name", request.getTargetProject().getName());
+ baseMap.put("repo", repoMap);
+
requestMap.put("base", baseMap);
if (request.getSubmitter() != null) {
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.html b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.html
index ae0aef7a5e..02f2f5d0b7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.html
@@ -20,6 +20,7 @@
<div wicket:id="contribution"></div>
</div>
<div class="pull-right">
+ <span wicket:id="verificationStatus" class="verification-status"></span>
<span class="btn-group">
<a wicket:id="hashLink" class="hash btn btn-sm btn-default"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-sm btn-default"><i class="fa fa-clipboard"></i></a>
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java
index 9255933c7b..3fe9ee9f6f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java
@@ -26,9 +26,12 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
import org.joda.time.DateTime;
+import com.gitplex.server.GitPlex;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.Project;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.ContributorAvatars;
@@ -37,6 +40,7 @@ import com.gitplex.server.web.component.commitgraph.CommitGraphUtils;
import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.component.verification.VerificationStatusPanel;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.commit.CommitDetailPage;
import com.gitplex.server.web.util.model.CommitRefsModel;
@@ -143,6 +147,18 @@ public class CommitListPanel extends Panel {
fragment.add(new ContributorPanel("contribution",
commit.getAuthorIdent(), commit.getCommitterIdent(), true));
+ String commitHash = commit.name();
+ fragment.add(new VerificationStatusPanel("verificationStatus",
+ new LoadableDetachableModel<Map<String, Verification>>() {
+
+ @Override
+ protected Map<String, Verification> load() {
+ return GitPlex.getInstance(VerificationManager.class)
+ .getVerifications(projectModel.getObject(), commitHash);
+ }
+
+ }));
+
CommitDetailPage.State commitState = new CommitDetailPage.State();
commitState.revision = commit.name();
PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitlist/commit-list.css b/web/src/main/java/com/gitplex/server/web/component/commitlist/commit-list.css
index 8dc8f2b559..4745c46174 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitlist/commit-list.css
+++ b/web/src/main/java/com/gitplex/server/web/component/commitlist/commit-list.css
@@ -44,4 +44,7 @@
}
.commit-list .alert {
margin-bottom: 12px;
+}
+.commit-list .verification-status {
+ margin-right: 4px;
}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java
index 0ec6228a84..c71fcbe596 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java
@@ -70,7 +70,7 @@ public abstract class ReviewerChoice extends SelectToAddChoice<UserFacade> {
invitation.setType(ReviewInvitation.Type.MANUAL);
invitation.setDate(new Date());
- request.clearReviewStatus();
+ request.clearQualityStatus();
if (!request.isNew())
GitPlex.getInstance(ReviewInvitationManager.class).invite(invitation);
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html
index d67a54e39e..45ee3e1161 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.html
@@ -1,15 +1,15 @@
<wicket:panel>
<table class="reviewers">
<tr wicket:id="reviewers">
- <td class="reviewer">
- <a wicket:id="avatar"></a> <a wicket:id="name"></a>
- </td>
<td class="result">
<span wicket:id="result"></span>
</td>
+ <td class="reviewer">
+ <a wicket:id="avatar"></a> <a wicket:id="name"></a>
+ </td>
<td class="actions">
- <a wicket:id="delete" title="Remove this reviewer"><i class="fa fa-trash"></i></a>
<a wicket:id="withdraw" title="Withdraw this review"><i class="fa fa-undo"></i></a>
+ <a wicket:id="delete" title="Remove this reviewer"><i class="fa fa-trash"></i></a>
</td>
</tr>
<wicket:container wicket:id="noReviewers">
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
index c2e828298b..289c67c71d 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
@@ -31,7 +31,7 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.Review;
import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.security.SecurityUtils;
-import com.gitplex.server.util.ReviewStatus;
+import com.gitplex.server.util.QualityCheckStatus;
import com.gitplex.server.util.facade.UserFacade;
import com.gitplex.server.web.behavior.dropdown.DropdownHover;
import com.gitplex.server.web.component.avatar.AvatarLink;
@@ -71,13 +71,13 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
List<User> reviewers = new ArrayList<>();
- List<Review> reviews = new ArrayList<>(request.getReviewStatus().getEffectiveReviews().values());
+ List<Review> reviews = new ArrayList<>(request.getQualityCheckStatus().getEffectiveReviews().values());
Collections.sort(reviews);
for (Review review: reviews)
reviewers.add(review.getUser());
- for (User awaitingReviewer: request.getReviewStatus().getAwaitingReviewers())
+ for (User awaitingReviewer: request.getQualityCheckStatus().getAwaitingReviewers())
reviewers.add(awaitingReviewer);
return reviewers;
@@ -92,7 +92,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
item.add(new UserLink("name", item.getModelObject()));
PullRequest request = getPullRequest();
- Review review = request.getReviewStatus().getEffectiveReviews().get(item.getModelObject());
+ Review review = request.getQualityCheckStatus().getEffectiveReviews().get(item.getModelObject());
WebMarkupContainer result = new WebMarkupContainer("result");
if (review != null) {
@@ -153,12 +153,12 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
}
if (invitation != null) {
- request.clearReviewStatus();
+ request.clearQualityStatus();
invitation.setDate(new Date());
boolean removed;
if (request.isNew()) {
invitation.setType(ReviewInvitation.Type.EXCLUDE);
- removed = !request.getReviewStatus().getAwaitingReviewers().contains(reviewer);
+ removed = !request.getQualityCheckStatus().getAwaitingReviewers().contains(reviewer);
} else {
removed = GitPlex.getInstance(ReviewInvitationManager.class).exclude(invitation);
}
@@ -198,7 +198,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
User reviewer = item.getModelObject();
- Review review = request.getReviewStatus().getEffectiveReviews().get(reviewer);
+ Review review = request.getQualityCheckStatus().getEffectiveReviews().get(reviewer);
setVisible(review != null
&& (reviewer.equals(SecurityUtils.getUser())
|| SecurityUtils.canManage(request.getTargetProject())));
@@ -208,7 +208,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
public void onClick(AjaxRequestTarget target) {
PullRequest request = getPullRequest();
User reviewer = item.getModelObject();
- request.clearReviewStatus();
+ request.clearQualityStatus();
GitPlex.getInstance(ReviewManager.class).delete(reviewer, request);
reviewersModel.detach();
send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));
@@ -224,7 +224,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
@Override
protected void onConfigure() {
super.onConfigure();
- ReviewStatus reviewCheckStatus = getPullRequest().getReviewStatus();
+ QualityCheckStatus reviewCheckStatus = getPullRequest().getQualityCheckStatus();
setVisible(reviewCheckStatus.getAwaitingReviewers().isEmpty()
&& reviewCheckStatus.getEffectiveReviews().isEmpty());
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java
index 4896f54b2e..75b59b8110 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java
@@ -12,7 +12,7 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.User;
import com.gitplex.server.security.ProjectPrivilege;
import com.gitplex.server.security.SecurityUtils;
-import com.gitplex.server.util.ReviewStatus;
+import com.gitplex.server.util.QualityCheckStatus;
import com.gitplex.server.util.facade.UserFacade;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.select2.Response;
@@ -31,7 +31,7 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {
@Override
public void query(String term, int page, Response<UserFacade> response) {
PullRequest request = requestModel.getObject();
- ReviewStatus checkStatus = request.getReviewStatus();
+ QualityCheckStatus checkStatus = request.getQualityCheckStatus();
Collection<UserFacade> users = SecurityUtils.getAuthorizedUsers(request.getTargetProject().getFacade(),
ProjectPrivilege.READ);
for (User reviewer: checkStatus.getAwaitingReviewers())
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/reviewer-list.css b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/reviewer-list.css
index aca300925a..32f1047e7b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/reviewer-list.css
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/reviewer-list.css
@@ -1,11 +1,21 @@
table.reviewers a {
color: #333;
}
+table.reviewers td.result {
+ font-size: 16px;
+ width: 16px;
+ padding-left: 0;
+ padding-right: 8px;
+}
+table.reviewers td.reviewer {
+ padding-left: 0;
+}
table.reviewers>tbody>tr>td {
- padding: 0 12px 12px 0;
+ padding: 6px 12px;
}
-table.reviewers>tbody>tr>td.result, table.reviewers>tbody>tr>td.actions {
+table.reviewers>tbody>tr>td.actions {
font-size: 16px;
+ text-align: right;
}
table.reviewers>tbody>tr>td.result span.awaiting {
color: #DCB412;
@@ -19,6 +29,7 @@ table.reviewers>tbody>tr>td.result span.disapproved {
table.reviewers>tbody>tr:last-child>td {
padding-bottom: 0;
+ padding-left: 0;
}
table.reviewers>tbody>tr>td.no-reviewers {
font-size: 16px;
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/RequiredVerificationsPanel.html b/web/src/main/java/com/gitplex/server/web/component/verification/RequiredVerificationsPanel.html
new file mode 100644
index 0000000000..d590322bdf
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/RequiredVerificationsPanel.html
@@ -0,0 +1,18 @@
+<wicket:panel>
+ <table class="required-verifications">
+ <tr wicket:id="verifications">
+ <td class="result">
+ <span wicket:id="result" class="verification-status"></span>
+ </td>
+ <td class="name">
+ <span wicket:id="name"></span>
+ </td>
+ <td class="description">
+ <span wicket:id="content"></span>
+ </td>
+ </tr>
+ </table>
+ <wicket:fragment wicket:id="linkFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/RequiredVerificationsPanel.java b/web/src/main/java/com/gitplex/server/web/component/verification/RequiredVerificationsPanel.java
new file mode 100644
index 0000000000..86102f5663
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/RequiredVerificationsPanel.java
@@ -0,0 +1,144 @@
+package com.gitplex.server.web.component.verification;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.util.QualityCheckStatus;
+import com.gitplex.server.util.Verification;
+import com.gitplex.server.util.Verification.Status;
+import com.gitplex.server.web.websocket.PageDataChanged;
+
+@SuppressWarnings("serial")
+public class RequiredVerificationsPanel extends GenericPanel<PullRequest> {
+
+ public RequiredVerificationsPanel(String id, IModel<PullRequest> model) {
+ super(id, model);
+ }
+
+ private PullRequest getPullRequest() {
+ return getModelObject();
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PageDataChanged && isVisible()) {
+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
+ pageDataChanged.getHandler().add(this);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ IModel<List<String>> verificationsModel = new LoadableDetachableModel<List<String>>() {
+
+ @Override
+ protected List<String> load() {
+ PullRequest request = getPullRequest();
+ Map<String, Verification> effectiveVerifications =
+ request.getQualityCheckStatus().getEffectiveVerifications();
+ List<String> requiredVerifications = new ArrayList<>(effectiveVerifications.keySet());
+ Collections.sort(requiredVerifications, new Comparator<String>() {
+
+ @Override
+ public int compare(String o1, String o2) {
+ return effectiveVerifications.get(o1).getDate()
+ .compareTo(effectiveVerifications.get(o2).getDate());
+ }
+
+ });
+ requiredVerifications.addAll(request.getQualityCheckStatus().getAwaitingVerifications());
+ return requiredVerifications;
+ }
+
+ };
+ add(new ListView<String>("verifications", verificationsModel) {
+
+ @Override
+ protected void populateItem(ListItem<String> item) {
+ PullRequest request = getPullRequest();
+ String verificationName = item.getModelObject();
+ item.add(new Label("name", verificationName));
+
+ Verification verification =
+ request.getQualityCheckStatus().getEffectiveVerifications().get(verificationName);
+
+ WebMarkupContainer result = new WebMarkupContainer("result");
+ if (verification != null) {
+ if (verification.getDescription() != null) {
+ if (verification.getTargetUrl() != null) {
+ Fragment fragment = new Fragment("content", "linkFrag", RequiredVerificationsPanel.this);
+ ExternalLink link = new ExternalLink("link", verification.getTargetUrl());
+ link.add(new Label("label", verification.getDescription()));
+ fragment.add(link);
+ item.add(fragment);
+ } else {
+ item.add(new Label("content", verification.getDescription()));
+ }
+ } else {
+ item.add(new Label("content").setVisible(false));
+ }
+ if (verification.getStatus() == Status.SUCCESS) {
+ result.add(AttributeAppender.append("class", "success fa fa-check"));
+ result.add(AttributeAppender.append("title", "Verification is successful"));
+ } else if (verification.getStatus() == Status.ERROR) {
+ result.add(AttributeAppender.append("class", "error fa fa-warning"));
+ result.add(AttributeAppender.append("title", "Verification is in error"));
+ } else if (verification.getStatus() == Status.FAILURE) {
+ result.add(AttributeAppender.append("class", "failure fa fa-times"));
+ result.add(AttributeAppender.append("title", "Verification is failed"));
+ } else {
+ result.add(AttributeAppender.append("class", "running fa fa-circle"));
+ result.add(AttributeAppender.append("title", "Verification is running"));
+ }
+ } else {
+ item.add(new Label("content").setVisible(false));
+ result.add(AttributeAppender.append("class", "awaiting fa fa-clock-o"));
+ result.add(AttributeAppender.append("title", "Waiting for verification"));
+ }
+
+ item.add(result);
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ QualityCheckStatus qualityStatus = getPullRequest().getQualityCheckStatus();
+ setVisible(!qualityStatus.getAwaitingVerifications().isEmpty()
+ || !qualityStatus.getEffectiveVerifications().isEmpty());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new VerificationResourceReference()));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/VerificationChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationChoiceProvider.java
new file mode 100644
index 0000000000..3a4b1b81c8
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationChoiceProvider.java
@@ -0,0 +1,46 @@
+package com.gitplex.server.web.component.verification;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.json.JSONException;
+import org.json.JSONWriter;
+import org.unbescape.html.HtmlEscape;
+
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.VerificationManager;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.page.project.ProjectPage;
+import com.gitplex.server.web.util.WicketUtils;
+
+public class VerificationChoiceProvider extends ChoiceProvider<String> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void toJson(String choice, JSONWriter writer) throws JSONException {
+ String escapedName = HtmlEscape.escapeHtml5(choice);
+ writer.key("id").value(escapedName).key("name").value(escapedName);
+ }
+
+ @Override
+ public Collection<String> toChoices(Collection<String> ids) {
+ return ids;
+ }
+
+ @Override
+ public void query(String term, int page, Response<String> response) {
+ ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
+ Collection<String> verifications = GitPlex.getInstance(VerificationManager.class)
+ .getVerificationNames(projectPage.getProject());
+ List<String> verificationList = new ArrayList<>(verifications);
+ Collections.sort(verificationList);
+ new ResponseFiller<String>(response).fill(verificationList, page, WebConstants.PAGE_SIZE);
+ }
+
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/VerificationDetailPanel.html b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationDetailPanel.html
new file mode 100644
index 0000000000..33217caf30
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationDetailPanel.html
@@ -0,0 +1,20 @@
+<wicket:panel>
+ <div class="verification-detail">
+ <table>
+ <tr wicket:id="verifications">
+ <td class="result">
+ <span wicket:id="result" class="verification-status"></span>
+ </td>
+ <td class="name">
+ <span wicket:id="name"></span>
+ </td>
+ <td class="description">
+ <span wicket:id="content"></span>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <wicket:fragment wicket:id="linkFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/VerificationDetailPanel.java b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationDetailPanel.java
new file mode 100644
index 0000000000..e84778d226
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationDetailPanel.java
@@ -0,0 +1,106 @@
+package com.gitplex.server.web.component.verification;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import com.gitplex.server.util.Pair;
+import com.gitplex.server.util.Verification;
+import com.gitplex.server.util.Verification.Status;
+
+@SuppressWarnings("serial")
+public class VerificationDetailPanel extends GenericPanel<Map<String, Verification>> {
+
+ public VerificationDetailPanel(String id, IModel<Map<String, Verification>> model) {
+ super(id, model);
+
+ add(new ListView<Pair<String, Verification>>("verifications", new LoadableDetachableModel<List<Pair<String, Verification>>>() {
+
+ @Override
+ protected List<Pair<String, Verification>> load() {
+ Map<String, Verification> map = VerificationDetailPanel.this.getModelObject();
+ List<Pair<String, Verification>> list = new ArrayList<>();
+ for (Map.Entry<String, Verification> entry: map.entrySet()) {
+ list.add(new Pair<String, Verification>(entry.getKey(), entry.getValue()));
+ }
+ Collections.sort(list, new Comparator<Pair<String, Verification>>() {
+
+ @Override
+ public int compare(Pair<String, Verification> o1, Pair<String, Verification> o2) {
+ return o1.getSecond().getDate().compareTo(o2.getSecond().getDate());
+ }
+
+ });
+ return list;
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<Pair<String, Verification>> item) {
+ Verification verification = item.getModelObject().getSecond();
+
+ WebMarkupContainer result = new WebMarkupContainer("result");
+ item.add(result);
+
+ if (verification.getStatus() == Status.SUCCESS) {
+ result.add(AttributeAppender.append("class", "success fa fa-check"));
+ result.add(AttributeAppender.append("title", "Verification is successful"));
+ } else if (verification.getStatus() == Status.ERROR) {
+ result.add(AttributeAppender.append("class", "error fa fa-warning"));
+ result.add(AttributeAppender.append("title", "Verification is in error"));
+ } else if (verification.getStatus() == Status.FAILURE) {
+ result.add(AttributeAppender.append("class", "failure fa fa-times"));
+ result.add(AttributeAppender.append("title", "Verification is failed"));
+ } else {
+ result.add(AttributeAppender.append("class", "running fa fa-circle"));
+ result.add(AttributeAppender.append("title", "Verification is running"));
+ }
+
+ item.add(new Label("name", item.getModelObject().getFirst()));
+
+ if (verification.getDescription() != null) {
+ if (verification.getTargetUrl() != null) {
+ Fragment fragment = new Fragment("content", "linkFrag", VerificationDetailPanel.this);
+ ExternalLink link = new ExternalLink("link", verification.getTargetUrl());
+ link.add(new Label("label", verification.getDescription()));
+ fragment.add(link);
+ item.add(fragment);
+ } else {
+ item.add(new Label("content", verification.getDescription()));
+ }
+ } else {
+ item.add(new WebMarkupContainer("content").setVisible(false));
+ }
+ }
+
+ });
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new VerificationResourceReference()));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/VerificationMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationMultiChoice.java
new file mode 100644
index 0000000000..d20a96117d
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationMultiChoice.java
@@ -0,0 +1,35 @@
+package com.gitplex.server.web.component.verification;
+
+import java.util.Collection;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.model.IModel;
+
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
+
+public class VerificationMultiChoice extends Select2MultiChoice<String> {
+
+ private static final long serialVersionUID = 1L;
+
+ public VerificationMultiChoice(String id, IModel<Collection<String>> model, VerificationChoiceProvider choiceProvider) {
+ super(id, model, choiceProvider);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("Choose verifications...");
+ getSettings().setFormatResult("gitplex.server.verificationChoiceFormatter.formatResult");
+ getSettings().setFormatSelection("gitplex.server.verificationChoiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("gitplex.server.verificationChoiceFormatter.escapeMarkup");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new VerificationResourceReference()));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/VerificationResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationResourceReference.java
new file mode 100644
index 0000000000..5d6f5044d5
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationResourceReference.java
@@ -0,0 +1,27 @@
+package com.gitplex.server.web.component.verification;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.server.web.page.base.BaseDependentResourceReference;
+
+public class VerificationResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public VerificationResourceReference() {
+ super(VerificationResourceReference.class, "verification.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ VerificationResourceReference.class, "verification.css")));
+ return dependencies;
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/VerificationStatusPanel.html b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationStatusPanel.html
new file mode 100644
index 0000000000..4f9c8b5acc
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationStatusPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <a wicket:id="status" class="verification-status"><span></span></a>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/VerificationStatusPanel.java b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationStatusPanel.java
new file mode 100644
index 0000000000..6c04870cdb
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/VerificationStatusPanel.java
@@ -0,0 +1,93 @@
+package com.gitplex.server.web.component.verification;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.wicket.Component;
+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 com.gitplex.server.util.Verification;
+import com.gitplex.server.util.Verification.Status;
+import com.gitplex.server.web.component.floating.FloatingPanel;
+import com.gitplex.server.web.component.link.DropdownLink;
+import com.gitplex.server.web.websocket.PageDataChanged;
+
+@SuppressWarnings("serial")
+public class VerificationStatusPanel extends GenericPanel<Map<String, Verification>> {
+
+ public VerificationStatusPanel(String id, IModel<Map<String, Verification>> model) {
+ super(id, model);
+ }
+
+ private boolean hasStatus(Collection<Verification> verifications, Verification.Status status) {
+ for (Verification verification: verifications) {
+ if (verification.getStatus() == status)
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PageDataChanged) {
+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
+ pageDataChanged.getHandler().add(this);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new DropdownLink("status") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel floating) {
+ return new VerificationDetailPanel(id, VerificationStatusPanel.this.getModel());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ Collection<Verification> verifications = VerificationStatusPanel.this.getModelObject().values();
+ if (hasStatus(verifications, Status.ERROR)) {
+ tag.put("class", "verification-status error fa fa-warning");
+ tag.put("title", "Some verifications are in error, click for details");
+ } else if (hasStatus(verifications, Status.FAILURE)) {
+ tag.put("class", "verification-status failure fa fa-times");
+ tag.put("title", "Some verifications are failed, click for details");
+ } else if (hasStatus(verifications, Status.RUNNING)) {
+ tag.put("class", "verification-status running fa fa-circle");
+ tag.put("title", "Some verifications are running, click for details");
+ } else if (hasStatus(verifications, Status.SUCCESS)) {
+ tag.put("class", "verification-status success fa fa-check");
+ tag.put("title", "Verifications are successful, click for details");
+ }
+ }
+
+ });
+
+ setOutputMarkupPlaceholderTag(true);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getModelObject().isEmpty());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new VerificationResourceReference()));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/verification.css b/web/src/main/java/com/gitplex/server/web/component/verification/verification.css
new file mode 100644
index 0000000000..3bed113b01
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/verification.css
@@ -0,0 +1,44 @@
+a.verification {
+ text-decoration: none;
+}
+.verification-detail {
+ margin-bottom: 0;
+ padding: 8px;
+}
+
+.verification-detail table td {
+ padding: 4px 12px;
+}
+.verification-detail table td.result {
+ padding-right: 4px;
+}
+.verification-detail table td.name {
+ padding-left: 0;
+}
+
+.verification-status.success {
+ color: #06BC06 !important;
+}
+.verification-status.failure, .verification-status.error {
+ color: red !important;
+}
+.verification-status.running, .verification-status.awaiting {
+ color: #D2A906 !important;
+}
+
+.required-verifications td.result {
+ width: 12px;
+}
+
+.required-verifications tr td {
+ padding: 2px 12px;
+}
+
+.required-verifications td.result {
+ padding-left: 0;
+ padding-right: 8px;
+ font-size: 16px;
+}
+.required-verifications td.name {
+ padding-left: 0;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/verification/verification.js b/web/src/main/java/com/gitplex/server/web/component/verification/verification.js
new file mode 100644
index 0000000000..5f487aa1ab
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/verification/verification.js
@@ -0,0 +1,14 @@
+gitplex.server.verificationChoiceFormatter = {
+ formatSelection: function(verification) {
+ return verification.name;
+ },
+
+ formatResult: function(verification) {
+ return "<div class='verification'>" + verification.name + "</div>";
+ },
+
+ escapeMarkup: function(m) {
+ return m;
+ },
+
+};
diff --git a/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationEditSupport.java
new file mode 100644
index 0000000000..1c3c90a9af
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationEditSupport.java
@@ -0,0 +1,72 @@
+package com.gitplex.server.web.editable.verification;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+import org.eclipse.jgit.util.StringUtils;
+
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.VerificationChoice;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class VerificationEditSupport implements EditSupport {
+
+ @Override
+ public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {
+ return null;
+ }
+
+ @Override
+ public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {
+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);
+ Method propertyGetter = propertyDescriptor.getPropertyGetter();
+ VerificationChoice verificationChoice = propertyGetter.getAnnotation(VerificationChoice.class);
+ if (verificationChoice != null) {
+ if (List.class.isAssignableFrom(propertyGetter.getReturnType())
+ && EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {
+ return new PropertyContext<List<String>>(propertyDescriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {
+ return new PropertyViewer(componentId, this) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ List<String> verifications = model.getObject();
+ if (verifications != null && !verifications.isEmpty()) {
+ return new Label(id, StringUtils.join(verifications, ", " ));
+ } else {
+ return new NotDefinedLabel(id);
+ }
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {
+ return new VerificationMultiChoiceEditor(componentId, this, model);
+ }
+
+ };
+ } else {
+ throw new RuntimeException("Annotation 'VerificationChoice' should be applied to property with type "
+ + "'List<String>'.");
+ }
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationMultiChoiceEditor.html b/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationMultiChoiceEditor.html
new file mode 100644
index 0000000000..f1c90cbe9e
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationMultiChoiceEditor.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <input wicket:id="input" type="hidden"></input>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationMultiChoiceEditor.java
new file mode 100644
index 0000000000..a296e214e3
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/editable/verification/VerificationMultiChoiceEditor.java
@@ -0,0 +1,62 @@
+package com.gitplex.server.web.editable.verification;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import com.gitplex.server.web.component.verification.VerificationChoiceProvider;
+import com.gitplex.server.web.component.verification.VerificationMultiChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+
+@SuppressWarnings("serial")
+public class VerificationMultiChoiceEditor extends PropertyEditor<List<String>> {
+
+ private VerificationMultiChoice input;
+
+ public VerificationMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
+ IModel<List<String>> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<String> verifications = new ArrayList<>();
+ if (getModelObject() != null) {
+ verifications.addAll(getModelObject());
+ }
+
+ input = new VerificationMultiChoice("input", new Model((Serializable) verifications),
+ new VerificationChoiceProvider());
+ input.setConvertEmptyInputStringToNull(true);
+
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected List<String> convertInputToValue() throws ConversionException {
+ List<String> verifications = new ArrayList<>();
+ Collection<String> convertedInput = input.getConvertedInput();
+ if (convertedInput != null) {
+ for (String each: convertedInput)
+ verifications.add(each);
+ }
+ return verifications;
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.java
index 4c00ec444c..5a75271254 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -67,7 +67,7 @@ public class MailSettingPage extends AdministrationPage {
try {
GitPlex.getInstance(MailManager.class).sendMail(mailSettingHolder.getMailSetting(),
Sets.newHashSet(currentUser.getEmail()),
- "Test email from GitPlex", "Great, your mail setting is correct!");
+ "Test email from GitPlex", "Great, your mail setting is working!");
return new TestResult.Successful("Test mail has been sent to " +
currentUser.getEmail() + ", please check your mail box.");
} catch (Exception e) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.java
index e5f5592208..bc496d2d39 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/BlobUploadPanel.java
@@ -26,8 +26,8 @@ import com.gitplex.server.git.GitUtils;
import com.gitplex.server.git.exception.NotTreeException;
import com.gitplex.server.git.exception.ObjectAlreadyExistsException;
import com.gitplex.server.git.exception.ObsoleteCommitException;
+import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.UserManager;
-import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.User;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.dropzonefield.DropzoneField;
@@ -85,16 +85,16 @@ abstract class BlobUploadPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- ReviewManager reviewManager = GitPlex.getInstance(ReviewManager.class);
+ ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);
Map<String, BlobContent> newBlobs = new HashMap<>();
for (FileUpload upload: uploads) {
String blobPath = upload.getClientFileName();
if (context.getBlobIdent().path != null)
blobPath = context.getBlobIdent().path + "/" + blobPath;
- if (!reviewManager.canModify(SecurityUtils.getUser(), context.getProject(),
+ if (projectManager.isModificationNeedsQualityCheck(SecurityUtils.getUser(), context.getProject(),
context.getBlobIdent().revision, blobPath)) {
- form.error("Adding of file '" + blobPath + "' need to be reviewed. "
+ form.error("Adding of file '" + blobPath + "' need to be reviewed/verified. "
+ "Please submit pull request instead");
target.add(feedback);
return;
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index 64c0a92a84..c013ab1c69 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -48,11 +48,11 @@ import com.gitplex.server.git.GitUtils;
import com.gitplex.server.git.exception.NotTreeException;
import com.gitplex.server.git.exception.ObjectAlreadyExistsException;
import com.gitplex.server.git.exception.ObsoleteCommitException;
+import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.UserManager;
-import com.gitplex.server.manager.ReviewManager;
-import com.gitplex.server.model.User;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.model.User;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.Provider;
import com.gitplex.server.util.diff.WhitespaceOption;
@@ -318,9 +318,9 @@ public class CommitOptionPanel extends Panel {
Map<String, BlobContent> newBlobs = new HashMap<>();
if (newContentProvider != null) {
- if (!GitPlex.getInstance(ReviewManager.class).canModify(SecurityUtils.getUser(), context.getProject(),
+ if (GitPlex.getInstance(ProjectManager.class).isModificationNeedsQualityCheck(SecurityUtils.getUser(), context.getProject(),
context.getBlobIdent().revision, context.getNewPath())) {
- CommitOptionPanel.this.error("Adding of file '" + context.getNewPath() + "' need to be reviewed. "
+ CommitOptionPanel.this.error("Adding of file '" + context.getNewPath() + "' need to be reviewed/verified. "
+ "Please submit pull request instead");
target.add(feedback);
return false;
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
index 4495a50f72..016d36da80 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
@@ -19,6 +19,7 @@
<td class="detail">
<div class="branch">
<a wicket:id="branchLink" class="name"><span wicket:id="name"></span></a>
+ <span wicket:id="verificationStatus" class="verification-status"></span>
<span class="label label-default" wicket:id="default">default</span>
<span class="btn-group">
<a wicket:id="makeDefault" class="make-default btn btn-xs btn-default"><i class="fa fa-check"></i> make default</a>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
index 7403dfc3a5..5ced0f42eb 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
@@ -53,12 +53,14 @@ import com.gitplex.server.git.GitUtils;
import com.gitplex.server.git.RefInfo;
import com.gitplex.server.manager.BranchWatchManager;
import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.BranchWatch;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.ProjectAndBranch;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;
@@ -67,6 +69,7 @@ import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
+import com.gitplex.server.web.component.verification.VerificationStatusPanel;
import com.gitplex.server.web.page.project.NoBranchesPage;
import com.gitplex.server.web.page.project.ProjectPage;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
@@ -395,6 +398,18 @@ public class ProjectBranchesPage extends ProjectPage {
link.add(new Label("name", branch));
item.add(link);
+ RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId());
+
+ String lastCommitHash = lastCommit.name();
+ item.add(new VerificationStatusPanel("verificationStatus", new LoadableDetachableModel<Map<String, Verification>>() {
+
+ @Override
+ protected Map<String, Verification> load() {
+ return GitPlex.getInstance(VerificationManager.class).getVerifications(getProject(), lastCommitHash);
+ }
+
+ }));
+
item.add(new AjaxLink<Void>("makeDefault") {
@Override
@@ -422,7 +437,6 @@ public class ProjectBranchesPage extends ProjectPage {
});
- RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId());
PageParameters params = CommitDetailPage.paramsOf(getProject(), lastCommit.name());
link = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/project-branches.css b/web/src/main/java/com/gitplex/server/web/page/project/branches/project-branches.css
index 3b57a25978..9ed0eb2a8a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/project-branches.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/project-branches.css
@@ -20,6 +20,9 @@
color: #555;
margin-right: 8px;
}
+#repo-branches>.list>table td.detail>.branch>.verification-status {
+ margin-right: 8px;
+}
#repo-branches>.list>table td.detail>.commit {
margin: 8px 0;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.html b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.html
index e8c59d2d20..52f4cfb5b9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.html
@@ -36,6 +36,7 @@
</wicket:enclosure>
</div>
<div class="commit pull-right">
+ <span wicket:id="verificationStatus" class="verification-status"></span>
<span wicket:id="hash" class="hash"></span>
<a wicket:id="copyHash"><i class="fa fa-clipboard"></i></a>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.java
index 738e7e282e..3ac454d313 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/CommitDetailPage.java
@@ -40,10 +40,12 @@ import com.gitplex.server.git.GitUtils;
import com.gitplex.server.git.RefInfo;
import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.MarkPos;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.ContributorAvatars;
@@ -54,6 +56,7 @@ import com.gitplex.server.web.component.createtag.CreateTagLink;
import com.gitplex.server.web.component.diff.revision.CommentSupport;
import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.component.verification.VerificationStatusPanel;
import com.gitplex.server.web.page.project.ProjectPage;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.branches.ProjectBranchesPage;
@@ -209,6 +212,15 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));
add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent(), true));
+ add(new VerificationStatusPanel("verificationStatus", new LoadableDetachableModel<Map<String, Verification>>() {
+
+ @Override
+ protected Map<String, Verification> load() {
+ return GitPlex.getInstance(VerificationManager.class).getVerifications(getProject(), getCommit().name());
+ }
+
+ }));
+
add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));
add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(getCommit().name()))));
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.html
index 5fde2d5784..b13164eb19 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.html
@@ -42,6 +42,7 @@
</span>
</div>
<div class="pull-right hash">
+ <span wicket:id="verificationStatus"></span>
<span class="btn-group">
<a wicket:id="hashLink" class="btn btn-sm btn-default"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-sm btn-default"><i class="fa fa-clipboard"></i></a>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java
index 7a6ce27923..e9158898c9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
@@ -45,12 +46,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.unbescape.java.JavaEscape;
+import com.gitplex.server.GitPlex;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.git.command.RevListCommand;
+import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.support.ProjectAndRevision;
import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.ContributorAvatars;
@@ -59,6 +63,7 @@ import com.gitplex.server.web.component.commitgraph.CommitGraphUtils;
import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.component.verification.VerificationStatusPanel;
import com.gitplex.server.web.page.project.ProjectPage;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.commit.CommitQueryParser.CriteriaContext;
@@ -499,6 +504,15 @@ public class ProjectCommitsPage extends ProjectPage {
item.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
+
+ item.add(new VerificationStatusPanel("verificationStatus", new LoadableDetachableModel<Map<String, Verification>>() {
+
+ @Override
+ protected Map<String, Verification> load() {
+ return GitPlex.getInstance(VerificationManager.class).getVerifications(getProject(), commit.name());
+ }
+
+ }));
item.add(AttributeAppender.append("class", "commit clearfix"));
} else {
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html
index 5f6267978d..6135e0bfa8 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html
@@ -86,9 +86,13 @@
</td>
</tr>
<tr class="reviewers">
- <td class="name">Reviewers</td>
+ <td class="name">Required Reviewers</td>
<td class="value"><div wicket:id="reviewers"></div></td>
</tr>
+ <tr class="verifications">
+ <td class="name">Required Verifications</td>
+ <td class="value"><div wicket:id="verifications"></div></td>
+ </tr>
</table>
<div class="clearfix">
<input wicket:id="send" type="submit" class="btn btn-primary pull-left" value="Create Pull Request"></input>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.java
index 5d88bcb780..d7b3da101e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.java
@@ -50,6 +50,8 @@ import com.gitplex.server.model.support.MergeStrategy;
import com.gitplex.server.model.support.ProjectAndBranch;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.QualityCheckStatus;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.component.branchpicker.AffinalBranchPicker;
import com.gitplex.server.web.component.comment.CommentInput;
@@ -64,6 +66,7 @@ import com.gitplex.server.web.component.requestreviewer.ReviewerListPanel;
import com.gitplex.server.web.component.tabbable.AjaxActionTab;
import com.gitplex.server.web.component.tabbable.Tab;
import com.gitplex.server.web.component.tabbable.Tabbable;
+import com.gitplex.server.web.component.verification.RequiredVerificationsPanel;
import com.gitplex.server.web.page.base.BasePage;
import com.gitplex.server.web.page.project.NoBranchesPage;
import com.gitplex.server.web.page.project.ProjectPage;
@@ -169,6 +172,7 @@ public class NewRequestPage extends ProjectPage implements MarkSupport {
pullRequestRef.get().setMergeStrategy(MergeStrategy.ALWAYS_MERGE);
pullRequestRef.get().setBaseCommitHash(baseCommitId.name());
+ pullRequestRef.get().setHeadCommitHash(source.getObjectName());
if (pullRequestRef.get().getBaseCommitHash().equals(source.getObjectName())) {
CloseInfo closeInfo = new CloseInfo();
closeInfo.setCloseDate(new Date());
@@ -179,7 +183,7 @@ public class NewRequestPage extends ProjectPage implements MarkSupport {
PullRequestUpdate update = new PullRequestUpdate();
pullRequestRef.get().addUpdate(update);
update.setRequest(pullRequestRef.get());
- update.setHeadCommitHash(source.getObjectName());
+ update.setHeadCommitHash(pullRequestRef.get().getHeadCommitHash());
update.setMergeBaseCommitHash(pullRequestRef.get().getBaseCommitHash());
}
requestModel = new LoadableDetachableModel<PullRequest>() {
@@ -568,8 +572,18 @@ public class NewRequestPage extends ProjectPage implements MarkSupport {
PullRequest request = getPullRequest();
+ QualityCheckStatus qualityCheckStatus = request.getQualityCheckStatus();
+ boolean hasUnsuccessVerifications = false;
+ for (Verification verification: qualityCheckStatus.getEffectiveVerifications().values()) {
+ if (verification.getStatus() != Verification.Status.SUCCESS) {
+ hasUnsuccessVerifications = true;
+ break;
+ }
+ }
setVisible(request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE
- && request.getReviewStatus().getAwaitingReviewers().isEmpty());
+ && qualityCheckStatus.getAwaitingReviewers().isEmpty()
+ && !hasUnsuccessVerifications
+ && qualityCheckStatus.getAwaitingVerifications().isEmpty());
}
}.setOutputMarkupPlaceholderTag(true));
@@ -697,6 +711,8 @@ public class NewRequestPage extends ProjectPage implements MarkSupport {
}.setOutputMarkupId(true));
form.add(new ReviewerListPanel("reviewers", requestModel));
+
+ form.add(new RequiredVerificationsPanel("verifications", requestModel));
return fragment;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/new-request.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/new-request.css
index 8f7f293bd4..e1629e0784 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/new-request.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/new-request.css
@@ -43,18 +43,18 @@
border-top: 1px dashed #BBB;
border-bottom: 1px dashed #BBB;
}
-#new-request>.body>.status>.can-send form>table td.name {
- width: 160px;
+#new-request>.body>.status>.can-send form>table>tbody>tr>td.name {
+ width: 200px;
font-size: 18px;
padding-right: 8px;
}
-#new-request>.body>.status>.can-send form>table td.value {
+#new-request>.body>.status>.can-send form>table>tbody>tr>td.value {
padding-left: 8px;
}
#new-request>.body>.status>.can-send form>table {
margin-bottom: 16px;
}
-#new-request>.body>.status>.can-send form>table td.name .required:BEFORE {
+#new-request>.body>.status>.can-send form>table>tbody>tr>td.name .required:BEFORE {
content: "*";
color: red;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java
index 115c674aec..9f233fce84 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java
@@ -130,7 +130,7 @@ public enum PullRequestOperation {
private static boolean canReview(PullRequest request) {
User user = GitPlex.getInstance(UserManager.class).getCurrent();
- return request.getReviewStatus().getAwaitingReviewers().contains(user);
+ return request.getQualityCheckStatus().getAwaitingReviewers().contains(user);
}
public abstract void operate(PullRequest request, @Nullable String comment);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html
index 45cfc0446b..fbca4b0c42 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html
@@ -47,7 +47,10 @@
<div wicket:id="noConflict" class="no-conflict">
<label><i class="fa fa-check-circle"></i> Able to merge without conflicts</label>
<wicket:enclosure child="mergePreview">
- <span class="middot"></span> Target branch will be updated to the <a wicket:id="mergePreview">merge result</a> upon approvals of all reviewers
+ <span class="middot"></span> Target branch will be updated to the
+ <a wicket:id="mergePreview">merge result</a>
+ <span wicket:id="verificationStatus" class="verification-status"></span>
+ upon approvals of all reviewers and verifications
</wicket:enclosure>
</div>
<div wicket:id="conflict" class="conflict">
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java
index d95ffdc852..d021573a6b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java
@@ -14,6 +14,7 @@ import static com.gitplex.server.web.page.project.pullrequest.requestdetail.Pull
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.persistence.EntityNotFoundException;
@@ -55,6 +56,7 @@ import org.apache.wicket.util.visit.IVisitor;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.manager.PullRequestUpdateManager;
+import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.manager.VisitManager;
import com.gitplex.server.model.User;
import com.gitplex.server.model.Project;
@@ -65,6 +67,7 @@ import com.gitplex.server.model.support.MergePreview;
import com.gitplex.server.model.support.MergeStrategy;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;
import com.gitplex.server.web.component.floating.FloatingPanel;
@@ -77,6 +80,7 @@ import com.gitplex.server.web.component.tabbable.PageTab;
import com.gitplex.server.web.component.tabbable.PageTabLink;
import com.gitplex.server.web.component.tabbable.Tab;
import com.gitplex.server.web.component.tabbable.Tabbable;
+import com.gitplex.server.web.component.verification.VerificationStatusPanel;
import com.gitplex.server.web.page.base.BasePage;
import com.gitplex.server.web.page.project.ProjectPage;
import com.gitplex.server.web.page.project.NoBranchesPage;
@@ -311,7 +315,8 @@ public abstract class RequestDetailPage extends ProjectPage {
tabs.add(new RequestTab("Overview", RequestOverviewPage.class));
tabs.add(new RequestTab("File Changes", RequestChangesPage.class));
tabs.add(new RequestTab("Code Comments", CodeCommentsPage.class));
- tabs.add(new RequestTab("Merge Preview", MergePreviewPage.class));
+ if (request.isOpen())
+ tabs.add(new RequestTab("Merge Preview", MergePreviewPage.class));
add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));
}
@@ -502,7 +507,7 @@ public abstract class RequestDetailPage extends ProjectPage {
protected void onInitialize() {
super.onInitialize();
- Link<Void> link = new Link<Void>("mergePreview") {
+ add(new Link<Void>("mergePreview") {
@Override
public void onClick() {
@@ -511,8 +516,19 @@ public abstract class RequestDetailPage extends ProjectPage {
setResponsePage(MergePreviewPage.class, params);
}
- };
- add(link);
+ });
+
+ add(new VerificationStatusPanel("verificationStatus",
+ new LoadableDetachableModel<Map<String, Verification>>() {
+
+ @Override
+ protected Map<String, Verification> load() {
+ return GitPlex.getInstance(VerificationManager.class)
+ .getVerifications(getProject(), getPullRequest().getMergePreview().getMerged());
+ }
+
+ }));
+
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html
index c54bfaab80..4a008a3c77 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html
@@ -2,14 +2,28 @@
<div wicket:id="content" class="merge-preview"></div>
<wicket:fragment wicket:id="availableFrag">
<div class="available">
- <div class="head clearfix">
- <div class="title pull-left">
- Comparison of target branch and merged commit
+ <div class="commits clearfix">
+ <div class="commit pull-left">
+ <div class="title">Left Side</div>
+ <span class="btn-group">
+ <a wicket:id="targetHead" class="hash btn btn-sm btn-default"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyTargetHead" class="btn btn-sm btn-default"><i class="fa fa-clipboard"></i></a>
+ </span>
+ <div class="description">Head of target branch</div>
</div>
- <div class="out-dated pull-left">
- <a wicket:id="refresh"><i class="fa fa-warning"></i> Merge preview is out dated, click to refresh</a>
+ <div class="vs pull-left">VS</div>
+ <div class="commit pull-left">
+ <div class="title">Right Side</div>
+ <span class="btn-group">
+ <a wicket:id="mergedCommit" class="hash btn btn-sm btn-default"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyMergedCommit" class="btn btn-sm btn-default"><i class="fa fa-clipboard"></i></a>
+ </span>
+ <div class="description">Merged commit</div>
</div>
</div>
+ <div class="out-dated">
+ <a wicket:id="refresh"><i class="fa fa-warning"></i> Merge preview is out dated, click to refresh</a>
+ </div>
<div wicket:id="revisionDiff" class="body"></div>
</div>
</wicket:fragment>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java
index c9a03bed4e..1f134f7751 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java
@@ -12,16 +12,24 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+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.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
+import com.gitplex.server.git.GitUtils;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.MergePreview;
import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.page.project.commit.CommitDetailPage;
import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.websocket.CommitIndexedRegion;
import com.gitplex.server.web.websocket.PageDataChanged;
@@ -80,6 +88,23 @@ public class MergePreviewPage extends RequestDetailPage {
MergePreview preview = getPullRequest().getMergePreview();
if (getPullRequest().isOpen() && preview != null && preview.getMerged() != null) {
fragment = new Fragment("content", "availableFrag", this);
+
+ CommitDetailPage.State commitState = new CommitDetailPage.State();
+ commitState.revision = preview.getTargetHead();
+ PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);
+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("targetHead", CommitDetailPage.class, params);
+ fragment.add(hashLink);
+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getTargetHead())));
+ fragment.add(new WebMarkupContainer("copyTargetHead").add(new CopyClipboardBehavior(Model.of(preview.getTargetHead()))));
+
+ commitState = new CommitDetailPage.State();
+ commitState.revision = preview.getMerged();
+ params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);
+ hashLink = new ViewStateAwarePageLink<Void>("mergedCommit", CommitDetailPage.class, params);
+ 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 AjaxLink<Void>("refresh") {
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css
index 3cd84cb05c..59151449f2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css
@@ -1,13 +1,29 @@
-#request-detail>.merge-preview>.available>.head {
+#request-detail>.merge-preview>.available>.commits {
margin-bottom: 20px;
+}
+#request-detail>.merge-preview>.available>.commits>.commit {
+ border: 1px solid #DDD;
+ background: #F5F5F5;
+ padding: 20px;
+}
+#request-detail>.merge-preview>.available>.commits>.vs {
+ margin: 55px 20px 0 20px;
+ color: #999;
+}
+#request-detail>.merge-preview>.available>.commits>.commit>.title {
font-size: 16px;
+ color: #666;
+ margin-bottom: 6px;
}
-#request-detail>.merge-preview>.available>.head .out-dated {
- margin-left: 20px;
+#request-detail>.merge-preview>.available>.commits>.commit>.description {
+ font-size: 13px;
+ color: #999;
+ margin-top: 8px;
}
-#request-detail>.merge-preview>.available>.head .out-dated a {
+
+#request-detail>.merge-preview>.available>.out-dated a {
color: #666;
}
#request-detail>.merge-preview>.not-available {
font-size: 16px;
-}
\ No newline at end of file
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html
index 6f5fae3a61..c311c9d44a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html
@@ -22,21 +22,32 @@
<td class="info">
<div class="well">
<div class="reviewers">
- <label>Reviewers:</label>
+ <label>Required Reviewers</label>
<div wicket:id="reviewers"></div>
</div>
+ <wicket:enclosure child="verifications">
+ <div class="verifications">
+ <label>Required Verifications</label>
+ <div wicket:id="verifyMerges" class="verify-merges"></div>
+ <div wicket:id="verifications"></div>
+ </div>
+ </wicket:enclosure>
<div wicket:id="mergeStrategy" class="merge-strategy">
<div>
- <label>Merge Strategy:</label>
- <select wicket:id="editor"></select>
- <span wicket:id="viewer"></span>
+ <label>Merge Strategy</label>
+ <div>
+ <select wicket:id="editor" class="form-control"></select>
+ <span wicket:id="viewer"></span>
+ </div>
</div>
<div wicket:id="help" class="help-block"></div>
</div>
<div wicket:id="watch" class="watch">
<div>
- <label>Watch Status:</label>
- <select wicket:id="option"></select>
+ <label>Watch Status</label>
+ <div>
+ <select wicket:id="option" class="form-control"></select>
+ </div>
</div>
<div wicket:id="help" class="help-block"></div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java
index 053e92e27f..602b922379 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java
@@ -43,6 +43,7 @@ import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestUpdate;
import com.gitplex.server.model.PullRequestWatch;
import com.gitplex.server.model.User;
+import com.gitplex.server.model.support.BranchProtection;
import com.gitplex.server.model.support.MergeStrategy;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.SecurityUtils;
@@ -51,6 +52,7 @@ import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.ProjectAttachmentSupport;
import com.gitplex.server.web.component.markdown.AttachmentSupport;
import com.gitplex.server.web.component.requestreviewer.ReviewerListPanel;
+import com.gitplex.server.web.component.verification.RequiredVerificationsPanel;
import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.CommentedActivity;
import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity.OpenedActivity;
@@ -371,6 +373,14 @@ public class RequestOverviewPage extends RequestDetailPage {
add(newMergeStrategyContainer());
add(new ReviewerListPanel("reviewers", requestModel));
+
+ BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch());
+ if (protection != null && !protection.getVerifications().isEmpty() && protection.isVerifyMerges()) {
+ add(new Label("verifyMerges", "(On Merged Commit)"));
+ } else {
+ add(new WebMarkupContainer("verifyMerges"));
+ }
+ add(new RequiredVerificationsPanel("verifications", requestModel));
add(newWatchContainer());
add(newManageContainer());
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html
index 34297e3be6..f681b858c5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html
@@ -13,6 +13,7 @@
<a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>
</div>
<div class="pull-right">
+ <span wicket:id="verificationStatus" class="verification-status"></span>
<span class="btn-group">
<a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
index bfe38f6f30..87ce75063f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
@@ -1,6 +1,7 @@
package com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.activity;
import java.util.List;
+import java.util.Map;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -17,15 +18,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.gitplex.server.GitPlex;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.VerificationManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.PullRequestUpdate;
+import com.gitplex.server.util.Verification;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.component.verification.VerificationStatusPanel;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.commit.CommitDetailPage;
@@ -79,6 +84,18 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {
};
item.add(new ExpandableCommitMessagePanel("message", projectModel, item.getModel()));
+ String commitHash = commit.name();
+ item.add(new VerificationStatusPanel("verificationStatus",
+ new LoadableDetachableModel<Map<String, Verification>>() {
+
+ @Override
+ protected Map<String, Verification> load() {
+ return GitPlex.getInstance(VerificationManager.class)
+ .getVerifications(projectModel.getObject(), commitHash);
+ }
+
+ }));
+
CommitDetailPage.State commitState = new CommitDetailPage.State();
commitState.revision = commit.name();
PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css
index df47b137f4..1e416ac790 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css
@@ -270,12 +270,16 @@
margin-bottom: 0;
}
#request-detail .info>div>.reviewers>div,
+#request-detail .info>div>.verifications>div,
#request-detail .info>div>.merge-strategy,
#request-detail .info>div>.watch {
padding-bottom: 20px;
}
-#request-detail .info>div>.reviewers .no-reviewers {
+
+#request-detail .info>div>.reviewers .no-reviewers,
+#request-detail .info>div>.verifications .no-verifications {
font-size: 14px;
+ padding-left: 0;
}
#request-detail .info .help-block {
@@ -305,3 +309,13 @@
#request-detail .info .manage .help-block {
margin-bottom: 12px;
}
+
+#request-detail .hash-and-status>div>.verification-status {
+ margin-right: 4px;
+}
+
+#request-detail .verifications>.verify-merges {
+ font-size: 13px;
+ color: #888;
+ padding-bottom: 8px !important;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/request-detail.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/request-detail.css
index 15466a96ba..287711f181 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/request-detail.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/request-detail.css
@@ -89,6 +89,10 @@
color: #399529;
font-size: 16px;
}
+#request-detail>.summary .no-conflict .verification-status {
+ margin-right: 0;
+ margin-left: -3px;
+}
#request-detail>.summary .no-conflict>* {
margin-right: 4px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
index 63fea58a20..f94bb06738 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
@@ -1,9 +1,7 @@
package com.gitplex.server.web.page.test;
-import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.wicket.markup.html.link.Link;
-import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -17,7 +15,6 @@ public class TestPage extends BasePage {
@Override
public void onClick() {
- System.out.println(SecurityUtils.getSecurityManager().authenticate(new UsernamePasswordToken("robinshine", "sysvalue8")));
}
});