From 82cbc403271cf39c4962d253659dfdca67c0d5eb Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 5 May 2018 10:24:45 +0200 Subject: [PATCH] Bump MiniDNS to 0.3.0 --- .../jivesoftware/smack/AbstractXMPPConnection.java | 4 ++-- .../smack/ConnectionConfiguration.java | 10 +++++----- .../java/org/jivesoftware/smack/util/DNSUtil.java | 14 +++++++------- .../jivesoftware/smack/util/dns/DNSResolver.java | 10 +++++----- .../jivesoftware/smack/util/dns/HostAddress.java | 10 +++++----- .../org/jivesoftware/smack/util/dns/SRVRecord.java | 4 ++-- .../org/jivesoftware/smack/SmackExceptionTest.java | 6 +++--- .../smack/util/dns/dnsjava/DNSJavaResolver.java | 6 +++--- .../smack/util/dns/javax/JavaxResolver.java | 8 ++++---- .../smack/util/dns/minidns/MiniDnsResolver.java | 12 ++++++------ version.gradle | 2 +- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java index 302efbc93..9e8ba53ff 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -93,7 +93,7 @@ import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.parts.Resourcepart; import org.jxmpp.util.XmppStringUtils; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; import org.xmlpull.v1.XmlPullParser; @@ -614,7 +614,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } } else { // N.B.: Important to use config.serviceName and not AbstractXMPPConnection.serviceName - DNSName dnsName = DNSName.from(config.getXMPPServiceDomain()); + DnsName dnsName = DnsName.from(config.getXMPPServiceDomain()); hostAddresses = DNSUtil.resolveXMPPServiceDomain(dnsName, failedAddresses, config.getDnssecMode()); } // Either the populated host addresses are not empty *or* there must be at least one failed address. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java index 854bb812e..916804f02 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java @@ -44,7 +44,7 @@ import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.parts.Resourcepart; import org.jxmpp.stringprep.XmppStringprepException; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; /** * Configuration to use while establishing the connection to the server. @@ -67,7 +67,7 @@ public abstract class ConnectionConfiguration { protected final DomainBareJid xmppServiceDomain; protected final InetAddress hostAddress; - protected final DNSName host; + protected final DnsName host; protected final int port; private final String keystorePath; @@ -507,7 +507,7 @@ public abstract class ConnectionConfiguration { private SocketFactory socketFactory; private DomainBareJid xmppServiceDomain; private InetAddress hostAddress; - private DNSName host; + private DnsName host; private int port = 5222; private boolean allowEmptyOrNullUsername = false; private boolean saslMechanismsSealed; @@ -625,7 +625,7 @@ public abstract class ConnectionConfiguration { * @return a reference to this builder. */ public B setHost(String host) { - DNSName hostDnsName = DNSName.from(host); + DnsName hostDnsName = DnsName.from(host); return setHost(hostDnsName); } @@ -637,7 +637,7 @@ public abstract class ConnectionConfiguration { * @param host the DNS name of the host providing the XMPP service. * @return a reference to this builder. */ - public B setHost(DNSName host) { + public B setHost(DnsName host) { this.host = host; return getThis(); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java index 084290536..6557187e1 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java @@ -31,7 +31,7 @@ import org.jivesoftware.smack.util.dns.HostAddress; import org.jivesoftware.smack.util.dns.SRVRecord; import org.jivesoftware.smack.util.dns.SmackDaneProvider; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; /** * Utility class to perform DNS lookups for XMPP services. @@ -89,10 +89,10 @@ public class DNSUtil { server(XMPP_SERVER_DNS_SRV_PREFIX), client(XMPP_CLIENT_DNS_SRV_PREFIX), ; - public final DNSName srvPrefix; + public final DnsName srvPrefix; DomainType(String srvPrefixString) { - srvPrefix = DNSName.from(srvPrefixString); + srvPrefix = DnsName.from(srvPrefixString); } } @@ -111,7 +111,7 @@ public class DNSUtil { * @return List of HostAddress, which encompasses the hostname and port that the * XMPP server can be reached at for the specified domain. */ - public static List resolveXMPPServiceDomain(DNSName domain, List failedAddresses, DnssecMode dnssecMode) { + public static List resolveXMPPServiceDomain(DnsName domain, List failedAddresses, DnssecMode dnssecMode) { return resolveDomain(domain, DomainType.client, failedAddresses, dnssecMode); } @@ -130,7 +130,7 @@ public class DNSUtil { * @return List of HostAddress, which encompasses the hostname and port that the * XMPP server can be reached at for the specified domain. */ - public static List resolveXMPPServerDomain(DNSName domain, List failedAddresses, DnssecMode dnssecMode) { + public static List resolveXMPPServerDomain(DnsName domain, List failedAddresses, DnssecMode dnssecMode) { return resolveDomain(domain, DomainType.server, failedAddresses, dnssecMode); } @@ -141,7 +141,7 @@ public class DNSUtil { * @param failedAddresses a list that will be populated with host addresses that failed to resolve. * @return a list of resolver host addresses for this domain. */ - private static List resolveDomain(DNSName domain, DomainType domainType, + private static List resolveDomain(DnsName domain, DomainType domainType, List failedAddresses, DnssecMode dnssecMode) { if (dnsResolver == null) { throw new IllegalStateException("No DNS Resolver active in Smack"); @@ -150,7 +150,7 @@ public class DNSUtil { List addresses = new ArrayList(); // Step one: Do SRV lookups - DNSName srvDomain = DNSName.from(domainType.srvPrefix, domain); + DnsName srvDomain = DnsName.from(domainType.srvPrefix, domain); List srvRecords = dnsResolver.lookupSRVRecords(srvDomain, failedAddresses, dnssecMode); if (srvRecords != null && !srvRecords.isEmpty()) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java index 0744d3f1d..1e7efe50c 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.jivesoftware.smack.ConnectionConfiguration.DnssecMode; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; /** * Implementations of this interface define a class that is capable of resolving DNS addresses. @@ -48,14 +48,14 @@ public abstract class DNSResolver { * @param dnssecMode security mode. * @return The list of SRV records mapped to the service name. */ - public final List lookupSRVRecords(DNSName name, List failedAddresses, DnssecMode dnssecMode) { + public final List lookupSRVRecords(DnsName name, List failedAddresses, DnssecMode dnssecMode) { checkIfDnssecRequestedAndSupported(dnssecMode); return lookupSRVRecords0(name, failedAddresses, dnssecMode); } - protected abstract List lookupSRVRecords0(DNSName name, List failedAddresses, DnssecMode dnssecMode); + protected abstract List lookupSRVRecords0(DnsName name, List failedAddresses, DnssecMode dnssecMode); - public final HostAddress lookupHostAddress(DNSName name, int port, List failedAddresses, DnssecMode dnssecMode) { + public final HostAddress lookupHostAddress(DnsName name, int port, List failedAddresses, DnssecMode dnssecMode) { checkIfDnssecRequestedAndSupported(dnssecMode); List inetAddresses = lookupHostAddress0(name, failedAddresses, dnssecMode); if (inetAddresses == null || inetAddresses.isEmpty()) { @@ -78,7 +78,7 @@ public abstract class DNSResolver { * @param dnssecMode the selected DNSSEC mode * @return A list, either empty or non-empty, or null */ - protected List lookupHostAddress0(DNSName name, List failedAddresses, DnssecMode dnssecMode) { + protected List lookupHostAddress0(DnsName name, List failedAddresses, DnssecMode dnssecMode) { // Default implementation of a DNS name lookup for A/AAAA records. It is assumed that this method does never // support DNSSEC. Subclasses are free to override this method. if (dnssecMode != DnssecMode.disabled) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java index da528166e..f0bc854f5 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java @@ -26,10 +26,10 @@ import java.util.Map.Entry; import org.jivesoftware.smack.SmackException.ConnectionException; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; public class HostAddress { - private final DNSName fqdn; + private final DnsName fqdn; private final int port; private final Map exceptions = new LinkedHashMap<>(); private final List inetAddresses; @@ -42,7 +42,7 @@ public class HostAddress { * @param inetAddresses list of addresses. * @throws IllegalArgumentException If the port is out of valid range (0 - 65535). */ - public HostAddress(DNSName fqdn, int port, List inetAddresses) { + public HostAddress(DnsName fqdn, int port, List inetAddresses) { if (port < 0 || port > 65535) throw new IllegalArgumentException( "Port must be a 16-bit unsigned integer (i.e. between 0-65535. Port was: " + port); @@ -65,7 +65,7 @@ public class HostAddress { * @param fqdn the domain name of the host. * @param e the exception causing the failure. */ - public HostAddress(DNSName fqdn, Exception e) { + public HostAddress(DnsName fqdn, Exception e) { this.fqdn = fqdn; this.port = 5222; inetAddresses = Collections.emptyList(); @@ -88,7 +88,7 @@ public class HostAddress { * * @return the fully qualified domain name or null */ - public DNSName getFQDN() { + public DnsName getFQDN() { return fqdn; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java index c134570e2..d049ce03d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java @@ -21,7 +21,7 @@ import java.util.List; import org.jivesoftware.smack.util.StringUtils; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; /** * A DNS SRV RR. @@ -46,7 +46,7 @@ public class SRVRecord extends HostAddress implements Comparable { * @param inetAddresses list of addresses. * @throws IllegalArgumentException fqdn is null or any other field is not in valid range (0-65535). */ - public SRVRecord(DNSName fqdn, int port, int priority, int weight, List inetAddresses) { + public SRVRecord(DnsName fqdn, int port, int priority, int weight, List inetAddresses) { super(fqdn, port, inetAddresses); StringUtils.requireNotNullOrEmpty(fqdn, "The FQDN must not be null"); if (weight < 0 || weight > 65535) diff --git a/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java index fb9c52a0a..4403f7bf5 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java @@ -28,7 +28,7 @@ import org.jivesoftware.smack.SmackException.ConnectionException; import org.jivesoftware.smack.util.dns.HostAddress; import org.junit.Test; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; public class SmackExceptionTest { @@ -36,14 +36,14 @@ public class SmackExceptionTest { public void testConnectionException() throws UnknownHostException { List failedAddresses = new LinkedList(); - DNSName host = DNSName.from("foo.bar.example"); + DnsName host = DnsName.from("foo.bar.example"); InetAddress inetAddress = InetAddress.getByAddress(host.toString(), new byte[] { 0, 0, 0, 0 }); List inetAddresses = Collections.singletonList(inetAddress); HostAddress hostAddress = new HostAddress(host, 1234, inetAddresses); hostAddress.setException(new Exception("Failed for some reason")); failedAddresses.add(hostAddress); - host = DNSName.from("barz.example"); + host = DnsName.from("barz.example"); inetAddress = InetAddress.getByAddress(host.toString(), new byte[] { 0, 0, 0, 0 }); inetAddresses = Collections.singletonList(inetAddress); hostAddress = new HostAddress(host, 5678, inetAddresses); diff --git a/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java b/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java index aad3f4613..afa4dbd72 100644 --- a/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java +++ b/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java @@ -27,7 +27,7 @@ import org.jivesoftware.smack.util.dns.DNSResolver; import org.jivesoftware.smack.util.dns.HostAddress; import org.jivesoftware.smack.util.dns.SRVRecord; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; import org.xbill.DNS.Lookup; import org.xbill.DNS.Record; import org.xbill.DNS.TextParseException; @@ -50,7 +50,7 @@ public class DNSJavaResolver extends DNSResolver implements SmackInitializer { } @Override - protected List lookupSRVRecords0(DNSName name, List failedAddresses, DnssecMode dnssecMode) { + protected List lookupSRVRecords0(DnsName name, List failedAddresses, DnssecMode dnssecMode) { List res = new ArrayList<>(); Lookup lookup; @@ -68,7 +68,7 @@ public class DNSJavaResolver extends DNSResolver implements SmackInitializer { for (Record record : recs) { org.xbill.DNS.SRVRecord srvRecord = (org.xbill.DNS.SRVRecord) record; if (srvRecord != null && srvRecord.getTarget() != null) { - DNSName host = DNSName.from(srvRecord.getTarget().toString()); + DnsName host = DnsName.from(srvRecord.getTarget().toString()); int port = srvRecord.getPort(); int priority = srvRecord.getPriority(); int weight = srvRecord.getWeight(); diff --git a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java index c0e23b403..2049a4455 100644 --- a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java +++ b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java @@ -37,7 +37,7 @@ import org.jivesoftware.smack.util.dns.DNSResolver; import org.jivesoftware.smack.util.dns.HostAddress; import org.jivesoftware.smack.util.dns.SRVRecord; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; /** * A DNS resolver (mostly for SRV records), which makes use of the API provided in the javax.* namespace. @@ -83,7 +83,7 @@ public class JavaxResolver extends DNSResolver implements SmackInitializer { } @Override - protected List lookupSRVRecords0(DNSName name, List failedAddresses, DnssecMode dnssecMode) { + protected List lookupSRVRecords0(DnsName name, List failedAddresses, DnssecMode dnssecMode) { List res = null; Attribute srvAttribute; @@ -112,12 +112,12 @@ public class JavaxResolver extends DNSResolver implements SmackInitializer { int weight = Integer.parseInt(srvRecordEntries[srvRecordEntries.length - 3]); String srvTarget = srvRecordEntries[srvRecordEntries.length - 1]; // Strip trailing '.' from srvTarget. - // Later MiniDNS version may do the right thing when DNSName.from() is called with a DNS name string + // Later MiniDNS version may do the right thing when DnsName.from() is called with a DNS name string // having a trailing dot, so this can possibly be removed in future Smack versions. if (srvTarget.length() > 0 && srvTarget.charAt(srvTarget.length() - 1) == '.') { srvTarget = srvTarget.substring(0, srvTarget.length() - 1); } - DNSName host = DNSName.from(srvTarget); + DnsName host = DnsName.from(srvTarget); List hostAddresses = lookupHostAddress0(host, failedAddresses, dnssecMode); if (shouldContinue(name, host, hostAddresses)) { diff --git a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java index 4f13f91ed..615c6a3e1 100644 --- a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java +++ b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java @@ -32,9 +32,9 @@ import org.jivesoftware.smack.util.dns.DNSResolver; import org.jivesoftware.smack.util.dns.HostAddress; import org.jivesoftware.smack.util.dns.SRVRecord; -import org.minidns.dnsmessage.DNSMessage.RESPONSE_CODE; +import org.minidns.dnsmessage.DnsMessage.RESPONSE_CODE; import org.minidns.dnsmessage.Question; -import org.minidns.dnsname.DNSName; +import org.minidns.dnsname.DnsName; import org.minidns.hla.DnssecResolverApi; import org.minidns.hla.ResolutionUnsuccessfulException; import org.minidns.hla.ResolverApi; @@ -66,7 +66,7 @@ public class MiniDnsResolver extends DNSResolver implements SmackInitializer { } @Override - protected List lookupSRVRecords0(final DNSName name, List failedAddresses, DnssecMode dnssecMode) { + protected List lookupSRVRecords0(final DnsName name, List failedAddresses, DnssecMode dnssecMode) { final ResolverApi resolver = getResolver(dnssecMode); SrvResolverResult result; @@ -89,7 +89,7 @@ public class MiniDnsResolver extends DNSResolver implements SmackInitializer { List res = new LinkedList<>(); for (SRV srv : result.getAnswers()) { - DNSName hostname = srv.target; + DnsName hostname = srv.target; List hostAddresses = lookupHostAddress0(hostname, failedAddresses, dnssecMode); if (shouldContinue(name, hostname, hostAddresses)) { continue; @@ -103,7 +103,7 @@ public class MiniDnsResolver extends DNSResolver implements SmackInitializer { } @Override - protected List lookupHostAddress0(final DNSName name, List failedAddresses, DnssecMode dnssecMode) { + protected List lookupHostAddress0(final DnsName name, List failedAddresses, DnssecMode dnssecMode) { final ResolverApi resolver = getResolver(dnssecMode); final ResolverResult aResult; @@ -193,7 +193,7 @@ public class MiniDnsResolver extends DNSResolver implements SmackInitializer { } } - private static boolean shouldAbortIfNotAuthentic(DNSName name, DnssecMode dnssecMode, + private static boolean shouldAbortIfNotAuthentic(DnsName name, DnssecMode dnssecMode, ResolverResult result, List failedAddresses) { switch (dnssecMode) { case needsDnssec: diff --git a/version.gradle b/version.gradle index 7a0aa27bb..8f32d4fbc 100644 --- a/version.gradle +++ b/version.gradle @@ -3,7 +3,7 @@ allprojects { shortVersion = '4.3.0-beta2' isSnapshot = true jxmppVersion = '0.6.0' - miniDnsVersion = '0.3.0-alpha1' + miniDnsVersion = '0.3.0' smackMinAndroidSdk = 9 } }