Merge pull request #299 from sxci/config_dns

jemygraw · web-flow · commit ef21d758de7e · 2018-04-04T17:13:32.000+08:00
Config dns
diff --git a/library/src/androidTest/java/com/qiniu/android/DnsTest.java b/library/src/androidTest/java/com/qiniu/android/DnsTest.java
@@ -2,10 +2,15 @@
 
 import android.test.AndroidTestCase;
 
+import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.utils.Dns;
 
 import junit.framework.Assert;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+
 /**
  * Created by bailong on 15/1/5.
  */
@@ -16,4 +21,14 @@ public void testDns() {
         ip = Dns.getAddressesString("nodns.qiniu.com");
         Assert.assertEquals("", ip);
     }
+
+
+    public void testDnsConfig() throws UnknownHostException {
+        Configuration config = new Configuration.Builder().build();
+        Assert.assertTrue(" 默认使用 happlyDns ", config.dns != null);
+        List<InetAddress> inetAddress = config.dns.lookup("www.baidu.com");
+//        System.out.println(inetAddress.get(0).getHostAddress());
+        Assert.assertFalse(" 解析不能为空 ", inetAddress.isEmpty());
+        Assert.assertTrue(" 禁用 happlyDns ", new Configuration.Builder().dns(null).build().dns == null);
+    }
 }
diff --git a/library/src/main/java/com/qiniu/android/http/Client.java b/library/src/main/java/com/qiniu/android/http/Client.java
@@ -1,8 +1,6 @@
 package com.qiniu.android.http;
 
 import com.qiniu.android.common.Constants;
-import com.qiniu.android.dns.DnsManager;
-import com.qiniu.android.dns.Domain;
 import com.qiniu.android.storage.UpCancellationSignal;
 import com.qiniu.android.storage.UpToken;
 import com.qiniu.android.utils.AsyncRun;
@@ -15,14 +13,11 @@
 import java.net.InetAddress;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Call;
 import okhttp3.Callback;
-import okhttp3.Dns;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.MediaType;
@@ -48,7 +43,7 @@ public Client() {
         this(null, 10, 30, null, null);
     }
 
-    public Client(ProxyConfiguration proxy, int connectTimeout, int responseTimeout, UrlConverter converter, final DnsManager dns) {
+    public Client(ProxyConfiguration proxy, int connectTimeout, int responseTimeout, UrlConverter converter, final Dns dns) {
         this.converter = converter;
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
@@ -59,22 +54,15 @@ public Client(ProxyConfiguration proxy, int connectTimeout, int responseTimeout,
             }
         }
         if (dns != null) {
-            builder.dns(new Dns() {
+            builder.dns(new okhttp3.Dns() {
                 @Override
                 public List<InetAddress> lookup(String hostname) throws UnknownHostException {
-                    InetAddress[] ips;
                     try {
-                        ips = dns.queryInetAdress(new Domain(hostname));
-                    } catch (IOException e) {
+                        return dns.lookup(hostname);
+                    } catch (Exception e) {
                         e.printStackTrace();
-                        throw new UnknownHostException(e.getMessage());
                     }
-                    if (ips == null) {
-                        throw new UnknownHostException(hostname + " resolve failed");
-                    }
-                    List<InetAddress> l = new ArrayList<>();
-                    Collections.addAll(l, ips);
-                    return l;
+                    return okhttp3.Dns.SYSTEM.lookup(hostname);
                 }
             });
         }
diff --git a/library/src/main/java/com/qiniu/android/http/Dns.java b/library/src/main/java/com/qiniu/android/http/Dns.java
@@ -0,0 +1,13 @@
+package com.qiniu.android.http;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+
+/**
+ * Created by sxci on 03/04/2018.
+ */
+
+public interface Dns {
+    List<InetAddress> lookup(String hostname) throws UnknownHostException;
+}
diff --git a/library/src/main/java/com/qiniu/android/storage/Configuration.java b/library/src/main/java/com/qiniu/android/storage/Configuration.java
@@ -1,19 +1,24 @@
 package com.qiniu.android.storage;
 
-
 import com.qiniu.android.common.AutoZone;
 import com.qiniu.android.common.Zone;
 import com.qiniu.android.dns.DnsManager;
+import com.qiniu.android.dns.Domain;
 import com.qiniu.android.dns.IResolver;
 import com.qiniu.android.dns.NetworkInfo;
 import com.qiniu.android.dns.local.AndroidDnsServer;
 import com.qiniu.android.dns.local.Resolver;
+import com.qiniu.android.http.Dns;
 import com.qiniu.android.http.ProxyConfiguration;
 import com.qiniu.android.http.UrlConverter;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public final class Configuration {
 
@@ -60,7 +65,7 @@ public final class Configuration {
     /**
      * dns 解析客户端
      */
-    public DnsManager dns;
+    public Dns dns;
 
     /**
      * 上传区域
@@ -92,12 +97,7 @@ private Configuration(Builder builder) {
         urlConverter = builder.urlConverter;
 
         zone = builder.zone == null ? AutoZone.autoZone : builder.zone;
-        dns = initDns(builder);
-    }
-
-    private static DnsManager initDns(Builder builder) {
-        DnsManager d = builder.dns;
-        return d;
+        dns = builder.dns;
     }
 
     private KeyGenerator getKeyGen(KeyGenerator keyGen) {
@@ -125,17 +125,40 @@ public static class Builder {
         private int responseTimeout = 60;
         private int retryMax = 3;
         private UrlConverter urlConverter = null;
-        private DnsManager dns = null;
+        private Dns dns = null;
 
         public Builder() {
+            buildDefaultDns();
+        }
+
+        private void buildDefaultDns() {
             IResolver r1 = AndroidDnsServer.defaultResolver();
             IResolver r2 = null;
             try {
                 r2 = new Resolver(InetAddress.getByName("119.29.29.29"));
             } catch (IOException ex) {
                 ex.printStackTrace();
             }
-            dns = new DnsManager(NetworkInfo.normal, new IResolver[]{r1, r2});
+            final DnsManager happlyDns = new DnsManager(NetworkInfo.normal, new IResolver[]{r1, r2});
+
+            dns = new Dns() {
+                @Override
+                public List<InetAddress> lookup(String hostname) throws UnknownHostException {
+                    InetAddress[] ips;
+                    try {
+                        ips = happlyDns.queryInetAdress(new Domain(hostname));
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        throw new UnknownHostException(e.getMessage());
+                    }
+                    if (ips == null) {
+                        throw new UnknownHostException(hostname + " resolve failed.");
+                    }
+                    List<InetAddress> l = new ArrayList<>();
+                    Collections.addAll(l, ips);
+                    return l;
+                }
+            };
         }
 
         public Builder zone(Zone zone) {
@@ -189,7 +212,7 @@ public Builder urlConverter(UrlConverter converter) {
             return this;
         }
 
-        public Builder dns(DnsManager dns) {
+        public Builder dns(Dns dns) {
             this.dns = dns;
             return this;
         }
