From 386add71e3e08fb02395d27a65cbdf5c4b405ac8 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 14 Feb 2013 11:40:03 -0800 Subject: [PATCH] Move @AnonymousCowardName into EmailArguments Change-Id: I8575ca45655bcd4496c88e0bd87530b44c66992a --- .../google/gerrit/server/mail/AbandonedSender.java | 8 +++----- .../google/gerrit/server/mail/AddReviewerSender.java | 7 ++----- .../com/google/gerrit/server/mail/ChangeEmail.java | 5 ++--- .../com/google/gerrit/server/mail/CommentSender.java | 4 +--- .../gerrit/server/mail/CommitMessageEditedSender.java | 6 ++---- .../google/gerrit/server/mail/CreateChangeSender.java | 7 ++----- .../com/google/gerrit/server/mail/EmailArguments.java | 4 ++++ .../google/gerrit/server/mail/MergeFailSender.java | 6 ++---- .../com/google/gerrit/server/mail/MergedSender.java | 9 +++------ .../google/gerrit/server/mail/NewChangeSender.java | 5 ++--- .../google/gerrit/server/mail/NotificationEmail.java | 6 +++--- .../com/google/gerrit/server/mail/OutgoingEmail.java | 11 ++++------- .../gerrit/server/mail/RebasedPatchSetSender.java | 7 ++----- .../gerrit/server/mail/RegisterNewEmailSender.java | 4 +--- .../gerrit/server/mail/ReplacePatchSetSender.java | 9 +++------ .../gerrit/server/mail/ReplyToChangeSender.java | 5 ++--- .../com/google/gerrit/server/mail/RestoredSender.java | 8 +++----- .../com/google/gerrit/server/mail/RevertedSender.java | 8 +++----- 18 files changed, 44 insertions(+), 75 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java index 69e01ccca8..8387f51090 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java @@ -15,9 +15,8 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; -import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; -import com.google.gerrit.server.config.AnonymousCowardName; +import com.google.gerrit.reviewdb.client.Change; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -29,9 +28,8 @@ public class AbandonedSender extends ReplyToChangeSender { } @Inject - public AbandonedSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, @Assisted Change c) { - super(ea, anonymousCowardName, c, "abandon"); + public AbandonedSender(EmailArguments ea, @Assisted Change c) { + super(ea, c, "abandon"); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java index 54341d00a0..247eeead85 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -28,10 +27,8 @@ public class AddReviewerSender extends NewChangeSender { } @Inject - public AddReviewerSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, SshInfo si, - @Assisted Change c) { - super(ea, anonymousCowardName, c); + public AddReviewerSender(EmailArguments ea, SshInfo si, @Assisted Change c) { + super(ea, c); setSshInfo(si); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java index f16470f700..885f1aa46f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java @@ -65,9 +65,8 @@ public abstract class ChangeEmail extends NotificationEmail { protected Set authors; protected boolean emailOnlyAuthors; - protected ChangeEmail(EmailArguments ea, final String anonymousCowardName, - final Change c, final String mc) { - super(ea, anonymousCowardName, mc, c.getProject(), c.getDest()); + protected ChangeEmail(EmailArguments ea, Change c, String mc) { + super(ea, mc, c.getProject(), c.getDest()); change = c; changeData = new ChangeData(change); emailOnlyAuthors = false; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java index 656a412b5a..b16ab2a595 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java @@ -20,7 +20,6 @@ import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.server.change.PostReview.NotifyHandling; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.patch.PatchFile; import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListNotAvailableException; @@ -47,10 +46,9 @@ public class CommentSender extends ReplyToChangeSender { @Inject public CommentSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, @Assisted NotifyHandling notify, @Assisted Change c) { - super(ea, anonymousCowardName, c, "comment"); + super(ea, c, "comment"); this.notify = notify; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommitMessageEditedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommitMessageEditedSender.java index 4e378f5738..3eb60952dd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommitMessageEditedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommitMessageEditedSender.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -27,10 +26,9 @@ public class CommitMessageEditedSender extends ReplacePatchSetSender { } @Inject - public CommitMessageEditedSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, SshInfo si, + public CommitMessageEditedSender(EmailArguments ea, SshInfo si, @Assisted Change c) { - super(ea, anonymousCowardName, si, c); + super(ea, si, c); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java index fd45c4fb4f..2b5977866c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java @@ -19,7 +19,6 @@ import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.mail.ProjectWatch.Watchers; import com.google.gerrit.server.ssh.SshInfo; import com.google.gwtorm.server.OrmException; @@ -39,10 +38,8 @@ public class CreateChangeSender extends NewChangeSender { } @Inject - public CreateChangeSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, SshInfo si, - @Assisted Change c) { - super(ea, anonymousCowardName, c); + public CreateChangeSender(EmailArguments ea, SshInfo si, @Assisted Change c) { + super(ea, c); setSshInfo(si); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java index 6ee8afb51e..28ac14e906 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java @@ -23,6 +23,7 @@ import com.google.gerrit.server.account.CapabilityControl; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupIncludeCache; import com.google.gerrit.server.config.AllProjectsName; +import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.PatchListCache; @@ -50,6 +51,7 @@ class EmailArguments { final IdentifiedUser.GenericFactory identifiedUserFactory; final CapabilityControl.Factory capabilityControlFactory; final AnonymousUser anonymousUser; + final String anonymousCowardName; final Provider urlProvider; final AllProjectsName allProjectsName; @@ -68,6 +70,7 @@ class EmailArguments { GenericFactory identifiedUserFactory, CapabilityControl.Factory capabilityControlFactory, AnonymousUser anonymousUser, + @AnonymousCowardName String anonymousCowardName, @CanonicalWebUrl @Nullable Provider urlProvider, AllProjectsName allProjectsName, ChangeQueryBuilder.Factory queryBuilder, @@ -86,6 +89,7 @@ class EmailArguments { this.identifiedUserFactory = identifiedUserFactory; this.capabilityControlFactory = capabilityControlFactory; this.anonymousUser = anonymousUser; + this.anonymousCowardName = anonymousCowardName; this.urlProvider = urlProvider; this.allProjectsName = allProjectsName; this.queryBuilder = queryBuilder; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java index 9612ee2827..3a5f7ebe1d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -27,9 +26,8 @@ public class MergeFailSender extends ReplyToChangeSender { } @Inject - public MergeFailSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, @Assisted Change c) { - super(ea, anonymousCowardName, c, "merge-failed"); + public MergeFailSender(EmailArguments ea, @Assisted Change c) { + super(ea, c, "merge-failed"); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java index 08d34519a2..d84deb3a0a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java @@ -18,12 +18,11 @@ import com.google.gerrit.common.data.ApprovalType; import com.google.gerrit.common.data.ApprovalTypes; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Account; +import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.ApprovalCategory; import com.google.gerrit.reviewdb.client.ApprovalCategoryValue; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSetApproval; -import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -40,10 +39,8 @@ public class MergedSender extends ReplyToChangeSender { private final ApprovalTypes approvalTypes; @Inject - public MergedSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, ApprovalTypes at, - @Assisted Change c) { - super(ea, anonymousCowardName, c, "merged"); + public MergedSender(EmailArguments ea, ApprovalTypes at, @Assisted Change c) { + super(ea, c, "merged"); approvalTypes = at; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java index 52dc32c5d8..9ff0dbd04a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java @@ -29,9 +29,8 @@ public abstract class NewChangeSender extends ChangeEmail { private final Set reviewers = new HashSet(); private final Set extraCC = new HashSet(); - protected NewChangeSender(EmailArguments ea, String anonymousCowardName, - Change c) { - super(ea, anonymousCowardName, c, "newchange"); + protected NewChangeSender(EmailArguments ea, Change c) { + super(ea, c, "newchange"); } public void addReviewers(final Collection cc) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/NotificationEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NotificationEmail.java index 6338b4eea1..b1badaa633 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/NotificationEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NotificationEmail.java @@ -41,9 +41,9 @@ public abstract class NotificationEmail extends OutgoingEmail { protected Branch.NameKey branch; private SshInfo sshInfo; - protected NotificationEmail(EmailArguments ea, String anonymousCowardName, + protected NotificationEmail(EmailArguments ea, String mc, Project.NameKey project, Branch.NameKey branch) { - super(ea, anonymousCowardName, mc); + super(ea, mc); this.project = project; this.branch = branch; @@ -121,4 +121,4 @@ public abstract class NotificationEmail extends OutgoingEmail { velocityContext.put("projectName", project.get()); velocityContext.put("branch", branch); } -} \ No newline at end of file +} diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java index 9bb087dc8e..997bc03da6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java @@ -60,14 +60,11 @@ public abstract class OutgoingEmail { protected VelocityContext velocityContext; protected final EmailArguments args; - private final String anonymousCowardName; protected Account.Id fromId; - protected OutgoingEmail(EmailArguments ea, final String anonymousCowardName, - final String mc) { + protected OutgoingEmail(EmailArguments ea, String mc) { args = ea; - this.anonymousCowardName = anonymousCowardName; messageClass = mc; headers = new LinkedHashMap(); } @@ -236,7 +233,7 @@ public abstract class OutgoingEmail { /** Lookup a human readable name for an account, usually the "full name". */ protected String getNameFor(final Account.Id accountId) { if (accountId == null) { - return anonymousCowardName; + return args.anonymousCowardName; } final Account userAccount = args.accountCache.get(accountId).getAccount(); @@ -245,7 +242,7 @@ public abstract class OutgoingEmail { name = userAccount.getPreferredEmail(); } if (name == null) { - name = anonymousCowardName + " #" + accountId; + name = args.anonymousCowardName + " #" + accountId; } return name; } @@ -264,7 +261,7 @@ public abstract class OutgoingEmail { return email; } else /* (name == null && email == null) */{ - return anonymousCowardName + " #" + accountId; + return args.anonymousCowardName + " #" + accountId; } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RebasedPatchSetSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RebasedPatchSetSender.java index 49e08b1710..cfafd9a0c4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RebasedPatchSetSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RebasedPatchSetSender.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -28,10 +27,8 @@ public class RebasedPatchSetSender extends ReplacePatchSetSender { } @Inject - public RebasedPatchSetSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, SshInfo si, - @Assisted Change c) { - super(ea, anonymousCowardName, si, c); + public RebasedPatchSetSender(EmailArguments ea, SshInfo si, @Assisted Change c) { + super(ea, si, c); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java index 923feadaff..eb32700c50 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.config.AnonymousCowardName; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -33,10 +32,9 @@ public class RegisterNewEmailSender extends OutgoingEmail { @Inject public RegisterNewEmailSender(EmailArguments ea, EmailTokenVerifier etv, - @AnonymousCowardName String anonymousCowardName, IdentifiedUser callingUser, @Assisted final String address) { - super(ea, anonymousCowardName, "registernewemail"); + super(ea, "registernewemail"); tokenVerifier = etv; user = callingUser; addr = address; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java index 4cf0701796..23327b5abf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java @@ -16,9 +16,8 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; -import com.google.gerrit.server.config.AnonymousCowardName; +import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -39,10 +38,8 @@ public class ReplacePatchSetSender extends ReplyToChangeSender { private final Set extraCC = new HashSet(); @Inject - public ReplacePatchSetSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, SshInfo si, - @Assisted Change c) { - super(ea, anonymousCowardName, c, "newpatchset"); + public ReplacePatchSetSender(EmailArguments ea, SshInfo si, @Assisted Change c) { + super(ea, c, "newpatchset"); setSshInfo(si); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java index c9540c7e32..42ac91770e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java @@ -23,9 +23,8 @@ public abstract class ReplyToChangeSender extends ChangeEmail { public T create(Change change); } - protected ReplyToChangeSender(EmailArguments ea, String anonymousCowardName, - Change c, String mc) { - super(ea, anonymousCowardName, c, mc); + protected ReplyToChangeSender(EmailArguments ea, Change c, String mc) { + super(ea, c, mc); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java index f72af2689c..7f464f7e27 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java @@ -15,9 +15,8 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; -import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; -import com.google.gerrit.server.config.AnonymousCowardName; +import com.google.gerrit.reviewdb.client.Change; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -29,9 +28,8 @@ public class RestoredSender extends ReplyToChangeSender { } @Inject - public RestoredSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, @Assisted Change c) { - super(ea, anonymousCowardName, c, "restore"); + public RestoredSender(EmailArguments ea, @Assisted Change c) { + super(ea, c, "restore"); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java index 8b9a6d7f20..d1389fb48f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java @@ -15,9 +15,8 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; -import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; -import com.google.gerrit.server.config.AnonymousCowardName; +import com.google.gerrit.reviewdb.client.Change; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -28,9 +27,8 @@ public class RevertedSender extends ReplyToChangeSender { } @Inject - public RevertedSender(EmailArguments ea, - @AnonymousCowardName String anonymousCowardName, @Assisted Change c) { - super(ea, anonymousCowardName, c, "revert"); + public RevertedSender(EmailArguments ea, @Assisted Change c) { + super(ea, c, "revert"); } @Override