add happydns

build.gradle

@@ -12,17 +12,17 @@ repositories {
 }
 
 dependencies {
-//    String version = System.getProperty("java.version")
-//    println("JDK: " + version)
+//    String ver = System.getProperty("java.version")
+//    println("JDK: " + ver)
 //    int c = version.compareTo("1.7")
 //    if (c < 0) {
 //        compile fileTree(dir: 'libs', include: '*.jar')
 //    } else {
     compile group:'com.squareup.okhttp3', name:'okhttp', version:'3.3.1'
 //    }
     compile group:'com.google.code.gson', name:'gson', version:'2.6.2'
+    compile group:'com.qiniu', name:'happy-dns-java', version:'0.1.3'
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    println("JDK : " + version)
 }
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 07 13:33:33 CST 2015
+#Thu Jul 14 15:30:24 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

src/main/java/com/qiniu/common/Config.java

@@ -1,12 +1,14 @@
 package com.qiniu.common;
 
+import qiniu.happydns.DnsClient;
+
 import java.nio.charset.Charset;
 
 // CHECKSTYLE:OFF
 
 public final class Config {
 
-    public static final String VERSION = "7.1.1";
+    public static final String VERSION = "7.1.2";
     /**
      * 断点上传时的分块大小(默认的分块大小, 不允许改变)
      */
@@ -54,6 +56,11 @@ public final class Config {
      */
     public static int RETRY_MAX = 5;
 
+    /**
+     * 外部dns
+     */
+    public static DnsClient dns = null;
+
     private Config() {
     }
 }

src/main/java/com/qiniu/common/QiniuException.java

@@ -5,7 +5,7 @@
 import java.io.IOException;
 
 
-public class QiniuException extends IOException {
+public final class QiniuException extends IOException {
     public final Response response;
 
 

src/main/java/com/qiniu/http/Client.java

@@ -6,9 +6,16 @@
 import com.qiniu.util.StringUtils;
 import okhttp3.*;
 import okio.BufferedSink;
+import qiniu.happydns.DnsClient;
+import qiniu.happydns.Domain;
 
 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;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -46,10 +53,32 @@ public okhttp3.Response intercept(Chain chain) throws IOException {
                 return response;
             }
         });
+        if (Config.dns != null) {
+            final DnsClient d = Config.dns;
+            builder.dns(new Dns() {
+                @Override
+                public List<InetAddress> lookup(String hostname) throws UnknownHostException {
+                    InetAddress[] ips;
+                    try {
+                        ips = d.queryInetAddress(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;
+                }
+            });
+        }
         builder.connectTimeout(Config.CONNECT_TIMEOUT, TimeUnit.SECONDS);
         builder.readTimeout(Config.RESPONSE_TIMEOUT, TimeUnit.SECONDS);
         builder.writeTimeout(Config.WRITE_TIMEOUT, TimeUnit.SECONDS);
         httpClient = builder.build();
+
     }
 
     private static String userAgent() {

src/main/java/com/qiniu/http/Proxy.java

@@ -3,7 +3,7 @@
 /**
  * http 代理
  */
-public class Proxy {
+public final class Proxy {
 
     public final String hostAddress;
     public final int port;

src/main/java/com/qiniu/processing/OperationManager.java

@@ -12,7 +12,7 @@
  * 触发持久化处理
  * 针对七牛空间文件，触发异步文件处理。如异步视频转码等
  */
-public class OperationManager {
+public final class OperationManager {
     private final Client client;
     private final Auth auth;
 

src/main/java/com/qiniu/storage/model/BatchStatus.java

@@ -3,6 +3,6 @@
 /**
  * Created by bailong on 15/2/22.
  */
-public class BatchStatus {
+public final class BatchStatus {
     public int code;
 }

src/main/java/com/qiniu/storage/model/DefaultPutRet.java

@@ -1,6 +1,6 @@
 package com.qiniu.storage.model;
 
-public class DefaultPutRet {
+public final class DefaultPutRet {
     public String hash;
     public String key;
 }

src/main/java/com/qiniu/storage/model/FileInfo.java

@@ -1,6 +1,6 @@
 package com.qiniu.storage.model;
 
-public class FileInfo {
+public final class FileInfo {
     public String key;
     public String hash;
     public long fsize;

src/main/java/com/qiniu/storage/model/FileListing.java

@@ -5,7 +5,7 @@
 /**
  * Created by bailong on 15/2/20.
  */
-public class FileListing {
+public final class FileListing {
     public FileInfo[] items;
     public String marker;
     public String[] commonPrefixes;

src/main/java/com/qiniu/storage/model/ResumeBlockInfo.java

@@ -3,7 +3,7 @@
 /**
  * Created by bailong on 15/2/23.
  */
-public class ResumeBlockInfo {
+public final class ResumeBlockInfo {
     public String ctx;
     public long crc32;
 }

src/test/java/com/qiniu/HttpTest.java

@@ -1,10 +1,19 @@
 package com.qiniu;
 
+import com.qiniu.common.Config;
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Client;
 import com.qiniu.http.Response;
 import org.junit.Assert;
 import org.junit.Test;
+import qiniu.happydns.DnsClient;
+import qiniu.happydns.IResolver;
+import qiniu.happydns.local.Hosts;
+import qiniu.happydns.local.Resolver;
+import qiniu.happydns.local.SystemDnsServer;
+
+import java.io.IOException;
+import java.net.InetAddress;
 
 
 public class HttpTest {
@@ -32,6 +41,27 @@ public void testPost2() {
         }
     }
 
+    @Test
+    public void testDns() {
+        IResolver r1 = SystemDnsServer.defaultResolver();
+        IResolver r2 = null;
+        try {
+            r2 = new Resolver(InetAddress.getByName("119.29.29.29"));
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+        Hosts h = new Hosts();
+        h.put("upnonodns.qiniu.com", "115.231.183.168");
+        Config.dns = new DnsClient(new IResolver[]{r1, r2}, h);
+        Response r = null;
+        try {
+            r = new Client().post("http://upnonodns.qiniu.com", "hello", null);
+            Assert.fail();
+        } catch (QiniuException e) {
+            Assert.assertNotNull(e.response.reqId);
+        }
+    }
+
     @Test
     public void testPost3() {
         Response r = null;

src/test/java/com/qiniu/TempFile.java

@@ -9,11 +9,11 @@
  * Created by bailong on 14/10/11.
  */
 public final class TempFile {
+    static final Random r = new Random();
+
     private TempFile() {
     }
 
-    static final Random r = new Random();
-
     public static void remove(File f) {
         f.delete();
     }

src/test/java/com/qiniu/storage/RecordUploadTest.java

@@ -24,15 +24,15 @@
  */
 public class RecordUploadTest {
     final Random r = new Random();
-    private Response response = null;
     final RecordKeyGenerator keyGen = new RecordKeyGenerator() {
         @Override
         public String gen(String key, File file) {
             return key + "_._" + file.getAbsolutePath();
         }
     };
-    FileRecorder recorder = null;
     final Client client = new Client();
+    FileRecorder recorder = null;
+    private Response response = null;
 
     private void template(final int size) throws IOException {
         response = null;