JAMES-1877 Refactor DnsHelper
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b299e326 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b299e326 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b299e326 Branch: refs/heads/master Commit: b299e3265423bcd64a3be52e0cc10d4f02c75120 Parents: 1f01e8a Author: Benoit Tellier <btell...@linagora.com> Authored: Fri Dec 2 14:38:00 2016 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 10 18:14:26 2017 +0700 ---------------------------------------------------------------------- .../mailets/remoteDelivery/DnsHelper.java | 23 +++----------------- 1 file changed, 3 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/b299e326/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DnsHelper.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DnsHelper.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DnsHelper.java index 5e92040..6d396be 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DnsHelper.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DnsHelper.java @@ -19,7 +19,6 @@ package org.apache.james.transport.mailets.remoteDelivery; -import java.util.Collection; import java.util.Iterator; import org.apache.james.dnsservice.api.DNSService; @@ -31,6 +30,7 @@ import org.slf4j.Logger; @SuppressWarnings("deprecation") public class DnsHelper { + public static final boolean USE_SEVERAL_IP = false; private final DNSService dnsServer; private final RemoteDeliveryConfiguration configuration; private final Logger logger; @@ -43,27 +43,10 @@ public class DnsHelper { public Iterator<HostAddress> retrieveHostAddressIterator(String host) throws TemporaryResolutionException { if (configuration.getGatewayServer().isEmpty()) { - return new MXHostAddressIterator(dnsServer.findMXRecords(host).iterator(), dnsServer, false, logger); + return new MXHostAddressIterator(dnsServer.findMXRecords(host).iterator(), dnsServer, USE_SEVERAL_IP, logger); } else { - return getGatewaySMTPHostAddresses(configuration.getGatewayServer()); + return new MXHostAddressIterator(configuration.getGatewayServer().iterator(), dnsServer, USE_SEVERAL_IP, logger); } } - /** - * Returns an Iterator over org.apache.mailet.HostAddress, a specialized - * subclass of javax.mail.URLName, which provides location information for - * servers that are specified as mail handlers for the given hostname. If no - * host is found, the Iterator returned will be empty and the first call to - * hasNext() will return false. The Iterator is a nested iterator: the outer - * iteration is over each gateway, and the inner iteration is over - * potentially multiple A records for each gateway. - * - * @param gatewayServers - Collection of host[:port] Strings - * @return an Iterator over HostAddress instances, sorted by priority - * @since v2.2.0a16-unstable - */ - private Iterator<HostAddress> getGatewaySMTPHostAddresses(Collection<String> gatewayServers) { - return new MXHostAddressIterator(gatewayServers.iterator(), dnsServer, false, logger); - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
