Merge pull request #235 from tencentyun/dev/checkPointUpload

Dev/check point upload

Author: Dzkol

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.242</version>
+    <version>5.6.244</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>

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

@@ -587,6 +587,7 @@ private static PutObjectResult createPutObjectResult(ObjectMetadata metadata) {
         result.setSSECustomerAlgorithm(metadata.getSSECustomerAlgorithm());
         result.setSSECustomerKeyMd5(metadata.getSSECustomerKeyMd5());
         result.setCrc64Ecma(metadata.getCrc64Ecma());
+        result.setCrc32c(metadata.getCrc32c());
         result.setMetadata(metadata);
         result.setCiUploadResult(metadata.getCiUploadResult());
         return result;
@@ -1328,6 +1329,11 @@ public void deleteObject(DeleteObjectRequest deleteObjectRequest)
         if (deleteObjectRequest.isRecursive()) {
             request.addParameter("recursive", null);
         }
+
+        if (deleteObjectRequest.getVersionId() != null && !deleteObjectRequest.getVersionId().isEmpty()) {
+            request.addParameter("versionId", deleteObjectRequest.getVersionId());
+        }
+
         invoke(request, voidCosResponseHandler);
     }
 
@@ -1902,8 +1908,12 @@ public CompleteMultipartUploadResult completeMultipartUpload(
                 Map<String, String> responseHeaders = responseHandler.getResponseHeaders();
                 String versionId = responseHeaders.get(Headers.COS_VERSION_ID);
                 String crc64Ecma = responseHeaders.get(Headers.COS_HASH_CRC64_ECMA);
+                String crc32c = responseHeaders.get(Headers.COS_HASH_CRC32_C);
                 handler.getCompleteMultipartUploadResult().setVersionId(versionId);
                 handler.getCompleteMultipartUploadResult().setCrc64Ecma(crc64Ecma);
+                if (crc32c != null) {
+                    handler.getCompleteMultipartUploadResult().setCrc32c(crc32c);
+                }
                 // if ci request, set ciUploadResult to CompleteMultipartUploadResult
                 if(completeMultipartUploadRequest.getPicOperations() != null) {
                     handler.getCompleteMultipartUploadResult().setCiUploadResult(handler.getCiUploadResult());

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

@@ -139,6 +139,8 @@ public class ClientConfig {
 
     private long connectionMaxIdleMillis = 60 * 1000;
 
+    private boolean addLogDebugHeader = true;
+
     // 不传入region 用于后续调用List Buckets(获取所有的bucket信息)
     public ClientConfig() {
         super();
@@ -507,4 +509,12 @@ public boolean isRetryAfterPreflight() {
     public void setRetryAfterPreflight(boolean retryAfterPreflight) {
         this.retryAfterPreflight = retryAfterPreflight;
     }
+
+    public boolean isAddLogDebugHeader() {
+        return addLogDebugHeader;
+    }
+
+    public void setAddLogDebugHeader(boolean addLogDebugHeader) {
+        this.addLogDebugHeader = addLogDebugHeader;
+    }
 }

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

@@ -69,6 +69,8 @@ public interface Headers {
      */
     public static final String COS_HASH_CRC64_ECMA = "x-cos-hash-crc64ecma";
 
+    public static final String COS_HASH_CRC32_C = "x-cos-hash-crc32c";
+
     /**
      * Prefix for COS user metadata: x-cos-meta-
      */

src/main/java/com/qcloud/cos/http/DefaultCosHttpClient.java

@@ -362,10 +362,12 @@ private <X extends CosServiceRequest> HttpRequestBase buildHttpRequest(
             }
         }
 
-        if (log.isDebugEnabled()) {
-            httpRequestBase.addHeader(Headers.SDK_LOG_DEBUG, "on");
-        } else {
-            httpRequestBase.addHeader(Headers.SDK_LOG_DEBUG, "off");
+        if (clientConfig.isAddLogDebugHeader()) {
+            if (log.isDebugEnabled()) {
+                httpRequestBase.addHeader(Headers.SDK_LOG_DEBUG, "on");
+            } else {
+                httpRequestBase.addHeader(Headers.SDK_LOG_DEBUG, "off");
+            }
         }
 
         if (clientConfig.isShortConnection()) {

src/main/java/com/qcloud/cos/http/IdleConnectionMonitor.java

@@ -79,6 +79,10 @@ public void run() {
                 }
 
                 Thread.sleep(PERIOD_MILLISECONDS);
+            } catch (InterruptedException e) {
+                if (!shuttingDown) {
+                    log.error("interrupt exception occurred:", e);
+                }
             } catch (Throwable t) {
                 log.error("error occurred when closeExpiredConnections and closeIdleConnections, err:", t);
             }

src/main/java/com/qcloud/cos/model/CompleteMultipartUploadResult.java

@@ -66,7 +66,7 @@ public class CompleteMultipartUploadResult extends SSEResultBase
     /*The ci upload result*/
     private CIUploadResult ciUploadResult;
 
-
+    private String crc32c;
 
     /**
      * get requestid for this upload
@@ -245,4 +245,12 @@ public CIUploadResult getCiUploadResult() {
     public void setCiUploadResult(CIUploadResult ciUploadResult) {
         this.ciUploadResult = ciUploadResult;
     }
+
+    public String getCrc32c() {
+        return crc32c;
+    }
+
+    public void setCrc32c(String crc32c) {
+        this.crc32c = crc32c;
+    }
 }

src/main/java/com/qcloud/cos/model/DeleteObjectRequest.java

@@ -38,7 +38,7 @@ public class DeleteObjectRequest extends CosServiceRequest implements Serializab
      */
     private boolean isRecursive;
 
-
+    private String versionId;
     /**
      * Constructs a new {@link DeleteObjectRequest}, specifying the object's bucket name and key.
      *
@@ -129,4 +129,12 @@ public void setRecursive(boolean isRecursive) {
     public boolean isRecursive() {
         return this.isRecursive;
     }
+
+    public String getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(String versionId) {
+        this.versionId = versionId;
+    }
 }

src/main/java/com/qcloud/cos/model/ObjectMetadata.java

@@ -818,6 +818,10 @@ public String getCrc64Ecma() {
         return (String)metadata.get(Headers.COS_HASH_CRC64_ECMA);
     }
 
+    public String getCrc32c() {
+        return (String)metadata.get(Headers.COS_HASH_CRC32_C);
+    }
+
     @Override
     public String getRequestId() {
         return (String)metadata.get(Headers.REQUEST_ID);

src/main/java/com/qcloud/cos/model/PutObjectResult.java

@@ -61,6 +61,8 @@ public class PutObjectResult extends SSEResultBase implements ObjectExpirationRe
     /** The crc64ecma value for this object */
     private String crc64Ecma;
 
+    private String crc32c;
+
     /** The ci upload result */
     private CIUploadResult ciUploadResult;
 
@@ -229,4 +231,12 @@ public CIUploadResult getCiUploadResult() {
     public void setCiUploadResult(CIUploadResult ciUploadResult) {
         this.ciUploadResult = ciUploadResult;
     }
+
+    public String getCrc32c() {
+        return crc32c;
+    }
+
+    public void setCrc32c(String crc32c) {
+        this.crc32c = crc32c;
+    }
 }