Merge pull request #115 from longbai/mzone

mzone

Author: longbai

library/src/androidTest/java/com/qiniu/android/FormUploadTest.java

@@ -10,6 +10,7 @@
 import com.qiniu.android.storage.UpCompletionHandler;
 import com.qiniu.android.storage.UploadManager;
 import com.qiniu.android.storage.UploadOptions;
+import com.qiniu.android.storage.Zone;
 
 import junit.framework.Assert;
 
@@ -280,8 +281,10 @@ public void testNoComplete() {
 
     @SmallTest
     public void testIpBack() throws Throwable {
+
         Configuration c = new Configuration.Builder()
-                .upHost("upwelcome.qiniu.com").build();
+                .zone(new Zone("upwelcome.qiniu.com", Zone.zone0.upHostBackup, Zone.zone0.upIp))
+                .build();
         UploadManager _up = new UploadManager(c);
         final String expectKey = "你好;\"\r\n\r\n\r\n";
         Map<String, String> params = new HashMap<String, String>();

library/src/main/java/com/qiniu/android/storage/Configuration.java

@@ -103,10 +103,11 @@ public String gen(String key, File file) {
     }
 
     public static class Builder{
-        private String upHost = "upload.qiniu.com";
-        private String upHostBackup = "up.qiniu.com";
-        private String upIp = "183.136.139.16";
-        private int upPort = 80;
+        private String upHost;
+        private String upHostBackup;
+        private String upIp;
+        private int upPort;
+
         private Recorder recorder = null;
         private KeyGenerator keyGen = null;
         private Proxy proxy = null;
@@ -117,10 +118,19 @@ public static class Builder{
         private int responseTimeout = 60;
         private int retryMax = 5;
 
+        public Builder(){
+            this.upHost = Zone.zone0.upHost;
+            this.upHostBackup = Zone.zone0.upHostBackup;
+            this.upIp = Zone.zone0.upIp;
+            this.upPort = 80;
+        }
+
         private UrlConverter urlConverter = null;
 
-        public Builder upHost(String upHost){
-            this.upHost = upHost;
+        public Builder zone(Zone zone){
+            this.upHost = zone.upHost;
+            this.upHostBackup = zone.upHostBackup;
+            this.upIp = zone.upIp;
             return this;
         }
 
@@ -135,16 +145,6 @@ public Builder recorder(Recorder recorder, KeyGenerator keyGen){
             return this;
         }
 
-        public Builder upHostBackup(String backup){
-            upHostBackup = backup;
-            return this;
-        }
-
-        public Builder upIp(String ip){
-            upIp = ip;
-            return this;
-        }
-
         public Builder upPort(int port){
             upPort = port;
             return this;

library/src/main/java/com/qiniu/android/storage/Zone.java

@@ -0,0 +1,22 @@
+package com.qiniu.android.storage;
+
+
+public final class Zone {
+    public final String upHost;
+    public final String upHostBackup;
+    public final String upIp;
+
+    public Zone(String upHost, String upHostBackup, String upIp) {
+        this.upHost = upHost;
+        this.upHostBackup = upHostBackup;
+        this.upIp = upIp;
+    }
+
+    public static final Zone zone0 =
+            new Zone("upload.qiniu.com", "up.qiniu.com", "183.136.139.16");
+
+
+    public static final Zone zone1 =
+            new Zone("upload-z1.qiniu.com", "up-z1.qiniu.com", "106.38.227.27");
+
+}