delete check & range set

Author: jeffreykzli

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

@@ -38,6 +38,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -143,6 +144,7 @@
 import com.qcloud.cos.utils.*;
 import com.qcloud.cos.http.TimeOutCosHttpClient;
 
+import com.qcloud.cos.utils.Base64;
 import org.apache.commons.codec.DecoderException;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.entity.ContentType;
@@ -1072,8 +1074,16 @@ public COSObject getObject(GetObjectRequest getObjectRequest)
         // Range
         long[] range = getObjectRequest.getRange();
         if (range != null) {
-            request.addHeader(Headers.RANGE,
-                    "bytes=" + Long.toString(range[0]) + "-" + Long.toString(range[1]));
+            if (range[0] == -1) {
+                request.addHeader(Headers.RANGE,
+                        "bytes=" + "-" + Long.toString(range[1]));
+            } else if (range[1] == -1) {
+                request.addHeader(Headers.RANGE,
+                        "bytes=" + Long.toString(range[0]) + "-");
+            } else {
+                request.addHeader(Headers.RANGE,
+                        "bytes=" + Long.toString(range[0]) + "-" + Long.toString(range[1]));
+            }
         }
         addResponseHeaderParameters(request, getObjectRequest.getResponseHeaders());
 
@@ -1274,6 +1284,11 @@ public void deleteObject(DeleteObjectRequest deleteObjectRequest)
 
         rejectEmpty(deleteObjectRequest.getKey(),
                                 "The length of the key must be greater than 0");
+
+        if (Objects.equals(deleteObjectRequest.getKey(), "/")) {
+            throw new IllegalArgumentException("The specified key should not be /");
+        }
+
         CosHttpRequest<DeleteObjectRequest> request =
                 createRequest(deleteObjectRequest.getBucketName(), deleteObjectRequest.getKey(),
                         deleteObjectRequest, HttpMethodName.DELETE);

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

@@ -509,6 +509,7 @@ public <X, Y extends CosServiceRequest> X exeute(CosHttpRequest<Y> request,
                 }
                 if (retryIndex != 0) {
                     long delay = backoffStrategy.computeDelayBeforeNextRetry(retryIndex);
+                    request.addHeader("x-cos-sdk-retry", "true");
                     Thread.sleep(delay);
                 }
                 HttpContext context = HttpClientContext.create();

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

@@ -329,6 +329,20 @@ public void setRange(long start, long end) {
         range = new long[] {start, end};
     }
 
+    public void setRangeStart(long start) {
+        if (start < 0) {
+            throw new IllegalArgumentException("The range start should be greater than or equal to 0");
+        }
+        range = new long[] {start, -1L};
+    }
+
+    public void setRangeEnd(long end) {
+        if (end < 0) {
+            throw new IllegalArgumentException("The range end should be greater than or equal to 0");
+        }
+        range = new long[] {-1L, end};
+    }
+
     /**
      * <p>
      * Sets the optional inclusive byte range within the desired object that will be downloaded by

src/main/java/com/qcloud/cos/transfer/TransferManager.java

@@ -721,7 +721,7 @@ private Download doDownload(final GetObjectRequest getObjectRequest, final File
         long lastByte;
 
         long[] range = getObjectRequest.getRange();
-        if (range != null && range.length == 2) {
+        if (range != null && range.length == 2 && range[0] != -1 && range[1] != -1) {
             startingByte = range[0];
             lastByte = range[1];
         } else {
@@ -734,6 +734,13 @@ private Download doDownload(final GetObjectRequest getObjectRequest, final File
             final ObjectMetadata objectMetadata = cos.getObjectMetadata(getObjectMetadataRequest);
 
             lastByte = objectMetadata.getContentLength() - 1;
+            if (range != null && range.length == 2) {
+                if (range[0] == -1) {
+                    startingByte = lastByte - range[1] + 1;
+                } else {
+                    startingByte = range[0];
+                }
+            }
         }
         final long origStartingByte = startingByte;
         // We still pass the unfiltered listener chain into DownloadImpl