commit d64e5d04eacce14dd389b589da7092f46f21fd07
author Dave Borowitz <dborowitz@google.com> Thu Apr 25 10:34:27 2019 -0700
committer Dave Borowitz <dborowitz@google.com> Tue May 07 13:06:42 2019 -0700
tree 0f8f5736301b50e2343aae02ba028e0c3664db60
parent f12edc5203cf1659ec54d37a81505bd7cd390bc3

Adapt to new PatchSet method names

Change-Id: I5ea71182b84d7009fcc959efdb4a668c7a5dc703

src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergeChangeAction.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergeChangeAction.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergeChangeAction.java
index 6c755c1..de7348e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergeChangeAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergeChangeAction.java
@@ -71,12 +71,12 @@
       log.debug("Branch map is empty for change {}", change.getKey().get());
       return Response.none();
     }
-    String revision = rev.getPatchSet().getCommitId().name();
+    String revision = rev.getPatchSet().commitId().name();
 
     MultipleDownstreamMergeInput mdsMergeInput = new MultipleDownstreamMergeInput();
     mdsMergeInput.dsBranchMap = branchMap;
     mdsMergeInput.changeNumber = change.getId().get();
-    mdsMergeInput.patchsetNumber = rev.getPatchSet().getPatchSetId();
+    mdsMergeInput.patchsetNumber = rev.getPatchSet().number();
     mdsMergeInput.project = change.getProject().get();
     mdsMergeInput.topic = dsCreator.getOrSetTopic(change.getId().get(), change.getTopic());
     mdsMergeInput.subject = change.getSubject();