upload hosts support null

Author: YangSen-qn

src/main/java/com/qiniu/storage/Region.java

@@ -506,6 +506,13 @@ public Region autoRegion(int retryMax, int retryInterval, int hostFreezeDuration
          * @return 区域信息
          */
         public Region build() {
+            if (region.srcUpHosts == null) {
+                region.srcUpHosts = new ArrayList<>();
+            }
+            if (region.accUpHosts == null) {
+                region.accUpHosts = new ArrayList<>();
+            }
+
             return region;
         }
     }

src/main/java/com/qiniu/storage/UpHostHelper.java

@@ -1,6 +1,7 @@
 package com.qiniu.storage;
 
 import com.qiniu.common.QiniuException;
+import com.qiniu.util.StringUtils;
 
 import java.util.*;
 
@@ -32,11 +33,15 @@ String upHost(Region region, String upToken, String lastUsedHost, boolean change
         try {
             accHosts = region.getAccUpHost(regionReqInfo);
             srcHosts = region.getSrcUpHost(regionReqInfo);
-        } catch (QiniuException e) { // it will success soon.
+        } catch (Exception e) { // it will success soon.
             if (mustReturnUpHost && conf.useDefaultUpHostIfNone) {
                 return failedUpHost("failed_get_region");
             } else {
-                throw e;
+                if (e instanceof QiniuException) {
+                    throw e;
+                } else {
+                    throw QiniuException.unrecoverable(e);
+                }
             }
         }
 
@@ -50,7 +55,7 @@ String upHost(Region region, String upToken, String lastUsedHost, boolean change
         return regionHost.upHost(accHosts, srcHosts, lastUsedHost, changeHost);
     }
 
-    private String failedUpHost(String regionKey) {
+    private String failedUpHost(String regionKey) throws QiniuException {
         List<String> srcHosts;
         List<String> accHosts;
 
@@ -75,42 +80,44 @@ private String failedUpHost(String regionKey) {
             srcHosts = regionHost.lastSrcHosts;
             accHosts = regionHost.lastAccHosts;
         }
-        String host = regionHost.upHost(accHosts, srcHosts, null, false);
-        return host;
+        return regionHost.upHost(accHosts, srcHosts, null, false);
     }
 
 
     String getRegionKey(List<String> srcHosts, List<String> accHosts) {
         String host = null;
         String lhost = null;
-        for (String a : srcHosts) {
-            if (host == null) {
-                host = a;
-                lhost = a;
-            }
-            if (a.length() < host.length()) {
-                host = a;
-            }
-            if (a.length() > lhost.length()) {
-                lhost = a;
+
+        if (srcHosts != null) {
+            for (String a : srcHosts) {
+                if (host == null) {
+                    host = a;
+                    lhost = a;
+                }
+                if (a.length() < host.length()) {
+                    host = a;
+                }
+                if (a.length() > lhost.length()) {
+                    lhost = a;
+                }
             }
         }
-        if (host != null) {
-            return host + ";+=-_" + lhost;
-        }
 
-        for (String a : accHosts) {
-            if (host == null) {
-                host = a;
-                lhost = a;
-            }
-            if (a.length() < host.length()) {
-                host = a;
-            }
-            if (a.length() > lhost.length()) {
-                lhost = a;
+        if (host == null && accHosts != null) {
+            for (String a : accHosts) {
+                if (host == null) {
+                    host = a;
+                    lhost = a;
+                }
+                if (a.length() < host.length()) {
+                    host = a;
+                }
+                if (a.length() > lhost.length()) {
+                    lhost = a;
+                }
             }
         }
+
         return host + ";+=-_" + lhost;
     }
 
@@ -126,6 +133,14 @@ class RegionUpHost {
         volatile String lastHost;
 
         private void initHostMark(List<String> f, List<String> s) {
+            if (f == null) {
+                f = new ArrayList<>();
+            }
+
+            if (s == null) {
+                s = new ArrayList<>();
+            }
+
             ArrayList<String> _lastHosts = new ArrayList<>();
             int _mainHostCount = 0;
 
@@ -181,7 +196,12 @@ private void randomAdd(ArrayList<String> _lastHosts, ArrayList<Integer> iidx, Ra
             }
         }
 
-        String upHost(List<String> accHosts, List<String> srcHosts, String lastUsedHost, boolean changeHost) {
+        String upHost(List<String> accHosts, List<String> srcHosts, String lastUsedHost, boolean changeHost) throws QiniuException {
+            if ((accHosts == null || accHosts.isEmpty()) &&
+                    (srcHosts == null || srcHosts.isEmpty())) {
+                throw QiniuException.unrecoverable("no up host found");
+            }
+
             if (lastAccHosts != accHosts || lastSrcHosts != srcHosts) {
                 lastAccHosts = accHosts;
                 lastSrcHosts = srcHosts;

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

@@ -5,6 +5,7 @@
 import com.qiniu.processing.OperationManager;
 import com.qiniu.processing.OperationStatus;
 import com.qiniu.storage.Configuration;
+import com.qiniu.storage.Region;
 import com.qiniu.storage.UpCompletionHandler;
 import com.qiniu.storage.UploadManager;
 import com.qiniu.util.StringMap;
@@ -93,6 +94,54 @@ public void testSimple() {
         }
     }
 
+    @Test
+    @Tag("IntegrationTest")
+    public void testEmptyUploadHosts() {
+        Region region = new Region.Builder()
+                .build();
+        Configuration config = new Configuration(region);
+        UploadManager uploadManager = new UploadManager(config);
+        try {
+            String key = "empty_upload_hosts";
+            String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_na0, key);
+            Response response = uploadManager.put("".getBytes(), key, token, null, "", true);
+        } catch (QiniuException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            fail(e);
+        }
+
+        region = new Region.Builder()
+                .srcUpHost("aaa")
+                .build();
+        config = new Configuration(region);
+        uploadManager = new UploadManager(config);
+        try {
+            String key = "empty_upload_hosts";
+            String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_na0, key);
+            Response response = uploadManager.put("".getBytes(), key, token, null, "", true);
+        } catch (QiniuException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            fail(e);
+        }
+
+        region = new Region.Builder()
+                .accUpHost("aaa")
+                .build();
+        config = new Configuration(region);
+        uploadManager = new UploadManager(config);
+        try {
+            String key = "empty_upload_hosts";
+            String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_na0, key);
+            Response response = uploadManager.put("".getBytes(), key, token, null, "", true);
+        } catch (QiniuException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            fail(e);
+        }
+    }
+
     @Test
     @Tag("IntegrationTest")
     public void testSyncRetry() {