Merge pull request #195 from tencentyun/dev/update_demo

update sce Demo

Author: Dzkol

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

@@ -47,6 +47,13 @@ public class AsymmetricKeyEncryptionClientDemo {
 
 	private static COSClient cosClient = createCosClient();
 
+    public static void main(String[] args) throws Exception {
+        putObjectDemo();
+        getObjectDemo();
+        // 关闭
+        cosClient.shutdown();
+    }
+
 	private static COSClient createCosClient() {
 		return createCosClient("ap-guangzhou");
 	}
@@ -76,12 +83,6 @@ private static COSClient createCosClient(String region) {
         CryptoConfiguration cryptoConf = new CryptoConfiguration(CryptoMode.AesCtrEncryption)
                 .withStorageMode(CryptoStorageMode.ObjectMetadata);
 
-        //// 如果 kms 服务的 region 与 cos 的 region 不一致，则在加密信息里指定 kms 服务的 region
-        //cryptoConf.setKmsRegion(kmsRegion);
-
-        //// 如果需要可以为 KMS 服务的 cmk 设置对应的描述信息。
-        //encryptionMaterials.addDescription("kms-region", "guangzhou");
-
         // 生成加密客户端EncryptionClient, COSEncryptionClient是COSClient的子类, 所有COSClient支持的接口他都支持。
         // EncryptionClient覆盖了COSClient上传下载逻辑，操作内部会执行加密操作，其他操作执行逻辑和COSClient一致
         COSEncryptionClient cosEncryptionClient =
@@ -157,11 +158,4 @@ private static void deleteObjectDemo() {
         // 删除文件
 		cosClient.deleteObject(bucketName, key);
 	}
-
-    public static void main(String[] args) throws Exception {
-        putObjectDemo();
-        getObjectDemo();
-        // 关闭
-        cosClient.shutdown();
-    }
 }

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

@@ -7,10 +7,13 @@
 import com.qcloud.cos.exception.CosClientException;
 import com.qcloud.cos.exception.CosServiceException;
 import com.qcloud.cos.internal.SkipMd5CheckStrategy;
+import com.qcloud.cos.model.COSObject;
+import com.qcloud.cos.model.COSObjectInputStream;
 import com.qcloud.cos.model.CompleteMultipartUploadRequest;
 import com.qcloud.cos.model.CompleteMultipartUploadResult;
 import com.qcloud.cos.model.CopyObjectRequest;
 import com.qcloud.cos.model.CopyObjectResult;
+import com.qcloud.cos.model.GetObjectRequest;
 import com.qcloud.cos.model.InitiateMultipartUploadRequest;
 import com.qcloud.cos.model.InitiateMultipartUploadResult;
 import com.qcloud.cos.model.PartETag;
@@ -21,8 +24,11 @@
 import com.qcloud.cos.model.UploadPartResult;
 import com.qcloud.cos.region.Region;
 import com.qcloud.cos.utils.Base64;
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -38,8 +44,14 @@ public class KmsUploadDemo {
     private static String encryptionContext = Base64.encodeAsString("{\"Ssekmstest\":\"Ssekmstest\"}".getBytes());
 
     public static void main(String[] args) {
-        simpleUploadWithKmsMeta();
-        copyObjectWithKmsMeta();
+        try {
+            simpleUploadWithKmsMeta();
+            simpledownloadWithKmsMeta();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            cosClient.shutdown();
+        }
     }
 
     private static COSClient createCOSClient() {
@@ -72,6 +84,27 @@ private static void simpleUploadWithKmsMeta() {
         }
     }
 
+    private static void simpledownloadWithKmsMeta() throws IOException {
+        GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, key);
+        COSObject cosObject = null;
+        try {
+            cosObject = cosClient.getObject(getObjectRequest);
+            COSObjectInputStream cosObjectInputStream = cosObject.getObjectContent();
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(cosObjectInputStream));
+            System.out.println(bufferedReader.readLine());
+        } catch (CosServiceException e) {
+            e.printStackTrace();
+        } catch (CosClientException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (cosObject != null) {
+                cosObject.close();
+            }
+        }
+    }
+
     private static void multipartUploadWithKmsMeta() {
         InitiateMultipartUploadRequest initiateMultipartUploadRequest = new InitiateMultipartUploadRequest(bucketName, key);
         SSECOSKeyManagementParams ssecosKeyManagementParams = new SSECOSKeyManagementParams(kmsKeyId, encryptionContext);

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

@@ -75,16 +75,10 @@ private static COSClient createCosClient(String region) {
 
         // 初始化 KMS 加密材料
         EncryptionMaterials encryptionMaterials = new EncryptionMaterials(symKey);
-        // 使用AES/GCM模式，并将加密信息存储在文件元信息中.
+        // 使用AES模式，并将加密信息存储在文件元信息中,暂不支持GCM模式
         CryptoConfiguration cryptoConf = new CryptoConfiguration(CryptoMode.AesCtrEncryption)
                 .withStorageMode(CryptoStorageMode.ObjectMetadata);
 
-        //// 如果 kms 服务的 region 与 cos 的 region 不一致，则在加密信息里指定 kms 服务的 region
-        //cryptoConf.setKmsRegion(kmsRegion);
-
-        //// 如果需要可以为 KMS 服务的 cmk 设置对应的描述信息。
-        //encryptionMaterials.addDescription("kms-region", "guangzhou");
-
         // 生成加密客户端EncryptionClient, COSEncryptionClient是COSClient的子类, 所有COSClient支持的接口他都支持。
         // EncryptionClient覆盖了COSClient上传下载逻辑，操作内部会执行加密操作，其他操作执行逻辑和COSClient一致
         COSEncryptionClient cosEncryptionClient =