JAMES-2352 MailetContext should use domain where applicable
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9af52dad Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9af52dad Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9af52dad Branch: refs/heads/master Commit: 9af52dad928ec342afee8279e46a654ee91bffe8 Parents: ae85899 Author: benwa <btell...@linagora.com> Authored: Mon Mar 19 13:51:16 2018 +0700 Committer: benwa <btell...@linagora.com> Committed: Tue Mar 27 15:13:47 2018 +0700 ---------------------------------------------------------------------- .../api/src/main/java/org/apache/mailet/MailetContext.java | 4 ++-- .../java/org/apache/mailet/base/test/FakeMailContext.java | 4 ++-- .../james/mailetcontainer/impl/JamesMailetContext.java | 8 ++++---- .../transport/mailets/redirect/ProcessRedirectNotify.java | 3 +-- .../apache/james/transport/matchers/SenderInFakeDomain.java | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/9af52dad/mailet/api/src/main/java/org/apache/mailet/MailetContext.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/main/java/org/apache/mailet/MailetContext.java b/mailet/api/src/main/java/org/apache/mailet/MailetContext.java index e987882..6b91dd0 100644 --- a/mailet/api/src/main/java/org/apache/mailet/MailetContext.java +++ b/mailet/api/src/main/java/org/apache/mailet/MailetContext.java @@ -272,7 +272,7 @@ public interface MailetContext { * @return the sorted mail-handling hostnames for the domain * @deprecated use the generic dnsLookup method */ - Collection<String> getMailServers(String domain); + Collection<String> getMailServers(Domain domain); /** * Returns the SMTP host addresses specified as mail handlers for @@ -288,7 +288,7 @@ public interface MailetContext { * @since Mailet API v2.3 * @deprecated use the generic dnsLookup method */ - Iterator<HostAddress> getSMTPHostAddresses(String domain); + Iterator<HostAddress> getSMTPHostAddresses(Domain domain); /** * Sends an outgoing message to the top of this mailet container's root queue. http://git-wip-us.apache.org/repos/asf/james-project/blob/9af52dad/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java index 27c372b..5621104 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java @@ -381,7 +381,7 @@ public class FakeMailContext implements MailetContext { * @deprecated use the generic dnsLookup method */ @Override - public Collection<String> getMailServers(String host) { + public Collection<String> getMailServers(Domain host) { return null; // trivial implementation } @@ -521,7 +521,7 @@ public class FakeMailContext implements MailetContext { * @deprecated use the generic dnsLookup method */ @Override - public Iterator<HostAddress> getSMTPHostAddresses(String domainName) { + public Iterator<HostAddress> getSMTPHostAddresses(Domain domainName) { return null; // trivial implementation } http://git-wip-us.apache.org/repos/asf/james-project/blob/9af52dad/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java index 5c979e1..c309370 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java @@ -101,9 +101,9 @@ public class JamesMailetContext implements MailetContext, Configurable { } @Override - public Collection<String> getMailServers(String host) { + public Collection<String> getMailServers(Domain host) { try { - return dns.findMXRecords(host); + return dns.findMXRecords(host.asString()); } catch (TemporaryResolutionException e) { // TODO: We only do this to not break backward compatiblity. Should // fixed later @@ -293,9 +293,9 @@ public class JamesMailetContext implements MailetContext, Configurable { */ @Override @Deprecated - public Iterator<org.apache.mailet.HostAddress> getSMTPHostAddresses(String domainName) { + public Iterator<org.apache.mailet.HostAddress> getSMTPHostAddresses(Domain domainName) { try { - return new MXHostAddressIterator(dns.findMXRecords(domainName).iterator(), dns, false); + return new MXHostAddressIterator(dns.findMXRecords(domainName.asString()).iterator(), dns, false); } catch (TemporaryResolutionException e) { // TODO: We only do this to not break backward compatiblity. Should // fixed later http://git-wip-us.apache.org/repos/asf/james-project/blob/9af52dad/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 8099966..eec8238 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 @@ -180,8 +180,7 @@ public class ProcessRedirectNotify { || mail.getSender() == null || !mailet.getMailetContext() .getMailServers(mail.getSender() - .getDomain() - .name()) + .getDomain()) .isEmpty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/9af52dad/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java index 87b17e7..e9468b2 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java @@ -44,7 +44,7 @@ public class SenderInFakeDomain extends AbstractNetworkMatcher { Domain domain = mail.getSender().getDomain(); // DNS Lookup for this domain @SuppressWarnings("deprecation") - Collection<String> servers = getMailetContext().getMailServers(domain.name()); + Collection<String> servers = getMailetContext().getMailServers(domain); if (servers.size() == 0) { // No records...could not deliver to this domain, so matches // criteria. --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
