JAMES-2363 Remove unneeded parameters in MailModifier
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/00575b95 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/00575b95 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/00575b95 Branch: refs/heads/master Commit: 00575b954c99ee671b07485685f8499b12c751a5 Parents: ae042f0 Author: benwa <[email protected]> Authored: Thu Mar 29 11:47:39 2018 +0700 Committer: benwa <[email protected]> Committed: Thu Mar 29 16:44:49 2018 +0700 ---------------------------------------------------------------------- .../java/org/apache/james/transport/mailets/DSNBounce.java | 6 +++--- .../james/transport/mailets/redirect/MailModifier.java | 6 +++--- .../transport/mailets/redirect/ProcessRedirectNotify.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/00575b95/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java index 66dc638..c1ecbeb 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java @@ -264,10 +264,10 @@ public class DSNBounce extends GenericMailet implements RedirectNotify { mailModifier.setRecipients(getRecipients(originalMail)); mailModifier.setTo(getTo(originalMail)); mailModifier.setSubjectPrefix(originalMail); - mailModifier.setReplyTo(getReplyTo(originalMail), originalMail); - mailModifier.setReversePath(getReversePath(originalMail), originalMail); + mailModifier.setReplyTo(getReplyTo(originalMail)); + mailModifier.setReversePath(getReversePath(originalMail)); mailModifier.setIsReply(getInitParameters().isReply(), originalMail); - mailModifier.setSender(getSender(originalMail), originalMail); + mailModifier.setSender(getSender(originalMail)); newMail.getMessage().setHeader(RFC2822Headers.DATE, getDateHeader(originalMail)); http://git-wip-us.apache.org/repos/asf/james-project/blob/00575b95/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java index 9e7f631..5345a6e 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java @@ -139,7 +139,7 @@ public class MailModifier { * If the requested value is <code>SpecialAddress.NULL</code> will remove * the "Reply-To:" header. If the requested value is null does nothing.</p> */ - public void setReplyTo(Optional<MailAddress> optionalReplyTo, Mail originalMail) throws MessagingException { + public void setReplyTo(Optional<MailAddress> optionalReplyTo) throws MessagingException { if (optionalReplyTo.isPresent()) { MailAddress replyTo = optionalReplyTo.get(); if (replyTo.equals(SpecialAddress.NULL)) { @@ -161,7 +161,7 @@ public class MailModifier { * requested value is <code>SpecialAddress.NULL</code> sets it to "<>". If * the requested value is null does nothing. */ - public void setReversePath(Optional<MailAddress> maybeReversePath, Mail originalMail) { + public void setReversePath(Optional<MailAddress> maybeReversePath) { if (maybeReversePath.isPresent()) { MailAddress reversePath = maybeReversePath.get(); if (reversePath.equals(SpecialAddress.NULL)) { @@ -194,7 +194,7 @@ public class MailModifier { } } - public void setSender(Optional<MailAddress> sender, Mail originalMail) throws MessagingException { + public void setSender(Optional<MailAddress> sender) throws MessagingException { if (sender.isPresent()) { mail.getMessage().setFrom(sender.get().toInternetAddress()); http://git-wip-us.apache.org/repos/asf/james-project/blob/00575b95/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java index 7aa25a7..bcec3e4 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java @@ -45,9 +45,9 @@ public class ProcessRedirectNotify { // duplicates the Mail object, to be able to modify the new mail keeping // the original untouched + String originalMessageId = originalMail.getMessage().getMessageID(); MailImpl newMail = MailImpl.duplicate(originalMail); try { - String originalMessageId = originalMail.getMessage().getMessageID(); MailModifier mailModifier = MailModifier.builder() .mailet(mailet) .mail(newMail) @@ -74,10 +74,10 @@ public class ProcessRedirectNotify { mailModifier.setRecipients(mailet.getRecipients(originalMail)); mailModifier.setTo(mailet.getTo(originalMail)); mailModifier.setSubjectPrefix(originalMail); - mailModifier.setReplyTo(mailet.getReplyTo(originalMail), originalMail); - mailModifier.setReversePath(mailet.getReversePath(originalMail), originalMail); + mailModifier.setReplyTo(mailet.getReplyTo(originalMail)); + mailModifier.setReversePath(mailet.getReversePath(originalMail)); mailModifier.setIsReply(mailet.getInitParameters().isReply(), originalMail); - mailModifier.setSender(mailet.getSender(originalMail), originalMail); + mailModifier.setSender(mailet.getSender(originalMail)); mailModifier.initializeDateIfNotPresent(); if (keepMessageId) { mailModifier.setMessageId(originalMessageId); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
