Skip to content

Commit 91b6527

Browse files
author
robert
committed
Update to 3.22.3
1 parent 0717dc1 commit 91b6527

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+793
-319
lines changed

‎README-Android.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.22.3
2+
Third-party dependence:
3+
1. Replace log4j2 2.17.0 with log4j2 2.17.1
4+
2. Replace okhttp 4.9.1 with okhttp 4.9.3
5+
3. Replace okio 2.7.0 with okio 2.10.0
6+
4. Replace jackson-core 2.12.5 with jackson-core 2.13.0
7+
5. Replace jackson-databind 2.12.5 with jackson-databind 2.13.0
8+
6. Replace jackson-annotations 2.12.5 with jackson-annotations 2.13.0
9+
-----------------------------------------------------------------------------------
10+
111
Version 3.21.12
212
Third-party dependence:
313
1. Replace log4j2 2.16.0 with log4j2 2.17.0

‎README-Java.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.22.3
2+
Third-party dependence:
3+
1. Replace log4j2 2.17.0 with log4j2 2.17.1
4+
2. Replace okhttp 4.9.1 with okhttp 4.9.3
5+
3. Replace okio 2.7.0 with okio 2.10.0
6+
4. Replace jackson-core 2.12.5 with jackson-core 2.13.0
7+
5. Replace jackson-databind 2.12.5 with jackson-databind 2.13.0
8+
6. Replace jackson-annotations 2.12.5 with jackson-annotations 2.13.0
9+
-----------------------------------------------------------------------------------
10+
111
Version 3.21.12
212
Third-party dependence:
313
1. Replace log4j2 2.16.0 with log4j2 2.17.0

‎README.MD‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.22.3
2+
Third-party dependence:
3+
1. Replace log4j2 2.17.0 with log4j2 2.17.1
4+
2. Replace okhttp 4.9.1 with okhttp 4.9.3
5+
3. Replace okio 2.7.0 with okio 2.10.0
6+
4. Replace jackson-core 2.12.5 with jackson-core 2.13.0
7+
5. Replace jackson-databind 2.12.5 with jackson-databind 2.13.0
8+
6. Replace jackson-annotations 2.12.5 with jackson-annotations 2.13.0
9+
-----------------------------------------------------------------------------------
10+
111
Version 3.21.12
212
Third-party dependence:
313
1. Replace log4j2 2.16.0 with log4j2 2.17.0

‎README_CN.MD‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 3.22.3
2+
Third-party dependence:
3+
1. 使用 log4j2 2.17.1 替代 log4j2 2.17.0
4+
2. 使用 okhttp 4.9.3 替代 okhttp 4.9.1
5+
3. 使用 okio 2.10.0 替代 okio 2.7.0
6+
4. 使用 jackson-core 2.13.0 替代 jackson-core 2.12.5
7+
5. 使用 jackson-databind 2.13.0 替代 jackson-databind 2.12.5
8+
6. 使用 jackson-annotations 2.13.0 替代 jackson-annotations 2.12.5
9+
-----------------------------------------------------------------------------------
10+
111
Version 3.21.12
212
三方依赖:
313
1. 使用 log4j2 2.17.0 替代 log4j2 2.16.0

‎app/src/main/java/com/obs/services/AbstractBatchClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ private int restoreVersions(RestoreObjectsRequest request, DefaultTaskProgressSt
185185
}
186186

187187
private void checkRestoreObjectsRequest(RestoreObjectsRequest request) {
188-
ServiceUtils.asserParameterNotNull(request, "RestoreObjectsRequest is null");
188+
ServiceUtils.assertParameterNotNull(request, "RestoreObjectsRequest is null");
189189
if (!this.isCname()) {
190-
ServiceUtils.asserParameterNotNull(request.getBucketName(), "bucketName is null");
190+
ServiceUtils.assertParameterNotNull(request.getBucketName(), "bucketName is null");
191191
}
192192

193193
if (request.getKeyAndVersions() != null && request.getPrefix() != null) {
@@ -202,7 +202,7 @@ private void checkRestoreObjectsRequest(RestoreObjectsRequest request) {
202202

203203
@Override
204204
public UploadProgressStatus putObjects(final PutObjectsRequest request) throws ObsException {
205-
ServiceUtils.asserParameterNotNull(request, "PutObjectsRequest is null");
205+
ServiceUtils.assertParameterNotNull(request, "PutObjectsRequest is null");
206206

207207
ThreadPoolExecutor executor = this.initThreadPool(request);
208208
Date now = new Date();

‎app/src/main/java/com/obs/services/AbstractBucketAdvanceClient.java‎

Lines changed: 48 additions & 48 deletions
Large diffs are not rendered by default.

‎app/src/main/java/com/obs/services/AbstractBucketClient.java‎

Lines changed: 40 additions & 40 deletions
Large diffs are not rendered by default.

‎app/src/main/java/com/obs/services/AbstractClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public String createSignedUrl(HttpMethodEnum method, String bucketName, String o
173173

174174
@Deprecated
175175
public V4TemporarySignatureResponse createV4TemporarySignature(V4TemporarySignatureRequest request) {
176-
ServiceUtils.asserParameterNotNull(request, "V4TemporarySignatureRequest is null");
176+
ServiceUtils.assertParameterNotNull(request, "V4TemporarySignatureRequest is null");
177177
InterfaceLogBean reqBean = new InterfaceLogBean("createV4TemporarySignature", this.getEndpoint(), "");
178178
try {
179179
TemporarySignatureResponse response = this.createV4TemporarySignature((TemporarySignatureRequest) request);
@@ -207,7 +207,7 @@ public V4PostSignatureResponse createV4PostSignature(long expires, String bucket
207207

208208
@Deprecated
209209
public V4PostSignatureResponse createV4PostSignature(V4PostSignatureRequest request) throws ObsException {
210-
ServiceUtils.asserParameterNotNull(request, "V4PostSignatureRequest is null");
210+
ServiceUtils.assertParameterNotNull(request, "V4PostSignatureRequest is null");
211211
InterfaceLogBean reqBean = new InterfaceLogBean("createV4PostSignature", this.getEndpoint(), "");
212212
return (V4PostSignatureResponse)createPostSignature(request, reqBean, true);
213213
}
@@ -221,7 +221,7 @@ public V4PostSignatureResponse createV4PostSignature(V4PostSignatureRequest requ
221221
*/
222222
@Override
223223
public TemporarySignatureResponse createTemporarySignature(TemporarySignatureRequest request) {
224-
ServiceUtils.asserParameterNotNull(request, "TemporarySignatureRequest is null");
224+
ServiceUtils.assertParameterNotNull(request, "TemporarySignatureRequest is null");
225225
InterfaceLogBean reqBean = new InterfaceLogBean("createTemporarySignature", this.getEndpoint(), "");
226226
try {
227227
return this.getProviderCredentials().getLocalAuthType(request.getBucketName()) == AuthTypeEnum.V4
@@ -358,7 +358,7 @@ public PostSignatureResponse createPostSignature(long expires, String bucketName
358358
*/
359359
@Override
360360
public PostSignatureResponse createPostSignature(PostSignatureRequest request) throws ObsException {
361-
ServiceUtils.asserParameterNotNull(request, "PostSignatureRequest is null");
361+
ServiceUtils.assertParameterNotNull(request, "PostSignatureRequest is null");
362362
InterfaceLogBean reqBean = new InterfaceLogBean("createPostSignature", this.getEndpoint(), "");
363363
return createPostSignature(request, reqBean, this.getProviderCredentials()
364364
.getLocalAuthType(request.getBucketName()) == AuthTypeEnum.V4);
@@ -381,7 +381,7 @@ void authTypeNegotiate(String bucketName) throws ServiceException {
381381
protected <T> T doActionWithResult(String action, String bucketName, ActionCallbackWithResult<T> callback)
382382
throws ObsException {
383383
if (!this.isCname()) {
384-
ServiceUtils.asserParameterNotNull(bucketName, "bucketName is null");
384+
ServiceUtils.assertParameterNotNull(bucketName, "bucketName is null");
385385
}
386386
InterfaceLogBean reqBean = new InterfaceLogBean(action, this.getEndpoint(), "");
387387
try {

‎app/src/main/java/com/obs/services/AbstractDeprecatedBucketClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public abstract class AbstractDeprecatedBucketClient extends AbstractClient {
4646

4747
@Deprecated
4848
public ObsBucket createBucket(final S3Bucket bucket) throws ObsException {
49-
ServiceUtils.asserParameterNotNull(bucket, "bucket is null");
49+
ServiceUtils.assertParameterNotNull(bucket, "bucket is null");
5050
ObsBucket obsBucket = new ObsBucket();
5151
obsBucket.setBucketName(bucket.getBucketName());
5252
obsBucket.setLocation(bucket.getLocation());
@@ -89,7 +89,7 @@ public HeaderResponse setBucketAcl(final String bucketName, final String cannedA
8989

9090
@Deprecated
9191
public HeaderResponse setBucketCors(final String bucketName, final S3BucketCors s3BucketCors) throws ObsException {
92-
ServiceUtils.asserParameterNotNull(s3BucketCors,
92+
ServiceUtils.assertParameterNotNull(s3BucketCors,
9393
"The bucket '" + bucketName + "' does not include Cors information");
9494
BucketCors bucketCors = new BucketCors();
9595
bucketCors.setRules(s3BucketCors.getRules());
@@ -115,7 +115,7 @@ public OptionsInfoResult optionsBucket(final String bucketName, final OptionsInf
115115

116116
@Override
117117
public OptionsInfoResult action() throws ServiceException {
118-
ServiceUtils.asserParameterNotNull(optionInfo, "OptionsInfoRequest is null");
118+
ServiceUtils.assertParameterNotNull(optionInfo, "OptionsInfoRequest is null");
119119
return AbstractDeprecatedBucketClient.this.optionsImpl(bucketName, null, optionInfo);
120120
}
121121
});

‎app/src/main/java/com/obs/services/AbstractFileClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ public DownloadFileResult downloadFile(DownloadFileRequest downloadFileRequest)
8888
*/
8989
@Override
9090
public TaskProgressStatus dropFolder(DropFolderRequest request) throws ObsException {
91-
ServiceUtils.asserParameterNotNull(request, "DropFolderRequest is null");
91+
ServiceUtils.assertParameterNotNull(request, "DropFolderRequest is null");
9292
if (!this.isCname()) {
93-
ServiceUtils.asserParameterNotNull(request.getBucketName(), "bucketName is null");
93+
ServiceUtils.assertParameterNotNull(request.getBucketName(), "bucketName is null");
9494
}
9595
ThreadPoolExecutor executor = this.initThreadPool(request);
9696
DefaultTaskProgressStatus progressStatus = new DefaultTaskProgressStatus();

0 commit comments

Comments
 (0)