Skip to content

Commit 5331fcc

Browse files
author
YangSen-qn
committed
Merge branches 'master' and 'master' of YangSen-qn:qiniu/java-sdk
2 parents a5b7adb + 7729932 commit 5331fcc

16 files changed

+31
-26
lines changed

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.qiniu.util.StringUtils;
1111
import okhttp3.MediaType;
1212
import okhttp3.MultipartBody;
13-
import okhttp3.Request;
1413
import okhttp3.RequestBody;
1514
import okio.BufferedSink;
1615

@@ -117,10 +116,7 @@ protected com.qiniu.http.Response innerRequest(Request request) throws QiniuExce
117116
MethodType method = request.getMethod();
118117
String url = request.getUrl().toString();
119118
StringMap header = request.getHeader();
120-
RequestBody body = null;
121-
if (method.hasContent()) {
122-
body = request.getRequestBody();
123-
}
119+
RequestBody body = method.hasContent() ? request.getRequestBody() : null;
124120
okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
125121
.url(url)
126122
.method(method.toString(), body);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Api.Response intercept(Api.Request request, Api.Handler handler) throws QiniuExc
3535
return handler.handle(request);
3636
}
3737

38-
final static class Builder {
38+
static final class Builder {
3939
private Auth auth;
4040

4141
Builder setAuth(Auth auth) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ApiQueryRegion extends Api {
2020
public ApiQueryRegion(Client client) {
2121
this(client, new Api.Config.Builder()
2222
.setHostRetryMax(DEFAULT_UC_BACKUP_HOSTS.length)
23-
.setHostProvider(HostProvider.ArrayProvider(DEFAULT_UC_BACKUP_HOSTS))
23+
.setHostProvider(HostProvider.arrayProvider(DEFAULT_UC_BACKUP_HOSTS))
2424
.build());
2525
}
2626

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private UCRet queryRegionInfoFromServerIfNeeded(RegionIndex index) throws QiniuE
8888
.setRetryInterval(retryInterval)
8989
.setHostFreezeDuration(hostFreezeDuration)
9090
.setHostRetryMax(ucHosts.length)
91-
.setHostProvider(HostProvider.ArrayProvider(ucHosts))
91+
.setHostProvider(HostProvider.arrayProvider(ucHosts))
9292
.build());
9393
Response r = api.requestWithInterceptor(new Api.Request(address));
9494
ret = r.jsonToObject(UCRet.class);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ private Api.Interceptor[] ucInterceptors() throws QiniuException {
12051205
Api.Interceptor hostRetryInterceptor = new ApiInterceptorRetryHosts.Builder()
12061206
.setRetryMax(config.retryMax)
12071207
.setRetryInterval(Retry.staticInterval(config.retryInterval))
1208-
.setHostProvider(HostProvider.ArrayProvider(ucHosts))
1208+
.setHostProvider(HostProvider.arrayProvider(ucHosts))
12091209
.setHostFreezeDuration(config.hostFreezeDuration)
12101210
.build();
12111211
return new Api.Interceptor[]{authInterceptor, hostRetryInterceptor};

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

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.qiniu.util.UrlUtils;
88

99
import java.util.*;
10-
import java.util.function.Function;
1110

1211
class ConfigHelper {
1312
private Configuration config;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public final class Configuration implements Cloneable {
1919
*/
2020
public static String defaultRsHost = "rs.qiniu.com";
2121
public static String defaultApiHost = "api.qiniu.com";
22-
public static String defaultUcHost = "uc.qbox.me";
22+
public static String defaultUcHost = "kodo-config.qiniuapi.com";
2323

24-
static final String ucBackUpHost0 = "kodo-config.qiniuapi.com";
24+
static final String ucBackUpHost0 = "uc.qbox.me";
2525
static final String[] defaultUcHosts = new String[]{defaultUcHost, ucBackUpHost0, defaultApiHost};
2626

2727
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Response uploadFlows() throws QiniuException {
7878
.setHostRetryMax(config.retryMax)
7979
.setRetryInterval(Retry.staticInterval(config.retryInterval))
8080
.setHostFreezeDuration(config.hostFreezeDuration)
81-
.setHostProvider(HostProvider.ArrayProvider(this.configHelper.upHostsWithoutScheme().toArray(new String[0])))
81+
.setHostProvider(HostProvider.arrayProvider(this.configHelper.upHostsWithoutScheme().toArray(new String[0])))
8282
.build());
8383
Api.Request request = new Api.Request(urlPrefix);
8484
request.setMethod(MethodType.POST);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
public abstract class HostProvider {
1010

11-
public static HostProvider ArrayProvider(String... hosts) {
11+
public static HostProvider arrayProvider(String... hosts) {
1212
if (hosts == null || hosts.length == 0) {
1313
return null;
1414
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ abstract class ResumeUploadPerformer {
3636
.setHostRetryMax(ipHosts.size())
3737
.setRetryInterval(Retry.staticInterval(config.retryInterval))
3838
.setHostFreezeDuration(config.hostFreezeDuration)
39-
.setHostProvider(HostProvider.ArrayProvider(ipHosts.toArray(new String[0])))
39+
.setHostProvider(HostProvider.arrayProvider(ipHosts.toArray(new String[0])))
4040
.build();
4141
}
4242

‎src/main/java/com/qiniu/util/DefaultHeader.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.qiniu.util;
22

33
import com.qiniu.http.Client;
4-
import com.qiniu.http.Headers;
54

65
import java.text.DateFormat;
76
import java.text.SimpleDateFormat;
@@ -11,6 +10,9 @@
1110
public final class DefaultHeader {
1211
public static final String DISABLE_TIMESTAMP_SIGNATURE_ENV_KEY = "DISABLE_QINIU_TIMESTAMP_SIGNATURE";
1312

13+
private DefaultHeader() {
14+
}
15+
1416
public static void setDefaultHeader(HeadAdder adder) {
1517
if (adder == null) {
1618
return;

‎src/main/java/com/qiniu/util/Timestamp.java

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package com.qiniu.util;
22

33
public final class Timestamp {
4+
5+
private Timestamp() {
6+
}
7+
48
public static long second() {
59
return System.currentTimeMillis() / 1000;
610
}

‎src/test/java/com/qiniu/storage/ApiQueryRegionTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.qiniu.common.QiniuException;
44
import com.qiniu.http.Client;
5-
import com.qiniu.storage.*;
65
import com.qiniu.util.Timestamp;
76
import org.junit.jupiter.api.Tag;
87
import org.junit.jupiter.api.Test;
@@ -78,7 +77,7 @@ public void testQueryWithRetry() {
7877
.setHostRetryMax(retryMax)
7978
.setRetryInterval(1000)
8079
.setSingleHostRetryMax(retryMax)
81-
.setHostProvider(HostProvider.ArrayProvider("mock.uc.com", Configuration.defaultUcHost))
80+
.setHostProvider(HostProvider.arrayProvider("mock.uc.com", Configuration.defaultUcHost))
8281
.build());
8382
ApiQueryRegion.Request request = new ApiQueryRegion.Request("https://mock.uc.com", accessKey, bucket);
8483

@@ -89,7 +88,7 @@ public void testQueryWithRetry() {
8988
System.out.println("query region data:" + response.getDataMap());
9089
long en = Timestamp.second();
9190

92-
assertTrue(en - st >= retryMax * 2, "retry interval or retry max error");
91+
assertTrue(en - st >= retryMax + 1, "retry interval or retry max error");
9392

9493
assertTrue(response.isOK(), response.getResponse() + "");
9594

‎src/test/java/test/com/qiniu/storage/ApiUploadV1Test.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void testUpload(boolean isUploadBytes) {
8989
try {
9090
Field hostsFiled = Region.class.getDeclaredField("srcUpHosts");
9191
hostsFiled.setAccessible(true);
92-
hosts = new ArrayList<String>((List<String>)hostsFiled.get(region));
92+
hosts = new ArrayList<>((List<String>) hostsFiled.get(region));
9393
} catch (Exception e) {
9494
e.printStackTrace();
9595
fail(e);
@@ -104,7 +104,7 @@ public void testUpload(boolean isUploadBytes) {
104104
.setResponseDebugLevel(Api.Config.DebugLevelNormal)
105105
.setResponseDebugLevel(1)
106106
.setHostRetryMax(hosts.size())
107-
.setHostProvider(HostProvider.ArrayProvider(hosts.toArray(new String[0])))
107+
.setHostProvider(HostProvider.arrayProvider(hosts.toArray(new String[0])))
108108
.build();
109109
if (!isUploadBytes) {
110110
// 非 bytes 不支持重试

‎src/test/java/test/com/qiniu/storage/ApiUploadV2Test.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ private void testUpload(boolean isUploadBytes, boolean isSetContentLength) {
9494
try {
9595
Field hostsFiled = Region.class.getDeclaredField("srcUpHosts");
9696
hostsFiled.setAccessible(true);
97-
hosts = new ArrayList<String>((List<String>)hostsFiled.get(region));
97+
List<String> srcHosts = (List<String>) hostsFiled.get(region);
98+
hosts = new ArrayList<>(srcHosts);
9899
} catch (Exception e) {
99100
e.printStackTrace();
100101
fail(e);
@@ -108,7 +109,7 @@ private void testUpload(boolean isUploadBytes, boolean isSetContentLength) {
108109
.setRequestDebugLevel(Api.Config.DebugLevelNormal)
109110
.setResponseDebugLevel(Api.Config.DebugLevelNormal)
110111
.setHostRetryMax(hosts.size())
111-
.setHostProvider(HostProvider.ArrayProvider(hosts.toArray(new String[0])))
112+
.setHostProvider(HostProvider.arrayProvider(hosts.toArray(new String[0])))
112113
.build();
113114
if (!isUploadBytes) {
114115
// 非 bytes 不支持重试
@@ -193,7 +194,7 @@ private void testUpload(boolean isUploadBytes, boolean isSetContentLength) {
193194
ApiUploadV2ListParts listPartsApi = new ApiUploadV2ListParts(client, apiConfig);
194195
ApiUploadV2ListParts.Request listPartsRequest = new ApiUploadV2ListParts.Request(urlPrefix, token,
195196
uploadId).setKey(key).setMaxParts(2) // 此处仅为示例分页拉去，实际可不配置使用默认值1000
196-
.setPartNumberMarker(partNumberMarker);
197+
.setPartNumberMarker(partNumberMarker);
197198
try {
198199
ApiUploadV2ListParts.Response listPartsResponse = listPartsApi.request(listPartsRequest);
199200
partNumberMarker = listPartsResponse.getPartNumberMarker();

‎src/test/java/test/com/qiniu/storage/BucketTest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.qiniu.storage.Configuration;
99
import com.qiniu.storage.model.*;
1010
import com.qiniu.util.Json;
11-
import com.qiniu.util.StringMap;
1211
import com.qiniu.util.StringUtils;
1312
import okhttp3.Call;
1413
import okhttp3.OkHttpClient;
@@ -75,8 +74,13 @@ public void testCreateBuckets() throws Exception {
7574
testFileWithHandler(new TestFileHandler() {
7675
@Override
7776
public void testFile(TestConfig.TestFile file, BucketManager bucketManager) throws IOException {
77+
String bucket = "java-sdk-test-create-bucket";
78+
try {
79+
bucketManager.deleteBucket(bucket);
80+
} catch (QiniuException e) {
81+
}
82+
7883
try {
79-
String bucket = "java-sdk-test-create-bucket";
8084
Response response = bucketManager.createBucket(bucket, file.getRegionId());
8185
assertTrue(response.isOK());
8286

0 commit comments

Comments
 (0)