Remove extraReviewers arg from (Async)ReceiveCommits.Factory

This is never used to pass anything other than an empty multimap,
including internally at Google.

Change-Id: I9ba7fd3a1faf325d5b5b2fa324e7fee68c1ed324

java/com/google/gerrit/acceptance/InProcessProtocol.java

@@ -14,7 +14,6 @@
 
 package com.google.gerrit.acceptance;
 
-import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Lists;
 import com.google.gerrit.acceptance.InProcessProtocol.Context;
 import com.google.gerrit.common.data.Capable;
@@ -330,8 +329,7 @@ class InProcessProtocol extends TestProtocol<Context> {
           throw new RuntimeException(String.format("project %s not found", req.project));
         }
 
-        AsyncReceiveCommits arc =
+        AsyncReceiveCommits arc = factory.create(projectState, identifiedUser, db, null);
-            factory.create(projectState, identifiedUser, db, null, ImmutableSetMultimap.of());
         if (arc.canUpload() != Capable.OK) {
           throw new ServiceNotAuthorizedException();
         }

java/com/google/gerrit/httpd/GitOverHttpServlet.java

@@ -15,7 +15,6 @@
 package com.google.gerrit.httpd;
 
 import com.google.common.cache.Cache;
-import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Lists;
 import com.google.gerrit.common.data.Capable;
 import com.google.gerrit.extensions.registration.DynamicSet;
@@ -308,8 +307,7 @@ public class GitOverHttpServlet extends GitServlet {
       }
 
       AsyncReceiveCommits arc =
-          factory.create(
+          factory.create(state, userProvider.get().asIdentifiedUser(), db, null);
-              state, userProvider.get().asIdentifiedUser(), db, null, ImmutableSetMultimap.of());
       ReceivePack rp = arc.getReceivePack();
       req.setAttribute(ATT_ARC, arc);
       return rp;

java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java

@@ -14,13 +14,11 @@
 
 package com.google.gerrit.server.git.receive;
 
-import com.google.common.collect.SetMultimap;
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.common.data.Capable;
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.ResourceConflictException;
-import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.config.ConfigUtil;
@@ -30,7 +28,6 @@ import com.google.gerrit.server.git.DefaultAdvertiseRefsHook;
 import com.google.gerrit.server.git.MultiProgressMonitor;
 import com.google.gerrit.server.git.ProjectRunnable;
 import com.google.gerrit.server.git.TransferConfig;
-import com.google.gerrit.server.notedb.ReviewerStateInternal;
 import com.google.gerrit.server.permissions.PermissionBackend;
 import com.google.gerrit.server.permissions.PermissionBackend.RefFilterOptions;
 import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -82,8 +79,7 @@ public class AsyncReceiveCommits implements PreReceiveHook {
         ProjectState projectState,
         IdentifiedUser user,
         Repository repository,
-        @Nullable MessageSender messageSender,
+        @Nullable MessageSender messageSender);
-        SetMultimap<ReviewerStateInternal, Account.Id> extraReviewers);
   }
 
   public static class Module extends PrivateModule {
@@ -196,8 +192,7 @@ public class AsyncReceiveCommits implements PreReceiveHook {
       @Assisted ProjectState projectState,
       @Assisted IdentifiedUser user,
       @Assisted Repository repo,
-      @Assisted @Nullable MessageSender messageSender,
+      @Assisted @Nullable MessageSender messageSender)
-      @Assisted SetMultimap<ReviewerStateInternal, Account.Id> extraReviewers)
       throws PermissionBackendException {
     this.executor = executor;
     this.scopePropagator = scopePropagator;
@@ -242,9 +237,7 @@ public class AsyncReceiveCommits implements PreReceiveHook {
     advHooks.add(new HackPushNegotiateHook());
     receivePack.setAdvertiseRefsHook(AdvertiseRefsHookChain.newChain(advHooks));
 
-    receiveCommits =
+    receiveCommits = factory.create(projectState, user, receivePack, allRefsWatcher, messageSender);
-        factory.create(
-            projectState, user, receivePack, allRefsWatcher, extraReviewers, messageSender);
     receiveCommits.init();
   }
 

java/com/google/gerrit/server/git/receive/ReceiveCommits.java

@@ -47,14 +47,12 @@ import com.google.common.base.Throwables;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.MultimapBuilder;
-import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.SortedSetMultimap;
 import com.google.common.flogger.FluentLogger;
@@ -119,7 +117,6 @@ import com.google.gerrit.server.logging.TraceContext;
 import com.google.gerrit.server.mail.MailUtil.MailRecipients;
 import com.google.gerrit.server.notedb.ChangeNotes;
 import com.google.gerrit.server.notedb.NotesMigration;
-import com.google.gerrit.server.notedb.ReviewerStateInternal;
 import com.google.gerrit.server.patch.PatchSetInfoFactory;
 import com.google.gerrit.server.permissions.ChangePermission;
 import com.google.gerrit.server.permissions.GlobalPermission;
@@ -231,7 +228,6 @@ class ReceiveCommits {
         IdentifiedUser user,
         ReceivePack receivePack,
         AllRefsWatcher allRefsWatcher,
-        SetMultimap<ReviewerStateInternal, Account.Id> extraReviewers,
         MessageSender messageSender);
   }
 
@@ -322,7 +318,6 @@ class ReceiveCommits {
 
   // Assisted injected fields.
   private final AllRefsWatcher allRefsWatcher;
-  private final ImmutableSetMultimap<ReviewerStateInternal, Account.Id> extraReviewers;
   private final ProjectState projectState;
   private final IdentifiedUser user;
   private final ReceivePack receivePack;
@@ -398,7 +393,6 @@ class ReceiveCommits {
       @Assisted IdentifiedUser user,
       @Assisted ReceivePack rp,
       @Assisted AllRefsWatcher allRefsWatcher,
-      @Assisted SetMultimap<ReviewerStateInternal, Account.Id> extraReviewers,
       @Nullable @Assisted MessageSender messageSender)
       throws IOException {
     // Injected fields.
@@ -438,7 +432,6 @@ class ReceiveCommits {
 
     // Assisted injected fields.
     this.allRefsWatcher = allRefsWatcher;
-    this.extraReviewers = ImmutableSetMultimap.copyOf(extraReviewers);
     this.projectState = projectState;
     this.user = user;
     this.receivePack = rp;
@@ -1582,8 +1575,6 @@ class ReceiveCommits {
   private void parseMagicBranch(ReceiveCommand cmd) throws PermissionBackendException {
     logger.atFine().log("Found magic branch %s", cmd.getRefName());
     MagicBranchInput magicBranch = new MagicBranchInput(user, cmd, labelTypes, notesMigration);
-    magicBranch.reviewer.addAll(extraReviewers.get(ReviewerStateInternal.REVIEWER));
-    magicBranch.cc.addAll(extraReviewers.get(ReviewerStateInternal.CC));
 
     String ref;
     magicBranch.cmdLineParser = optionParserFactory.create(magicBranch);

java/com/google/gerrit/sshd/commands/Receive.java

@@ -88,7 +88,7 @@ final class Receive extends AbstractGitCommand {
       throw new Failure(1, "fatal: unable to check permissions " + e);
     }
 
-    AsyncReceiveCommits arc = factory.create(projectState, currentUser, repo, null, reviewers);
+    AsyncReceiveCommits arc = factory.create(projectState, currentUser, repo, null);
 
     try {
       Capable r = arc.canUpload();