This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c4a775e09d9eac9aa7e28da4cdfd57fff8270b63 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Feb 3 22:50:21 2022 +0700 JAMES-3712 Remove RedirectNotify::getMimeMessageModifier This level of indirection is no longer needed. --- .../src/main/java/org/apache/james/transport/mailets/Bounce.java | 6 ------ .../src/main/java/org/apache/james/transport/mailets/DSNBounce.java | 6 ------ .../src/main/java/org/apache/james/transport/mailets/Forward.java | 6 ------ .../java/org/apache/james/transport/mailets/NotifyPostmaster.java | 6 ------ .../main/java/org/apache/james/transport/mailets/NotifySender.java | 6 ------ .../src/main/java/org/apache/james/transport/mailets/Redirect.java | 6 ------ .../src/main/java/org/apache/james/transport/mailets/Resend.java | 6 ------ .../org/apache/james/transport/mailets/redirect/MailModifier.java | 3 ++- .../org/apache/james/transport/mailets/redirect/RedirectNotify.java | 3 --- 9 files changed, 2 insertions(+), 46 deletions(-) diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java index ab1eefe..2818995 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java @@ -35,7 +35,6 @@ import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; import org.apache.james.transport.mailets.redirect.ProcessRedirectNotify; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.james.transport.util.RecipientsUtils; import org.apache.james.transport.util.ReplyToUtils; @@ -257,9 +256,4 @@ public class Bounce extends GenericMailet implements RedirectNotify { originalMail.setState(Mail.GHOST); } } - - @Override - public MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException { - return new MimeMessageModifier(newMail.getMessage()); - } } 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 5fb4ec8..0144d9a 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 @@ -57,7 +57,6 @@ import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.transport.mailets.redirect.TypeCode; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.james.transport.util.Patterns; import org.apache.james.transport.util.RecipientsUtils; @@ -558,9 +557,4 @@ public class DSNBounce extends GenericMailet implements RedirectNotify { part.setDisposition("Attachment"); return part; } - - @Override - public MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException { - return new MimeMessageModifier(newMail.getMessage()); - } } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java index 60b0a60..2419752 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java @@ -36,7 +36,6 @@ import org.apache.james.transport.mailets.redirect.ProcessRedirectNotify; import org.apache.james.transport.mailets.redirect.RedirectMailetInitParameters; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.TypeCode; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.util.RecipientsUtils; import org.apache.james.transport.util.ReplyToUtils; import org.apache.james.transport.util.SenderUtils; @@ -240,11 +239,6 @@ public class Forward extends GenericMailet implements RedirectNotify { } @Override - public MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException { - return new MimeMessageModifier(newMail.getMessage()); - } - - @Override public void service(Mail originalMail) throws MessagingException { ProcessRedirectNotify.from(this).process(originalMail); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java index ddaae14..be83f65 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java @@ -36,7 +36,6 @@ import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; import org.apache.james.transport.mailets.redirect.ProcessRedirectNotify; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.james.transport.util.RecipientsUtils; import org.apache.james.transport.util.ReplyToUtils; @@ -254,11 +253,6 @@ public class NotifyPostmaster extends GenericMailet implements RedirectNotify { } @Override - public MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException { - return new MimeMessageModifier(newMail.getMessage()); - } - - @Override public void service(Mail originalMail) throws MessagingException { ProcessRedirectNotify.from(this).process(originalMail); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java index 942261d..2b3888e 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java @@ -36,7 +36,6 @@ import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; import org.apache.james.transport.mailets.redirect.ProcessRedirectNotify; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.james.transport.util.RecipientsUtils; import org.apache.james.transport.util.ReplyToUtils; @@ -254,11 +253,6 @@ public class NotifySender extends GenericMailet implements RedirectNotify { } @Override - public MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException { - return new MimeMessageModifier(newMail.getMessage()); - } - - @Override public void service(Mail originalMail) throws MessagingException { ProcessRedirectNotify.from(this).process(originalMail); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java index c4fd907..6be98c2 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java @@ -35,7 +35,6 @@ import org.apache.james.transport.mailets.redirect.ProcessRedirectNotify; import org.apache.james.transport.mailets.redirect.RedirectMailetInitParameters; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.TypeCode; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.james.transport.util.MailAddressUtils; import org.apache.james.transport.util.RecipientsUtils; @@ -467,11 +466,6 @@ public class Redirect extends GenericMailet implements RedirectNotify { } @Override - public MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException { - return new MimeMessageModifier(newMail.getMessage()); - } - - @Override public void service(Mail originalMail) throws MessagingException { ProcessRedirectNotify.from(this).process(originalMail); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java index 1b13c81..e0147b1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java @@ -34,7 +34,6 @@ import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.ProcessRedirectNotify; import org.apache.james.transport.mailets.redirect.RedirectMailetInitParameters; import org.apache.james.transport.mailets.redirect.RedirectNotify; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.james.transport.util.MailAddressUtils; import org.apache.james.transport.util.RecipientsUtils; @@ -434,11 +433,6 @@ public class Resend extends GenericMailet implements RedirectNotify { } @Override - public MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException { - return new MimeMessageModifier(newMail.getMessage()); - } - - @Override public void service(Mail originalMail) throws MessagingException { ProcessRedirectNotify.from(this).process(originalMail); } 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 aa2b79e..cf1113e 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 @@ -30,6 +30,7 @@ import javax.mail.internet.InternetAddress; import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.server.core.MailImpl; +import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.james.transport.util.MailAddressUtils; import org.apache.mailet.Mail; import org.apache.mailet.base.DateFormats; @@ -132,7 +133,7 @@ public class MailModifier { } public void setSubjectPrefix(Mail originalMail) throws MessagingException { - mailet.getMimeMessageModifier(mail, originalMail) + new MimeMessageModifier(mail.getMessage()) .replaceSubject(mailet.getSubjectPrefix(mail, mailet.getInitParameters().getSubjectPrefix(), originalMail)); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java index 4089d88..ec1b4c8 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java @@ -29,7 +29,6 @@ import javax.mail.internet.InternetAddress; import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.Redirect; -import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; @@ -291,6 +290,4 @@ public interface RedirectNotify extends Mailet, MailetConfig { */ @Override void service(Mail originalMail) throws MessagingException; - - MimeMessageModifier getMimeMessageModifier(Mail newMail, Mail originalMail) throws MessagingException; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
