JAMES-2557 Fix MaybeSender deprecation warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4116ea81 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4116ea81 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4116ea81 Branch: refs/heads/master Commit: 4116ea8194db4c61c97e9a4b3a9fc5958ceb6bfe Parents: cf5f341 Author: Raphael Ouazana <[email protected]> Authored: Tue Dec 11 15:09:17 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Tue Dec 11 15:23:54 2018 +0100 ---------------------------------------------------------------------- core/src/main/java/org/apache/james/core/MaybeSender.java | 1 + .../src/test/java/org/apache/james/core/MailAddressTest.java | 4 ++++ .../org/apache/james/transport/matchers/SenderDomainIs.java | 8 ++++++-- .../protocols/smtp/core/fastfail/MaxRcptHandlerTest.java | 5 +++-- .../src/main/java/org/apache/james/server/core/MailImpl.java | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4116ea81/core/src/main/java/org/apache/james/core/MaybeSender.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/james/core/MaybeSender.java b/core/src/main/java/org/apache/james/core/MaybeSender.java index cdd4474..6460ddc 100644 --- a/core/src/main/java/org/apache/james/core/MaybeSender.java +++ b/core/src/main/java/org/apache/james/core/MaybeSender.java @@ -55,6 +55,7 @@ public class MaybeSender { return new MaybeSender(Optional.empty()); } + @SuppressWarnings("deprecation") public static MaybeSender of(MailAddress mailAddress) { return new MaybeSender(Optional.ofNullable(mailAddress) .filter(address -> !address.isNullSender())); http://git-wip-us.apache.org/repos/asf/james-project/blob/4116ea81/core/src/test/java/org/apache/james/core/MailAddressTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/james/core/MailAddressTest.java b/core/src/test/java/org/apache/james/core/MailAddressTest.java index 16e9a5b..8169978 100644 --- a/core/src/test/java/org/apache/james/core/MailAddressTest.java +++ b/core/src/test/java/org/apache/james/core/MailAddressTest.java @@ -232,24 +232,28 @@ public class MailAddressTest { .isEqualTo(MailAddress.nullSender()); } + @SuppressWarnings("deprecation") @Test public void getMailSenderShouldReturnNullSenderWhenNullSender() { assertThat(MailAddress.getMailSender(MailAddress.NULL_SENDER_AS_STRING)) .isEqualTo(MailAddress.nullSender()); } + @SuppressWarnings("deprecation") @Test public void getMailSenderShouldReturnParsedAddressWhenNotNullAddress() throws Exception { assertThat(MailAddress.getMailSender(GOOD_ADDRESS)) .isEqualTo(new MailAddress(GOOD_ADDRESS)); } + @SuppressWarnings("deprecation") @Test public void equalsShouldReturnFalseWhenOnlyFirstMemberIsANullSender() { assertThat(MailAddress.getMailSender(GOOD_ADDRESS)) .isNotEqualTo(MailAddress.nullSender()); } + @SuppressWarnings("deprecation") @Test public void equalsShouldReturnFalseWhenOnlySecondMemberIsANullSender() { assertThat(MailAddress.nullSender()) http://git-wip-us.apache.org/repos/asf/james-project/blob/4116ea81/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderDomainIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderDomainIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderDomainIs.java index 07633a7..f3a251b 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderDomainIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderDomainIs.java @@ -25,6 +25,7 @@ import javax.mail.MessagingException; import org.apache.james.core.Domain; import org.apache.james.core.MailAddress; +import org.apache.james.core.MaybeSender; import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; @@ -81,8 +82,11 @@ public class SenderDomainIs extends GenericMatcher { @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { try { - MailAddress mailAddress = mail.getSender(); - if (mailAddress != null && senderDomains.contains(mailAddress.getDomain())) { + MaybeSender maybeSender = mail.getMaybeSender(); + if (maybeSender.asOptional() + .map(MailAddress::getDomain) + .map(senderDomains::contains) + .orElse(false)) { return mail.getRecipients(); } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/4116ea81/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java index 0164520..c9eb470 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.james.core.MailAddress; +import org.apache.james.core.MaybeSender; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; @@ -60,7 +61,7 @@ public class MaxRcptHandlerTest { MaxRcptHandler handler = new MaxRcptHandler(); handler.setMaxRcpt(2); - HookReturnCode resp = handler.doRcpt(session, MailAddress.nullSender(), new MailAddress("test@test")).getResult(); + HookReturnCode resp = handler.doRcpt(session, MaybeSender.nullSender(), new MailAddress("test@test")).getResult(); assertThat(HookReturnCode.deny()).describedAs("Rejected.. To many recipients").isEqualTo(resp); } @@ -72,7 +73,7 @@ public class MaxRcptHandlerTest { MaxRcptHandler handler = new MaxRcptHandler(); handler.setMaxRcpt(4); - HookReturnCode resp = handler.doRcpt(session, MailAddress.nullSender(), new MailAddress("test@test")).getResult(); + HookReturnCode resp = handler.doRcpt(session, MaybeSender.nullSender(), new MailAddress("test@test")).getResult(); assertThat(HookReturnCode.declined()).describedAs("Not Rejected..").isEqualTo(resp); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4116ea81/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java index 5720c0a..6b48478 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java @@ -431,7 +431,7 @@ public class MailImpl implements Disposable, Mail { } } - @SuppressWarnings({"unchecked", "deprecated"}) + @SuppressWarnings({"unchecked", "deprecation"}) private MailImpl(Mail mail, String newName) throws MessagingException { this(newName, mail.getSender(), mail.getRecipients(), mail.getMessage()); setRemoteHost(mail.getRemoteHost()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
