Merge pull request #410 from YangSen-qn/sdk_v7_uc_query_to_v4

version 7: uc query v2 to v4

Author: bachue

library/src/main/java/com/qiniu/android/common/AutoZone.java

@@ -53,12 +53,12 @@ public String getUcServer() {
     }
 
     private void getZoneJsonAsync(LogHandler logHandler, ZoneIndex index, CompletionHandler handler) {
-        String address = ucServer + "/v2/query?ak=" + index.accessKey + "&bucket=" + index.bucket;
+        String address = ucServer + "/v4/query?ak=" + index.accessKey + "&bucket=" + index.bucket;
         client.asyncGet(logHandler, address, null, UpToken.NULL, handler);
     }
 
     private ResponseInfo getZoneJsonSync(LogHandler logHandler, ZoneIndex index) {
-        String address = ucServer + "/v2/query?ak=" + index.accessKey + "&bucket=" + index.bucket;
+        String address = ucServer + "/v4/query?ak=" + index.accessKey + "&bucket=" + index.bucket;
         return client.syncGet(logHandler, address, null);
     }
 

library/src/main/java/com/qiniu/android/common/ZoneInfo.java

@@ -35,35 +35,35 @@ public ZoneInfo(int ttl, List<String> upDomainsList, Map<String, Long> upDomains
      * @throws JSONException
      */
     public static ZoneInfo buildFromJson(JSONObject obj) throws JSONException {
-        int ttl = obj.getInt("ttl");
+
         List<String> domainsList = new ArrayList<>();
         ConcurrentHashMap<String, Long> domainsMap = new ConcurrentHashMap<>();
-        JSONObject upObj = obj.getJSONObject("up");
 
-        String[] upDomainTags = new String[]{"acc", "src", "old_acc", "old_src"};
-        for (String tag : upDomainTags) {
-            JSONObject tagRootObj = upObj.getJSONObject(tag);
-            JSONArray tagMainObj = tagRootObj.getJSONArray("main");
-            for (int i = 0; i < tagMainObj.length(); i++) {
-                String upDomain = tagMainObj.getString(i);
-                domainsList.add(upDomain);
-                domainsMap.put(upDomain, 0L);
-            }
+        JSONArray hostsJson = obj.optJSONArray("hosts");
+
+        if (hostsJson == null || hostsJson.length() == 0){
+            return new ZoneInfo(0, domainsList, domainsMap);
+        }
 
-            try {
-                JSONArray tagBackupObj = tagRootObj.getJSONArray("backup");
-                if (tagBackupObj != null) {
-                    //this backup tag is optional
-                    for (int i = 0; i < tagBackupObj.length(); i++) {
-                        String upHost = tagBackupObj.getString(i);
-                        domainsList.add(upHost);
-                        domainsMap.put(upHost, 0L);
+        JSONObject regionJson = hostsJson.optJSONObject(0);
+
+        int ttl = regionJson.optInt("ttl");
+        JSONObject upObj = regionJson.optJSONObject("up");
+
+        String[] upDomainTags = new String[]{"domains", "old"};
+        for (String tag : upDomainTags) {
+            JSONArray tagObjects = upObj.optJSONArray(tag);
+            if (tagObjects != null && tagObjects.length() > 0){
+                for (int i = 0; i < tagObjects.length(); i++) {
+                    String upDomain = tagObjects.optString(i);
+                    if (upDomain != null && upDomain.length() > 0){
+                        domainsList.add(upDomain);
+                        domainsMap.put(upDomain, 0L);
                     }
                 }
-            } catch (JSONException ex) {
-                //some zone has not backup domain, just ignore here
             }
         }
+
         return new ZoneInfo(ttl, domainsList, domainsMap);
     }
 

library/src/main/java/com/qiniu/android/http/DnsPrefetcher.java

@@ -262,7 +262,7 @@ ResponseInfo getZoneJsonSync(DnsPrefetcher.ZoneIndex index) {
         if (!config.useHttps) {
             schema = "http://";
         }
-        String address = schema + Config.preQueryHost + "/v2/query?ak=" + index.accessKey + "&bucket=" + index.bucket;
+        String address = schema + Config.preQueryHost + "/v4/query?ak=" + index.accessKey + "&bucket=" + index.bucket;
 
         LogHandler logHandler = UploadInfoElementCollector.getUplogHandler(UploadInfo.getReqInfo());
         logHandler.send("up_type", "uc_query");