Merge branch 'master' into FUSION-17975

Author: bachue

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

@@ -294,7 +294,7 @@ private void setupDeadline() {
             deadline = System.currentTimeMillis() / 1000 + ttl;
         }
     }
-
+    // CHECKSTYLE:OFF
     private class ServerRets {
         long ttl;
 
@@ -305,6 +305,7 @@ private class ServerRets {
         ServerRet uc;
         ServerRet api;
         ServerRet io;
+        @SuppressWarnings({"MemberName"})
         ServerRet io_src;
 
         Region createRegion() {
@@ -356,7 +357,7 @@ Region createRegion() {
                     ioSrcHost, rsHost, rsfHost, apiHost, ucHost);
         }
     }
-
+    // CHECKSTYLE:ON
     private class ServerRet {
         HostInfoRet src;
         HostInfoRet acc;

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

@@ -146,7 +146,7 @@ public Configuration clone() {
         try {
             Configuration configuration = (Configuration) super.clone();
             if (region != null) {
-                configuration.region = (Region)region.clone();
+                configuration.region = (Region) region.clone();
             }
             return configuration;
         } catch (CloneNotSupportedException e) {

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

@@ -574,7 +574,7 @@ public void testDefaultIoSrcDomainDownload() {
         String url = "";
         try {
             url = new DownloadUrl(domain, false, key).buildURL();
-            url = TestConfig.testAuth.privateDownloadUrl(url, 3600);
+            url = TestConfig.testAuth.privateDownloadUrl(url, 180);
         } catch (QiniuException e) {
             fail(e);
         }