The Unified and Autonomous Development Platform
chore: Remove auto merge user field
Robin Shen3f024b687b07
diff --git a/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.java b/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.javaindex 379ad309c0..27bff6754e 100644--- a/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.java+++ b/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.java@@ -1713,7 +1713,6 @@ public class McpHelperResource {var autoMerge = new AutoMerge();autoMerge.setEnabled(autoMergeEnabled);autoMerge.setCommitMessage(StringUtils.trimToNull((String) data.remove("autoMergeCommitMessage")));- autoMerge.setUser(user);var errorMessage = request.checkMergeCommitMessage(user, autoMerge.getCommitMessage());if (errorMessage != null)throw new NotAcceptableException("Error validating param auto merge commit message: " + errorMessage);diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 6fbf468132..79e7cf9665 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -8193,6 +8193,14 @@ public class DataMigrator {for (Element element : dom.getRootElement().elements()) {groupIds.put(element.elementText("name").trim(), element.elementText("id").trim());}+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var autoMergeUserElement = element.element("autoMerge").element("user");+ if (autoMergeUserElement != null)+ autoMergeUserElement.detach();+ }+ dom.writeToFile(file, false);}}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 22315548d4..3ab012dd17 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@@ -502,10 +502,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>if (request.isOpen()) {var autoMerge = request.getAutoMerge();if (autoMerge.isEnabled() && request.checkMergeCondition() == null) {- if (autoMerge.getUser() != null)- merge(autoMerge.getUser(), request, autoMerge.getCommitMessage());- else- throw new ExplicitException("Auto merge user not specified");+ merge(userManager.getSystem(), request, autoMerge.getCommitMessage());}}}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex e8f5e3174c..63cdec1615 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -1308,7 +1308,8 @@ public class PullRequest extends ProjectBelonginggetBaseCommit().copy(), getLatestUpdate().getHeadCommit().copy(), new HashMap<>());}if (error == null && autoMerge.isEnabled()) {- var errorMessage = checkMergeCommitMessage(autoMerge.getUser(), autoMerge.getCommitMessage());+ var system = OneDev.getInstance(UserManager.class).getSystem();+ var errorMessage = checkMergeCommitMessage(system, autoMerge.getCommitMessage());if (errorMessage != null)error = new CommitMessageError(null, errorMessage);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.javaindex 932ae67eca..ef7e10be73 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java@@ -1,11 +1,12 @@package io.onedev.server.model.support.pullrequest;-import io.onedev.server.model.User;-import org.hibernate.annotations.OptimisticLock;+import java.io.Serializable;import javax.annotation.Nullable;-import javax.persistence.*;-import java.io.Serializable;+import javax.persistence.Column;+import javax.persistence.Embeddable;++import org.hibernate.annotations.OptimisticLock;@Embeddablepublic class AutoMerge implements Serializable {@@ -13,20 +14,13 @@ public class AutoMerge implements Serializable {private static final long serialVersionUID = 1L;public static final String COLUMN_ENABLED = "AUTO_MERGE_ENABLED";-- public static final String COLUMN_USER = "AUTO_MERGE_USER";-+public static final String COLUMN_COMMIT_MESSAGE = "AUTO_MERGE_COMMIT_MESSAGE";@Column(name=COLUMN_ENABLED, nullable = false)@OptimisticLock(excluded=true)private boolean enabled;- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(name=COLUMN_USER)- @OptimisticLock(excluded=true)- private User user;-@Column(length=1048576, name=COLUMN_COMMIT_MESSAGE)@OptimisticLock(excluded=true)private String commitMessage;@@ -39,14 +33,6 @@ public class AutoMerge implements Serializable {this.enabled = enabled;}- public User getUser() {- return user;- }-- public void setUser(User user) {- this.user = user;- }-@Nullablepublic String getCommitMessage() {return commitMessage;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.javaindex 439f77fe52..c3380f881a 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java@@ -373,7 +373,6 @@ public class PullRequestResource {var autoMerge = new AutoMerge();autoMerge.setEnabled(data.isEnabled());autoMerge.setCommitMessage(data.getCommitMessage());- autoMerge.setUser(user);var errorMessage = request.checkMergeCommitMessage(user, autoMerge.getCommitMessage());if (errorMessage != null)throw new NotAcceptableException("Error validating auto merge commit message: " + errorMessage);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex c64222eb96..0fed4ae1aa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -78,6 +78,7 @@ import io.onedev.server.entitymanager.PullRequestReactionManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.EntityReference;import io.onedev.server.entityreference.LinkTransformer;import io.onedev.server.git.GitUtils;@@ -1379,8 +1380,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRif (request.isMergeCommitMessageRequired()) {tipsContainer = new Fragment("tips", "autoMergeEnabledWithPresetCommitMessageFrag", PullRequestDetailPage.this);WebMarkupContainer link;- if (SecurityUtils.canManagePullRequests(getProject())- || autoMerge.getUser() != null && autoMerge.getUser().equals(SecurityUtils.getUser())) {+ if (SecurityUtils.canModifyPullRequest(getPullRequest()) && SecurityUtils.canWriteCode(getProject())) {link = new AjaxLink<Void>("commitMessage") {@Override@@ -1396,7 +1396,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected String onSave(AjaxRequestTarget target, CommitMessageBean bean) {var request = getPullRequest();- var branchProtection = getProject().getBranchProtection(request.getTargetBranch(), autoMerge.getUser());+ var system = OneDev.getInstance(UserManager.class).getSystem();+ var branchProtection = getProject().getBranchProtection(request.getTargetBranch(), system);var errorMessage = branchProtection.checkCommitMessage(bean.getCommitMessage(),request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);if (errorMessage != null) {@@ -1502,7 +1503,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR} else {var autoMerge = new AutoMerge();autoMerge.setEnabled(true);- autoMerge.setUser(user);autoMerge.setCommitMessage(bean.getCommitMessage());getPullRequestChangeManager().changeAutoMerge(getPullRequest(), autoMerge);target.add(autoMergeContainer);@@ -1523,12 +1523,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}};} else {- var autoMerge = new AutoMerge();- autoMerge.setEnabled(true);- autoMerge.setUser(SecurityUtils.getUser());- autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());- getPullRequestChangeManager().changeAutoMerge(request, autoMerge);- target.add(autoMergeContainer);+ var autoMerge = new AutoMerge();+ autoMerge.setEnabled(true);+ autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(request, autoMerge);+ target.add(autoMergeContainer);}} else {var autoMerge = new AutoMerge();diff --git a/server-ee b/server-eeindex 64ca3d0811..2b7de662ca 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 64ca3d0811a5f1c57090e8d47c720871dd5edb8d+Subproject commit 2b7de662ca1fb90d20c0fb506b15f46dffcfe2b2