Use new ApprovalsUtil method for getting by patch set
Core change I5de63a4210f29863274111964480fb1f5720ca60
Change-Id: I80c640c535678b5ad7be5d8a2757732eb973cb17
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
index fe6b267..b97d050 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
@@ -24,6 +24,7 @@
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RevId;
import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.config.AnonymousCowardName;
@@ -74,6 +75,7 @@
private final AccountCache accountCache;
private final String anonymousCowardName;
private final LabelTypes labelTypes;
+ private final ApprovalsUtil approvalsUtil;
private final LabelNormalizer labelNormalizer;
private final NotesBranchUtil.Factory notesBranchUtilFactory;
private final String canonicalWebUrl;
@@ -90,6 +92,7 @@
final AccountCache accountCache,
final @AnonymousCowardName String anonymousCowardName,
final ProjectCache projectCache,
+ final ApprovalsUtil approvalsUtil,
final LabelNormalizer labelNormalizer,
final NotesBranchUtil.Factory notesBranchUtilFactory,
final @Nullable @CanonicalWebUrl String canonicalWebUrl,
@@ -107,6 +110,7 @@
} else {
this.labelTypes = projectState.getLabelTypes();
}
+ this.approvalsUtil = approvalsUtil;
this.labelNormalizer = labelNormalizer;
this.notesBranchUtilFactory = notesBranchUtilFactory;
this.canonicalWebUrl = canonicalWebUrl;
@@ -264,7 +268,7 @@
// repeat some work, but results should be identical except in the case of
// an additional race with a permissions change.
List<PatchSetApproval> approvals = labelNormalizer.normalize(
- change, reviewDb.patchSetApprovals().byPatchSet(ps.getId()).toList());
+ change, approvalsUtil.byPatchSet(reviewDb, ps.getId()));
PatchSetApproval submit = null;
for (PatchSetApproval a : approvals) {
if (a.getValue() == 0) {
