revert multi region

Author: yangsen

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

@@ -68,17 +68,11 @@ private String[] getUcServerArray() {
     }
 
     @Override
-    @Deprecated
     public ZonesInfo getZonesInfo(UpToken token) {
-        return getZonesInfo(token, ApiType.ActionTypeNone);
-    }
-
-    @Override
-    public ZonesInfo getZonesInfo(UpToken token, int actionType) {
         if (token == null) {
             return null;
         }
-        final String cacheKey = token.index() + ApiType.actionTypeString(actionType);
+        final String cacheKey = token.index();
         ZonesInfo zonesInfo = GlobalCache.getInstance().zonesInfoForKey(cacheKey);
         if (zonesInfo != null) {
             try {
@@ -90,13 +84,7 @@ public ZonesInfo getZonesInfo(UpToken token, int actionType) {
     }
 
     @Override
-    @Deprecated
     public void preQuery(final UpToken token, final QueryHandler completeHandler) {
-        preQuery(token, ApiType.ActionTypeNone, completeHandler);
-    }
-
-    @Override
-    public void preQuery(UpToken token, final int actionType, QueryHandler completeHandler) {
         if (token == null || !token.isValid()) {
             completeHandler.complete(-1, ResponseInfo.invalidToken("invalid token"), null);
             return;
@@ -105,7 +93,7 @@ public void preQuery(UpToken token, final int actionType, QueryHandler completeH
         UploadRegionRequestMetrics localMetrics = new UploadRegionRequestMetrics(null);
         localMetrics.start();
 
-        final String cacheKey = token.index() + ApiType.actionTypeString(actionType);
+        final String cacheKey = token.index();
         ZonesInfo zonesInfo = GlobalCache.getInstance().zonesInfoForKey(cacheKey);
         if (zonesInfo != null && zonesInfo.isValid() && !zonesInfo.isTemporary()) {
             localMetrics.end();
@@ -144,7 +132,7 @@ public void complete(Object value) {
                     JSONObject response = singleFlightValue.response;
 
                     if (responseInfo != null && responseInfo.isOK() && response != null) {
-                        ZonesInfo zonesInfoP = ZonesInfo.createZonesInfo(response, actionType);
+                        ZonesInfo zonesInfoP = ZonesInfo.createZonesInfo(response);
                         if (zonesInfoP.isValid()) {
                             GlobalCache.getInstance().cache(zonesInfoP, cacheKey);
                             completeHandler.complete(0, responseInfo, requestMetrics);
@@ -157,7 +145,7 @@ public void complete(Object value) {
                         } else {
                             ZonesInfo info = null;
                             if (defaultZone != null) {
-                                ZonesInfo infoP = defaultZone.getZonesInfo(token, actionType);
+                                ZonesInfo infoP = defaultZone.getZonesInfo(token);
                                 if (infoP != null && infoP.isValid()) {
                                     infoP.toTemporary();
                                     info = infoP;

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

@@ -143,24 +143,12 @@ private ZonesInfo createZonesInfo(String[] upDomains,
     }
 
     @Override
-    @Deprecated
     public ZonesInfo getZonesInfo(UpToken token) {
         return zonesInfo;
     }
 
     @Override
-    public ZonesInfo getZonesInfo(UpToken token, int actionType) {
-        return zonesInfo;
-    }
-
-    @Override
-    @Deprecated
     public void preQuery(UpToken token, QueryHandler completeHandler) {
-        preQuery(token, ApiType.ActionTypeNone, completeHandler);
-    }
-
-    @Override
-    public void preQuery(UpToken token, int actionType, QueryHandler completeHandler) {
         if (completeHandler != null) {
             completeHandler.complete(0, null, null);
         }

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

@@ -9,16 +9,10 @@
  */
 public abstract class Zone {
 
-    @Deprecated
     public abstract ZonesInfo getZonesInfo(UpToken token);
 
-    public abstract ZonesInfo getZonesInfo(UpToken token, int actionType);
-
-    @Deprecated
     public abstract void preQuery(UpToken token, QueryHandler completeHandler);
 
-    public abstract void preQuery(UpToken token, int actionType, QueryHandler completeHandler);
-
     public interface QueryHandler {
         void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics metrics);
     }

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

@@ -23,49 +23,8 @@ public ZonesInfo(ArrayList<ZoneInfo> zonesInfo, boolean isTemporary) {
     }
 
     public static ZonesInfo createZonesInfo(JSONObject jsonObject) {
-        return createZonesInfo(jsonObject, ApiType.ActionTypeNone);
-    }
-
-    public static ZonesInfo createZonesInfo(JSONObject jsonObject, int actionType) {
         ArrayList<ZoneInfo> zonesInfo = new ArrayList<>();
         if (jsonObject != null) {
-            try {
-                String[] supportApis = ApiType.apisWithActionType(actionType);
-                if (supportApis != null && supportApis.length > 0) {
-                    JSONObject universal = jsonObject.getJSONObject("universal");
-                    JSONArray apis = universal.getJSONArray("support_apis");
-
-                    boolean support = true;
-                    for (String supportApi : supportApis) {
-
-                        // 需要支持的  api 是否存在，任何一个不存在则不支持。
-                        boolean contain = false;
-                        for (int i = 0; i < apis.length(); i++) {
-                            String api = apis.getString(i);
-                            if (supportApi.equals(api)) {
-                                contain = true;
-                                break;
-                            }
-                        }
-
-                        if (!contain) {
-                            support = false;
-                            break;
-                        }
-                    }
-
-                    if (support) {
-                        // 支持 api ，universal 满足条件
-                        ZoneInfo zoneInfo = ZoneInfo.buildFromJson(universal);
-                        if (zoneInfo != null && zoneInfo.isValid()) {
-                            zonesInfo.add(zoneInfo);
-                        }
-                    }
-                }
-            } catch (Exception ignored) {
-            }
-
-
             try {
                 JSONArray hosts = jsonObject.getJSONArray("hosts");
                 for (int i = 0; i < hosts.length(); i++) {

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

@@ -1,8 +1,6 @@
 package com.qiniu.android.http.dns;
 
-import com.qiniu.android.common.ApiType;
 import com.qiniu.android.common.Config;
-import com.qiniu.android.common.FixedZone;
 import com.qiniu.android.common.Zone;
 import com.qiniu.android.common.ZoneInfo;
 import com.qiniu.android.common.ZonesInfo;

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

@@ -1,6 +1,5 @@
 package com.qiniu.android.storage;
 
-import com.qiniu.android.common.ApiType;
 import com.qiniu.android.common.Zone;
 import com.qiniu.android.common.ZoneInfo;
 import com.qiniu.android.common.ZonesInfo;
@@ -88,7 +87,7 @@ protected void initData() {
     public void run() {
         metrics.start();
 
-        config.zone.preQuery(token, actionType(), new Zone.QueryHandler() {
+        config.zone.preQuery(token, new Zone.QueryHandler() {
             @Override
             public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics) {
                 metrics.setUcQueryMetrics(requestMetrics);
@@ -157,28 +156,11 @@ protected void completeAction(ResponseInfo responseInfo, JSONObject response) {
         }
     }
 
-    private int actionType() {
-        String upType = getUpType();
-        if (upType == null) {
-            return ApiType.ActionTypeNone;
-        }
-
-        int type = ApiType.ActionTypeNone;
-        if (upType.contains(UploadUpTypeForm)) {
-            type = ApiType.ActionTypeUploadByForm;
-        } else if (upType.contains(UploadUpTypeResumableV1)) {
-            type = ApiType.ActionTypeUploadByResumeV1;
-        } else if (upType.contains(UploadUpTypeResumableV2)) {
-            type = ApiType.ActionTypeUploadByResumeV2;
-        }
-        return type;
-    }
-
     private boolean setupRegions() {
         if (config == null || config.zone == null) {
             return false;
         }
-        ZonesInfo zonesInfo = config.zone.getZonesInfo(token, actionType());
+        ZonesInfo zonesInfo = config.zone.getZonesInfo(token);
         if (zonesInfo == null || zonesInfo.zonesInfo == null || zonesInfo.zonesInfo.size() == 0) {
             return false;
         }