Add message-id to emails sent by the checks plugin Ib7068983d introduced the requirement to have a message-id for all emails that are sent through Gerrit. This change makes sure that checks plugin complies with this requirement. Change-Id: I791c5d549e1e09e7da507ae17a60a7f4101cbc81
diff --git a/java/com/google/gerrit/plugins/checks/ChecksUpdate.java b/java/com/google/gerrit/plugins/checks/ChecksUpdate.java index 63df867..b017b68 100644 --- a/java/com/google/gerrit/plugins/checks/ChecksUpdate.java +++ b/java/com/google/gerrit/plugins/checks/ChecksUpdate.java
@@ -31,6 +31,7 @@ import com.google.gerrit.server.ServerInitiated; import com.google.gerrit.server.UserInitiated; import com.google.gerrit.server.change.NotifyResolver; +import com.google.gerrit.server.mail.send.MessageIdGenerator; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; @@ -64,6 +65,7 @@ private final Checks checks; private final Checkers checkers; private final NotifyResolver notifyResolver; + private final MessageIdGenerator messageIdGenerator; private final Optional<IdentifiedUser> currentUser; @AssistedInject @@ -76,6 +78,7 @@ Checks checks, Checkers checkers, NotifyResolver notifyResolver, + MessageIdGenerator messageIdGenerator, @Assisted IdentifiedUser currentUser) { this.checksStorageUpdate = checksStorageUpdate; this.combinedCheckStateCache = combinedCheckStateCache; @@ -85,6 +88,7 @@ this.checks = checks; this.checkers = checkers; this.notifyResolver = notifyResolver; + this.messageIdGenerator = messageIdGenerator; this.currentUser = Optional.of(currentUser); } @@ -97,7 +101,8 @@ PatchSetUtil psUtil, Checks checks, Checkers checkers, - NotifyResolver notifyResolver) { + NotifyResolver notifyResolver, + MessageIdGenerator messageIdGenerator) { this.checksStorageUpdate = checksStorageUpdate; this.combinedCheckStateCache = combinedCheckStateCache; this.combinedCheckStateUpdatedSenderFactory = combinedCheckStateUpdatedSenderFactory; @@ -106,6 +111,7 @@ this.checks = checks; this.checkers = checkers; this.notifyResolver = notifyResolver; + this.messageIdGenerator = messageIdGenerator; this.currentUser = Optional.empty(); } @@ -200,6 +206,8 @@ updatedCheck); sender.setNotify(notify); sender.setChecksByChecker(getAllChecksByChecker(checkKey)); + sender.setMessageId( + messageIdGenerator.fromChangeUpdate(checkKey.repository(), checkKey.patchSet())); sender.send(); } catch (Exception e) { logger.atSevere().withCause(e).log(