commit 3a13347b1c6a5daa0c5354feccbf117046e4516e
author David Pursehouse <dpursehouse@collab.net> Wed Oct 02 23:33:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 02 23:33:52 2019 +0000
tree 395487decb606fba7e7746689297d36ccb244e2c
parent bbba6c3e807772332b80fa5060e55df7a660d4db
parent 25525d9f0c24a6f80a4102afb3ea1d8947f3561d

Merge "Don't import Id/Key/NameKey directly"

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/MergeValidator.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/MergeValidator.java
index 72d401a..6bd6ba9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/MergeValidator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/MergeValidator.java
@@ -24,7 +24,7 @@
 import com.google.gerrit.extensions.common.RevisionInfo;
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.reviewdb.client.BranchNameKey;
-import com.google.gerrit.reviewdb.client.PatchSet.Id;
+import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.git.CodeReviewCommit;
 import com.google.gerrit.server.git.validators.MergeValidationException;
@@ -65,7 +65,7 @@
       CodeReviewCommit commit,
       ProjectState destProject,
       BranchNameKey destBranch,
-      Id patchSetId,
+      PatchSet.Id patchSetId,
       IdentifiedUser caller)
       throws MergeValidationException {
     int changeId = commit.change().getChangeId();