Move new change email from ReceiveCommits to ChangeInserter

ChangeInserter was already able to send email about a new change,
but this was disabled by ReceiveCommits. The code was identical
between the two sites, aside from background delivery.

Remove the code from ReceiveCommits and background formatting and
delivery inside the inserter.

Change-Id: I38cc862d98d58ab7f053942cfccf79703d756a43

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java

@@ -33,12 +33,14 @@ import com.google.gerrit.server.ChangeUtil;
 import com.google.gerrit.server.account.AccountCache;
 import com.google.gerrit.server.auth.AuthException;
 import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
+import com.google.gerrit.server.git.WorkQueue;
 import com.google.gerrit.server.index.ChangeIndexer;
 import com.google.gerrit.server.mail.CreateChangeSender;
 import com.google.gerrit.server.notedb.ChangeUpdate;
 import com.google.gerrit.server.patch.PatchSetInfoFactory;
 import com.google.gerrit.server.project.ChangeControl;
 import com.google.gerrit.server.project.RefControl;
+import com.google.gerrit.server.util.RequestScopePropagator;
 import com.google.gerrit.server.validators.ValidationException;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
@@ -73,6 +75,7 @@ public class ChangeInserter {
   private final CreateChangeSender.Factory createChangeSenderFactory;
   private final HashtagsUtil hashtagsUtil;
   private final AccountCache accountCache;
+  private final WorkQueue workQueue;
 
   private final RefControl refControl;
   private final Change change;
@@ -85,6 +88,7 @@ public class ChangeInserter {
   private Set<Account.Id> extraCC;
   private Map<String, Short> approvals;
   private Set<String> hashtags;
+  private RequestScopePropagator requestScopePropagator;
   private boolean runHooks;
   private boolean sendMail;
 
@@ -100,6 +104,7 @@ public class ChangeInserter {
       CreateChangeSender.Factory createChangeSenderFactory,
       HashtagsUtil hashtagsUtil,
       AccountCache accountCache,
+      WorkQueue workQueue,
       @Assisted RefControl refControl,
       @Assisted Change change,
       @Assisted RevCommit commit) {
@@ -113,6 +118,7 @@ public class ChangeInserter {
     this.createChangeSenderFactory = createChangeSenderFactory;
     this.hashtagsUtil = hashtagsUtil;
     this.accountCache = accountCache;
+    this.workQueue = workQueue;
     this.refControl = refControl;
     this.change = change;
     this.commit = commit;
@@ -173,6 +179,11 @@ public class ChangeInserter {
     return this;
   }
 
+  public ChangeInserter setRequestScopePropagator(RequestScopePropagator r) {
+    this.requestScopePropagator = r;
+    return this;
+  }
+
   public PatchSet getPatchSet() {
     return patchSet;
   }
@@ -224,21 +235,36 @@ public class ChangeInserter {
 
     CheckedFuture<?, IOException> f = indexer.indexAsync(change.getId());
 
-    if(!messageIsForChange()) {
+    if (!messageIsForChange()) {
       commitMessageNotForChange();
     }
 
     if (sendMail) {
-      try {
+      Runnable sender = new Runnable() {
-        CreateChangeSender cm =
+        @Override
-            createChangeSenderFactory.create(change);
+        public void run() {
-        cm.setFrom(change.getOwner());
+          try {
-        cm.setPatchSet(patchSet, patchSetInfo);
+            CreateChangeSender cm =
-        cm.addReviewers(reviewers);
+                createChangeSenderFactory.create(change);
-        cm.addExtraCC(extraCC);
+            cm.setFrom(change.getOwner());
-        cm.send();
+            cm.setPatchSet(patchSet, patchSetInfo);
-      } catch (Exception err) {
+            cm.addReviewers(reviewers);
-        log.error("Cannot send email for new change " + change.getId(), err);
+            cm.addExtraCC(extraCC);
+            cm.send();
+          } catch (Exception e) {
+            log.error("Cannot send email for new change " + change.getId(), e);
+          }
+        }
+
+        @Override
+        public String toString() {
+          return "send-email newchange";
+        }
+      };
+      if (requestScopePropagator != null) {
+        workQueue.getDefaultQueue().submit(requestScopePropagator.wrap(sender));
+      } else {
+        sender.run();
       }
     }
     f.checkedGet();

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

@@ -279,7 +279,6 @@ public class ReceiveCommits {
   private final SchemaFactory<ReviewDb> schemaFactory;
   private final AccountResolver accountResolver;
   private final CmdLineParser.Factory optionParserFactory;
-  private final CreateChangeSender.Factory createChangeSenderFactory;
   private final MergedSender.Factory mergedSenderFactory;
   private final ReplacePatchSetSender.Factory replacePatchSetFactory;
   private final GitReferenceUpdated gitRefUpdated;
@@ -347,7 +346,6 @@ public class ReceiveCommits {
       final ChangeUpdate.Factory updateFactory,
       final AccountResolver accountResolver,
       final CmdLineParser.Factory optionParserFactory,
-      final CreateChangeSender.Factory createChangeSenderFactory,
       final MergedSender.Factory mergedSenderFactory,
       final ReplacePatchSetSender.Factory replacePatchSetFactory,
       final GitReferenceUpdated gitRefUpdated,
@@ -387,7 +385,6 @@ public class ReceiveCommits {
     this.schemaFactory = schemaFactory;
     this.accountResolver = accountResolver;
     this.optionParserFactory = optionParserFactory;
-    this.createChangeSenderFactory = createChangeSenderFactory;
     this.mergedSenderFactory = mergedSenderFactory;
     this.replacePatchSetFactory = replacePatchSetFactory;
     this.gitRefUpdated = gitRefUpdated;
@@ -1716,35 +1713,14 @@ public class ReceiveCommits {
 
       ins
         .setReviewers(recipients.getReviewers())
+        .setExtraCC(recipients.getCcOnly())
         .setApprovals(approvals)
         .setMessage(msg)
-        .setSendMail(false)
+        .setRequestScopePropagator(requestScopePropagator)
+        .setSendMail(true)
         .insert();
       created = true;
 
-      workQueue.getDefaultQueue()
-          .submit(requestScopePropagator.wrap(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            CreateChangeSender cm =
-                createChangeSenderFactory.create(change);
-            cm.setFrom(me);
-            cm.setPatchSet(ps, ins.getPatchSetInfo());
-            cm.addReviewers(recipients.getReviewers());
-            cm.addExtraCC(recipients.getCcOnly());
-            cm.send();
-          } catch (Exception e) {
-            log.error("Cannot send email for new change " + change.getId(), e);
-          }
-        }
-
-        @Override
-        public String toString() {
-          return "send-email newchange";
-        }
-      }));
-
       if (magicBranch != null && magicBranch.isSubmit()) {
         submit(projectControl.controlFor(change), ps);
       }