diff options
author | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-02-26 13:44:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-26 13:44:52 +0000 |
commit | a7de1f841c21194e94ae8c6489b667a313f291e6 (patch) | |
tree | 331089624058e587df701fe1bfa2faaaa3783d89 | |
parent | 227e403a841d8a4e134624bde586fc6d65cc9b37 (diff) | |
parent | e32f90c4f2991ed9e84d42392cf1d14eaf3cba2c (diff) |
Merge "MergeValidators: Don't assume submitter record exists" into stable-2.12
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java index df2ab5b037..d08095cb9f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -20,11 +20,8 @@ import com.google.gerrit.extensions.registration.DynamicMap.Entry; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.PluginConfig; @@ -78,10 +75,7 @@ public class MergeValidators { public static class ProjectConfigValidator implements MergeValidationListener { private final AllProjectsName allProjectsName; - private final ReviewDb db; private final ProjectCache projectCache; - private final IdentifiedUser.GenericFactory identifiedUserFactory; - private final ApprovalsUtil approvalsUtil; private final DynamicMap<ProjectConfigEntry> pluginConfigEntries; public interface Factory { @@ -90,15 +84,10 @@ public class MergeValidators { @Inject public ProjectConfigValidator(AllProjectsName allProjectsName, - ReviewDb db, ProjectCache projectCache, - IdentifiedUser.GenericFactory iuf, - ApprovalsUtil approvalsUtil, + ProjectCache projectCache, DynamicMap<ProjectConfigEntry> pluginConfigEntries) { this.allProjectsName = allProjectsName; - this.db = db; this.projectCache = projectCache; - this.identifiedUserFactory = iuf; - this.approvalsUtil = approvalsUtil; this.pluginConfigEntries = pluginConfigEntries; } @@ -127,15 +116,7 @@ public class MergeValidators { } } else { if (!oldParent.equals(newParent)) { - PatchSetApproval psa = - approvalsUtil.getSubmitter(db, commit.notes(), patchSetId); - if (psa == null) { - throw new MergeValidationException(CommitMergeStatus. - SETTING_PARENT_PROJECT_ONLY_ALLOWED_BY_ADMIN); - } - final IdentifiedUser submitter = - identifiedUserFactory.create(psa.getAccountId()); - if (!submitter.getCapabilities().canAdministrateServer()) { + if (!caller.getCapabilities().canAdministrateServer()) { throw new MergeValidationException(CommitMergeStatus. SETTING_PARENT_PROJECT_ONLY_ALLOWED_BY_ADMIN); } |