The Unified and Autonomous Development Platform
Minium GitHub endpoint to support TeamCity and QuickBuild
robin sheneedf98782b8d
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.javaindex 8934c729dc..05b8a434da 100644--- a/core/src/main/java/com/gitplex/server/CoreModule.java+++ b/core/src/main/java/com/gitplex/server/CoreModule.java@@ -73,7 +73,8 @@ import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.UserAuthorizationManager;import com.gitplex.server.manager.UserInfoManager;import com.gitplex.server.manager.UserManager;-import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.manager.VerificationManager;+import com.gitplex.server.manager.VisitManager;import com.gitplex.server.manager.WorkExecutor;import com.gitplex.server.manager.impl.DefaultAttachmentManager;import com.gitplex.server.manager.impl.DefaultBatchWorkManager;@@ -105,7 +106,8 @@ import com.gitplex.server.manager.impl.DefaultStorageManager;import com.gitplex.server.manager.impl.DefaultUserAuthorizationManager;import com.gitplex.server.manager.impl.DefaultUserInfoManager;import com.gitplex.server.manager.impl.DefaultUserManager;-import com.gitplex.server.manager.impl.DefaultVisitInfoManager;+import com.gitplex.server.manager.impl.DefaultVerificationManager;+import com.gitplex.server.manager.impl.DefaultVisitManager;import com.gitplex.server.manager.impl.DefaultWorkExecutor;import com.gitplex.server.manager.impl.NotificationManager;import com.gitplex.server.migration.JpaConverter;@@ -210,7 +212,7 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);- bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);+ bind(VisitManager.class).to(DefaultVisitManager.class);bind(UserInfoManager.class).to(DefaultUserInfoManager.class);bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);bind(GroupManager.class).to(DefaultGroupManager.class);@@ -225,6 +227,7 @@ public class CoreModule extends AbstractPluginModule {bind(WorkExecutor.class).to(DefaultWorkExecutor.class);bind(NotificationManager.class).to(DefaultNotificationManager.class);bind(CacheManager.class).to(DefaultCacheManager.class);+ bind(VerificationManager.class).to(DefaultVerificationManager.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);diff --git a/core/src/main/java/com/gitplex/server/manager/VerificationManager.java b/core/src/main/java/com/gitplex/server/manager/VerificationManager.javanew file mode 100644index 0000000000..82a1793e2b--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/VerificationManager.java@@ -0,0 +1,17 @@+package com.gitplex.server.manager;++import java.util.Collection;+import java.util.Map;++import com.gitplex.server.model.Project;+import com.gitplex.server.util.Verification;++public interface VerificationManager {++ void saveVerification(Project project, String commit, String context, Verification verification);++ Map<String, Verification> getVerifications(Project project, String commit);++ Collection<String> getVerificationContexts(Project project);++}diff --git a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/VisitManager.javasimilarity index 92%rename from core/src/main/java/com/gitplex/server/manager/VisitInfoManager.javarename to core/src/main/java/com/gitplex/server/manager/VisitManager.javaindex 8b84047a9f..eb389c5d09 100644--- a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/VisitManager.java@@ -8,7 +8,7 @@ import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.User;-public interface VisitInfoManager {+public interface VisitManager {void visit(User user, PullRequest request);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.javaindex c64ab82995..ea51630295 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@@ -32,7 +32,7 @@ import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.manager.PullRequestTaskManager;import com.gitplex.server.manager.PullRequestWatchManager;import com.gitplex.server.manager.UrlManager;-import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.manager.VisitManager;import com.gitplex.server.model.User;import com.gitplex.server.model.BranchWatch;import com.gitplex.server.model.PullRequest;@@ -57,7 +57,7 @@ public class DefaultNotificationManager implements NotificationManager {private final UrlManager urlManager;- private final VisitInfoManager visitInfoManager;+ private final VisitManager visitInfoManager;private final MarkdownManager markdownManager;@@ -67,7 +67,7 @@ public class DefaultNotificationManager implements NotificationManager {@Injectpublic DefaultNotificationManager(MarkdownManager markdownManager, BranchWatchManager branchWatchManager,- MailManager mailManager, UrlManager urlManager, VisitInfoManager visitInfoManager,+ MailManager mailManager, UrlManager urlManager, VisitManager visitInfoManager,PullRequestWatchManager pullRequestWatchManager, PullRequestTaskManager pullRequestTaskManager) {this.branchWatchManager = branchWatchManager;this.mailManager = mailManager;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.javaindex f490c05637..5ca8e2530c 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@@ -24,8 +24,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.eclipse.jgit.treewalk.filter.TreeFilter;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CommitInfoManager;@@ -60,8 +58,6 @@ import com.gitplex.server.util.reviewappointment.ReviewAppointment;@Singletonpublic class DefaultReviewManager extends AbstractEntityManager<Review> implements ReviewManager {- private static final Logger logger = LoggerFactory.getLogger(DefaultReviewManager.class);-private static final int MAX_CONTRIBUTION_FILES = 100;private final UserManager userManager;@@ -268,19 +264,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemenPermission 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(), true);- }-- for (Iterator<Map.Entry<User, Review>> it = effectiveReviews.entrySet().iterator(); it.hasNext();) {- Review review = it.next().getValue();- if (review.isCheckMerged()) {- if (request.getMergePreview() == null- || !review.getCommit().equals(request.getMergePreview().getMerged())) {- if (!awaitingReviewers.contains(review.getUser()))- awaitingReviewers.add(review.getUser());- it.remove();- }- }+ checkReviews(writers, 1, request.getLatestUpdate());}}@@ -309,7 +293,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemenfor (Map.Entry<Group, Integer> entry: appointment.getGroups().entrySet()) {Group group = entry.getKey();int requiredCount = entry.getValue();- checkReviews(getFacades(group.getMembers()), requiredCount, update, false);+ checkReviews(getFacades(group.getMembers()), requiredCount, update);}}@@ -320,8 +304,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemenreturn facades;}- private void checkReviews(Collection<UserFacade> users, int requiredCount, PullRequestUpdate update,- boolean excludeAutoReviews) {+ private void checkReviews(Collection<UserFacade> users, int requiredCount, PullRequestUpdate update) {if (requiredCount == 0)requiredCount = users.size();@@ -335,12 +318,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen} else {Review effectiveReview = getReviewAfter(user.getId(), update);if (effectiveReview != null) {- if (!excludeAutoReviews || !effectiveReview.isAutoCheck()) {- effectiveCount++;- } else {- logger.warn("Auto review made by {} is ignored while checking reviews of pull request #{}",- user.getDisplayName(), update.getRequest().getNumber());- }+ effectiveCount++;} else {potentialReviewers.add(user);}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.javanew file mode 100644index 0000000000..0c9f2fdfd7--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java@@ -0,0 +1,172 @@+package com.gitplex.server.manager.impl;++import java.io.File;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.commons.lang.SerializationUtils;++import com.gitplex.launcher.loader.Listen;+import com.gitplex.server.manager.StorageManager;+import com.gitplex.server.manager.VerificationManager;+import com.gitplex.server.model.Project;+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 jetbrains.exodus.ArrayByteIterable;+import jetbrains.exodus.ByteIterable;+import jetbrains.exodus.env.Environment;+import jetbrains.exodus.env.Store;+import jetbrains.exodus.env.Transaction;+import jetbrains.exodus.env.TransactionalComputable;+import jetbrains.exodus.env.TransactionalExecutable;++@Singleton+public class DefaultVerificationManager extends AbstractEnvironmentManager implements VerificationManager {++ private static final int INFO_VERSION = 1;++ private static final String INFO_DIR = "verification";++ private static final String DEFAULT_STORE = "default";++ private static final String VERIFICATIONS_STORE = "verifications";++ private static final String VERIFICATION_CONTEXTS_KEY = "verificationContexts";++ private static final long MAX_VERIFICATION_CONTEXTS = 1000;++ private final StorageManager storageManager;++ private final Dao dao;++ @Inject+ public DefaultVerificationManager(Dao dao, StorageManager storageManager) {+ this.dao = dao;+ this.storageManager = storageManager;+ }++ @Override+ public void saveVerification(Project project, String commit, String context, Verification verification) {+ Environment env = getEnv(project.getId().toString());+ Store defaultStore = getStore(env, DEFAULT_STORE);+ Store verificationsStore = getStore(env, VERIFICATIONS_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @SuppressWarnings("unchecked")+ @Override+ public void execute(Transaction txn) {+ ByteIterable key = new StringByteIterable(VERIFICATION_CONTEXTS_KEY);+ byte[] bytes = getBytes(defaultStore.get(txn, key));+ Map<String, Date> verificationContexts;+ if (bytes != null)+ verificationContexts = (Map<String, Date>) SerializationUtils.deserialize(bytes);+ else+ verificationContexts = new HashMap<>();++ verificationContexts.put(context, 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));+ }++ defaultStore.put(txn, key,+ new ArrayByteIterable(SerializationUtils.serialize((Serializable) verificationContexts)));++ key = new StringByteIterable(commit);+ bytes = getBytes(verificationsStore.get(txn, key));+ Map<String, Verification> verifications;+ if (bytes != null)+ verifications = (Map<String, Verification>) SerializationUtils.deserialize(bytes);+ else+ verifications = new HashMap<>();++ verifications.put(context, verification);++ verificationsStore.put(txn, key, new ArrayByteIterable(SerializationUtils.serialize((Serializable) verifications)));+ }++ });+ }++ @Override+ public Map<String, Verification> getVerifications(Project project, String commit) {+ Environment env = getEnv(project.getId().toString());+ Store store = getStore(env, VERIFICATIONS_STORE);+ return env.computeInTransaction(new TransactionalComputable<Map<String, Verification>>() {++ @SuppressWarnings("unchecked")+ @Override+ public Map<String, Verification> compute(Transaction txn) {+ byte[] bytes = getBytes(store.get(txn, new StringByteIterable(commit)));+ if (bytes != null)+ return (Map<String, Verification>) SerializationUtils.deserialize(bytes);+ else+ return null;+ }++ });+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ dao.doAfterCommit(new Runnable() {++ @Override+ public void run() {+ removeEnv(event.getEntity().getId().toString());+ }++ });+ }+ }++ @Override+ protected File getEnvDir(String envKey) {+ File infoDir = new File(storageManager.getProjectInfoDir(Long.valueOf(envKey)), INFO_DIR);+ if (!infoDir.exists())+ FileUtils.createDir(infoDir);+ return infoDir;+ }++ @Override+ protected int getEnvVersion() {+ return INFO_VERSION;+ }++ @Override+ public Collection<String> getVerificationContexts(Project project) {+ Environment env = getEnv(project.getId().toString());+ Store store = getStore(env, DEFAULT_STORE);+ return env.computeInTransaction(new TransactionalComputable<Collection<String>>() {++ @SuppressWarnings("unchecked")+ @Override+ public Collection<String> compute(Transaction txn) {+ byte[] bytes = getBytes(store.get(txn, new StringByteIterable(VERIFICATION_CONTEXTS_KEY)));+ if (bytes != null)+ return ((Map<String, Date>) SerializationUtils.deserialize(bytes)).keySet();+ else+ return null;+ }++ });+ }++}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.javasimilarity index 95%rename from core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.javarename to core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.javaindex 2d2c712997..371d654f1c 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java@@ -13,7 +13,7 @@ import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;import com.gitplex.server.event.pullrequest.PullRequestOpened;import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.manager.StorageManager;-import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.manager.VisitManager;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;@@ -32,7 +32,7 @@ import jetbrains.exodus.env.TransactionalComputable;import jetbrains.exodus.env.TransactionalExecutable;@Singleton-public class DefaultVisitInfoManager extends AbstractEnvironmentManager implements VisitInfoManager {+public class DefaultVisitManager extends AbstractEnvironmentManager implements VisitManager {private static final int INFO_VERSION = 1;@@ -47,7 +47,7 @@ public class DefaultVisitInfoManager extends AbstractEnvironmentManager implemenprivate final Dao dao;@Inject- public DefaultVisitInfoManager(Dao dao, StorageManager storageManager) {+ public DefaultVisitManager(Dao dao, StorageManager storageManager) {this.dao = dao;this.storageManager = storageManager;}diff --git a/core/src/main/java/com/gitplex/server/model/CodeComment.java b/core/src/main/java/com/gitplex/server/model/CodeComment.javaindex 1a2d4d6428..245d9a5f69 100644--- a/core/src/main/java/com/gitplex/server/model/CodeComment.java+++ b/core/src/main/java/com/gitplex/server/model/CodeComment.java@@ -32,7 +32,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.manager.VisitManager;import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.model.support.MarkPos;import com.gitplex.server.model.support.LastEvent;@@ -202,7 +202,7 @@ public class CodeComment extends AbstractEntity {public boolean isVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {- Date visitDate = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, this);+ Date visitDate = GitPlex.getInstance(VisitManager.class).getVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();} else {return true;diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.javaindex 8d5f72936e..3f2f454846 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java@@ -41,7 +41,7 @@ import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.ReviewManager;-import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.manager.VisitManager;import com.gitplex.server.model.support.CloseInfo;import com.gitplex.server.model.support.LastEvent;import com.gitplex.server.model.support.MergePreview;@@ -72,7 +72,7 @@ public class PullRequest extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String REFS_PREFIX = "refs/pulls/";+ public static final String REFS_PREFIX = "refs/pull/";public static final int MAX_CODE_COMMENTS = 1000;@@ -682,7 +682,7 @@ public class PullRequest extends AbstractEntity {public boolean isVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {- Date visitDate = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, this);+ Date visitDate = GitPlex.getInstance(VisitManager.class).getVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();} else {return true;diff --git a/core/src/main/java/com/gitplex/server/model/Review.java b/core/src/main/java/com/gitplex/server/model/Review.javaindex 7a818720a0..759cbb4888 100644--- a/core/src/main/java/com/gitplex/server/model/Review.java+++ b/core/src/main/java/com/gitplex/server/model/Review.java@@ -34,10 +34,6 @@ public class Review extends AbstractEntity {@JoinColumn(nullable=false)private PullRequest request;- private boolean checkMerged;-- private boolean autoCheck;-private boolean approved;private transient Optional<PullRequestUpdate> updateOpt;@@ -76,22 +72,6 @@ public class Review extends AbstractEntity {this.approved = approved;}- public boolean isCheckMerged() {- return checkMerged;- }-- public void setCheckMerged(boolean checkMerged) {- this.checkMerged = checkMerged;- }-- public boolean isAutoCheck() {- return autoCheck;- }-- public void setAutoCheck(boolean autoCheck) {- this.autoCheck = autoCheck;- }-public String getNote() {return note;}diff --git a/core/src/main/java/com/gitplex/server/util/Verification.java b/core/src/main/java/com/gitplex/server/util/Verification.javanew file mode 100644index 0000000000..8872cc9f99--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/Verification.java@@ -0,0 +1,45 @@+package com.gitplex.server.util;++import java.io.Serializable;+import java.util.Date;++import javax.annotation.Nullable;++public class Verification implements Serializable {++ private static final long serialVersionUID = 1L;++ public enum Status {SUCCESS, FAILURE, ERROR, PENDING};++ private final Status status;++ private final Date date;++ private final String description;++ private final String targetUrl;++ public Verification(Status status, Date date, @Nullable String description, @Nullable String targetUrl) {+ this.status = status;+ this.date = date;+ this.description = description;+ this.targetUrl = targetUrl;+ }++ public Date getDate() {+ return date;+ }++ public Status getStatus() {+ return status;+ }++ public String getDescription() {+ return description;+ }++ public String getTargetUrl() {+ return targetUrl;+ }++}diff --git a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.javaindex 73c2e2d5cd..e8a12c1d00 100644--- a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java+++ b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java@@ -118,6 +118,7 @@ public class ProductServletConfigurator implements ServletConfigurator {ServletHolder jerseyServletHolder = new ServletHolder(jerseyServlet);context.addServlet(jerseyServletHolder, "/rest/*");+ context.addServlet(jerseyServletHolder, "/api/v3/*"); // GitHub api compatible}}diff --git a/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.javaindex 5a985d9bb3..f9bce53ead 100644--- a/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java@@ -14,7 +14,6 @@ import org.apache.shiro.authz.UnauthorizedException;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.model.Project;-import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.rest.jersey.ValidQueryParams;import com.gitplex.server.security.SecurityUtils;@@ -24,20 +23,17 @@ import com.gitplex.server.security.SecurityUtils;@Singletonpublic class ProjectResource {- private final Dao dao;-private final ProjectManager projectManager;@Inject- public ProjectResource(Dao dao, ProjectManager projectManager) {- this.dao = dao;+ public ProjectResource(ProjectManager projectManager) {this.projectManager = projectManager;}@Path("/{id}")@GETpublic Project get(@PathParam("id") Long id) {- Project project = dao.load(Project.class, id);+ Project project = projectManager.load(id);if (!SecurityUtils.canRead(project))throw new UnauthorizedException("Unauthorized access to project " + project.getName());diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.javaindex 4e10e81592..df22aea6b0 100644--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java@@ -17,8 +17,8 @@ import javax.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;+import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.rest.jersey.ValidQueryParams;import com.gitplex.server.security.SecurityUtils;@@ -33,17 +33,17 @@ public class PullRequestResource {private static final String CLOSED = "closed";- private final Dao dao;+ private final PullRequestManager pullRequestManager;@Inject- public PullRequestResource(Dao dao) {- this.dao = dao;+ public PullRequestResource(PullRequestManager pullRequestManager) {+ this.pullRequestManager = pullRequestManager;}@GET@Path("/{id}")public PullRequest get(@PathParam("id") Long id) {- PullRequest request = dao.load(PullRequest.class, id);+ PullRequest request = pullRequestManager.load(id);if (!SecurityUtils.canRead(request.getTargetProject()))throw new UnauthorizedException();@@ -83,7 +83,7 @@ public class PullRequestResource {if (endDate != null)criteria.add(Restrictions.le("submitDate", endDate));- List<PullRequest> requests = dao.findAll(criteria);+ List<PullRequest> requests = pullRequestManager.findAll(criteria);for (PullRequest request: requests) {if (!SecurityUtils.canRead(request.getTarget().getProject()))diff --git a/rest/src/main/java/com/gitplex/server/rest/RestConstants.java b/rest/src/main/java/com/gitplex/server/rest/RestConstants.javanew file mode 100644index 0000000000..b2f726bfa7--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/RestConstants.java@@ -0,0 +1,11 @@+package com.gitplex.server.rest;++import javax.ws.rs.core.MediaType;++public class RestConstants {++ public static final int PAGE_SIZE = 25;++ public static final String JSON_UTF8 = MediaType.APPLICATION_JSON + ";charset=utf-8";++}diff --git a/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.javaindex ba04d29be7..c558bdcd80 100644--- a/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java@@ -67,8 +67,6 @@ public class ReviewResource {Review existingReview = reviewManager.find(review.getRequest(), user, review.getCommit());if (existingReview != null) {existingReview.setApproved(review.isApproved());- existingReview.setAutoCheck(review.isAutoCheck());- existingReview.setCheckMerged(review.isCheckMerged());existingReview.setNote(review.getNote());reviewManager.save(existingReview);return existingReview.getId();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.javanew file mode 100644index 0000000000..c539f5dcc9--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java@@ -0,0 +1,74 @@+package com.gitplex.server.rest.github;++import java.util.Date;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.validation.Valid;+import javax.validation.constraints.NotNull;+import javax.ws.rs.Consumes;+import javax.ws.rs.POST;+import javax.ws.rs.Path;+import javax.ws.rs.PathParam;+import javax.ws.rs.Produces;+import javax.ws.rs.core.Context;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;+import javax.ws.rs.core.UriBuilder;+import javax.ws.rs.core.UriInfo;++import org.apache.shiro.authz.UnauthorizedException;++import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.manager.VerificationManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.rest.RestConstants;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.Verification;+import com.google.common.base.Preconditions;++@Path("/repos/projects")+@Consumes(MediaType.WILDCARD)+@Produces(MediaType.WILDCARD)+@Singleton+public class CommitStatusResource {++ private final ProjectManager projectManager;++ private final VerificationManager verificationManager;++ @Inject+ public CommitStatusResource(ProjectManager projectManager, VerificationManager verificationManager) {+ this.projectManager = projectManager;+ this.verificationManager = verificationManager;+ }++ private Project getProject(String projectName) {+ return Preconditions.checkNotNull(projectManager.find(projectName));+ }++ @Path("/{projectName}/statuses/{commit}")+ @POST+ public Response save(@PathParam("projectName") String projectName, @PathParam("commit") String commit,+ @NotNull @Valid Map<String, String> commitStatus, @Context UriInfo uriInfo) {++ Project project = getProject(projectName);+ if (!SecurityUtils.canWrite(project))+ throw new UnauthorizedException();++ Verification verification = new Verification(+ Verification.Status.valueOf(commitStatus.get("state").toUpperCase()),+ new Date(), commitStatus.get("description"), commitStatus.get("target_url"));+ String context = commitStatus.get("context");+ if (context == null)+ context = "default";+ verificationManager.saveVerification(project, commit, context, verification);+ UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder();+ uriBuilder.path(context);+ commitStatus.put("id", "1");++ return Response.created(uriBuilder.build()).entity(commitStatus).type(RestConstants.JSON_UTF8).build();+ }++}diff --git a/rest/src/main/java/com/gitplex/server/rest/github/IssueCommentResource.java b/rest/src/main/java/com/gitplex/server/rest/github/IssueCommentResource.javanew file mode 100644index 0000000000..0bcfa51db0--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/github/IssueCommentResource.java@@ -0,0 +1,27 @@+package com.gitplex.server.rest.github;++import javax.inject.Singleton;+import javax.ws.rs.Consumes;+import javax.ws.rs.POST;+import javax.ws.rs.Path;+import javax.ws.rs.PathParam;+import javax.ws.rs.Produces;+import javax.ws.rs.core.Context;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;+import javax.ws.rs.core.UriInfo;++@Path("/repos/projects")+@Consumes(MediaType.WILDCARD)+@Produces(MediaType.WILDCARD)+@Singleton+public class IssueCommentResource {++ @Path("/{projectName}/issues/{issueNumber}/comments")+ @POST+ public Response save(@PathParam("projectName") String projectName,+ @PathParam("issueNumber") Long issueNumber, @Context UriInfo uriInfo) {+ return Response.created(uriInfo.getAbsolutePath()).build();+ }++}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.javanew file mode 100644index 0000000000..50ae6e6a6a--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java@@ -0,0 +1,111 @@+package com.gitplex.server.rest.github;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.ws.rs.Consumes;+import javax.ws.rs.GET;+import javax.ws.rs.Path;+import javax.ws.rs.PathParam;+import javax.ws.rs.Produces;+import javax.ws.rs.QueryParam;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;++import org.apache.shiro.authz.UnauthorizedException;+import org.hibernate.criterion.Restrictions;++import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.support.MergePreview;+import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.rest.RestConstants;+import com.gitplex.server.security.SecurityUtils;+import com.google.common.base.Preconditions;++@Path("/repos/projects")+@Consumes(MediaType.WILDCARD)+@Produces(MediaType.WILDCARD)+@Singleton+public class PullRequestResource {++ private final ProjectManager projectManager;++ private final PullRequestManager pullRequestManager;++ @Inject+ public PullRequestResource(ProjectManager projectManager, PullRequestManager pullRequestManager) {+ this.projectManager = projectManager;+ this.pullRequestManager = pullRequestManager;+ }++ private Project getProject(String projectName) {+ return Preconditions.checkNotNull(projectManager.find(projectName));+ }++ @Path("/{name}/pulls")+ @GET+ public Response query(+ @PathParam("name") String projectName, @QueryParam("base") String branch,+ @QueryParam("state") String state, @QueryParam("per_page") Integer perPage,+ @QueryParam("page") Integer page) {++ Project project = getProject(projectName);++ if (!SecurityUtils.canRead(project))+ throw new UnauthorizedException("Unauthorized access to project '" + projectName + "'");++ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(PullRequest.CriterionHelper.ofTargetProject(project));+ if ("closed".equals(state))+ criteria.add(PullRequest.CriterionHelper.ofClosed());+ else if (state == null || state.equals("open"))+ criteria.add(PullRequest.CriterionHelper.ofOpen());++ if (branch != null)+ criteria.add(Restrictions.eq("targetBranch", branch));++ if (page == null)+ page = 0;+ else+ page--;++ if (perPage == null)+ perPage = RestConstants.PAGE_SIZE;++ List<Map<String, Object>> entity = new ArrayList<>();+ for (PullRequest request: pullRequestManager.findRange(criteria, page, perPage)) {+ Map<String, Object> map = new HashMap<>();+ map.put("number", String.valueOf(request.getNumber()));+ if (request.isOpen())+ map.put("state", "open");+ else+ map.put("state", "closed");+ map.put("title", request.getTitle());+ MergePreview preview = request.getMergePreview();+ if (preview != null && preview.getMerged() != null)+ map.put("merge_commit_sha", preview.getMerged());++ Map<String, Object> headMap = new HashMap<>();+ if (request.getSourceBranch() != null)+ headMap.put("ref", request.getSourceBranch());+ headMap.put("sha", request.getHeadCommitHash());+ map.put("head", headMap);++ Map<String, Object> baseMap = new HashMap<>();+ baseMap.put("ref", request.getTargetBranch());+ baseMap.put("sha", request.getBaseCommitHash());+ map.put("base", baseMap);++ entity.add(map);+ }+ return Response.ok(entity, RestConstants.JSON_UTF8).build();+ }++}\ No newline at end of filediff --git a/rest/src/main/java/com/gitplex/server/rest/github/RepositoryResource.java b/rest/src/main/java/com/gitplex/server/rest/github/RepositoryResource.javanew file mode 100644index 0000000000..600a2b11ec--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/github/RepositoryResource.java@@ -0,0 +1,55 @@+package com.gitplex.server.rest.github;++import java.util.HashMap;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.ws.rs.Consumes;+import javax.ws.rs.GET;+import javax.ws.rs.Path;+import javax.ws.rs.PathParam;+import javax.ws.rs.Produces;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;++import org.apache.shiro.authz.UnauthorizedException;++import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.rest.RestConstants;+import com.gitplex.server.security.SecurityUtils;++@Path("/repos/projects")+@Consumes(MediaType.WILDCARD)+@Produces(MediaType.WILDCARD)+@Singleton+public class RepositoryResource {++ private final ProjectManager projectManager;++ @Inject+ public RepositoryResource(ProjectManager projectManager) {+ this.projectManager = projectManager;+ }++ @Path("/{name}")+ @GET+ public Response get(@PathParam("name") String name) {+ Project project = projectManager.find(name);++ if (!SecurityUtils.canRead(project)) {+ throw new UnauthorizedException("Unauthorized access to project " + project.getName());+ } else {+ Map<String, Object> entity = new HashMap<>();+ Map<String, String> permissionsMap = new HashMap<>();+ permissionsMap.put("admin", String.valueOf(SecurityUtils.canManage(project)));+ permissionsMap.put("push", String.valueOf(SecurityUtils.canWrite(project)));+ permissionsMap.put("pull", "true");+ entity.put("permissions", permissionsMap);+ entity.put("name", project.getName());+ return Response.ok(entity, RestConstants.JSON_UTF8).build();+ }+ }++}diff --git a/rest/src/main/java/com/gitplex/server/rest/jersey/IllegalArgumentExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/IllegalArgumentExceptionMapper.javaindex 7355401707..1639907db9 100644--- a/rest/src/main/java/com/gitplex/server/rest/jersey/IllegalArgumentExceptionMapper.java+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/IllegalArgumentExceptionMapper.java@@ -5,11 +5,18 @@ import javax.ws.rs.core.Response.ResponseBuilder;import javax.ws.rs.ext.ExceptionMapper;import javax.ws.rs.ext.Provider;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+@Providerpublic class IllegalArgumentExceptionMapper implements ExceptionMapper<IllegalArgumentException> {+ private static final Logger logger = LoggerFactory.getLogger(IllegalArgumentException.class);+@Overridepublic Response toResponse(IllegalArgumentException exception) {+ logger.error("Error serving rest request", exception);+ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);if (exception.getMessage() != null)builder = builder.entity("Illegal argument: " + exception.getMessage()).type("text/plain");diff --git a/web/src/main/java/com/gitplex/server/web/DefaultUrlManager.java b/web/src/main/java/com/gitplex/server/web/DefaultUrlManager.javaindex ab8ab7e3c9..b724bfabc0 100644--- a/web/src/main/java/com/gitplex/server/web/DefaultUrlManager.java+++ b/web/src/main/java/com/gitplex/server/web/DefaultUrlManager.java@@ -40,7 +40,7 @@ public class DefaultUrlManager implements UrlManager {@Overridepublic String urlFor(PullRequest request) {- return urlFor(request.getTarget().getProject()) + "/pulls/" + request.getNumber();+ return urlFor(request.getTarget().getProject()) + "/pull/" + request.getNumber();}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.javaindex 8bd5fb2c4b..1c21839603 100644--- a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java+++ b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java@@ -152,13 +152,13 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {add(new WebPageMapper("projects/${project}/branches", ProjectBranchesPage.class));add(new WebPageMapper("projects/${project}/tags", ProjectTagsPage.class));- add(new WebPageMapper("projects/${project}/pulls", RequestListPage.class));- add(new WebPageMapper("projects/${project}/pulls/new", NewRequestPage.class));- add(new WebPageMapper("projects/${project}/pulls/${request}", RequestOverviewPage.class));- add(new WebPageMapper("projects/${project}/pulls/${request}/overview", RequestOverviewPage.class));- add(new WebPageMapper("projects/${project}/pulls/${request}/code-comments", CodeCommentsPage.class));- add(new WebPageMapper("projects/${project}/pulls/${request}/changes", RequestChangesPage.class));- add(new WebPageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));+ add(new WebPageMapper("projects/${project}/pull", RequestListPage.class));+ add(new WebPageMapper("projects/${project}/pull/new", NewRequestPage.class));+ add(new WebPageMapper("projects/${project}/pull/${request}", RequestOverviewPage.class));+ add(new WebPageMapper("projects/${project}/pull/${request}/overview", RequestOverviewPage.class));+ add(new WebPageMapper("projects/${project}/pull/${request}/code-comments", CodeCommentsPage.class));+ add(new WebPageMapper("projects/${project}/pull/${request}/changes", RequestChangesPage.class));+ add(new WebPageMapper("projects/${project}/pull/${request}/merge-preview", MergePreviewPage.class));add(new WebPageMapper("projects/${project}/settings/general", GeneralSettingPage.class));add(new WebPageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));diff --git a/web/src/main/java/com/gitplex/server/web/WebModule.java b/web/src/main/java/com/gitplex/server/web/WebModule.javaindex 75c3fd33d9..515f801ec3 100644--- a/web/src/main/java/com/gitplex/server/web/WebModule.java+++ b/web/src/main/java/com/gitplex/server/web/WebModule.java@@ -42,10 +42,9 @@ import com.gitplex.server.web.websocket.PullRequestChangeBroadcaster;import com.gitplex.server.web.websocket.TaskChangeBroadcaster;import com.gitplex.server.web.websocket.WebSocketManager;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import com.vladsch.flexmark.Extension;-import jersey.repackaged.com.google.common.collect.Sets;-/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.*diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.javaindex 3de047743f..4be983b29f 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java@@ -40,7 +40,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.CodeCommentReplyManager;import com.gitplex.server.manager.CodeCommentStatusChangeManager;-import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.manager.VisitManager;import com.gitplex.server.model.User;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.CodeCommentReply;@@ -61,9 +61,9 @@ import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;import com.gitplex.server.web.websocket.PageDataChanged;+import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import jersey.repackaged.com.google.common.collect.Lists;@SuppressWarnings("serial")public abstract class CodeCommentPanel extends Panel {@@ -616,7 +616,7 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onEndRequest(RequestCycle cycle) {if (SecurityUtils.getUser() != null) {- GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getUser(), getComment());+ GitPlex.getInstance(VisitManager.class).visit(SecurityUtils.getUser(), getComment());}}diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/ProjectAttachmentSupport.java b/web/src/main/java/com/gitplex/server/web/component/comment/ProjectAttachmentSupport.javaindex 55d0758a56..3e376e39fe 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/ProjectAttachmentSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/ProjectAttachmentSupport.java@@ -21,8 +21,7 @@ import com.gitplex.server.web.component.markdown.AttachmentSupport;import com.gitplex.server.web.util.resource.AttachmentResource;import com.gitplex.server.web.util.resource.AttachmentResourceReference;import com.google.common.base.Preconditions;--import jersey.repackaged.com.google.common.base.Throwables;+import com.google.common.base.Throwables;public class ProjectAttachmentSupport implements AttachmentSupport {diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.javaindex 0cd5a5d9bf..e30c103ee4 100644--- a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java@@ -23,8 +23,7 @@ import com.gitplex.server.web.page.project.NewProjectPage;import com.gitplex.server.web.page.project.ProjectListPage;import com.gitplex.server.web.page.user.NewUserPage;import com.gitplex.server.web.page.user.UserListPage;--import jersey.repackaged.com.google.common.collect.Lists;+import com.google.common.collect.Lists;@SuppressWarnings("serial")public class DashboardPage extends LayoutPage {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.javaindex 1804d69863..64c0a92a84 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@@ -65,10 +65,10 @@ import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.ajaxlistener.TrackViewStateListener;+import com.google.common.base.Objects;import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import jersey.repackaged.com.google.common.base.Objects;@SuppressWarnings("serial")public class CommitOptionPanel extends Panel {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.javaindex a6736c251c..7a6ce27923 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@@ -67,12 +67,12 @@ import com.gitplex.server.web.page.project.commit.CommitQueryParser.QueryContextimport com.gitplex.server.web.page.project.compare.RevisionComparePage;import com.gitplex.server.web.util.ajaxlistener.IndicateLoadingListener;import com.gitplex.server.web.util.model.CommitRefsModel;+import com.google.common.base.Joiner;import com.google.common.base.Optional;import com.google.common.base.Throwables;import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import jersey.repackaged.com.google.common.base.Joiner;@SuppressWarnings("serial")public class ProjectCommitsPage extends ProjectPage {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.javaindex 1bca065fb6..115c674aec 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@@ -38,8 +38,6 @@ public enum PullRequestOperation {public void operate(PullRequest request, String comment) {Review review = new Review();review.setApproved(true);- review.setAutoCheck(false);- review.setCheckMerged(false);review.setCommit(request.getHeadCommitHash());review.setNote(comment);review.setRequest(request);@@ -59,8 +57,6 @@ public enum PullRequestOperation {public void operate(PullRequest request, String comment) {Review review = new Review();review.setApproved(false);- review.setAutoCheck(false);- review.setCheckMerged(false);review.setCommit(request.getHeadCommitHash());review.setNote(comment);review.setRequest(request);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.javaindex 0c6c646289..d95ffdc852 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@@ -55,7 +55,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.VisitInfoManager;+import com.gitplex.server.manager.VisitManager;import com.gitplex.server.model.User;import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;@@ -352,7 +352,7 @@ public abstract class RequestDetailPage extends ProjectPage {@Overridepublic void onEndRequest(RequestCycle cycle) {if (SecurityUtils.getUser() != null) {- GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getUser(),+ GitPlex.getInstance(VisitManager.class).visit(SecurityUtils.getUser(),getPullRequest());}}