Use PatchSetUtil to read patch sets Previously we were reading directly from ReviewDb, which produced empty results in NoteDb. Change-Id: I3ef2ab6667e74351c50429ef6d85b232474073db Signed-off-by: Edwin Kempin <ekempin@google.com>
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 278a299..7237268 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java +++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
@@ -26,6 +26,7 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.GerritPersonIdent; +import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.AnonymousCowardName; @@ -77,6 +78,7 @@ private final Provider<InternalChangeQuery> queryProvider; private final DynamicItem<UrlFormatter> urlFormatter; private final ReviewDb reviewDb; + private final PatchSetUtil psUtil; private final Project.NameKey project; private final Repository git; @@ -95,6 +97,7 @@ NotesBranchUtil.Factory notesBranchUtilFactory, Provider<InternalChangeQuery> queryProvider, DynamicItem<UrlFormatter> urlFormatter, + PatchSetUtil psUtil, @Assisted ReviewDb reviewDb, @Assisted Project.NameKey project, @Assisted Repository git) { @@ -116,6 +119,7 @@ this.notesBranchUtilFactory = notesBranchUtilFactory; this.queryProvider = queryProvider; this.urlFormatter = urlFormatter; + this.psUtil = psUtil; this.reviewDb = reviewDb; this.project = project; this.git = git; @@ -173,7 +177,7 @@ for (ChangeNotes cn : notes) { monitor.update(1); - PatchSet ps = reviewDb.patchSets().get(cn.getChange().currentPatchSetId()); + PatchSet ps = psUtil.current(cn); ObjectId commitId = ObjectId.fromString(ps.getRevision().get()); RevCommit commit = rw.parseCommit(commitId); getNotes().set(commitId, createNoteContent(cn, ps));