remove non-zone config

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

@@ -134,11 +134,6 @@ public Builder zone(Zone zone){
             return this;
         }
 
-        public Builder upHost(String upHost){
-            this.upHost = upHost;
-            return this;
-        }
-
         public Builder recorder(Recorder recorder){
             this.recorder = recorder;
             return this;
@@ -150,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;