Remove redundant footerLines argument from ChangeInserter
The footer lines can be provided by the commit, which is already
passed in. It is not necessary to pass them in a separate argument.
Change-Id: I8cb7b5c0179af828b70dc310ff0f25d23e95f648
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
index 70cf586..2d1707c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
@@ -304,8 +304,7 @@
LabelTypes labelTypes = refControl.getProjectControl().getLabelTypes();
changeInserter.insertChange(db, change, cmsg, ps, revertCommit,
- labelTypes, revertCommit.getFooterLines(), info,
- Collections.<Account.Id> emptySet());
+ labelTypes, info, Collections.<Account.Id> emptySet());
final RevertedSender cm = revertedSenderFactory.create(change);
cm.setFrom(user.getAccountId());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index d444633..5c965e2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -30,11 +30,9 @@
import com.google.inject.Inject;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.FooterLine;
import org.eclipse.jgit.revwalk.RevCommit;
import java.util.Collections;
-import java.util.List;
import java.util.Set;
public class ChangeInserter {
@@ -54,22 +52,22 @@
}
public void insertChange(ReviewDb db, Change change, PatchSet ps,
- RevCommit commit, LabelTypes labelTypes, List<FooterLine> footerLines,
- PatchSetInfo info, Set<Account.Id> reviewers) throws OrmException {
- insertChange(db, change, null, ps, commit, labelTypes, footerLines, info, reviewers);
+ RevCommit commit, LabelTypes labelTypes, PatchSetInfo info,
+ Set<Account.Id> reviewers) throws OrmException {
+ insertChange(db, change, null, ps, commit, labelTypes, info, reviewers);
}
public void insertChange(ReviewDb db, Change change,
ChangeMessage changeMessage, PatchSet ps, RevCommit commit,
- LabelTypes labelTypes, List<FooterLine> footerLines, PatchSetInfo info,
- Set<Account.Id> reviewers) throws OrmException {
+ LabelTypes labelTypes, PatchSetInfo info, Set<Account.Id> reviewers)
+ throws OrmException {
db.changes().beginTransaction(change.getId());
try {
ChangeUtil.insertAncestors(db, ps.getId(), commit);
db.patchSets().insert(Collections.singleton(ps));
db.changes().insert(Collections.singleton(change));
- ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines);
+ ChangeUtil.updateTrackingIds(db, change, trackingFooters, commit.getFooterLines());
approvalsUtil.addReviewers(db, labelTypes, change, ps, info, reviewers,
Collections.<Account.Id> emptySet());
if (changeMessage != null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 9dd5a4f..3199a14 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -1466,8 +1466,8 @@
recipients.add(getRecipientsFromFooters(accountResolver, ps, footerLines));
recipients.remove(me);
- changeInserter.insertChange(db, change, ps, commit, labelTypes,
- footerLines, info, recipients.getReviewers());
+ changeInserter.insertChange(db, change, ps, commit, labelTypes, info,
+ recipients.getReviewers());
created = true;
