From b216a42d794e76aaa2c496be6175a5fb9adfbe99 Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Wed, 30 Nov 2016 18:19:08 +0100 Subject: [PATCH] Avoid passing ChangeControl to ChangeMessageModifier.onSubmit. Follow up on https://gerrit-review.googlesource.com/c/91991. Bug: Issue 5003 Change-Id: I7571ebe05d2924d6fbb8d94ec8bb1440abfda238 --- .../com/google/gerrit/acceptance/api/change/ChangeIT.java | 6 ++---- .../acceptance/rest/change/SubmitByCherryPickIT.java | 7 +++---- .../acceptance/rest/change/SubmitByRebaseAlwaysIT.java | 7 +++---- .../google/gerrit/server/git/ChangeMessageModifier.java | 6 +++--- .../main/java/com/google/gerrit/server/git/MergeUtil.java | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java index 1c8ab3cec0..c2618f5b55 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -1820,12 +1820,10 @@ public class ChangeIT extends AbstractDaemonTest { PushOneCommit.Result change = createChange(); RegistrationHandle handle = changeMessageModifiers.add(new ChangeMessageModifier() { - @Override public String onSubmit(String newCommitMessage, RevCommit original, - RevCommit mergeTip, ChangeControl ctl) { - return newCommitMessage + "Custom: " - + ctl.getChange().getDest().get(); + RevCommit mergeTip, Branch.NameKey destination) { + return newCommitMessage + "Custom: " + destination.get(); } }); ChangeInfo actual; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java index 9656762ded..0a3b217ec2 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java @@ -29,12 +29,12 @@ import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.RegistrationHandle; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.server.change.Submit.TestSubmitInput; import com.google.gerrit.server.git.ChangeMessageModifier; import com.google.gerrit.server.git.strategy.CommitMergeStatus; -import com.google.gerrit.server.project.ChangeControl; import com.google.inject.Inject; import org.eclipse.jgit.lib.ObjectId; @@ -103,9 +103,8 @@ public class SubmitByCherryPickIT extends AbstractSubmit { changeMessageModifiers.add(new ChangeMessageModifier() { @Override public String onSubmit(String newCommitMessage, RevCommit original, - RevCommit mergeTip, ChangeControl ctl) { - return newCommitMessage + "Custom: " - + ctl.getChange().getDest().get(); + RevCommit mergeTip, Branch.NameKey destination) { + return newCommitMessage + "Custom: " + destination.get(); } }); try { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java index 6caf12adb1..03894179f9 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java @@ -24,8 +24,8 @@ import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.RegistrationHandle; +import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.server.git.ChangeMessageModifier; -import com.google.gerrit.server.project.ChangeControl; import com.google.inject.Inject; import org.eclipse.jgit.lib.ObjectId; @@ -95,13 +95,12 @@ public class SubmitByRebaseAlwaysIT extends AbstractSubmitByRebase { changeMessageModifiers.add(new ChangeMessageModifier() { @Override public String onSubmit(String newCommitMessage, RevCommit original, - RevCommit mergeTip, ChangeControl ctl) { + RevCommit mergeTip, Branch.NameKey destination) { List custom = mergeTip.getFooterLines("Custom"); if (!custom.isEmpty()) { newCommitMessage += "Custom-Parent: " + custom.get(0) + "\n"; } - return newCommitMessage + "Custom: " - + ctl.getChange().getDest().get(); + return newCommitMessage + "Custom: " + destination.get(); } }); try { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMessageModifier.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMessageModifier.java index 2b05bc7a5d..75911f3f5f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMessageModifier.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMessageModifier.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.git; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.server.project.ChangeControl; +import com.google.gerrit.reviewdb.client.Branch; import org.eclipse.jgit.revwalk.RevCommit; @@ -45,9 +45,9 @@ public interface ChangeMessageModifier { * commit message may be different than newCommitMessage argument. * @param mergeTip the current HEAD of the destination branch, which will be a * parent of a new commit being generated - * @param ctl + * @param destination the branch onto which the change is being submitted * @return a new not null commit message. */ String onSubmit(String newCommitMessage, RevCommit original, - RevCommit mergeTip, ChangeControl ctl); + RevCommit mergeTip, Branch.NameKey destination); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java index eeed58630f..0a4a4300cc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java @@ -120,7 +120,7 @@ public class MergeUtil { } for (ChangeMessageModifier changeMessageModifier : changeMessageModifiers) { current = changeMessageModifier.onSubmit(current, original, - mergeTip, ctl); + mergeTip, ctl.getChange().getDest()); checkNotNull(current, changeMessageModifier.getClass().getName() + ".OnSubmit returned null instead of new commit message"); }