MAILET-115 Remove isNotifyMailet method
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/90cb230c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/90cb230c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/90cb230c Branch: refs/heads/master Commit: 90cb230cfea9b031e8e7663b12f713c3981a6154 Parents: bc3c546 Author: Antoine Duprat <[email protected]> Authored: Wed Oct 5 12:08:34 2016 +0200 Committer: Benoit Tellier <[email protected]> Committed: Wed Jan 11 10:03:28 2017 +0700 ---------------------------------------------------------------------- .../apache/james/transport/mailets/Bounce.java | 5 ---- .../james/transport/mailets/DSNBounce.java | 5 ---- .../apache/james/transport/mailets/Forward.java | 5 ---- .../transport/mailets/NotifyPostmaster.java | 5 ---- .../james/transport/mailets/NotifySender.java | 5 ---- .../james/transport/mailets/Redirect.java | 5 ---- .../apache/james/transport/mailets/Resend.java | 5 ---- .../mailets/redirect/AbstractRedirect.java | 25 -------------------- .../mailets/redirect/AbstractRedirectTest.java | 5 ---- 9 files changed, 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java ---------------------------------------------------------------------- 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 9bb8be3..1b07936 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 @@ -133,11 +133,6 @@ public class Bounce extends AbstractRedirect { } @Override - protected boolean isNotifyMailet() { - return true; - } - - @Override protected String getMessage(Mail originalMail) throws MessagingException { return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/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 08d5378..674cc7a 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 @@ -127,11 +127,6 @@ public class DSNBounce extends AbstractRedirect { } @Override - protected boolean isNotifyMailet() { - return true; - } - - @Override protected String getMessage(Mail originalMail) throws MessagingException { return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java ---------------------------------------------------------------------- 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 d5e9d13..7d1c2b3 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 @@ -105,11 +105,6 @@ public class Forward extends AbstractRedirect { } @Override - protected boolean isNotifyMailet() { - return false; - } - - @Override protected String getMessage(Mail originalMail) throws MessagingException { return getInitParameters().getMessage(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java ---------------------------------------------------------------------- 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 56210a8..16f85f0 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 @@ -142,11 +142,6 @@ public class NotifyPostmaster extends AbstractRedirect { } @Override - protected boolean isNotifyMailet() { - return true; - } - - @Override protected String getMessage(Mail originalMail) throws MessagingException { return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java ---------------------------------------------------------------------- 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 62a69a5..2a34c5f 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 @@ -143,11 +143,6 @@ public class NotifySender extends AbstractRedirect { } @Override - protected boolean isNotifyMailet() { - return true; - } - - @Override protected String getMessage(Mail originalMail) throws MessagingException { return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java ---------------------------------------------------------------------- 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 125c876..c1c8fd4 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 @@ -312,11 +312,6 @@ public class Redirect extends AbstractRedirect { } @Override - protected boolean isNotifyMailet() { - return false; - } - - @Override protected String getMessage(Mail originalMail) throws MessagingException { return getInitParameters().getMessage(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java ---------------------------------------------------------------------- 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 ab61b3e..4f550f1 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 @@ -303,11 +303,6 @@ public class Resend extends AbstractRedirect { } @Override - protected boolean isNotifyMailet() { - return false; - } - - @Override protected String getMessage(Mail originalMail) throws MessagingException { return getInitParameters().getMessage(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java index aa65857..4dac188 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java @@ -156,7 +156,6 @@ public abstract class AbstractRedirect extends GenericMailet { private static final char LINE_BREAK = '\n'; - protected abstract boolean isNotifyMailet(); protected abstract InitParameters getInitParameters(); protected abstract String[] getAllowedInitParameters(); @@ -475,30 +474,6 @@ public abstract class AbstractRedirect extends GenericMailet { * method. */ protected abstract void setSubjectPrefix(Mail newMail, String subjectPrefix, Mail originalMail) throws MessagingException; -// if (isNotifyMailet()) { -// new MimeMessageModifier(originalMail.getMessage()).addSubjectPrefix(subjectPrefix); -// } -// -// String subject = getInitParameters().getSubject(); -// if (!Strings.isNullOrEmpty(subjectPrefix) || subject != null) { -// String newSubject = Strings.nullToEmpty(subject); -// if (subject == null) { -// newSubject = Strings.nullToEmpty(originalMail.getMessage().getSubject()); -// } else { -// if (getInitParameters().isDebug()) { -// log("subject set to: " + subject); -// } -// } -// -// if (subjectPrefix != null) { -// newSubject = subjectPrefix + newSubject; -// if (getInitParameters().isDebug()) { -// log("subjectPrefix set to: " + subjectPrefix); -// } -// } -// changeSubject(newMail.getMessage(), newSubject); -// } -// } protected Optional<String> getNewSubject(String subjectPrefix, Mail originalMail) throws MessagingException { String subject = getInitParameters().getSubject(); http://git-wip-us.apache.org/repos/asf/james-project/blob/90cb230c/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java index 8847bfb..d7885fd 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java @@ -51,11 +51,6 @@ public class AbstractRedirectTest { private class TesteeRedirect extends AbstractRedirect { @Override - protected boolean isNotifyMailet() { - return false; - } - - @Override protected String[] getAllowedInitParameters() { return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
