Adapt to removal of ReviewDb arguments
No more direct ReviewDb dependencies are required.
Change-Id: Ie62fced013b5c47886fd0e904dee7d6aeda6e81a
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 7237268..da4aac5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
@@ -23,7 +23,6 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.Project;
-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;
@@ -63,7 +62,7 @@
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
interface Factory {
- CreateReviewNotes create(ReviewDb reviewDb, Project.NameKey project, Repository git);
+ CreateReviewNotes create(Project.NameKey project, Repository git);
}
private static final String REFS_NOTES_REVIEW = "refs/notes/review";
@@ -77,7 +76,6 @@
private final NotesBranchUtil.Factory notesBranchUtilFactory;
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;
@@ -98,7 +96,6 @@
Provider<InternalChangeQuery> queryProvider,
DynamicItem<UrlFormatter> urlFormatter,
PatchSetUtil psUtil,
- @Assisted ReviewDb reviewDb,
@Assisted Project.NameKey project,
@Assisted Repository git) {
this.gerritServerIdent = gerritIdent;
@@ -120,7 +117,6 @@
this.queryProvider = queryProvider;
this.urlFormatter = urlFormatter;
this.psUtil = psUtil;
- this.reviewDb = reviewDb;
this.project = project;
this.git = git;
}
@@ -262,7 +258,7 @@
// commit time so we will be able to skip this normalization step.
Change change = notes.getChange();
PatchSetApproval submit = null;
- for (PatchSetApproval a : approvalsUtil.byPatchSet(reviewDb, notes, ps.getId(), null, null)) {
+ for (PatchSetApproval a : approvalsUtil.byPatchSet(notes, ps.getId(), null, null)) {
if (a.getValue() == 0) {
// Ignore 0 values.
} else if (a.isLegacySubmit()) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java
index 76fe84c..ce159b4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java
@@ -23,14 +23,11 @@
import com.google.gerrit.extensions.restapi.RestApiException;
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.git.GitRepositoryManager;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.update.RetryHelper;
import com.google.gerrit.server.update.UpdateException;
import com.google.gerrit.sshd.SshCommand;
-import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import java.io.IOException;
import java.util.List;
@@ -48,8 +45,6 @@
@Inject private GitRepositoryManager gitManager;
- @Inject private SchemaFactory<ReviewDb> database;
-
@Inject private CreateReviewNotes.Factory reviewNotesFactory;
@Inject private ChangeNotes.Factory notesFactory;
@@ -78,23 +73,23 @@
}
private ListMultimap<Project.NameKey, ChangeNotes> mergedChanges() {
- try (ReviewDb db = database.open()) {
+ try {
return MultimapBuilder.hashKeys()
.arrayListValues()
.build(
notesFactory.create(notes -> notes.getChange().getStatus() == Change.Status.MERGED));
- } catch (OrmException | IOException e) {
+ } catch (IOException e) {
stderr.println("Cannot read changes from database " + e.getMessage());
return ImmutableListMultimap.of();
}
}
- private void export(ReviewDb db, Project.NameKey project, List<ChangeNotes> notes)
+ private void export(Project.NameKey project, List<ChangeNotes> notes)
throws RestApiException, UpdateException {
retryHelper.execute(
updateFactory -> {
try (Repository git = gitManager.openRepository(project)) {
- CreateReviewNotes crn = reviewNotesFactory.create(db, project, git);
+ CreateReviewNotes crn = reviewNotesFactory.create(project, git);
crn.createNotes(notes, monitor);
crn.commitNotes();
} catch (RepositoryNotFoundException e) {
@@ -127,12 +122,12 @@
private class Worker extends Thread {
@Override
public void run() {
- try (ReviewDb db = database.open()) {
+ try {
for (; ; ) {
Map.Entry<Project.NameKey, List<ChangeNotes>> next = next();
if (next != null) {
try {
- export(db, next.getKey(), next.getValue());
+ export(next.getKey(), next.getValue());
} catch (RestApiException | UpdateException e) {
stderr.println(e.getMessage());
}
@@ -140,8 +135,6 @@
break;
}
}
- } catch (OrmException e) {
- stderr.println(e.getMessage());
} finally {
monitor.endWorker();
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java
index d8e0e83..198aa6c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java
@@ -19,14 +19,12 @@
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.ProjectRunnable;
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.update.RetryHelper;
import com.google.gerrit.server.update.UpdateException;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import java.util.concurrent.Future;
import org.eclipse.jgit.lib.Config;
@@ -37,7 +35,6 @@
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final CreateReviewNotes.Factory reviewNotesFactory;
- private final SchemaFactory<ReviewDb> schema;
private final GitRepositoryManager repoManager;
private final WorkQueue workQueue;
private final RetryHelper retryHelper;
@@ -46,13 +43,11 @@
@Inject
RefUpdateListener(
CreateReviewNotes.Factory reviewNotesFactory,
- SchemaFactory<ReviewDb> schema,
GitRepositoryManager repoManager,
WorkQueue workQueue,
RetryHelper retryHelper,
@GerritServerConfig Config config) {
this.reviewNotesFactory = reviewNotesFactory;
- this.schema = schema;
this.repoManager = repoManager;
this.workQueue = workQueue;
this.retryHelper = retryHelper;
@@ -104,9 +99,8 @@
retryHelper.execute(
updateFactory -> {
Project.NameKey projectName = new Project.NameKey(e.getProjectName());
- try (Repository git = repoManager.openRepository(projectName);
- ReviewDb reviewDb = schema.open()) {
- CreateReviewNotes crn = reviewNotesFactory.create(reviewDb, projectName, git);
+ try (Repository git = repoManager.openRepository(projectName)) {
+ CreateReviewNotes crn = reviewNotesFactory.create(projectName, git);
crn.createNotes(
e.getRefName(),
ObjectId.fromString(e.getOldObjectId()),