commit 3c5badf147045ba55ed5098a1b97e7f632136917
author Dave Borowitz <dborowitz@google.com> Wed Oct 10 13:43:13 2018 -0700
committer Dave Borowitz <dborowitz@google.com> Wed Oct 10 14:06:08 2018 -0700
tree 59d3a08189ce6bf88f6b36a811c20b65e67b324b
parent b4eb0033632f4e0f821e7496e4ea9f2b4c469c01

AddReviewersOp: Get user and ReviewDb from context

The providers aren't in scope in the HTTP push codepath, preventing this
op class from being reused there. The values are available from the
context anyway, so we can eliminate the boilerplate.

Change-Id: I96764c721ae3a9a4329bfc1c1c19189249d1bfe4

java/com/google/gerrit/server/change/AddReviewersOp.java

diff --git a/java/com/google/gerrit/server/change/AddReviewersOp.java b/java/com/google/gerrit/server/change/AddReviewersOp.java
index b2c2105..e558d00 100644
--- a/java/com/google/gerrit/server/change/AddReviewersOp.java
+++ b/java/com/google/gerrit/server/change/AddReviewersOp.java
@@ -37,9 +37,7 @@
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.reviewdb.client.PatchSetApproval;
-import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.ApprovalsUtil;
-import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.PatchSetUtil;
 import com.google.gerrit.server.account.AccountCache;
 import com.google.gerrit.server.account.AccountState;
@@ -52,7 +50,6 @@
 import com.google.gerrit.server.update.Context;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.google.inject.assistedinject.Assisted;
 import java.io.IOException;
 import java.util.Collection;
@@ -119,8 +116,6 @@
   private final ProjectCache projectCache;
   private final AddReviewersEmail addReviewersEmail;
   private final NotesMigration migration;
-  private final Provider<IdentifiedUser> user;
-  private final Provider<ReviewDb> dbProvider;
   private final Set<Account.Id> accountIds;
   private final Collection<Address> addresses;
   private final ReviewerState state;
@@ -147,8 +142,6 @@
       ProjectCache projectCache,
       AddReviewersEmail addReviewersEmail,
       NotesMigration migration,
-      Provider<IdentifiedUser> user,
-      Provider<ReviewDb> dbProvider,
       @Assisted Set<Account.Id> accountIds,
       @Assisted Collection<Address> addresses,
       @Assisted ReviewerState state,
@@ -162,8 +155,6 @@
     this.projectCache = projectCache;
     this.addReviewersEmail = addReviewersEmail;
     this.migration = migration;
-    this.user = user;
-    this.dbProvider = dbProvider;
 
     this.accountIds = accountIds;
     this.addresses = addresses;
@@ -216,7 +207,7 @@
 
     checkAdded();
 
-    patchSet = psUtil.current(dbProvider.get(), ctx.getNotes());
+    patchSet = psUtil.current(ctx.getDb(), ctx.getNotes());
     return true;
   }
 
@@ -254,7 +245,7 @@
             .setAddedCCsByEmail(addedCCsByEmail)
             .build();
     addReviewersEmail.emailReviewers(
-        user.get(),
+        ctx.getUser().asIdentifiedUser(),
         change,
         Lists.transform(addedReviewers, PatchSetApproval::getAccountId),
         addedCCs,