merge origin master

Author: jeffreykzli

src/main/java/com/qcloud/cos/COS.java

@@ -3106,7 +3106,7 @@ SelectObjectContentResult selectObjectContent(SelectObjectContentRequest selectR
     /**
      * GenerateDocPreviewHtmlUrl  查询账号下已开通文档预览功能的bucket
      */
-    String GenerateDocPreviewUrl(DocHtmlRequest docJobRequest) throws URISyntaxException;
+    String generateDocPreviewUrl(DocHtmlRequest docJobRequest) throws URISyntaxException;
 
     /**
      * createWebpageAuditingJob  提交网页审核任务 https://cloud.tencent.com/document/product/460/63968

src/main/java/com/qcloud/cos/COSClient.java

@@ -250,6 +250,9 @@ protected <X extends CosServiceRequest> CosHttpRequest<X> createRequest(String b
         CosHttpRequest<X> httpRequest = new CosHttpRequest<X>(originalRequest);
         httpRequest.setHttpMethod(httpMethod);
         httpRequest.addHeader(Headers.USER_AGENT, clientConfig.getUserAgent());
+        if (originalRequest.getCustomRequestHeaders() != null && originalRequest.getCustomRequestHeaders().containsKey("Pic-Operations")) {
+            httpRequest.addHeader("Pic-Operations", originalRequest.getCustomRequestHeaders().get("Pic-Operations"));
+        }
         if (originalRequest instanceof ListBucketsRequest) {
             buildUrlAndHost(httpRequest, bucketName, key, true);
         } else {
@@ -959,8 +962,10 @@ ObjectMetadata uploadObjectInternal(UploadMode uploadMode, UploadObjectRequest u
             populateRequestMetadata(request, metadata);
             request.setContent(input);
             try {
-                if(uploadObjectRequest.getPicOperations() != null) {
-                    request.addHeader(Headers.PIC_OPERATIONS, Jackson.toJsonString(uploadObjectRequest.getPicOperations()));
+                if(uploadObjectRequest.getPicOperations() != null || (uploadObjectRequest.getCustomRequestHeaders() != null && uploadObjectRequest.getCustomRequestHeaders().containsKey(Headers.PIC_OPERATIONS)) ) {
+                    if (uploadObjectRequest.getCustomRequestHeaders() == null || !uploadObjectRequest.getCustomRequestHeaders().containsKey(Headers.PIC_OPERATIONS)){
+                        request.addHeader(Headers.PIC_OPERATIONS, Jackson.toJsonString(uploadObjectRequest.getPicOperations()));
+                    }
                     returnedMetadata = invoke(request, new ResponseHeaderHandlerChain<ObjectMetadata>(
                             new Unmarshallers.ImagePersistenceUnmarshaller(), new CosMetadataResponseHandler()));
                 } else {
@@ -4299,8 +4304,12 @@ public Boolean createMediaProcessBucket(MediaBucketRequest mediaBucketRequest) {
         return true;
     }
 
-    @Override
     public String GenerateDocPreviewUrl(DocHtmlRequest docJobRequest) throws URISyntaxException {
+        return generateDocPreviewUrl(docJobRequest);
+    }
+
+    @Override
+    public String generateDocPreviewUrl(DocHtmlRequest docJobRequest) throws URISyntaxException {
         rejectNull(docJobRequest,
                 "The request parameter must be specified setting the object tags");
         rejectNull(docJobRequest.getBucketName(),
@@ -5212,7 +5221,7 @@ public DeleteFileMetaIndexResponse deleteFileMetaIndex(DeleteFileMetaIndexReques
         rejectNull(customRequest, "The request parameter must be specified setting the object tags");
 
         CosHttpRequest<DeleteFileMetaIndexRequest> request = createRequest(customRequest.getAppId(), "/filemeta", customRequest , HttpMethodName.DELETE);
-
+        request.addHeader("Accept", "application/json");
         this.setContent(request, CIJackson.toJsonBytes(customRequest), "application/json", false);
         return invoke(request, new Unmarshallers.CICommonJsonUnmarshaller<DeleteFileMetaIndexResponse>(DeleteFileMetaIndexResponse.class));
     }

src/main/java/com/qcloud/cos/demo/CopyFileDemo.java

@@ -17,8 +17,8 @@
 import com.qcloud.cos.transfer.TransferManager;
 
 public class CopyFileDemo {
-    private static String secretId = "AKIDXXXXXXXX";
-    private static String secretKey = "1A2Z3YYYYYYYYYY";
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
     private static String srcBucketName = "srcBucket-12500000000";
     private static String srcKey = "aaa/bbb.txt";
     private static String destBucketName = "destBucket-12500000000";

src/main/java/com/qcloud/cos/demo/DelFileDemo.java

@@ -21,10 +21,10 @@
  * DelFileDemo展示了删除单个文件的DelObject, 删除多个文件的DelObjects的使用示例.
  */
 public class DelFileDemo {
-    private static String secretId = "AKIDXXXXXXXX";
-    private static String secretKey = "1A2Z3YYYYYYYYYY";
-    private static String bucketName = "examplebucket-12500000000";
-    private static String region = "ap-guangzhou";
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
+    private static String bucketName = System.getenv("BUCKET_NAME");
+    private static String region = System.getenv("REGION");
     private static COSClient cosClient = createCli();
     public static void main(String[] args) {
         delSingleFile();

src/main/java/com/qcloud/cos/demo/GetObjectDemo.java

@@ -17,10 +17,10 @@
 import com.qcloud.cos.utils.IOUtils;
 
 public class GetObjectDemo {
-    private static String secretId = "AKIDXXXXXXXX";
-    private static String secretKey = "1A2Z3YYYYYYYYYY";
-    private static String bucketName = "examplebucket-12500000000";
-    private static String region = "ap-guangzhou";
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
+    private static String bucketName = System.getenv("BUCKET_NAME");
+    private static String region = System.getenv("REGION");
     private static COSClient cosClient = createClient();
 
     public static void main(String[] args) {

src/main/java/com/qcloud/cos/demo/GetObjectMetadataDemo.java

@@ -9,19 +9,21 @@
 
 
 public class GetObjectMetadataDemo {
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
+    private static String bucketName = System.getenv("BUCKET_NAME");
+    private static String region = System.getenv("REGION");
     public static void main(String[] args) {
         getObjectMetadataDemo();
     }
 
     private static void getObjectMetadataDemo() {
         // 1 初始化用户身份信息(secretId, secretKey)
-        COSCredentials cred = new BasicCOSCredentials("AKIDXXXXXXXX", "1A2Z3YYYYYYYYYY");
+        COSCredentials cred = new BasicCOSCredentials(secretId, secretKey);
         // 2 设置bucket的区域, COS地域的简称请参照 https://www.qcloud.com/document/product/436/6224
-        ClientConfig clientConfig = new ClientConfig(new Region("ap-beijing-1"));
+        ClientConfig clientConfig = new ClientConfig(new Region(region));
         // 3 生成cos客户端
         COSClient cosclient = new COSClient(cred, clientConfig);
-        // bucket名需包含appid
-        String bucketName = "mybucket-12500000000";
 
         String key = "aaa/bbb.txt";
         ObjectMetadata objectMetadata = cosclient.getObjectMetadata(bucketName, key);

src/main/java/com/qcloud/cos/demo/ListObjectsDemo.java

@@ -20,10 +20,10 @@
  * ListObjectsDemo展示了如何列出object
  */
 public class ListObjectsDemo {
-    private static String secretId = "AKIDXXXXXXXX";
-    private static String secretKey = "1A2Z3YYYYYYYYYY";
-    private static String bucketName = "examplebucket-12500000000";
-    private static String region = "ap-guangzhou";
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
+    private static String bucketName = System.getenv("BUCKET_NAME");
+    private static String region = System.getenv("REGION");
     private static COSClient cosClient = createClient();
 
     public static void main(String[] args) {

src/main/java/com/qcloud/cos/demo/ModifyObjectMetadataDemo.java

@@ -12,17 +12,19 @@
 import com.qcloud.cos.region.Region;
 
 public class ModifyObjectMetadataDemo {
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
+    private static String bucketName = System.getenv("BUCKET_NAME");
+    private static String region = System.getenv("REGION");
     public static void main(String[] args) {
         // 1 初始化用户身份信息(secretId, secretKey)
-        COSCredentials cred = new BasicCOSCredentials("AKIDXXXXXXXX", "1A2Z3YYYYYYYYYY");
+        COSCredentials cred = new BasicCOSCredentials(secretId, secretKey);
         // 2 设置bucket的区域, COS地域的简称请参照 https://www.qcloud.com/document/product/436/6224
-        Region region = new Region("ap-beijing");
-        ClientConfig clientConfig = new ClientConfig(region);
+        Region cosRegion = new Region(region);
+        ClientConfig clientConfig = new ClientConfig(cosRegion);
         // 3 生成cos客户端
         COSClient cosclient = new COSClient(cred, clientConfig);
 
-        // 存储桶的命名格式为 BucketName-APPID，此处填写的存储桶名称必须为此格式
-        String bucketName = "examplebucket-1250000000";
         String key = "exampleobject";
 
         ObjectMetadata objectMetadata = cosclient.getObjectMetadata(bucketName, key);
@@ -33,7 +35,7 @@ public static void main(String[] args) {
         objectMetadata.setHeader("x-cos-storage-class", "STANDARD_IA");
         objectMetadata.setContentType("text/plain");
 
-        CopyObjectRequest copyObjectRequest = new CopyObjectRequest(region, bucketName, key, bucketName, key);
+        CopyObjectRequest copyObjectRequest = new CopyObjectRequest(cosRegion, bucketName, key, bucketName, key);
         copyObjectRequest.setNewObjectMetadata(objectMetadata);
 
         try {

src/main/java/com/qcloud/cos/demo/MultipartUploadDemo.java

@@ -32,10 +32,10 @@
  * 分块上传的完成逻辑较复杂，需要经历多个步骤, 建议用户使用TransferManager中封装好的上传接口来进行文件的上传
  */
 public class MultipartUploadDemo {
-    private static String secretId = "AKIDXXXXXXXX";
-    private static String secretKey = "1A2Z3YYYYYYYYYY";
-    private static String region = "ap-guangzhou";
-    private static String bucketName = "mybucket-12500000000";
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
+    private static String region = System.getenv("REGION");
+    private static String bucketName = System.getenv("BUCKET_NAME");
     private static String key = "aaa/bbb.txt";
 
     private static COSClient cosClient = createCli(region);

src/main/java/com/qcloud/cos/demo/PutObjectDemo.java

@@ -16,11 +16,11 @@
 import com.qcloud.cos.region.Region;
 
 public class PutObjectDemo {
-    private static String secretId = "AKIDXXXXXXXX";
-    private static String secretKey = "1A2Z3YYYYYYYYYY";
-    private static String bucketName = "examplebucket-12500000000";
-    private static String region = "ap-guangzhou";
-    private static COSClient cosClient = createCli();;
+    private static String secretId = System.getenv("SECRETID");
+    private static String secretKey = System.getenv("SECRETKEY");
+    private static String bucketName = System.getenv("BUCKET_NAME");
+    private static String region = System.getenv("REGION");
+    private static COSClient cosClient = createCli();
 
     public static void main(String[] args) {
         try {