Skip to content

Commit 4bcb7b2

Browse files
huiguangjunhuiguangjun
committed
update test case.
1 parent bb9e34a commit 4bcb7b2

19 files changed

+289
-166
lines changed

‎src/main/java/com/aliyun/oss/OSSClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ public void setBucketRequestPayment(SetBucketRequestPaymentRequest setBucketRequ
14351435
public GetBucketRequestPaymentResult getBucketRequestPayment(String bucketName) throws OSSException, ClientException{
14361436
return this.bucketOperation.getBucketRequestPayment(new GenericRequest(bucketName));
14371437
}
1438-
1438+
14391439
@Override
14401440
public GetBucketRequestPaymentResult getBucketRequestPayment(GenericRequest genericRequest) throws OSSException, ClientException{
14411441
return this.bucketOperation.getBucketRequestPayment(genericRequest);

‎src/main/java/com/aliyun/oss/internal/OSSDownloadOperation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ public int hashCode() {
180180
public static ObjectStat getFileStat(OSSObjectOperation objectOperation, DownloadFileRequest downloadFileRequest) {
181181
String bucketName = downloadFileRequest.getBucketName();
182182
String key = downloadFileRequest.getKey();
183-
183+
184184
GenericRequest genericRequest = new GenericRequest(bucketName, key);
185-
185+
186186
Payer payer = downloadFileRequest.getRequestPayer();
187187
if (payer != null) {
188188
genericRequest.setRequestPayer(payer);

‎src/main/java/com/aliyun/oss/internal/OSSHeaders.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public interface OSSHeaders extends HttpHeaders {
7676
static final String OSS_HEADER_CALLBACK = "x-oss-callback";
7777
static final String OSS_HEADER_CALLBACK_VAR = "x-oss-callback-var";
7878
static final String OSS_HEADER_SYMLINK_TARGET = "x-oss-symlink-target";
79-
static final String OSS_HEADER_TRAFFIC_LIMIT = "x-oss-traffic-limit";
8079

8180
static final String OSS_STORAGE_CLASS = "x-oss-storage-class";
8281
static final String OSS_RESTORE = "x-oss-restore";
@@ -95,4 +94,6 @@ public interface OSSHeaders extends HttpHeaders {
9594

9695
static final String OSS_REQUEST_PAYER = "x-oss-request-payer";
9796

97+
static final String OSS_HEADER_TRAFFIC_LIMIT = "x-oss-traffic-limit";
98+
9899
}

‎src/main/java/com/aliyun/oss/internal/OSSMultipartOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public CompleteMultipartUploadResult completeMultipartUpload(
152152
Map<String, String> headers = new HashMap<String, String>();
153153
populateCompleteMultipartUploadOptionalHeaders(completeMultipartUploadRequest, headers);
154154
populateRequestCallback(headers, completeMultipartUploadRequest.getCallback());
155-
155+
156156
populateRequestPayerHeader(headers, completeMultipartUploadRequest.getRequestPayer());
157157

158158
Map<String, String> parameters = new HashMap<String, String>();
@@ -212,7 +212,7 @@ public InitiateMultipartUploadResult initiateMultipartUpload(
212212
if (initiateMultipartUploadRequest.getObjectMetadata() != null) {
213213
populateRequestMetadata(headers, initiateMultipartUploadRequest.getObjectMetadata());
214214
}
215-
215+
216216
populateRequestPayerHeader(headers, initiateMultipartUploadRequest.getRequestPayer());
217217

218218
// Be careful that we don't send the object's total size as the content
@@ -327,7 +327,7 @@ public UploadPartResult uploadPart(UploadPartRequest uploadPartRequest) throws O
327327

328328
Map<String, String> headers = new HashMap<String, String>();
329329
populateUploadPartOptionalHeaders(uploadPartRequest, headers);
330-
330+
331331
populateRequestPayerHeader(headers, uploadPartRequest.getRequestPayer());
332332
populateTrafficLimitHeader(headers, uploadPartRequest.getTrafficLimit());
333333

‎src/main/java/com/aliyun/oss/internal/OSSObjectOperation.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public OSSObject selectObject(SelectObjectRequest selectObjectRequest) throws OS
266266
ensureObjectKeyValid(key);
267267
Map<String, String> headers = new HashMap<String, String>();
268268
populateGetObjectRequestHeaders(selectObjectRequest, headers);
269-
269+
270270
populateRequestPayerHeader(headers, selectObjectRequest.getRequestPayer());
271271

272272
Map<String, String> params = new HashMap<String, String>();
@@ -900,7 +900,7 @@ public void createSymlink(CreateSymlinkRequest createSymlinkRequest) throws OSSE
900900

901901
Map<String, String> headers = new HashMap<String, String>();
902902
populateRequestMetadata(headers, metadata);
903-
903+
904904
populateRequestPayerHeader(headers, createSymlinkRequest.getRequestPayer());
905905

906906
Map<String, String> params = new HashMap<String, String>();
@@ -959,15 +959,14 @@ public boolean doesObjectExist(GenericRequest genericRequest) throws OSSExceptio
959959
public boolean doesObjectExistWithRedirect(GenericRequest genericRequest) throws OSSException, ClientException {
960960
OSSObject ossObject = null;
961961
try {
962-
String bucketName = genericRequest.getBucketName();
963-
String key = genericRequest.getKey();
964-
Payer payer = genericRequest.getRequestPayer();
962+
String bucketName = genericRequest.getBucketName();
963+
String key = genericRequest.getKey();
964+
Payer payer = genericRequest.getRequestPayer();
965965

966966
GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, key);
967-
968-
if (payer != null)
967+
if (payer != null) {
969968
getObjectRequest.setRequestPayer(payer);
970-
969+
}
971970
ossObject = this.getObject(getObjectRequest);
972971
return true;
973972
} catch (OSSException e) {

‎src/main/java/com/aliyun/oss/internal/OSSUploadOperation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,12 +413,12 @@ private void prepare(UploadCheckPoint uploadCheckPoint, UploadFileRequest upload
413413

414414
InitiateMultipartUploadRequest initiateUploadRequest = new InitiateMultipartUploadRequest(
415415
uploadFileRequest.getBucketName(), uploadFileRequest.getKey(), metadata);
416-
416+
417417
Payer payer = uploadFileRequest.getRequestPayer();
418418
if (payer != null) {
419419
initiateUploadRequest.setRequestPayer(payer);
420420
}
421-
421+
422422
InitiateMultipartUploadResult initiateUploadResult = multipartOperation
423423
.initiateMultipartUpload(initiateUploadRequest);
424424
uploadCheckPoint.uploadID = initiateUploadResult.getUploadId();

‎src/main/java/com/aliyun/oss/internal/RequestParameters.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public final class RequestParameters {
117117
public static final String OSS_ACCESS_KEY_ID_PARAM = "x-oss-access-key-id";
118118
public static final String OSS_ADDITIONAL_HEADERS = "x-oss-additional-headers";
119119
public static final String OSS_SIGNATURE = "x-oss-signature";
120+
120121
public static final String OSS_TRAFFIC_LIMIT = "x-oss-traffic-limit";
121122

122123
}

‎src/main/java/com/aliyun/oss/model/GetBucketRequestPaymentResult.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@
2020
package com.aliyun.oss.model;
2121

2222
public class GetBucketRequestPaymentResult extends GenericResult{
23-
23+
2424
private Payer payer;
2525

2626
public Payer getPayer() {
2727
return payer;
2828
}
29-
29+
3030
public void setPayer(Payer payer) {
3131
this.payer = payer;
3232
}
33-
3433
}

‎src/main/java/com/aliyun/oss/model/UploadPartCopyRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public String getMd5Digest() {
208208

209209
/**
210210
* Sets the part data's MD5 value.
211-
*
211+
*
212212
* @param md5Digest
213213
* The part data's MD5 value.
214214
*/
@@ -232,7 +232,7 @@ public void setSourceKey(String sourceKey) {
232232
this.sourceKey = sourceKey;
233233
}
234234

235-
/**
235+
/**
236236
* * <p>
237237
* Sets the one who pays for the request
238238
* The Third party should set request payer when requesting resources.

‎src/samples/SetRequestPaymentSample.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ public class SetRequestPaymentSample {
3838

3939

4040
public static void main(String[] args) throws Throwable {
41-
// Create oss client
42-
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
43-
try {
44-
/*
41+
// Create oss client
42+
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
43+
try {
44+
/*
4545
* Default payer is "BucketOwner"
46-
*/
46+
*/
4747

4848
Payer payer = Payer.Requester;
4949

0 commit comments

Comments
 (0)