Factor parser class out of DraftCommentNotes

Change-Id: Ib7b1eee4ff6aca706dd7b9b301fd6e7882f40431

gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java

@@ -17,7 +17,6 @@ package com.google.gerrit.server.notedb;
 import static com.google.gerrit.server.notedb.CommentsInNotesUtil.getCommentPsId;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Table;
@@ -25,7 +24,6 @@ import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchLineComment;
 import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.client.PatchLineComment.Status;
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.config.AllUsersName;
@@ -35,10 +33,8 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import org.eclipse.jgit.errors.ConfigInvalidException;
-import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.CommitBuilder;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.notes.NoteMap;
 import org.eclipse.jgit.revwalk.RevWalk;
 
@@ -68,44 +64,6 @@ public class DraftCommentNotes extends AbstractChangeNotes<DraftCommentNotes> {
     }
   }
 
-  private static class Parser implements AutoCloseable {
-    private final Change.Id changeId;
-    private final ObjectId tip;
-    private final RevWalk walk;
-    private final Repository repo;
-    private final Account.Id author;
-
-    private final Multimap<PatchSet.Id, PatchLineComment> draftBaseComments;
-    private final Multimap<PatchSet.Id, PatchLineComment> draftPsComments;
-    private NoteMap noteMap;
-
-    private Parser(Change.Id changeId, RevWalk walk, ObjectId tip,
-        GitRepositoryManager repoManager, AllUsersName draftsProject,
-        Account.Id author) throws RepositoryNotFoundException, IOException {
-      this.changeId = changeId;
-      this.walk = walk;
-      this.tip = tip;
-      this.repo = repoManager.openRepository(draftsProject);
-      this.author = author;
-
-      draftBaseComments = ArrayListMultimap.create();
-      draftPsComments = ArrayListMultimap.create();
-    }
-
-    @Override
-    public void close() {
-      repo.close();
-    }
-
-    private void parseDraftComments() throws IOException, ConfigInvalidException {
-      walk.markStart(walk.parseCommit(tip));
-      noteMap = CommentsInNotesUtil.parseCommentsFromNotes(repo,
-          RefNames.refsDraftComments(author, changeId),
-          walk, changeId, draftBaseComments,
-          draftPsComments, Status.DRAFT);
-    }
-  }
-
   private final AllUsersName draftsProject;
   private final Account.Id author;
 
@@ -172,8 +130,8 @@ public class DraftCommentNotes extends AbstractChangeNotes<DraftCommentNotes> {
     }
 
     RevWalk walk = new RevWalk(reader);
-    try (Parser parser = new Parser(getChangeId(), walk, rev, repoManager,
-        draftsProject, author)) {
+    try (DraftCommentNotesParser parser = new DraftCommentNotesParser(
+        getChangeId(), walk, rev, repoManager, draftsProject, author)) {
       parser.parseDraftComments();
 
       buildCommentTable(draftBaseComments, parser.draftBaseComments);