additionalHeaderNames) {
+ this.additionalHeaderNames = additionalHeaderNames;
+ }
+
+ public void addAdditionalHeaderName(String name) {
+ this.additionalHeaderNames.add(name);
+ }
}
diff --git a/src/main/java/com/aliyun/oss/model/GenerateVodPlaylistRequest.java b/src/main/java/com/aliyun/oss/model/GenerateVodPlaylistRequest.java
index 3ea9f248..83c195c0 100644
--- a/src/main/java/com/aliyun/oss/model/GenerateVodPlaylistRequest.java
+++ b/src/main/java/com/aliyun/oss/model/GenerateVodPlaylistRequest.java
@@ -26,11 +26,11 @@ public GenerateVodPlaylistRequest(String bucketName, String liveChannelName, Str
this.playlistName = playlistName;
}
- public GenerateVodPlaylistRequest(String bucketName, String liveChannelName, String playlistName, long stratTime,
+ public GenerateVodPlaylistRequest(String bucketName, String liveChannelName, String playlistName, long startTime,
long endTime) {
super(bucketName, liveChannelName);
this.playlistName = playlistName;
- this.stratTime = stratTime;
+ this.startTime = startTime;
this.endTime = endTime;
}
@@ -42,12 +42,12 @@ public void setPlaylistName(String playlistName) {
this.playlistName = playlistName;
}
- public Long getStratTime() {
- return stratTime;
+ public Long getStartTime() {
+ return startTime;
}
- public void setStratTime(long stratTime) {
- this.stratTime = stratTime;
+ public void setStartTime(long startTime) {
+ this.startTime = startTime;
}
public Long getEndTime() {
@@ -59,6 +59,6 @@ public void setEndTime(long endTime) {
}
private String playlistName;
- private Long stratTime;
+ private Long startTime;
private Long endTime;
}
diff --git a/src/main/java/com/aliyun/oss/model/GetVodPlaylistRequest.java b/src/main/java/com/aliyun/oss/model/GetVodPlaylistRequest.java
new file mode 100644
index 00000000..26919b92
--- /dev/null
+++ b/src/main/java/com/aliyun/oss/model/GetVodPlaylistRequest.java
@@ -0,0 +1,30 @@
+package com.aliyun.oss.model;
+
+public class GetVodPlaylistRequest extends LiveChannelGenericRequest {
+
+ public GetVodPlaylistRequest(String bucketName, String liveChannelName, long startTime,
+ long endTime) {
+ super(bucketName, liveChannelName);
+ this.startTime = startTime;
+ this.endTime = endTime;
+ }
+
+ public Long getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(long startTime) {
+ this.startTime = startTime;
+ }
+
+ public Long getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(long endTime) {
+ this.endTime = endTime;
+ }
+
+ private Long startTime;
+ private Long endTime;
+}
diff --git a/src/main/java/com/aliyun/oss/model/ObjectMetadata.java b/src/main/java/com/aliyun/oss/model/ObjectMetadata.java
index f00e0069..d858165a 100644
--- a/src/main/java/com/aliyun/oss/model/ObjectMetadata.java
+++ b/src/main/java/com/aliyun/oss/model/ObjectMetadata.java
@@ -19,6 +19,7 @@
package com.aliyun.oss.model;
+import java.math.BigInteger;
import java.text.ParseException;
import java.util.Collections;
import java.util.Date;
@@ -42,6 +43,8 @@ public class ObjectMetadata {
public static final String AES_256_SERVER_SIDE_ENCRYPTION = "AES256";
+ public static final String KMS_SERVER_SIDE_ENCRYPTION = "KMS";
+
/**
*
* Gets the user's custom metadata.
@@ -282,6 +285,25 @@ public void setServerSideEncryption(String serverSideEncryption) {
metadata.put(OSSHeaders.OSS_SERVER_SIDE_ENCRYPTION, serverSideEncryption);
}
+ /**
+ * Gets the object's server side encryption key ID.
+ *
+ * @return The server side encryption key ID. Null means no encryption key ID.
+ */
+ public String getServerSideEncryptionKeyId() {
+ return (String) metadata.get(OSSHeaders.OSS_SERVER_SIDE_ENCRYPTION_KEY_ID);
+ }
+
+ /**
+ * Sets the object's server side encryption key ID.
+ *
+ * @param serverSideEncryptionKeyId
+ * The server side encryption key ID.
+ */
+ public void setServerSideEncryptionKeyId(String serverSideEncryptionKeyId) {
+ metadata.put(OSSHeaders.OSS_SERVER_SIDE_ENCRYPTION_KEY_ID, serverSideEncryptionKeyId);
+ }
+
/**
* Gets the object's storage type, which only supports "normal" and
* "appendable" for now.
@@ -322,6 +344,21 @@ public String getRequestId() {
return (String) metadata.get(OSSHeaders.OSS_HEADER_REQUEST_ID);
}
+ /**
+ * Gets the service crc.
+ *
+ * @return service crc.
+ */
+ public Long getServerCRC() {
+ String strSrvCrc = (String) metadata.get(OSSHeaders.OSS_HASH_CRC64_ECMA);
+
+ if (strSrvCrc != null) {
+ BigInteger bi = new BigInteger(strSrvCrc);
+ return bi.longValue();
+ }
+ return null;
+ }
+
/**
* Gets the object's storage class, which is "standard", "IA" or "Archive".
*
diff --git a/src/main/java/com/aliyun/oss/model/PolicyConditions.java b/src/main/java/com/aliyun/oss/model/PolicyConditions.java
index c59491eb..d0640243 100644
--- a/src/main/java/com/aliyun/oss/model/PolicyConditions.java
+++ b/src/main/java/com/aliyun/oss/model/PolicyConditions.java
@@ -153,6 +153,7 @@ public class PolicyConditions {
public final static String COND_SUCCESS_ACTION_REDIRECT = "success_action_redirect";
public final static String COND_SUCCESS_ACTION_STATUS = "success_action_status";
public final static String COND_X_OSS_META_PREFIX = "x-oss-meta-";
+ public final static String COND_X_OSS_SERVER_SIDE_PREFIX = "x-oss-server-side-";
private static Map> _supportedMatchRules = new HashMap>();
private List _conds = new ArrayList();
@@ -176,6 +177,7 @@ public class PolicyConditions {
_supportedMatchRules.put(COND_SUCCESS_ACTION_REDIRECT, ordinaryMatchModes);
_supportedMatchRules.put(COND_SUCCESS_ACTION_STATUS, ordinaryMatchModes);
_supportedMatchRules.put(COND_X_OSS_META_PREFIX, ordinaryMatchModes);
+ _supportedMatchRules.put(COND_X_OSS_SERVER_SIDE_PREFIX, ordinaryMatchModes);
}
/**
diff --git a/src/main/java/com/aliyun/oss/model/WebServiceRequest.java b/src/main/java/com/aliyun/oss/model/WebServiceRequest.java
index 538c8661..48ea5ff8 100644
--- a/src/main/java/com/aliyun/oss/model/WebServiceRequest.java
+++ b/src/main/java/com/aliyun/oss/model/WebServiceRequest.java
@@ -19,8 +19,10 @@
package com.aliyun.oss.model;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Set;
import com.aliyun.oss.event.ProgressListener;
@@ -38,6 +40,8 @@ public abstract class WebServiceRequest {
private Map parameters = new LinkedHashMap();
private Map headers = new LinkedHashMap();
+ private Set additionalHeaderNames = new HashSet();
+
public void setProgressListener(ProgressListener progressListener) {
this.progressListener = (progressListener == null) ? ProgressListener.NOOP : progressListener;
}
@@ -77,6 +81,18 @@ public void addHeader(String key, String value) {
this.headers.put(key, value);
}
+ public Set getAdditionalHeaderNames() {
+ return additionalHeaderNames;
+ }
+
+ public void setAdditionalHeaderNames(Set additionalHeaderNames) {
+ this.additionalHeaderNames = additionalHeaderNames;
+ }
+
+ public void addAdditionalHeaderName(String name) {
+ this.additionalHeaderNames.add(name);
+ }
+
public boolean isLogEnabled() {
return logEnabled;
}
diff --git a/src/main/resources/mime.types b/src/main/resources/mime.types
index 90e65da9..e7fb0c7e 100644
--- a/src/main/resources/mime.types
+++ b/src/main/resources/mime.types
@@ -225,4 +225,6 @@ xml application/xml
xsl application/xml
xslt application/xslt+xml
xul application/vnd.mozilla.xul+xml
-webp image/webp
\ No newline at end of file
+webp image/webp
+csv text/csv
+json application/json
\ No newline at end of file
diff --git a/src/main/resources/versioninfo.properties b/src/main/resources/versioninfo.properties
index 14103c3f..e6640dcd 100644
--- a/src/main/resources/versioninfo.properties
+++ b/src/main/resources/versioninfo.properties
@@ -1 +1 @@
-version=3.3.0
+version=3.4.0
diff --git a/src/samples/ImageSample.java b/src/samples/ImageSample.java
index e61c4a49..54a9f93c 100644
--- a/src/samples/ImageSample.java
+++ b/src/samples/ImageSample.java
@@ -98,7 +98,7 @@ public static void main(String[] args) throws IOException {
} catch (OSSException oe) {
System.out.println("Caught an OSSException, which means your request made it to OSS, "
+ "but was rejected with an error response for some reason.");
- System.out.println("Error Message: " + oe.getErrorCode());
+ System.out.println("Error Message: " + oe.getErrorMessage());
System.out.println("Error Code: " + oe.getErrorCode());
System.out.println("Request ID: " + oe.getRequestId());
System.out.println("Host ID: " + oe.getHostId());
diff --git a/src/samples/MultipartUploadSample.java b/src/samples/MultipartUploadSample.java
index 2aa0d15a..19bc224d 100644
--- a/src/samples/MultipartUploadSample.java
+++ b/src/samples/MultipartUploadSample.java
@@ -150,7 +150,7 @@ public static void main(String[] args) throws IOException {
} catch (OSSException oe) {
System.out.println("Caught an OSSException, which means your request made it to OSS, "
+ "but was rejected with an error response for some reason.");
- System.out.println("Error Message: " + oe.getErrorCode());
+ System.out.println("Error Message: " + oe.getErrorMessage());
System.out.println("Error Code: " + oe.getErrorCode());
System.out.println("Request ID: " + oe.getRequestId());
System.out.println("Host ID: " + oe.getHostId());
diff --git a/src/samples/UploadSample.java b/src/samples/UploadSample.java
index a00bc223..cb74effa 100644
--- a/src/samples/UploadSample.java
+++ b/src/samples/UploadSample.java
@@ -66,7 +66,7 @@ public static void main(String[] args) throws IOException {
} catch (OSSException oe) {
System.out.println("Caught an OSSException, which means your request made it to OSS, "
+ "but was rejected with an error response for some reason.");
- System.out.println("Error Message: " + oe.getErrorCode());
+ System.out.println("Error Message: " + oe.getErrorMessage());
System.out.println("Error Code: " + oe.getErrorCode());
System.out.println("Request ID: " + oe.getRequestId());
System.out.println("Host ID: " + oe.getHostId());
diff --git a/src/test/java/com/aliyun/oss/common/utils/VersionUtilTest.java b/src/test/java/com/aliyun/oss/common/utils/VersionUtilTest.java
index de85df33..edac1f5b 100644
--- a/src/test/java/com/aliyun/oss/common/utils/VersionUtilTest.java
+++ b/src/test/java/com/aliyun/oss/common/utils/VersionUtilTest.java
@@ -28,7 +28,7 @@ public class VersionUtilTest {
@Test
public void testGetDefaultUserAgent() {
String userAgent = VersionInfoUtils.getDefaultUserAgent();
- assertTrue(userAgent.startsWith("aliyun-sdk-java/3.3.0("));
+ assertTrue(userAgent.startsWith("aliyun-sdk-java/3.4.0("));
assertEquals(userAgent.split("/").length, 4);
assertEquals(userAgent.split(";").length, 2);
assertEquals(userAgent.split("\\(").length, 2);
diff --git a/src/test/java/com/aliyun/oss/integrationtests/BucketProcesTest.java b/src/test/java/com/aliyun/oss/integrationtests/BucketProcesTest.java
index ac9699d3..81b44d7f 100644
--- a/src/test/java/com/aliyun/oss/integrationtests/BucketProcesTest.java
+++ b/src/test/java/com/aliyun/oss/integrationtests/BucketProcesTest.java
@@ -30,6 +30,8 @@
import com.aliyun.oss.model.ImageProcess;
import com.aliyun.oss.model.SetBucketProcessRequest;
+import static com.aliyun.oss.integrationtests.TestUtils.waitForCacheExpiration;
+
public class BucketProcesTest extends TestBase {
@Test
@@ -49,7 +51,9 @@ public void testBucketImageProcessConf() {
ImageProcess imageProcess = new ImageProcess("Img", true, "jpg,png", "/,-");
SetBucketProcessRequest request = new SetBucketProcessRequest(bucketName, imageProcess);
ossClient.setBucketProcess(request);
-
+
+ waitForCacheExpiration(2);
+
// get 1
bucketProcess = ossClient.getBucketProcess(new GenericRequest(bucketName));
Assert.assertEquals(bucketProcess.getImageProcess().getCompliedHost(), "Img");
@@ -64,7 +68,9 @@ public void testBucketImageProcessConf() {
imageProcess = new ImageProcess("Both", false, "gif", "-");
request = new SetBucketProcessRequest(bucketName, imageProcess);
ossClient.setBucketProcess(request);
-
+
+ waitForCacheExpiration(2);
+
// get 2
bucketProcess = ossClient.getBucketProcess(new GenericRequest(bucketName));
Assert.assertEquals(bucketProcess.getImageProcess().getCompliedHost(), "Both");
@@ -79,7 +85,9 @@ public void testBucketImageProcessConf() {
imageProcess = new ImageProcess("Img", true, "*", "/", true);
request = new SetBucketProcessRequest(bucketName, imageProcess);
ossClient.setBucketProcess(request);
-
+
+ waitForCacheExpiration(2);
+
// get 3
bucketProcess = ossClient.getBucketProcess(new GenericRequest(bucketName));
Assert.assertEquals(bucketProcess.getImageProcess().getCompliedHost(), "Img");
diff --git a/src/test/java/com/aliyun/oss/integrationtests/CMKIDTest.java b/src/test/java/com/aliyun/oss/integrationtests/CMKIDTest.java
new file mode 100644
index 00000000..2985078a
--- /dev/null
+++ b/src/test/java/com/aliyun/oss/integrationtests/CMKIDTest.java
@@ -0,0 +1,290 @@
+package com.aliyun.oss.integrationtests;
+
+import com.aliyun.oss.model.*;
+import junit.framework.Assert;
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Test;
+
+import javax.activation.MimetypesFileTypeMap;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+
+public class CMKIDTest extends TestBase {
+
+ private String key = "CMKIDTest";
+
+ private String uploadLocalFilePath = "uploadFile";
+
+ private String downloadLocalFilePath = "downloadFile";
+
+ @Test
+ public void testPutObjectWithCMKID() {
+ try {
+ final File sampleFile = createSampleFile(uploadLocalFilePath, 1 * 1024 * 1024);
+
+ final ObjectMetadata metadata = new ObjectMetadata();
+ metadata.setServerSideEncryption(ObjectMetadata.KMS_SERVER_SIDE_ENCRYPTION);
+ metadata.setServerSideEncryptionKeyId(TestConfig.CMK_ID);
+ ossClient.putObject(bucketName, key, sampleFile, metadata);
+ ObjectMetadata objectMetadata = ossClient.getObject(new GetObjectRequest(bucketName, key), new File(downloadLocalFilePath));
+ Assert.assertEquals(TestConfig.CMK_ID, objectMetadata.getServerSideEncryptionKeyId());
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testPostObjectWithCMKID() {
+ HttpURLConnection conn = null;
+
+ try {
+ final File sampleFile = createSampleFile(uploadLocalFilePath, 1 * 1024 * 1024);
+
+ String urlStr = TestConfig.OSS_TEST_ENDPOINT.replace("http://", "http://" + bucketName + ".");
+
+ Map formFields = new LinkedHashMap();
+
+ formFields.put("key", this.key);
+ formFields.put("Content-Disposition", "attachment;filename="
+ + sampleFile.getAbsolutePath());
+ formFields.put("OSSAccessKeyId", TestConfig.OSS_TEST_ACCESS_KEY_ID);
+ formFields.put("x-oss-server-side-encryption", ObjectMetadata.KMS_SERVER_SIDE_ENCRYPTION);
+ formFields.put("x-oss-server-side-encryption-key-id", TestConfig.CMK_ID);
+ String policy
+ = "{\"expiration\": \"2120-01-01T12:00:00.000Z\",\"conditions\": [[\"content-length-range\", 0, 104857600]]}";
+ String encodePolicy = new String(Base64.encodeBase64(policy.getBytes()));
+ formFields.put("policy", encodePolicy);
+ String signaturecom = computeSignature(TestConfig.OSS_TEST_ACCESS_KEY_SECRET, encodePolicy);
+ formFields.put("Signature", signaturecom);
+
+ String boundary = "9431149156168";
+
+ URL url = new URL(urlStr);
+ conn = (HttpURLConnection)url.openConnection();
+ conn.setConnectTimeout(5000);
+ conn.setReadTimeout(30000);
+ conn.setDoOutput(true);
+ conn.setDoInput(true);
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("User-Agent",
+ "Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-CN; rv:1.9.2.6)");
+ conn.setRequestProperty("Content-Type",
+ "multipart/form-data; boundary=" + boundary);
+ OutputStream out = new DataOutputStream(conn.getOutputStream());
+
+ if (formFields != null) {
+ StringBuffer strBuf = new StringBuffer();
+ Iterator> iter = formFields.entrySet().iterator();
+ int i = 0;
+
+ while (iter.hasNext()) {
+ Map.Entry entry = iter.next();
+ String inputName = entry.getKey();
+ String inputValue = entry.getValue();
+
+ if (inputValue == null) {
+ continue;
+ }
+
+ if (i == 0) {
+ strBuf.append("--").append(boundary).append("\r\n");
+ strBuf.append("Content-Disposition: form-data; name=\""
+ + inputName + "\"\r\n\r\n");
+ strBuf.append(inputValue);
+ } else {
+ strBuf.append("\r\n").append("--").append(boundary).append("\r\n");
+ strBuf.append("Content-Disposition: form-data; name=\""
+ + inputName + "\"\r\n\r\n");
+ strBuf.append(inputValue);
+ }
+
+ i++;
+ }
+ out.write(strBuf.toString().getBytes());
+ }
+
+ String contentType = new MimetypesFileTypeMap().getContentType(sampleFile.getName());
+ if (contentType == null || contentType.equals("")) {
+ contentType = "application/octet-stream";
+ }
+
+ StringBuffer strBuf = new StringBuffer();
+ strBuf.append("\r\n").append("--").append(boundary)
+ .append("\r\n");
+ strBuf.append("Content-Disposition: form-data; name=\"file\"; "
+ + "filename=\"" + sampleFile.getName() + "\"\r\n");
+ strBuf.append("Content-Type: " + contentType + "\r\n\r\n");
+
+ out.write(strBuf.toString().getBytes());
+
+ DataInputStream in = new DataInputStream(new FileInputStream(sampleFile));
+ int bytes = 0;
+ byte[] bufferOut = new byte[1024];
+ while ((bytes = in.read(bufferOut)) != -1) {
+ out.write(bufferOut, 0, bytes);
+ }
+ in.close();
+
+ byte[] endData = ("\r\n--" + boundary + "--\r\n").getBytes();
+ out.write(endData);
+ out.flush();
+ out.close();
+
+ strBuf = new StringBuffer();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ strBuf.append(line).append("\n");
+ }
+ System.out.println(strBuf.toString());
+ reader.close();
+
+ ObjectMetadata objectMetadata = ossClient.getObject(new GetObjectRequest(bucketName, key), new File(downloadLocalFilePath));
+ Assert.assertEquals(TestConfig.CMK_ID, objectMetadata.getServerSideEncryptionKeyId());
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ } finally {
+ if (conn != null) {
+ conn.disconnect();
+ }
+ }
+ }
+
+ private static String computeSignature(String accessKeySecret, String encodePolicy)
+ throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
+ // convert to UTF-8
+ byte[] key = accessKeySecret.getBytes("UTF-8");
+ byte[] data = encodePolicy.getBytes("UTF-8");
+
+ // hmac-sha1
+ Mac mac = Mac.getInstance("HmacSHA1");
+ mac.init(new SecretKeySpec(key, "HmacSHA1"));
+ byte[] sha = mac.doFinal(data);
+
+ // base64
+ return new String(Base64.encodeBase64(sha));
+ }
+
+ @Test
+ public void testInitMultipartUploadWithCMKID() {
+ try {
+ final File sampleFile = createSampleFile(uploadLocalFilePath, 1 * 1024 * 1024);
+ ObjectMetadata metadata = new ObjectMetadata();
+ metadata.setServerSideEncryption(ObjectMetadata.KMS_SERVER_SIDE_ENCRYPTION);
+ metadata.setServerSideEncryptionKeyId(TestConfig.CMK_ID);
+
+ InitiateMultipartUploadRequest request = new InitiateMultipartUploadRequest(bucketName, key, metadata);
+ InitiateMultipartUploadResult result = ossClient.initiateMultipartUpload(request);
+ String uploadId = result.getUploadId();
+ List partETags = new ArrayList();
+
+ final long partSize = 1 * 1024 * 1024L;
+ long fileLength = sampleFile.length();
+ int partCount = (int) (fileLength / partSize);
+ if (fileLength % partSize != 0) {
+ partCount++;
+ }
+
+ for (int i = 0; i < partCount; i++) {
+ long startPos = i * partSize;
+ long curPartSize = (i + 1 == partCount) ? (fileLength - startPos) : partSize;
+ InputStream instream = new FileInputStream(sampleFile);
+ instream.skip(startPos);
+ UploadPartRequest uploadPartRequest = new UploadPartRequest();
+ uploadPartRequest.setBucketName(bucketName);
+ uploadPartRequest.setKey(key);
+ uploadPartRequest.setUploadId(uploadId);
+ uploadPartRequest.setInputStream(instream);
+ uploadPartRequest.setPartSize(curPartSize);
+ uploadPartRequest.setPartNumber(i + 1);
+ UploadPartResult uploadPartResult = ossClient.uploadPart(uploadPartRequest);
+ partETags.add(uploadPartResult.getPartETag());
+ }
+
+ Collections.sort(partETags, new Comparator() {
+ public int compare(PartETag p1, PartETag p2) {
+ return p1.getPartNumber() - p2.getPartNumber();
+ }
+ });
+ CompleteMultipartUploadRequest completeMultipartUploadRequest =
+ new CompleteMultipartUploadRequest(bucketName, key, uploadId, partETags);
+ ossClient.completeMultipartUpload(completeMultipartUploadRequest);
+
+ ObjectMetadata objectMetadata = ossClient.getObject(new GetObjectRequest(bucketName, key), new File(downloadLocalFilePath));
+
+ Assert.assertEquals(TestConfig.CMK_ID, objectMetadata.getServerSideEncryptionKeyId());
+ } catch (IOException e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testCopyObjectWithCMKID() {
+ try {
+ final String sourceBucketName = createBucket();
+ final String sourceKey = "src_key";
+ final File sampleFile = createSampleFile(uploadLocalFilePath, 1 * 1024 * 1024);
+ final CopyObjectRequest request =
+ new CopyObjectRequest(sourceBucketName, sourceKey, bucketName, key);
+
+ ossClient.putObject(sourceBucketName, sourceKey, sampleFile);
+
+ request.setServerSideEncryption(ObjectMetadata.KMS_SERVER_SIDE_ENCRYPTION);
+ request.setServerSideEncryptionKeyId(TestConfig.CMK_ID);
+ ossClient.copyObject(request);
+
+ String copyLocalFilePath = "copy";
+
+ ObjectMetadata metadataCopy = ossClient.getObject(new GetObjectRequest(bucketName, key), new File(copyLocalFilePath));
+
+ Assert.assertEquals(TestConfig.CMK_ID, metadataCopy.getServerSideEncryptionKeyId());
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testAppendObjectWithCMKID() {
+ try {
+ String content1 = "Hello OSS A ";
+ String content2 = "Hello OSS B ";
+
+ ObjectMetadata meta = new ObjectMetadata();
+
+ meta.setContentType("text/plain");
+ meta.setServerSideEncryption(ObjectMetadata.KMS_SERVER_SIDE_ENCRYPTION);
+ meta.setServerSideEncryptionKeyId(TestConfig.CMK_ID);
+
+ AppendObjectRequest appendObjectRequest = new AppendObjectRequest(bucketName, key, new ByteArrayInputStream(content1.getBytes()),meta);
+
+ appendObjectRequest.setPosition(0L);
+
+ AppendObjectResult appendObjectResult = ossClient.appendObject(appendObjectRequest);
+
+ appendObjectRequest.setPosition(appendObjectResult.getNextPosition());
+ appendObjectRequest.setInputStream(new ByteArrayInputStream(content2.getBytes()));
+
+ ossClient.appendObject(appendObjectRequest);
+
+ OSSObject o = ossClient.getObject(bucketName, key);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(o.getObjectContent()));
+ StringBuilder sb = new StringBuilder();
+
+ String line;
+
+ while ((line = reader.readLine()) != null) {
+ sb.append(line);
+ }
+
+ Assert.assertTrue(sb.toString().equals(content1 + content2));
+ } catch (IOException e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/com/aliyun/oss/integrationtests/CRCChecksumTest.java b/src/test/java/com/aliyun/oss/integrationtests/CRCChecksumTest.java
index 44d13300..f36345c4 100644
--- a/src/test/java/com/aliyun/oss/integrationtests/CRCChecksumTest.java
+++ b/src/test/java/com/aliyun/oss/integrationtests/CRCChecksumTest.java
@@ -48,6 +48,8 @@
import com.aliyun.oss.model.PutObjectResult;
import com.aliyun.oss.model.UploadPartRequest;
import com.aliyun.oss.model.UploadPartResult;
+import com.aliyun.oss.model.UploadFileRequest;
+import com.aliyun.oss.model.UploadFileResult;
public class CRCChecksumTest extends TestBase {
@@ -186,7 +188,26 @@ public void testMutilUploadCRC() {
Assert.fail(e.getMessage());
}
}
-
+
+ @Test
+ public void testUploadFileCRC() {
+ final String key = "upload-file-crc";
+
+ try {
+ File file = createSampleFile(key, 1024 * 500);
+
+ UploadFileRequest uploadFileRequest = new UploadFileRequest(bucketName, key);
+ uploadFileRequest.setUploadFile(file.getAbsolutePath());
+ uploadFileRequest.setTaskNum(10);
+ uploadFileRequest.setEnableCheckpoint(true);
+
+ UploadFileResult uploadRes = ossClient.uploadFile(uploadFileRequest);
+ Assert.assertEquals(uploadRes.getMultipartUploadResult().getClientCRC(), uploadRes.getMultipartUploadResult().getServerCRC());
+ } catch (Throwable e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
@Test
public void testGetObjectCRC() {
String key = "get-object-crc";
diff --git a/src/test/java/com/aliyun/oss/integrationtests/GetObjectTest.java b/src/test/java/com/aliyun/oss/integrationtests/GetObjectTest.java
index fad8bd61..0ba8f063 100644
--- a/src/test/java/com/aliyun/oss/integrationtests/GetObjectTest.java
+++ b/src/test/java/com/aliyun/oss/integrationtests/GetObjectTest.java
@@ -529,7 +529,7 @@ public void testGetObjectWithSpecialChars() {
@Test
public void testGetObjectByUrlsignature() {
final String key = "put-object-by-urlsignature";
- final String expirationString = "Sun, 12 Apr 2018 12:00:00 GMT";
+ final String expirationString = "Sun, 12 Apr 2020 12:00:00 GMT";
final long inputStreamLength = 128 * 1024; //128KB
final long firstByte= inputStreamLength / 2;
final long lastByte = inputStreamLength - 1;
diff --git a/src/test/java/com/aliyun/oss/integrationtests/HeadObjectTest.java b/src/test/java/com/aliyun/oss/integrationtests/HeadObjectTest.java
new file mode 100644
index 00000000..f93fdfb7
--- /dev/null
+++ b/src/test/java/com/aliyun/oss/integrationtests/HeadObjectTest.java
@@ -0,0 +1,56 @@
+package com.aliyun.oss.integrationtests;
+
+import com.aliyun.oss.model.HeadObjectRequest;
+import com.aliyun.oss.model.ObjectMetadata;
+import com.aliyun.oss.model.PutObjectRequest;
+import com.aliyun.oss.model.PutObjectResult;
+import junit.framework.Assert;
+import org.junit.Test;
+
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.aliyun.oss.integrationtests.TestUtils.genFixedLengthInputStream;
+
+public class HeadObjectTest extends TestBase {
+
+ @Test
+ public void testHeadObject() {
+ final String key = "head-object";
+ final long inputStreanLength = 1024;
+
+ try {
+ PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key,
+ genFixedLengthInputStream(inputStreanLength), null);
+ PutObjectResult putObjectResult = ossClient.putObject(putObjectRequest);
+ Assert.assertEquals(putObjectResult.getRequestId().length(), REQUEST_ID_LEN);
+
+ HeadObjectRequest headObjectRequest = new HeadObjectRequest(bucketName, key);
+ List matchingETags = new LinkedList();
+ matchingETags.add(putObjectResult.getETag());
+ headObjectRequest.setMatchingETagConstraints(matchingETags);
+ ObjectMetadata o = ossClient.headObject(headObjectRequest);
+ Assert.assertEquals(o.getETag(), putObjectResult.getETag());
+
+ headObjectRequest = new HeadObjectRequest(bucketName, key);
+ List nonmatchingEtags = new LinkedList();
+ nonmatchingEtags.add("nonmatching");
+ headObjectRequest.setNonmatchingETagConstraints(nonmatchingEtags);
+ o = ossClient.headObject(headObjectRequest);
+ Assert.assertEquals(o.getETag(), putObjectResult.getETag());
+
+ headObjectRequest = new HeadObjectRequest(bucketName, key);
+ headObjectRequest.setModifiedSinceConstraint(new Date(System.currentTimeMillis() - 3600 * 1000));
+ o = ossClient.headObject(headObjectRequest);
+ Assert.assertEquals(o.getETag(), putObjectResult.getETag());
+
+ headObjectRequest = new HeadObjectRequest(bucketName, key);
+ headObjectRequest.setUnmodifiedSinceConstraint(new Date(System.currentTimeMillis() + 3600 * 1000));
+ o = ossClient.headObject(headObjectRequest);
+ Assert.assertEquals(o.getETag(), putObjectResult.getETag());
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+}
diff --git a/src/test/java/com/aliyun/oss/integrationtests/PostPolicyTest.java b/src/test/java/com/aliyun/oss/integrationtests/PostPolicyTest.java
index f605395d..7e85cb90 100644
--- a/src/test/java/com/aliyun/oss/integrationtests/PostPolicyTest.java
+++ b/src/test/java/com/aliyun/oss/integrationtests/PostPolicyTest.java
@@ -65,7 +65,8 @@ public void testGenPostPolicy() {
String actualPostSignature = ossClient.calculatePostSignature(actualPostPolicy);
// It has something to do with the local time
Assert.assertTrue((actualPostSignature.equals("88kD3wGu1W5isVAdWSG765DRPKY=") ||
- actualPostSignature.equals("KbUYorFeyyqxntffsNlrRcV50Ds=")));
+ actualPostSignature.equals("KbUYorFeyyqxntffsNlrRcV50Ds=") ||
+ actualPostSignature.equals("oGVOEb+wFKpZMgMqI0NNfSldA6s=")));
} catch (Exception e) {
Assert.fail(e.getMessage());
}
diff --git a/src/test/java/com/aliyun/oss/integrationtests/PutObjectTest.java b/src/test/java/com/aliyun/oss/integrationtests/PutObjectTest.java
index c4776823..de825a1f 100644
--- a/src/test/java/com/aliyun/oss/integrationtests/PutObjectTest.java
+++ b/src/test/java/com/aliyun/oss/integrationtests/PutObjectTest.java
@@ -348,7 +348,7 @@ public void testPutObjectByUrlSignature() throws Exception {
final String key = "put-object-by-urlsignature";
final String metaKey0 = "author";
final String metaValue0 = "aliy";
- final String expirationString = "Sun, 12 Apr 2018 12:00:00 GMT";
+ final String expirationString = "Sun, 12 Apr 2020 12:00:00 GMT";
final long inputStreamLength = 128 * 1024; //128KB
GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucketName, key, HttpMethod.PUT);
@@ -494,5 +494,25 @@ public void testIncorrentSignature() throws Exception {
}
}
}
-
+
+ @Test
+ public void testPutCSVTypeFile() throws Exception {
+ final String key = "1.csv";
+ final int instreamLength = 128 * 1024;
+
+ InputStream instream = null;
+ try {
+ instream = genFixedLengthInputStream(instreamLength);
+ ossClient.putObject(bucketName, key, instream);
+
+ OSSObject o = ossClient.getObject(bucketName, key);
+ Assert.assertEquals(o.getObjectMetadata().getContentType(), "text/csv");
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+
+ if (instream != null) {
+ instream.close();
+ }
+ }
+ }
}
diff --git a/src/test/java/com/aliyun/oss/integrationtests/RtmpTest.java b/src/test/java/com/aliyun/oss/integrationtests/RtmpTest.java
index 18afdd00..559ffdcf 100644
--- a/src/test/java/com/aliyun/oss/integrationtests/RtmpTest.java
+++ b/src/test/java/com/aliyun/oss/integrationtests/RtmpTest.java
@@ -42,6 +42,7 @@
import com.aliyun.oss.model.LiveChannelTarget;
import com.aliyun.oss.model.LiveRecord;
import com.aliyun.oss.model.PushflowStatus;
+import com.aliyun.oss.model.OSSObject;
/**
* Test rtmp
@@ -56,6 +57,7 @@ public void testCreateLiveChannelDefault() {
CreateLiveChannelRequest createLiveChannelRequest = new CreateLiveChannelRequest(
bucketName, liveChannel);
CreateLiveChannelResult createLiveChannelResult = ossClient.createLiveChannel(createLiveChannelRequest);
+ ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicReadWrite);
Assert.assertEquals(createLiveChannelResult.getPublishUrls().size(), 1);
Assert.assertTrue(createLiveChannelResult.getPublishUrls().get(0).startsWith("rtmp://"));
Assert.assertTrue(createLiveChannelResult.getPublishUrls().get(0).endsWith("live/" + liveChannel));
@@ -553,7 +555,34 @@ public void testGenerateVodPlaylist() {
Assert.fail(e.getMessage());
}
}
-
+
+ @Test
+ public void testGetVodPlaylist() {
+ final String liveChannel = "normal-get-vod-playlist";
+
+ try {
+ CreateLiveChannelRequest createLiveChannelRequest = new CreateLiveChannelRequest(
+ bucketName, liveChannel);
+ ossClient.createLiveChannel(createLiveChannelRequest);
+ ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicReadWrite);
+
+ long startTime = System.currentTimeMillis() / 1000 - 3600;
+ long endTime = System.currentTimeMillis() / 1000 + 3600;
+ try {
+ OSSObject o = ossClient.getVodPlaylist(bucketName, liveChannel, startTime, endTime);
+ Assert.assertEquals(bucketName, o.getBucketName());
+ Assert.assertEquals(liveChannel, o.getKey());
+ } catch (OSSException e) {
+ Assert.assertEquals(e.getErrorCode(), OSSErrorCode.INVALID_ARGUMENT);
+ Assert.assertTrue(e.getMessage().indexOf("No ts file found in specified time span.") > -1);
+ }
+
+ ossClient.deleteLiveChannel(bucketName, liveChannel);
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
@Test
public void testGeneratePushflowUri() {
final String liveChannel = "normal-generate-pushflow-uri";
diff --git a/src/test/java/com/aliyun/oss/integrationtests/SignTest.java b/src/test/java/com/aliyun/oss/integrationtests/SignTest.java
new file mode 100644
index 00000000..732dba23
--- /dev/null
+++ b/src/test/java/com/aliyun/oss/integrationtests/SignTest.java
@@ -0,0 +1,236 @@
+package com.aliyun.oss.integrationtests;
+
+import com.aliyun.oss.ClientBuilderConfiguration;
+import com.aliyun.oss.HttpMethod;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.common.comm.SignVersion;
+import com.aliyun.oss.common.utils.DateUtil;
+import com.aliyun.oss.common.utils.HttpHeaders;
+import com.aliyun.oss.common.utils.IOUtils;
+import com.aliyun.oss.model.GeneratePresignedUrlRequest;
+import com.aliyun.oss.model.OSSObject;
+import com.aliyun.oss.model.PutObjectRequest;
+import junit.framework.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.util.*;
+
+import static com.aliyun.oss.integrationtests.TestUtils.genFixedLengthFile;
+import static com.aliyun.oss.integrationtests.TestUtils.genFixedLengthInputStream;
+import static com.aliyun.oss.integrationtests.TestUtils.removeFile;
+import static com.aliyun.oss.internal.OSSConstants.DEFAULT_OBJECT_CONTENT_TYPE;
+
+public class SignTest {
+
+ @Test
+ public void testSignV2() {
+ String key = "test-sign-V2";
+ ClientBuilderConfiguration conf = new ClientBuilderConfiguration();
+ conf.setSignatureVersion(SignVersion.V2);
+ OSS ossClient = new OSSClientBuilder().build(TestConfig.OSS_TEST_ENDPOINT, TestConfig.OSS_TEST_ACCESS_KEY_ID, TestConfig.OSS_TEST_ACCESS_KEY_SECRET, conf);
+ long ticks = new Date().getTime() / 1000 + new Random().nextInt(5000);
+ String bucket = TestBase.BUCKET_NAME_PREFIX + ticks;
+ ossClient.createBucket(bucket);
+ String filePath = null;
+
+ try {
+ filePath = genFixedLengthFile(1 * 1024 * 1024); //1MB
+ PutObjectRequest request = new PutObjectRequest(bucket, key, new File(filePath));
+ request.addHeader("x-oss-head1", "value");
+ request.addHeader("abc", "value");
+ request.addHeader("ZAbc", "value");
+ request.addHeader("XYZ", "value");
+ request.addAdditionalHeaderName("ZAbc");
+ request.addAdditionalHeaderName("x-oss-head1");
+ request.addAdditionalHeaderName("abc");
+ request.addParameter("param1", "value1");
+
+ ossClient.putObject(request);
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ } finally {
+ if (filePath != null) {
+ removeFile(filePath);
+ }
+ }
+ }
+
+ @Test
+ public void testGenerateSignedV2URL() {
+ String key = "test-sign-v2-url";
+ ClientBuilderConfiguration conf = new ClientBuilderConfiguration();
+ conf.setSignatureVersion(SignVersion.V2);
+ OSS ossClient = new OSSClientBuilder().build(TestConfig.OSS_TEST_ENDPOINT, TestConfig.OSS_TEST_ACCESS_KEY_ID, TestConfig.OSS_TEST_ACCESS_KEY_SECRET, conf);
+ Date expiration = new Date(new Date().getTime() + 1000 * 60 *10);
+ long ticks = new Date().getTime() / 1000 + new Random().nextInt(5000);
+ String bucket = TestBase.BUCKET_NAME_PREFIX + ticks;
+
+ ossClient.createBucket(bucket);
+ URL url;
+ String filePath;
+
+ try {
+ filePath = genFixedLengthFile(1 * 1024 * 1024); //1MB
+ PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, key, new File(filePath));
+
+ ossClient.putObject(putObjectRequest);
+
+ URI endpointURI = new URI(TestConfig.OSS_TEST_ENDPOINT);
+ GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, key);
+ request.setExpiration(expiration);
+ url = ossClient.generatePresignedUrl(request);
+
+ StringBuilder expectedUrlPrefix = new StringBuilder();
+
+ expectedUrlPrefix.append(endpointURI.getScheme()).append("://").append(bucket).append(".").append(endpointURI.getHost()).append("/")
+ .append(key).append("?x-oss-");
+
+ Assert.assertTrue(url.toString().startsWith(expectedUrlPrefix.toString()));
+ Assert.assertTrue(url.toString().contains("x-oss-signature"));
+ Assert.assertTrue(url.toString().contains("x-oss-signature-version"));
+ Assert.assertTrue(url.toString().contains("x-oss-expires"));
+ Assert.assertTrue(url.toString().contains("x-oss-access-key-id"));
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testSwitchSignatureVersion() {
+ String key = "test-switch-signature-version";
+ ClientBuilderConfiguration conf = new ClientBuilderConfiguration();
+ conf.setSignatureVersion(SignVersion.V2);
+ OSS ossClient = new OSSClientBuilder().build(TestConfig.OSS_TEST_ENDPOINT, TestConfig.OSS_TEST_ACCESS_KEY_ID, TestConfig.OSS_TEST_ACCESS_KEY_SECRET, conf);
+ long ticks = new Date().getTime() / 1000 + new Random().nextInt(5000);
+ String bucket = TestBase.BUCKET_NAME_PREFIX + ticks;
+ ossClient.createBucket(bucket);
+ String filePath;
+
+ try {
+ filePath = genFixedLengthFile(1 * 1024 * 1024); //1MB
+
+ ossClient.putObject(bucket, key, new File(filePath));
+
+ ossClient.switchSignatureVersion(SignVersion.V1);
+
+ ossClient.putObject(bucket, key, new File(filePath));
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testPutObjectByUrlSignature() {
+ final String key = "put-object-by-urlSignature";
+ ClientBuilderConfiguration conf = new ClientBuilderConfiguration();
+ conf.setSignatureVersion(SignVersion.V2);
+ OSS ossClient = new OSSClientBuilder().build(TestConfig.OSS_TEST_ENDPOINT, TestConfig.OSS_TEST_ACCESS_KEY_ID, TestConfig.OSS_TEST_ACCESS_KEY_SECRET, conf);
+ long ticks = new Date().getTime() / 1000 + new Random().nextInt(5000);
+ String bucket = TestBase.BUCKET_NAME_PREFIX + ticks;
+ ossClient.createBucket(bucket);
+
+ final String expirationString = "Sun, 12 Apr 2020 12:00:00 GMT";
+ final long inputStreamLength = 128 * 1024; //128KB
+
+ GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, key, HttpMethod.PUT);
+ try {
+ Date expiration = DateUtil.parseRfc822Date(expirationString);
+ request.setExpiration(expiration);
+ request.setContentType(DEFAULT_OBJECT_CONTENT_TYPE);
+ request.addHeader("x-oss-head1", "value");
+ request.addHeader("abc", "value");
+ request.addHeader("ZAbc", "value");
+ request.addHeader("XYZ", "value");
+ request.addAdditionalHeaderName("ZAbc");
+ request.addAdditionalHeaderName("x-oss-head1");
+ request.addAdditionalHeaderName("abc");
+ request.addQueryParameter("param1", "value1");
+ URL signedUrl = ossClient.generatePresignedUrl(request);
+
+ Map requestHeaders = new HashMap();
+
+ requestHeaders.put("x-oss-head1", "value");
+ requestHeaders.put("abc", "value");
+ requestHeaders.put("ZAbc", "value");
+ requestHeaders.put("XYZ", "value");
+ requestHeaders.put(HttpHeaders.CONTENT_TYPE, DEFAULT_OBJECT_CONTENT_TYPE);
+ InputStream instream = genFixedLengthInputStream(inputStreamLength);
+ // Using url signature & chunked encoding to upload specified inputstream.
+ ossClient.putObject(signedUrl, instream, -1, requestHeaders, true);
+ OSSObject o = ossClient.getObject(bucket, key);
+ Assert.assertEquals(key, o.getKey());
+ Assert.assertEquals(inputStreamLength, o.getObjectMetadata().getContentLength());
+ } catch (Exception ex) {
+ Assert.fail(ex.getMessage());
+ }
+ }
+
+ @Test
+ public void testGetObjectByUrlsignature() {
+ final String key = "get-object-by-urlsignature";
+ ClientBuilderConfiguration conf = new ClientBuilderConfiguration();
+ conf.setSignatureVersion(SignVersion.V2);
+ OSS ossClient = new OSSClientBuilder().build(TestConfig.OSS_TEST_ENDPOINT, TestConfig.OSS_TEST_ACCESS_KEY_ID, TestConfig.OSS_TEST_ACCESS_KEY_SECRET, conf);
+ long ticks = new Date().getTime() / 1000 + new Random().nextInt(5000);
+ String bucket = TestBase.BUCKET_NAME_PREFIX + ticks;
+ ossClient.createBucket(bucket);
+
+ final String expirationString = "Sun, 12 Apr 2020 12:00:00 GMT";
+ final long inputStreamLength = 128 * 1024; //128KB
+ final long firstByte= inputStreamLength / 2;
+ final long lastByte = inputStreamLength - 1;
+
+ try {
+ ossClient.putObject(bucket, key, genFixedLengthInputStream(inputStreamLength), null);
+
+ GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, key);
+ Date expiration = DateUtil.parseRfc822Date(expirationString);
+ request.setExpiration(expiration);
+ request.setContentType(DEFAULT_OBJECT_CONTENT_TYPE);
+ request.addHeader(HttpHeaders.RANGE, String.format("bytes=%d-%d", firstByte, lastByte));
+ request.addHeader("x-oss-head1", "value");
+ request.addHeader("abc", "value");
+ request.addHeader("ZAbc", "value");
+ request.addHeader("XYZ", "value");
+ request.addAdditionalHeaderName("ZAbc");
+ request.addAdditionalHeaderName("x-oss-head1");
+ request.addAdditionalHeaderName("abc");
+ request.addQueryParameter("param1", "value1");
+ URL signedUrl = ossClient.generatePresignedUrl(request);
+
+ Map requestHeaders = new HashMap();
+
+ requestHeaders.put("x-oss-head1", "value");
+ requestHeaders.put("abc", "value");
+ requestHeaders.put("ZAbc", "value");
+ requestHeaders.put("XYZ", "value");
+ requestHeaders.put(HttpHeaders.CONTENT_TYPE, DEFAULT_OBJECT_CONTENT_TYPE);
+ requestHeaders.put(HttpHeaders.RANGE, String.format("bytes=%d-%d", firstByte, lastByte));
+
+ OSSObject o = ossClient.getObject(signedUrl, requestHeaders);
+
+ try {
+ int bytesRead = -1;
+ int totalBytes = 0;
+ byte[] buffer = new byte[4096];
+ while ((bytesRead = o.getObjectContent().read(buffer)) != -1) {
+ totalBytes += bytesRead;
+ }
+
+ Assert.assertEquals((lastByte - firstByte + 1), totalBytes);
+ } catch (IOException e) {
+ Assert.fail(e.getMessage());
+ } finally {
+ IOUtils.safeClose(o.getObjectContent());
+ }
+ } catch (Exception ex) {
+ Assert.fail(ex.getMessage());
+ }
+ }
+}
diff --git a/src/test/java/com/aliyun/oss/integrationtests/TestConfig.java b/src/test/java/com/aliyun/oss/integrationtests/TestConfig.java
index 99b78700..047f17eb 100644
--- a/src/test/java/com/aliyun/oss/integrationtests/TestConfig.java
+++ b/src/test/java/com/aliyun/oss/integrationtests/TestConfig.java
@@ -45,4 +45,6 @@ public final class TestConfig {
public static String PROXY_USER = null;
public static String PROXY_PASSWORD = null;
+ // OSS cmk id configuration
+ public static String CMK_ID = null;
}