Adapt to API changes in 3.1
Also avoid importing Id classes directly.
Change-Id: I40945e75ace97168727f0310d7705ebe0897d26c
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rejectprivate/RejectPrivateSubmitListener.java b/src/main/java/com/googlesource/gerrit/plugins/rejectprivate/RejectPrivateSubmitListener.java
index 13144f7..d8a0fcc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rejectprivate/RejectPrivateSubmitListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rejectprivate/RejectPrivateSubmitListener.java
@@ -14,9 +14,9 @@
package com.googlesource.gerrit.plugins.rejectprivate;
+import com.google.gerrit.entities.BranchNameKey;
+import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.reviewdb.client.Branch.NameKey;
-import com.google.gerrit.reviewdb.client.PatchSet.Id;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.git.CodeReviewCommit;
import com.google.gerrit.server.git.validators.MergeValidationException;
@@ -46,8 +46,8 @@
Repository repo,
CodeReviewCommit commit,
ProjectState destProject,
- NameKey destBranch,
- Id patchSetId,
+ BranchNameKey destBranch,
+ PatchSet.Id patchSetId,
IdentifiedUser caller)
throws MergeValidationException {
if (commit == null || commit.change() == null) {