opendev/gerrit
Code Issues Proposed changes

Remove fields/methods that are unused since requireChangeId has been removed

Browse Source 
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I409106ce23a993899aded48434637d9f4305dba7
This commit is contained in:
Edwin Kempin
2019-07-18 11:59:35 +02:00
parent 2892aa981b
commit 80beb1cac2
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,12 +146,7 @@ public class CommitValidators {
new CommitterUploaderValidator(user, perm, urlFormatter.get()), new CommitterUploaderValidator(user, perm, urlFormatter.get()),
new SignedOffByValidator(user, perm, projectState), new SignedOffByValidator(user, perm, projectState),
new ChangeIdValidator( new ChangeIdValidator(
projectState, user, urlFormatter.get(), installCommitMsgHookCommand, sshInfo, change),
user,
urlFormatter.get(),
installCommitMsgHookCommand,
sshInfo,
change),
new ConfigValidator(projectConfigFactory, branch, user, rw, allUsers, allProjects), new ConfigValidator(projectConfigFactory, branch, user, rw, allUsers, allProjects),
new BannedCommitsValidator(rejectCommits), new BannedCommitsValidator(rejectCommits),
new PluginCommitValidationListener(pluginValidators, skipValidation), new PluginCommitValidationListener(pluginValidators, skipValidation),
@@ -178,12 +173,7 @@ public class CommitValidators {
new AuthorUploaderValidator(user, perm, urlFormatter.get()), new AuthorUploaderValidator(user, perm, urlFormatter.get()),
new SignedOffByValidator(user, perm, projectCache.checkedGet(branch.project())), new SignedOffByValidator(user, perm, projectCache.checkedGet(branch.project())),
new ChangeIdValidator( new ChangeIdValidator(
projectState, user, urlFormatter.get(), installCommitMsgHookCommand, sshInfo, change),
user,
urlFormatter.get(),
installCommitMsgHookCommand,
sshInfo,
change),
new ConfigValidator(projectConfigFactory, branch, user, rw, allUsers, allProjects), new ConfigValidator(projectConfigFactory, branch, user, rw, allUsers, allProjects),
new PluginCommitValidationListener(pluginValidators), new PluginCommitValidationListener(pluginValidators),
new ExternalIdUpdateListener(allUsers, externalIdsConsistencyChecker), new ExternalIdUpdateListener(allUsers, externalIdsConsistencyChecker),
@@ -257,7 +247,6 @@ public class CommitValidators {
private static final Pattern CHANGE_ID = Pattern.compile(CHANGE_ID_PATTERN); private static final Pattern CHANGE_ID = Pattern.compile(CHANGE_ID_PATTERN);
private final ProjectState projectState;
private final UrlFormatter urlFormatter; private final UrlFormatter urlFormatter;
private final String installCommitMsgHookCommand; private final String installCommitMsgHookCommand;
private final SshInfo sshInfo; private final SshInfo sshInfo;
@@ -265,13 +254,11 @@ public class CommitValidators {
private final Change change; private final Change change;
public ChangeIdValidator( public ChangeIdValidator(
ProjectState projectState,
IdentifiedUser user, IdentifiedUser user,
UrlFormatter urlFormatter, UrlFormatter urlFormatter,
String installCommitMsgHookCommand, String installCommitMsgHookCommand,
SshInfo sshInfo, SshInfo sshInfo,
Change change) { Change change) {
this.projectState = projectState;
this.urlFormatter = urlFormatter; this.urlFormatter = urlFormatter;
this.installCommitMsgHookCommand = installCommitMsgHookCommand; this.installCommitMsgHookCommand = installCommitMsgHookCommand;
this.sshInfo = sshInfo; this.sshInfo = sshInfo;

4
javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
View File

@@ -2663,10 +2663,6 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
return cds.get(0); return cds.get(0);
} }
private static void pushForReviewOk(TestRepository<?> testRepo) throws GitAPIException {
pushForReview(testRepo, RemoteRefUpdate.Status.OK, null);
}
private static void pushForReviewRejected(TestRepository<?> testRepo, String expectedMessage) private static void pushForReviewRejected(TestRepository<?> testRepo, String expectedMessage)
throws GitAPIException { throws GitAPIException {
pushForReview(testRepo, RemoteRefUpdate.Status.REJECTED_OTHER_REASON, expectedMessage); pushForReview(testRepo, RemoteRefUpdate.Status.REJECTED_OTHER_REASON, expectedMessage);