opendev/gerrit
Code Issues Proposed changes

CommitValidators: uniformize argument ordering for creation methods

Browse Source 
Change-Id: Idf5a3bed6cbd3f90f5c9582e160c57a3a201933f
This commit is contained in:
Han-Wen Nienhuys
2018-09-06 14:03:52 +02:00
parent 4faeb9dd9e
commit f40fbff686
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/com/google/gerrit/server/git/validators/CommitValidators.java
View File

@@ -35,7 +35,6 @@ import com.google.gerrit.reviewdb.client.BooleanProjectConfig;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Branch.NameKey;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.IdentifiedUser;
@@ -48,7 +47,6 @@ import com.google.gerrit.server.events.CommitReceivedEvent;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.ValidationError;
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackend.ForRef;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.ProjectCache;
@@ -122,7 +120,7 @@ public class CommitValidators {
}
public CommitValidators forReceiveCommits(
PermissionBackend.ForRef perm,
PermissionBackend.ForProject forProject,
Branch.NameKey branch,
IdentifiedUser user,
SshInfo sshInfo,
@@ -130,6 +128,7 @@ public class CommitValidators {
RevWalk rw,
@Nullable Change change)
throws IOException {
PermissionBackend.ForRef perm = forProject.ref(branch.get());
ProjectState projectState = projectCache.checkedGet(branch.getParentKey());
return new CommitValidators(
ImmutableList.of(
@@ -155,13 +154,14 @@ public class CommitValidators {
}
public CommitValidators forGerritCommits(
ForRef perm,
PermissionBackend.ForProject forProject,
NameKey branch,
IdentifiedUser user,
SshInfo sshInfo,
RevWalk rw,
@Nullable Change change)
throws IOException {
PermissionBackend.ForRef perm = forProject.ref(branch.get());
ProjectState projectState = projectCache.checkedGet(branch.getParentKey());
return new CommitValidators(
ImmutableList.of(
@@ -185,7 +185,7 @@ public class CommitValidators {
}
public CommitValidators forMergedCommits(
Project.NameKey project, PermissionBackend.ForRef perm, IdentifiedUser user)
PermissionBackend.ForProject forProject, Branch.NameKey branch, IdentifiedUser user)
throws IOException {
// Generally only include validators that are based on permissions of the
// user creating a change for a merged commit; generally exclude
@@ -200,10 +200,11 @@ public class CommitValidators {
// discuss what to do about it.
// - Plugin validators may do things like require certain commit message
// formats, so we play it safe and exclude them.
PermissionBackend.ForRef perm = forProject.ref(branch.get());
return new CommitValidators(
ImmutableList.of(
new UploadMergesPermissionValidator(perm),
new ProjectStateValidationListener(projectCache.checkedGet(project)),
new ProjectStateValidationListener(projectCache.checkedGet(branch.getParentKey())),
new AuthorUploaderValidator(user, perm, canonicalWebUrl),
new CommitterUploaderValidator(user, perm, canonicalWebUrl)));
}