Merge pull request #117 from yuyang733/feature-add_symlink_support

fix: remove the versionId and ACL
tencentyun · Jul 15, 2022 · 39e76a5 · 39e76a5
2 parents 43efa3c + f8e6594
commit 39e76a5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 55 deletions.
diff --git a/src/main/java/com/qcloud/cos/COSClient.java b/src/main/java/com/qcloud/cos/COSClient.java
@@ -1187,24 +1187,9 @@ public PutSymlinkResult putSymlink(PutSymlinkRequest putSymlinkRequest) {
         CosHttpRequest<CosServiceRequest> request = createRequest(putSymlinkRequest.getBucketName(),
                 putSymlinkRequest.getSymlink(), putSymlinkRequest, HttpMethodName.PUT);
         request.addParameter("symlink", null);
-        addParameterIfNotNull(request,"versionId", putSymlinkRequest.getVersionId());
 
         request.addHeader(Headers.SYMLINK_TARGET, putSymlinkRequest.getTarget());
 
-        // Set acl
-        // canned acl
-        addHeaderIfNotNull(request, Headers.COS_CANNED_ACL,
-                putSymlinkRequest.getCannedAccessControlList() != null ?
-                        putSymlinkRequest.getCannedAccessControlList().toString() : null);
-
-        // custom acl
-        if (putSymlinkRequest.getAccessControlList() != null) {
-            byte[] aclAsXml = new AclXmlFactory().convertToXmlByteArray(putSymlinkRequest.getAccessControlList());
-            request.addHeader(Headers.CONTENT_TYPE, "application/xml");
-            request.addHeader(Headers.CONTENT_LENGTH, String.valueOf(aclAsXml.length));
-            request.setContent(new ByteArrayInputStream(aclAsXml));
-        }
-
         return invoke(request, new PutSymlinkResultHandler());
     }
 

diff --git a/src/main/java/com/qcloud/cos/model/PutSymlinkRequest.java b/src/main/java/com/qcloud/cos/model/PutSymlinkRequest.java
@@ -9,10 +9,6 @@ public class PutSymlinkRequest extends CosServiceRequest implements Serializable
     private String bucketName;
     private String symlink;
     private String target;
-    private String versionId;
-
-    private AccessControlList accessControlList;
-    private CannedAccessControlList cannedAccessControlList;
 
     public PutSymlinkRequest() {
     }
@@ -38,18 +34,6 @@ public PutSymlinkRequest withTarget(String target) {
         return this;
     }
 
-    public PutSymlinkRequest withAccessControlList(
-            AccessControlList accessControlList) {
-        this.accessControlList = accessControlList;
-        return this;
-    }
-
-    public PutSymlinkRequest withCannedAccessControlList(
-            CannedAccessControlList cannedAccessControlList) {
-        this.cannedAccessControlList = cannedAccessControlList;
-        return this;
-    }
-
     public String getBucketName() {
         return bucketName;
     }
@@ -73,28 +57,4 @@ public String getTarget() {
     public void setTarget(String target) {
         this.target = target;
     }
-
-    public String getVersionId() {
-        return versionId;
-    }
-
-    public void setVersionId(String versionId) {
-        this.versionId = versionId;
-    }
-
-    public AccessControlList getAccessControlList() {
-        return accessControlList;
-    }
-
-    public void setAccessControlList(AccessControlList accessControlList) {
-        this.accessControlList = accessControlList;
-    }
-
-    public CannedAccessControlList getCannedAccessControlList() {
-        return cannedAccessControlList;
-    }
-
-    public void setCannedAccessControlList(CannedAccessControlList cannedAccessControlList) {
-        this.cannedAccessControlList = cannedAccessControlList;
-    }
 }