Merge pull request #230 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.238</version>
+    <version>5.6.240</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>com.tencentcloudapi</groupId>
             <artifactId>tencentcloud-sdk-java-kms</artifactId>
-            <version>3.1.213</version>
+            <version>3.1.1138</version>
             <exclusions>
                 <exclusion>
                     <groupId>log4j</groupId>

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

@@ -78,7 +78,6 @@
 import com.qcloud.cos.model.fetch.PutAsyncFetchTaskRequest;
 import com.qcloud.cos.model.fetch.PutAsyncFetchTaskResult;
 import com.qcloud.cos.model.inventory.InventoryConfiguration;
-import com.squareup.okhttp.internal.http.HttpMethod;
 
 
 public interface COS extends COSDirectSpi {

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

@@ -5545,13 +5545,22 @@ private void preflightObj(PutObjectRequest putObjectRequest) throws CosClientExc
             String reqMsg = String.format("will do preflight request for put object[%s] to the bucket[%s]", key, bucketName);
             log.debug(reqMsg);
             CosServiceRequest serviceRequest = new CosServiceRequest();
+            Map<String, String> customHeaders = putObjectRequest.getCustomRequestHeaders();
+            if (customHeaders != null) {
+                for (Map.Entry<String, String> e : customHeaders.entrySet()) {
+                    serviceRequest.putCustomRequestHeader(e.getKey(), e.getValue());
+                }
+            }
             CosHttpRequest<CosServiceRequest> request = createRequest(bucketName, key, serviceRequest, HttpMethodName.HEAD);
             if (putObjectRequest.getFixedEndpointAddr() != null) {
                 request.setEndpoint(putObjectRequest.getFixedEndpointAddr());
             }
             request.addParameter("preflight", null);
+            ObjectMetadata metadata = putObjectRequest.getMetadata();
+            if (metadata != null) {
+                populateRequestMetadata(request, metadata);
+            }
             request.addHeader("x-cos-next-action", "PutObject");
-
             invoke(request, voidCosResponseHandler);
         }
     }