Uc query hosts order (#586)

Author: YangSen-qn

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

@@ -10,7 +10,6 @@
 import com.qiniu.util.StringUtils;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
-import okhttp3.Request;
 import okhttp3.RequestBody;
 import okio.BufferedSink;
 
@@ -117,10 +116,7 @@ protected com.qiniu.http.Response innerRequest(Request request) throws QiniuExce
         MethodType method = request.getMethod();
         String url = request.getUrl().toString();
         StringMap header = request.getHeader();
-        RequestBody body = null; 
-        if (method.hasContent()) {
-            body = request.getRequestBody();
-        }
+        RequestBody body = method.hasContent() ? request.getRequestBody() : null;
         okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
                 .url(url)
                 .method(method.toString(), body);

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

@@ -35,7 +35,7 @@ Api.Response intercept(Api.Request request, Api.Handler handler) throws QiniuExc
         return handler.handle(request);
     }
 
-    final static class Builder {
+    static final class Builder {
         private Auth auth;
 
         Builder setAuth(Auth auth) {

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

@@ -20,7 +20,7 @@ public class ApiQueryRegion extends Api {
     public ApiQueryRegion(Client client) {
         this(client, new Api.Config.Builder()
                 .setHostRetryMax(DEFAULT_UC_BACKUP_HOSTS.length)
-                .setHostProvider(HostProvider.ArrayProvider(DEFAULT_UC_BACKUP_HOSTS))
+                .setHostProvider(HostProvider.arrayProvider(DEFAULT_UC_BACKUP_HOSTS))
                 .build());
     }
 

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

@@ -88,7 +88,7 @@ private UCRet queryRegionInfoFromServerIfNeeded(RegionIndex index) throws QiniuE
                 .setRetryInterval(retryInterval)
                 .setHostFreezeDuration(hostFreezeDuration)
                 .setHostRetryMax(ucHosts.length)
-                .setHostProvider(HostProvider.ArrayProvider(ucHosts))
+                .setHostProvider(HostProvider.arrayProvider(ucHosts))
                 .build());
         Response r = api.requestWithInterceptor(new Api.Request(address));
         ret = r.jsonToObject(UCRet.class);

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

@@ -1205,7 +1205,7 @@ private Api.Interceptor[] ucInterceptors() throws QiniuException {
         Api.Interceptor hostRetryInterceptor = new ApiInterceptorRetryHosts.Builder()
                 .setRetryMax(config.retryMax)
                 .setRetryInterval(Retry.staticInterval(config.retryInterval))
-                .setHostProvider(HostProvider.ArrayProvider(ucHosts))
+                .setHostProvider(HostProvider.arrayProvider(ucHosts))
                 .setHostFreezeDuration(config.hostFreezeDuration)
                 .build();
         return new Api.Interceptor[]{authInterceptor, hostRetryInterceptor};

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

@@ -7,7 +7,6 @@
 import com.qiniu.util.UrlUtils;
 
 import java.util.*;
-import java.util.function.Function;
 
 class ConfigHelper {
     private Configuration config;

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

@@ -19,9 +19,9 @@ public final class Configuration implements Cloneable {
      */
     public static String defaultRsHost = "rs.qiniu.com";
     public static String defaultApiHost = "api.qiniu.com";
-    public static String defaultUcHost = "uc.qbox.me";
+    public static String defaultUcHost = "kodo-config.qiniuapi.com";
 
-    static final String ucBackUpHost0 = "kodo-config.qiniuapi.com";
+    static final String ucBackUpHost0 = "uc.qbox.me";
     static final String[] defaultUcHosts = new String[]{defaultUcHost, ucBackUpHost0, defaultApiHost};
 
     /**

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

@@ -78,7 +78,7 @@ Response uploadFlows() throws QiniuException {
                 .setHostRetryMax(config.retryMax)
                 .setRetryInterval(Retry.staticInterval(config.retryInterval))
                 .setHostFreezeDuration(config.hostFreezeDuration)
-                .setHostProvider(HostProvider.ArrayProvider(this.configHelper.upHostsWithoutScheme().toArray(new String[0])))
+                .setHostProvider(HostProvider.arrayProvider(this.configHelper.upHostsWithoutScheme().toArray(new String[0])))
                 .build());
         Api.Request request = new Api.Request(urlPrefix);
         request.setMethod(MethodType.POST);

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

@@ -8,7 +8,7 @@
 
 public abstract class HostProvider {
 
-    public static HostProvider ArrayProvider(String... hosts) {
+    public static HostProvider arrayProvider(String... hosts) {
         if (hosts == null || hosts.length == 0) {
             return null;
         }

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

@@ -36,7 +36,7 @@ abstract class ResumeUploadPerformer {
                 .setHostRetryMax(ipHosts.size())
                 .setRetryInterval(Retry.staticInterval(config.retryInterval))
                 .setHostFreezeDuration(config.hostFreezeDuration)
-                .setHostProvider(HostProvider.ArrayProvider(ipHosts.toArray(new String[0])))
+                .setHostProvider(HostProvider.arrayProvider(ipHosts.toArray(new String[0])))
                 .build();
     }