ReviewerManager: Fix build error
The breakage was introduced in merge commit Ie7d6439bf27. Mention of
ReviewDb was missed to be removed after merging to stable-3.0 branch.
Also avoid importing Account.Id class directly.
Change-Id: Ie48ceb78540fdb9a91fd2c35fa4fe2ec1424496b
diff --git a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java
index 3634cbe..0a3f6f9 100644
--- a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java
+++ b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java
@@ -23,10 +23,8 @@
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.client.Account.Id;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.permissions.ChangePermission;
import com.google.gerrit.server.permissions.PermissionBackend;
@@ -75,7 +73,7 @@
ReviewInput in = new ReviewInput();
in.reviewers = new ArrayList<>(reviewers.size());
for (Account.Id account : reviewers) {
- if (isVisibleTo(ctx.getReviewDbProvider().get(), changeInfo, account)) {
+ if (isVisibleTo(changeInfo, account)) {
AddReviewerInput addReviewerInput = new AddReviewerInput();
addReviewerInput.reviewer = account.toString();
in.reviewers.add(addReviewerInput);
@@ -94,10 +92,10 @@
}
}
- private boolean isVisibleTo(ReviewDb reviewDb, ChangeInfo changeInfo, Id account) {
+ private boolean isVisibleTo(ChangeInfo changeInfo, Account.Id account) {
ChangeData changeData =
changeDataFactory.create(
- reviewDb, new Project.NameKey(changeInfo.project), new Change.Id(changeInfo._number));
+ new Project.NameKey(changeInfo.project), new Change.Id(changeInfo._number));
return permissionBackend
.user(userFactory.create(account))
.change(changeData)
