Skip to content

Commit 79f5e0c

Browse files
baiyubin2020baiyubin2020
committed
ci rtmp code
1 parent d487c82 commit 79f5e0c

File tree

9 files changed

+102
-32
lines changed

9 files changed

+102
-32
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@ public OSSObject getObject(URL signedUrl, Map<String, String> requestHeaders)
617617
return objectOperation.getObject(getObjectRequest);
618618
}
619619

620-
621620
@Override
622621
public SimplifiedObjectMeta getSimplifiedObjectMeta(String bucketName, String key)
623622
throws OSSException, ClientException {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
package com.aliyun.oss.internal;
2121

2222
import static com.aliyun.oss.internal.OSSUtils.safeCloseResponse;
23-
import static com.aliyun.oss.internal.OSSUtils.COMMON_RESOURCE_MANAGER;
24-
2523
import org.apache.http.HttpStatus;
2624

2725
import com.aliyun.oss.ClientException;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,10 @@ private static void populateListPartsRequestParameters(ListPartsRequest listPart
467467
}
468468
params.put(PART_NUMBER_MARKER, partNumberMarker.toString());
469469
}
470+
471+
if (listPartsRequest.getEncodingType() != null) {
472+
params.put(ENCODING_TYPE, listPartsRequest.getEncodingType());
473+
}
470474
}
471475

472476
private static void populateCopyPartRequestHeaders(UploadPartCopyRequest uploadPartCopyRequest,

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* 包含完成一个Multipart上传事件的返回结果。
2626
*
2727
*/
28-
public class CompleteMultipartUploadResult extends WebServiceRequest implements CallbackResult {
28+
public class CompleteMultipartUploadResult extends GenericResult implements CallbackResult {
2929

3030
/** The name of the bucket containing the completed multipart upload. */
3131
private String bucketName;
@@ -40,8 +40,6 @@ public class CompleteMultipartUploadResult extends WebServiceRequest implements
4040

4141
/** 回调返回的消息体 */
4242
private InputStream callbackResponseBody;
43-
44-
private String requestId;
4543

4644
/**
4745
* 返回标识Multipart上传的{@link OSSObject}的URL地址。
@@ -127,13 +125,5 @@ public InputStream getCallbackResponseBody() {
127125
public void setCallbackResponseBody(InputStream callbackResponseBody) {
128126
this.callbackResponseBody = callbackResponseBody;
129127
}
130-
131-
public String getRequestId() {
132-
return requestId;
133-
}
134-
135-
public void setRequestId(String requestId) {
136-
this.requestId = requestId;
137-
}
138128

139129
}

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
package com.aliyun.oss.model;
2121

2222

23-
public class InitiateMultipartUploadResult extends WebServiceRequest {
23+
public class InitiateMultipartUploadResult extends GenericResult {
2424

2525
private String bucketName;
2626

2727
private String key;
2828

2929
private String uploadId;
3030

31-
private String requestId;
32-
3331
public String getBucketName() {
3432
return bucketName;
3533
}
@@ -54,12 +52,4 @@ public void setUploadId(String uploadId) {
5452
this.uploadId = uploadId;
5553
}
5654

57-
public String getRequestId() {
58-
return requestId;
59-
}
60-
61-
public void setRequestId(String requestId) {
62-
this.requestId = requestId;
63-
}
64-
6555
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public class ListPartsRequest extends GenericRequest {
3030
private Integer maxParts;
3131

3232
private Integer partNumberMarker;
33+
34+
private String encodingType;
3335

3436
/**
3537
* 构造函数。
@@ -96,5 +98,25 @@ public Integer getPartNumberMarker() {
9698
public void setPartNumberMarker(Integer partNumberMarker) {
9799
this.partNumberMarker = partNumberMarker;
98100
}
101+
102+
/**
103+
* 获取应用于请求响应体中Object名称的编码方式。
104+
105+
* @return 请求响应体中Object名称的编码方式。
106+
*/
107+
public String getEncodingType() {
108+
return encodingType;
109+
}
99110

111+
/**
112+
* 设置应用于请求响应体中Object名称的编码方式。
113+
*
114+
* @param encodingType
115+
* 请求响应体中Object名称的编码方式。
116+
* 有效值: null (不进行编码处理) 或 "url".
117+
*/
118+
public void setEncodingType(String encodingType) {
119+
this.encodingType = encodingType;
120+
}
121+
100122
}

‎src/test/java/com/aliyun/oss/integrationtests/GetSimplifiedObjectMetaTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ public void testNormalGetSimplifiedObjectMeta() {
5454
Assert.assertEquals(inputStreamLength, o.getObjectMetadata().getContentLength());
5555
o.getObjectContent().close();
5656

57-
long start = System.currentTimeMillis();
5857
SimplifiedObjectMeta objectMeta = secondClient.getSimplifiedObjectMeta(bucketName, key);
59-
long end = System.currentTimeMillis();
60-
System.out.println("GetSimplifiedObjectMeta use time:" + (end - start));
61-
Assert.assertTrue((end - start) < 10000);
6258
Assert.assertEquals(inputStreamLength, objectMeta.getSize());
6359
Assert.assertEquals(putObjectResult.getETag(), objectMeta.getETag());
6460
Assert.assertNotNull(objectMeta.getLastModified());

‎src/test/java/com/aliyun/oss/integrationtests/TestConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public final class TestConfig {
3737
public static final String SECOND_ACCESS_ID = "<valid access id>";
3838
public static final String SECOND_ACCESS_KEY = "<valid access key>";
3939

40-
public static final String SECOND_REPLICATION_ENDPOINT = "http://10.101.166.37";
40+
public static final String SECOND_REPLICATION_ENDPOINT = "http://InvalidEndpoint";
4141
public static final String SECOND_REPLICATION_LOCATION = "oss-cn-qingdao";
4242
public static final String SECOND_REPLICATION_ACCESS_ID = "<valid access id>";
4343
public static final String SECOND_REPLICATION_ACCESS_KEY = "<valid access key>";
@@ -77,8 +77,8 @@ public final class TestConfig {
7777
public static final String DOWNLOAD_DIRECOTRY = USER_DIR + File.separator + "download" + File.separator;
7878

7979
// Configurations for STS.
80-
public static final String STS_USER = "1287905056319499";
81-
public static final String STS_HOST = "10.101.88.247";
80+
public static final String STS_USER = "<STS_USER>";
81+
public static final String STS_HOST = "<STS_HOST>";
8282
public static final int STS_PORT = 8200;
8383
public static final int STS_DURATION_SECONDS = 3600;
8484
public static final String STS_GET_TOKEN_URI = "/api/GetFederationToken";

‎src/test/java/com/aliyun/oss/integrationtests/UploadPartTest.java

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,77 @@ public void testNormalListParts() {
329329
}
330330
}
331331

332+
@Test
333+
public void testNormalListPartsWithEncoding() {
334+
final String key = "normal-list-parts-常记溪亭日暮，沉醉不知归路";
335+
final int partSize = 128 * 1024;
336+
final int partCount = 25;
337+
338+
try {
339+
String uploadId = claimUploadId(secondClient, bucketName, key);
340+
341+
// List parts under empty bucket
342+
ListPartsRequest listPartsRequest = new ListPartsRequest(bucketName, key, uploadId);
343+
PartListing partListing = secondClient.listParts(listPartsRequest);
344+
Assert.assertEquals(0, partListing.getParts().size());
345+
Assert.assertEquals(bucketName, partListing.getBucketName());
346+
Assert.assertEquals(key, partListing.getKey());
347+
Assert.assertEquals(uploadId, partListing.getUploadId());
348+
Assert.assertEquals(LIST_PART_MAX_RETURNS, partListing.getMaxParts().intValue());
349+
Assert.assertNull(partListing.getNextPartNumberMarker());
350+
Assert.assertFalse(partListing.isTruncated());
351+
352+
// Upload parts
353+
List<PartETag> partETags = new ArrayList<PartETag>();
354+
for (int i = 0; i < partCount; i++) {
355+
InputStream instream = genFixedLengthInputStream(partSize);
356+
UploadPartRequest uploadPartRequest = new UploadPartRequest();
357+
uploadPartRequest.setBucketName(bucketName);
358+
uploadPartRequest.setKey(key);
359+
uploadPartRequest.setInputStream(instream);
360+
uploadPartRequest.setPartNumber(i + 1);
361+
uploadPartRequest.setPartSize(partSize);
362+
uploadPartRequest.setUploadId(uploadId);
363+
UploadPartResult uploadPartResult = secondClient.uploadPart(uploadPartRequest);
364+
partETags.add(uploadPartResult.getPartETag());
365+
}
366+
367+
// List parts with encoding
368+
listPartsRequest = new ListPartsRequest(bucketName, key, uploadId);
369+
listPartsRequest.setEncodingType(DEFAULT_ENCODING_TYPE);
370+
partListing = secondClient.listParts(listPartsRequest);
371+
Assert.assertEquals(partCount, partListing.getParts().size());
372+
for (int i = 0; i < partCount; i++) {
373+
PartSummary ps = partListing.getParts().get(i);
374+
PartETag eTag = partETags.get(i);
375+
Assert.assertEquals(eTag.getPartNumber(), ps.getPartNumber());
376+
Assert.assertEquals(eTag.getETag(), ps.getETag());
377+
}
378+
Assert.assertEquals(bucketName, partListing.getBucketName());
379+
Assert.assertEquals(key, URLDecoder.decode(partListing.getKey(), "UTF-8"));
380+
Assert.assertEquals(uploadId, partListing.getUploadId());
381+
Assert.assertEquals(LIST_PART_MAX_RETURNS, partListing.getMaxParts().intValue());
382+
Assert.assertEquals(partCount, partListing.getNextPartNumberMarker().intValue());
383+
Assert.assertFalse(partListing.isTruncated());
384+
385+
// Complete multipart upload
386+
CompleteMultipartUploadRequest completeMultipartUploadRequest =
387+
new CompleteMultipartUploadRequest(bucketName, key, uploadId, partETags);
388+
CompleteMultipartUploadResult completeMultipartUploadResult =
389+
secondClient.completeMultipartUpload(completeMultipartUploadRequest);
390+
Assert.assertEquals(composeLocation(secondClient, SECOND_ENDPOINT, bucketName, key),
391+
completeMultipartUploadResult.getLocation());
392+
Assert.assertEquals(bucketName, completeMultipartUploadResult.getBucketName());
393+
Assert.assertEquals(key, completeMultipartUploadResult.getKey());
394+
Assert.assertEquals(calcMultipartsETag(partETags), completeMultipartUploadResult.getETag());
395+
396+
secondClient.deleteObject(bucketName, key);
397+
398+
} catch (Exception e) {
399+
Assert.fail(e.getMessage());
400+
}
401+
}
402+
332403
@Test
333404
public void testUnormalListParts() {
334405
final String key = "unormal-list-parts-object";

0 commit comments

Comments
 (0)