Merge branch 'tencentyun:master' into master

Author: 563750789

pom.xml

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

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

@@ -375,6 +375,28 @@ public COSObject getObject(GetObjectRequest getObjectRequest)
     public ObjectMetadata getObject(GetObjectRequest getObjectRequest, File destinationFile)
             throws CosClientException, CosServiceException;
 
+    /**
+     * <p>
+     *     Create a Symlink for the specified object.
+     *     The <code>PutSymlinkRequest</code> contains all the details of the request, including the bucket created to,
+     *     the symLink name referred to the target object, the target object key.
+     * <p/>
+     * @param putSymlinkRequest the request object containing all the parameter to create a symlink.
+     * @return the result creating symlink.
+     */
+    public PutSymlinkResult putSymlink(PutSymlinkRequest putSymlinkRequest);
+
+    /**
+     * <p>
+     *     Get the object the symbolic link actually points to.
+     *     The <code>GetSymlinkRequest</code> contains all the details of the request, including the bucket created to,
+     *     the symbolic link queried.
+     * </p>
+     * @param getSymlinkRequest the request object containing all the parameter to get a symlink.
+     * @return the target the symbolic link referred to.
+     */
+    public GetSymlinkResult getSymlink(GetSymlinkRequest getSymlinkRequest);
+
     /**
      * @param bucketName Name of bucket that presumably contains object
      * @param objectName Name of object that has to be checked

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

@@ -1183,6 +1183,39 @@ public COSObject getCOSObjectStream() {
         return cosObject.getObjectMetadata();
     }
 
+    @Override
+    public PutSymlinkResult putSymlink(PutSymlinkRequest putSymlinkRequest) {
+        rejectNull(putSymlinkRequest, "The request must not be null.");
+        rejectNull(putSymlinkRequest.getBucketName(),
+                "The bucket name parameter must be specified when create symlink.");
+        rejectNull(putSymlinkRequest.getSymlink(), "The symlink name must be specified when create symlink");
+        rejectNull(putSymlinkRequest.getTarget(), "The target object must be specified when create symlink");
+
+        CosHttpRequest<CosServiceRequest> request = createRequest(putSymlinkRequest.getBucketName(),
+                putSymlinkRequest.getSymlink(), putSymlinkRequest, HttpMethodName.PUT);
+        request.addParameter("symlink", null);
+
+        request.addHeader(Headers.SYMLINK_TARGET, putSymlinkRequest.getTarget());
+
+        return invoke(request, new PutSymlinkResultHandler());
+    }
+
+    @Override
+    public GetSymlinkResult getSymlink(GetSymlinkRequest getSymlinkRequest) {
+        rejectNull(getSymlinkRequest, "The request must not be null.");
+        rejectNull(getSymlinkRequest.getBucketName(),
+                "The bucket name parameter must be specified when getting symlink.");
+        rejectNull(getSymlinkRequest.getSymlink(), "The requested symbolic link must be specified.");
+
+        CosHttpRequest<CosServiceRequest> request = createRequest(getSymlinkRequest.getBucketName(),
+                getSymlinkRequest.getSymlink(), getSymlinkRequest, HttpMethodName.GET);
+        request.addParameter("symlink", null);
+        addParameterIfNotNull(request,"versionId", getSymlinkRequest.getVersionId());
+
+        return invoke(request, new GetSymlinkResultHandler());
+    }
+
+
     @Override
     public boolean doesObjectExist(String bucketName, String objectName)
             throws CosClientException, CosServiceException {
@@ -1694,8 +1727,6 @@ public void abortMultipartUpload(AbortMultipartUploadRequest abortMultipartUploa
 
     }
 
-
-
     @Override
     public CompleteMultipartUploadResult completeMultipartUpload(
             CompleteMultipartUploadRequest completeMultipartUploadRequest)

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

@@ -327,4 +327,6 @@ public interface Headers {
     public static final String ENCRYPTION_UNENCRYPTED_CONTENT_MD5 = "client-side-encryption-unencrypted-content-md5";
     public static final String ENCRYPTION_DATA_SIZE = "client-side-encryption-data-size";
     public static final String ENCRYPTION_PART_SIZE = "client-side-encryption-part-size";
+
+    public static final String SYMLINK_TARGET= "x-cos-symlink-target";
 }

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

@@ -0,0 +1,38 @@
+package com.qcloud.cos.demo;
+
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.ClientConfig;
+import com.qcloud.cos.auth.BasicCOSCredentials;
+import com.qcloud.cos.auth.COSCredentials;
+import com.qcloud.cos.model.PutSymlinkRequest;
+import com.qcloud.cos.model.PutSymlinkResult;
+import com.qcloud.cos.region.Region;
+
+public class CreateSymlinkDemo {
+
+    private static final String secretId = "";
+    private static final String secretKey = "";
+    private static final String bucket = "";
+    private static final String region = "";
+
+    public static void createSymlink(String symlink, String target)  {
+        COSCredentials cosCredentials = new BasicCOSCredentials(secretId, secretKey);
+        ClientConfig clientConfig = new ClientConfig(new Region(region));
+
+        COSClient cosClient = new COSClient(cosCredentials, clientConfig);
+
+        PutSymlinkRequest putSymlinkRequest = new PutSymlinkRequest(bucket, symlink, target);
+
+        try {
+            PutSymlinkResult putSymlinkResult = cosClient.putSymlink(putSymlinkRequest);
+            System.out.println("ETag: " + putSymlinkResult.getETag());
+        } finally {
+            cosClient.shutdown();
+        }
+
+    }
+
+    public static void main(String[] args) {
+        createSymlink("test-symlink", "word_count.txt");
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.qcloud.cos.demo;
+
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.ClientConfig;
+import com.qcloud.cos.auth.BasicCOSCredentials;
+import com.qcloud.cos.auth.COSCredentials;
+import com.qcloud.cos.model.GetSymlinkRequest;
+import com.qcloud.cos.model.GetSymlinkResult;
+import com.qcloud.cos.region.Region;
+
+public class GetSymlinkDemo {
+    private static final String secretId = "";
+    private static final String secretKey = "";
+    private static final String bucket = "";
+    private static final String region = "";
+
+    public static String getSymlink(String symlink) {
+        COSCredentials cosCredentials = new BasicCOSCredentials(secretId, secretKey);
+        ClientConfig clientConfig = new ClientConfig(new Region(region));
+        COSClient cosClient = new COSClient(cosCredentials, clientConfig);
+
+        GetSymlinkResult getSymlinkResult = cosClient.getSymlink(
+                new GetSymlinkRequest(bucket, symlink, null));
+
+        return getSymlinkResult.getTarget();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getSymlink("test-symlink"));
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.qcloud.cos.model;
+
+import com.qcloud.cos.internal.CosServiceRequest;
+
+import java.io.Serializable;
+
+public class GetSymlinkRequest extends CosServiceRequest implements Serializable {
+    private static final long serialVersionUID = -1413983172326934188L;
+
+    private String bucketName;
+    private String symlink;
+    private String versionId;
+
+    public GetSymlinkRequest() {
+    }
+
+    public GetSymlinkRequest(String bucketName, String symlink, String versionId) {
+        this.bucketName = bucketName;
+        this.symlink = symlink;
+        this.versionId = versionId;
+    }
+
+    public GetSymlinkRequest withBucketName(String bucketName) {
+        this.bucketName = bucketName;
+        return this;
+    }
+
+    public GetSymlinkRequest withSymlink(String symlink) {
+        this.symlink = symlink;
+        return this;
+    }
+
+    public GetSymlinkRequest withVersionId(String versionId) {
+        this.versionId = versionId;
+        return this;
+    }
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
+    public String getSymlink() {
+        return symlink;
+    }
+
+    public void setSymlink(String symlink) {
+        this.symlink = symlink;
+    }
+
+    public String getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(String versionId) {
+        this.versionId = versionId;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.qcloud.cos.model;
+
+import java.io.Serializable;
+
+public class GetSymlinkResult implements Serializable {
+    private static final long serialVersionUID = 3524820691299905321L;
+
+    private String requestId;
+    private String ETag;
+    private String target;
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public String getETag() {
+        return ETag;
+    }
+
+    public void setETag(String ETag) {
+        this.ETag = ETag;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.qcloud.cos.model;
+
+import com.qcloud.cos.Headers;
+import com.qcloud.cos.http.CosHttpResponse;
+import com.qcloud.cos.internal.AbstractCosResponseHandler;
+import com.qcloud.cos.internal.CosServiceResponse;
+
+import java.util.Map;
+
+public class GetSymlinkResultHandler extends AbstractCosResponseHandler<GetSymlinkResult> {
+    @Override
+    public CosServiceResponse<GetSymlinkResult> handle(CosHttpResponse response) throws Exception {
+        GetSymlinkResult getSymlinkResult = new GetSymlinkResult();
+        final CosServiceResponse<GetSymlinkResult> cosServiceResponse = new CosServiceResponse<>();
+        for (Map.Entry<String, String> header : response.getHeaders().entrySet()) {
+            String key = header.getKey();
+            String value = header.getValue();
+
+            if (Headers.REQUEST_ID.compareToIgnoreCase(key) == 0) {
+                getSymlinkResult.setRequestId(value);
+                continue;
+            }
+
+            if (Headers.ETAG.compareToIgnoreCase(key) == 0) {
+                getSymlinkResult.setETag(value);
+                continue;
+            }
+
+            if (Headers.SYMLINK_TARGET.compareToIgnoreCase(key) == 0) {
+                getSymlinkResult.setTarget(value);
+            }
+        }
+
+        cosServiceResponse.setResult(getSymlinkResult);
+        return cosServiceResponse;
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.qcloud.cos.model;
+
+import com.qcloud.cos.internal.CosServiceRequest;
+
+import java.io.Serializable;
+
+public class PutSymlinkRequest extends CosServiceRequest implements Serializable {
+    private static final long serialVersionUID = 2696244667516350971L;
+    private String bucketName;
+    private String symlink;
+    private String target;
+
+    public PutSymlinkRequest() {
+    }
+
+    public PutSymlinkRequest(String bucketName, String symlink, String target) {
+        this.bucketName = bucketName;
+        this.symlink = symlink;
+        this.target = target;
+    }
+
+    public PutSymlinkRequest withBucketName(String bucketName) {
+        this.bucketName = bucketName;
+        return this;
+    }
+
+    public PutSymlinkRequest withSymlink(String symlink) {
+        this.symlink = symlink;
+        return this;
+    }
+
+    public PutSymlinkRequest withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
+    public String getSymlink() {
+        return symlink;
+    }
+
+    public void setSymlink(String symlink) {
+        this.symlink = symlink;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+}