The Unified and Autonomous Development Platform
Fix issue #1155 - Pull request not closed if source project is removed
Robin Shen7ca37ed747f4
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex d14d0a505c..1ecc91671a 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -305,7 +305,7 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestManager.class).to(DefaultPullRequestManager.class);bind(PullRequestUpdateManager.class).to(DefaultPullRequestUpdateManager.class);bind(ProjectManager.class).to(DefaultProjectManager.class);- bind(ProjectUpdateManager.class).to(DefaultProjectUpdateManager.class);+ bind(ProjectDynamicsManager.class).to(DefaultProjectDynamicsManager.class);bind(UserManager.class).to(DefaultUserManager.class);bind(UserInvitationManager.class).to(DefaultUserInvitationManager.class);bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectDynamicsManager.javasimilarity index 64%rename from server-core/src/main/java/io/onedev/server/entitymanager/ProjectUpdateManager.javarename to server-core/src/main/java/io/onedev/server/entitymanager/ProjectDynamicsManager.javaindex 8b0b7cea9a..0524806f6a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectUpdateManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectDynamicsManager.java@@ -3,6 +3,6 @@ package io.onedev.server.entitymanager;import io.onedev.server.model.ProjectDynamics;import io.onedev.server.persistence.dao.EntityManager;-public interface ProjectUpdateManager extends EntityManager<ProjectDynamics> {+public interface ProjectDynamicsManager extends EntityManager<ProjectDynamics> {}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectDynamicsManager.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectUpdateManager.javarename to server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectDynamicsManager.javaindex 1c559a65d9..57accc464e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectUpdateManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectDynamicsManager.java@@ -1,6 +1,6 @@package io.onedev.server.entitymanager.impl;-import io.onedev.server.entitymanager.ProjectUpdateManager;+import io.onedev.server.entitymanager.ProjectDynamicsManager;import io.onedev.server.event.Listen;import io.onedev.server.event.project.ProjectCreated;import io.onedev.server.event.project.ProjectEvent;@@ -16,10 +16,10 @@ import javax.inject.Singleton;import java.util.Date;@Singleton-public class DefaultProjectUpdateManager extends BaseEntityManager<ProjectDynamics> implements ProjectUpdateManager {+public class DefaultProjectDynamicsManager extends BaseEntityManager<ProjectDynamics> implements ProjectDynamicsManager {@Inject- public DefaultProjectUpdateManager(Dao dao) {+ public DefaultProjectDynamicsManager(Dao dao) {super(dao);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 6e9fea90d0..a1e9bef68f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -116,12 +116,14 @@ public class DefaultProjectManager extends BaseEntityManager<Project>private final TransactionManager transactionManager;private final IssueManager issueManager;++ private final PullRequestManager pullRequestManager;private final LinkSpecManager linkSpecManager;private final JobManager jobManager;- private final ProjectUpdateManager updateManager;+ private final ProjectDynamicsManager dynamicsManager;private final ListenerRegistry listenerRegistry;@@ -152,7 +154,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>UserAuthorizationManager userAuthorizationManager, RoleManager roleManager,JobManager jobManager, IssueManager issueManager, LinkSpecManager linkSpecManager,StorageManager storageManager, ClusterManager clusterManager, GitService gitService,- ProjectUpdateManager updateManager, Set<ProjectNameReservation> nameReservations) {+ ProjectDynamicsManager dynamicsManager, PullRequestManager pullRequestManager,+ Set<ProjectNameReservation> nameReservations) {super(dao);this.commitInfoManager = commitInfoManager;@@ -170,7 +173,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>this.storageManager = storageManager;this.clusterManager = clusterManager;this.gitService = gitService;- this.updateManager = updateManager;+ this.dynamicsManager = dynamicsManager;+ this.pullRequestManager = pullRequestManager;for (ProjectNameReservation reservation : nameReservations)reservedNames.addAll(reservation.getReserved());@@ -273,7 +277,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>ProjectDynamics update = new ProjectDynamics();project.setDynamics(update);- updateManager.save(update);+ dynamicsManager.save(update);dao.persist(project);var projectDir = storageManager.getProjectDir(project.getId());@@ -361,25 +365,25 @@ public class DefaultProjectManager extends BaseEntityManager<Project>usage.checkInUse("Project '" + project.getPath() + "'");for (Project fork : project.getForks()) {- Collection<Project> descendants = fork.getForkChildren();- descendants.add(fork);- for (Project descendant : descendants) {+ Collection<Project> forkChildren = fork.getForkChildren();+ forkChildren.add(fork);+ for (Project forkChild : forkChildren) {Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",Issue.PROP_NUMBER_SCOPE, Issue.PROP_PROJECT));query.setParameter("fork", fork);- query.setParameter("descendant", descendant);+ query.setParameter("descendant", forkChild);query.executeUpdate();query = getSession().createQuery(String.format("update Build set %s=:fork where %s=:descendant",Build.PROP_NUMBER_SCOPE, Build.PROP_PROJECT));query.setParameter("fork", fork);- query.setParameter("descendant", descendant);+ query.setParameter("descendant", forkChild);query.executeUpdate();query = getSession().createQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",PullRequest.PROP_NUMBER_SCOPE, PullRequest.PROP_TARGET_PROJECT));query.setParameter("fork", fork);- query.setParameter("descendant", descendant);+ query.setParameter("descendant", forkChild);query.executeUpdate();}}@@ -389,6 +393,11 @@ public class DefaultProjectManager extends BaseEntityManager<Project>query.setParameter("forkedFrom", project);query.executeUpdate();+ for (PullRequest request: project.getOutgoingRequests()) {+ if (!request.getTargetProject().equals(project) && request.isOpen())+ pullRequestManager.discard(request, "Source project is deleted.");+ }+query = getSession().createQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",PullRequest.PROP_SOURCE_PROJECT, PullRequest.PROP_SOURCE_PROJECT));query.setParameter("sourceProject", project);@@ -398,7 +407,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>buildManager.delete(build);dao.remove(project);- updateManager.delete(project.getDynamics());+ dynamicsManager.delete(project.getDynamics());synchronized (repositoryCache) {Repository repository = repositoryCache.remove(project.getId());@@ -735,7 +744,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}Map<Long, ProjectDynamics> updates = new HashMap<>();- for (ProjectDynamics update : updateManager.query())+ for (ProjectDynamics update : dynamicsManager.query())updates.put(update.getId(), update);logger.info("Checking projects...");diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 7b3fee1b5a..b9d1776452 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -1,52 +1,8 @@package io.onedev.server.entitymanager.impl;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;--import java.io.ObjectStreamException;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.Date;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.util.lang.Objects;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.PersonIdent;-import org.hibernate.Session;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;-import org.joda.time.DateTime;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;@@ -54,14 +10,7 @@ import io.onedev.server.OneDev;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterRunnable;import io.onedev.server.cluster.ClusterTask;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.PendingSuggestionApplyManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.entitymanager.PullRequestUpdateManager;-import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entitymanager.*;import io.onedev.server.entityreference.EntityReferenceManager;import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.event.Listen;@@ -69,51 +18,21 @@ import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.project.RefUpdated;import io.onedev.server.event.project.build.BuildEvent;-import io.onedev.server.event.project.pullrequest.PullRequestAssigned;-import io.onedev.server.event.project.pullrequest.PullRequestBuildEvent;-import io.onedev.server.event.project.pullrequest.PullRequestChanged;-import io.onedev.server.event.project.pullrequest.PullRequestCheckFailed;-import io.onedev.server.event.project.pullrequest.PullRequestCodeCommentEvent;-import io.onedev.server.event.project.pullrequest.PullRequestEvent;-import io.onedev.server.event.project.pullrequest.PullRequestMergePreviewCalculated;-import io.onedev.server.event.project.pullrequest.PullRequestOpened;-import io.onedev.server.event.project.pullrequest.PullRequestReviewRequested;-import io.onedev.server.event.project.pullrequest.PullRequestReviewerRemoved;-import io.onedev.server.event.project.pullrequest.PullRequestUnassigned;-import io.onedev.server.event.project.pullrequest.PullRequestUpdated;+import io.onedev.server.event.project.pullrequest.*;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.GitService;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.infomanager.PullRequestInfoManager;import io.onedev.server.markdown.MarkdownManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.CodeCommentStatusChange;-import io.onedev.server.model.Group;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;+import io.onedev.server.model.*;import io.onedev.server.model.PullRequest.Status;-import io.onedev.server.model.PullRequestAssignment;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.User;-import io.onedev.server.model.support.code.BranchProtection;import io.onedev.server.model.support.CompareContext;-import io.onedev.server.model.support.code.FileProtection;import io.onedev.server.model.support.LastActivity;+import io.onedev.server.model.support.code.BranchProtection;+import io.onedev.server.model.support.code.FileProtection;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestTargetBranchChangeData;+import io.onedev.server.model.support.pullrequest.changedata.*;import io.onedev.server.persistence.SequenceGenerator;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;@@ -133,6 +52,30 @@ import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.EmailAddressFacade;import io.onedev.server.util.reviewrequirement.ReviewRequirement;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.util.lang.Objects;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.PersonIdent;+import org.hibernate.Session;+import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;+import org.joda.time.DateTime;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.*;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.util.*;+import java.util.stream.Collectors;++import static io.onedev.server.model.support.pullrequest.MergeStrategy.*;@Singletonpublic class DefaultPullRequestManager extends BaseEntityManager<PullRequest>@@ -490,16 +433,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>public void on(EntityRemoved event) {if (event.getEntity() instanceof Project) {Project project = (Project) event.getEntity();- for (PullRequest request: project.getOutgoingRequests()) {- if (!request.getTargetProject().equals(project) && request.isOpen())- discard(request, "Source project is deleted.");- }-- Query<?> query = getSession().createQuery("update PullRequest set sourceProject=null where "- + "sourceProject=:project");- query.setParameter("project", project);- query.executeUpdate();-if (project.getForkRoot().equals(project))numberGenerator.removeNextSequence(project);}