Skip to content

Commit 39e76a5

Browse files
authored
Merge pull request #117 from yuyang733/feature-add_symlink_support
fix: remove the versionId and ACL
2 parents 43efa3c + f8e6594 commit 39e76a5

File tree

2 files changed

+0
-55
lines changed

2 files changed

+0
-55
lines changed

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

-15
Original file line numberDiff line numberDiff line change
@@ -1187,24 +1187,9 @@ public PutSymlinkResult putSymlink(PutSymlinkRequest putSymlinkRequest) {
11871187
CosHttpRequest<CosServiceRequest> request = createRequest(putSymlinkRequest.getBucketName(),
11881188
putSymlinkRequest.getSymlink(), putSymlinkRequest, HttpMethodName.PUT);
11891189
request.addParameter("symlink", null);
1190-
addParameterIfNotNull(request,"versionId", putSymlinkRequest.getVersionId());
11911190

11921191
request.addHeader(Headers.SYMLINK_TARGET, putSymlinkRequest.getTarget());
11931192

1194-
// Set acl
1195-
// canned acl
1196-
addHeaderIfNotNull(request, Headers.COS_CANNED_ACL,
1197-
putSymlinkRequest.getCannedAccessControlList() != null ?
1198-
putSymlinkRequest.getCannedAccessControlList().toString() : null);
1199-
1200-
// custom acl
1201-
if (putSymlinkRequest.getAccessControlList() != null) {
1202-
byte[] aclAsXml = new AclXmlFactory().convertToXmlByteArray(putSymlinkRequest.getAccessControlList());
1203-
request.addHeader(Headers.CONTENT_TYPE, "application/xml");
1204-
request.addHeader(Headers.CONTENT_LENGTH, String.valueOf(aclAsXml.length));
1205-
request.setContent(new ByteArrayInputStream(aclAsXml));
1206-
}
1207-
12081193
return invoke(request, new PutSymlinkResultHandler());
12091194
}
12101195

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

-40
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ public class PutSymlinkRequest extends CosServiceRequest implements Serializable
99
private String bucketName;
1010
private String symlink;
1111
private String target;
12-
private String versionId;
13-
14-
private AccessControlList accessControlList;
15-
private CannedAccessControlList cannedAccessControlList;
1612

1713
public PutSymlinkRequest() {
1814
}
@@ -38,18 +34,6 @@ public PutSymlinkRequest withTarget(String target) {
3834
return this;
3935
}
4036

41-
public PutSymlinkRequest withAccessControlList(
42-
AccessControlList accessControlList) {
43-
this.accessControlList = accessControlList;
44-
return this;
45-
}
46-
47-
public PutSymlinkRequest withCannedAccessControlList(
48-
CannedAccessControlList cannedAccessControlList) {
49-
this.cannedAccessControlList = cannedAccessControlList;
50-
return this;
51-
}
52-
5337
public String getBucketName() {
5438
return bucketName;
5539
}
@@ -73,28 +57,4 @@ public String getTarget() {
7357
public void setTarget(String target) {
7458
this.target = target;
7559
}
76-
77-
public String getVersionId() {
78-
return versionId;
79-
}
80-
81-
public void setVersionId(String versionId) {
82-
this.versionId = versionId;
83-
}
84-
85-
public AccessControlList getAccessControlList() {
86-
return accessControlList;
87-
}
88-
89-
public void setAccessControlList(AccessControlList accessControlList) {
90-
this.accessControlList = accessControlList;
91-
}
92-
93-
public CannedAccessControlList getCannedAccessControlList() {
94-
return cannedAccessControlList;
95-
}
96-
97-
public void setCannedAccessControlList(CannedAccessControlList cannedAccessControlList) {
98-
this.cannedAccessControlList = cannedAccessControlList;
99-
}
10060
}

0 commit comments

Comments
 (0)