Adapt to the new related changes class on stable-2.15
Bug: Issue 10386
Change-Id: I68b5528feadc01ca4686e43f540e626c34c7b6d0
diff --git a/WORKSPACE b/WORKSPACE
index 809778d..a5e758f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "f1d3eefb78029298afe119b0d8b2a43de2b510f6",
+ commit = "2b1d68959119920e5fa9bdfb9f0cf926bfef4929",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java b/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java
index 31a11fa..4b7d779 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java
@@ -3,6 +3,8 @@
import static com.google.gerrit.server.permissions.ChangePermission.READ;
import com.google.gerrit.common.data.SubmitRecord;
+import com.google.gerrit.extensions.api.changes.RelatedChangeAndCommitInfo;
+import com.google.gerrit.extensions.api.changes.RelatedChangesInfo;
import com.google.gerrit.extensions.api.changes.SubmitInput;
import com.google.gerrit.extensions.client.ChangeStatus;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -13,8 +15,6 @@
import com.google.gerrit.server.account.Emails;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.GetRelated;
-import com.google.gerrit.server.change.GetRelated.ChangeAndCommit;
-import com.google.gerrit.server.change.GetRelated.RelatedInfo;
import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.change.Submit;
import com.google.gerrit.server.notedb.ChangeNotes;
@@ -75,13 +75,13 @@
throws IOException, NoSuchChangeException, NoSuchProjectException, OrmException,
PermissionBackendException {
RevisionResource r = getRevisionResource(project, number);
- RelatedInfo related = getRelated.apply(r);
+ RelatedChangesInfo related = getRelated.apply(r);
log.debug(String.format("Checking for related changes on review %d", number));
String checkedCommitSha1 = r.getPatchSet().getRevision().get();
int firstParentIndex = 0;
int i = 0;
- for (ChangeAndCommit c : related.changes) {
+ for (RelatedChangeAndCommitInfo c : related.changes) {
if (checkedCommitSha1.equals(c.commit.commit)) {
firstParentIndex = i + 1;
log.debug(
@@ -94,7 +94,8 @@
}
boolean hasNonMergedParent = false;
- for (ChangeAndCommit c : related.changes.subList(firstParentIndex, related.changes.size())) {
+ for (RelatedChangeAndCommitInfo c :
+ related.changes.subList(firstParentIndex, related.changes.size())) {
if (!ChangeStatus.MERGED.toString().equals(c.status)) {
log.info(
String.format(
