From 5843d5fee99ce0921841ed31855ce71b8f6391a7 Mon Sep 17 00:00:00 2001
From: Sebastian Annies <sebastian.annies@googlemail.com>
Date: Tue, 9 Aug 2011 16:15:54 +0200
Subject: [PATCH] Improve Range handling. * allowing to GET last n bytes. *
 start from GET range now spec conform (to field empty instead of
 Long.MAX_VALUE)

---
 .../functions/BlobToHttpGetOptions.java       |  8 +++----
 .../jclouds/blobstore/options/GetOptions.java | 10 ++++++++
 .../functions/BlobToHttpGetOptionsTest.java   | 23 +++++++++++++++++++
 .../blobstore/options/GetOptionsTest.java     | 15 ++++++++++++
 .../org/jclouds/http/options/GetOptions.java  |  2 +-
 .../jclouds/http/options/GetOptionsTest.java  |  4 ++--
 6 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java
index a2ceb68d0e..28f3311cb8 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java
@@ -51,11 +51,11 @@ public class BlobToHttpGetOptions implements Function<org.jclouds.blobstore.opti
          httpOptions.ifUnmodifiedSince(from.getIfUnmodifiedSince());
       }
       for (String range : from.getRanges()) {
-         String[] firstLast = range.split("\\-");
-         if (firstLast.length == 2)
+         String[] firstLast = range.split("\\-", 2);
+         if (!firstLast[0].isEmpty() && !firstLast[1].isEmpty())
             httpOptions.range(Long.parseLong(firstLast[0]), Long.parseLong(firstLast[1]));
-         else if (range.startsWith("-"))
-            httpOptions.tail(Long.parseLong(firstLast[0]));
+         else if (firstLast[0].isEmpty() && !firstLast[1].isEmpty())
+            httpOptions.tail(Long.parseLong(firstLast[1]));
          else
             httpOptions.startAt(Long.parseLong(firstLast[0]));
       }
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/options/GetOptions.java b/blobstore/src/main/java/org/jclouds/blobstore/options/GetOptions.java
index 394bed84be..c0e6b556ca 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/options/GetOptions.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/options/GetOptions.java
@@ -72,6 +72,16 @@ public class GetOptions {
       return this;
    }
 
+
+   /**
+    * download the specified range of the object starting from the end of the object.
+    */
+   public GetOptions tail(long length) {
+      checkArgument(length >= 0, "length must be >= 0");
+      getRanges().add(String.format("-%d", length));
+      return this;
+   }
+
    /**
     * Only return the object if it has changed since this time.
     * <p />
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
index 9f3bf9dba3..ca0d8a7ddc 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
@@ -103,6 +103,29 @@ public class BlobToHttpGetOptionsTest {
       assertEquals(fn.apply(in), expected);
 
    }
+
+   @Test
+   public void testRangesTail(){
+      org.jclouds.blobstore.options.GetOptions in = new org.jclouds.blobstore.options.GetOptions();
+      in.tail(1024);
+
+      GetOptions expected = new GetOptions();
+      expected.tail(1024);
+
+      assertEquals(fn.apply(in), expected);
+
+   }
+   @Test
+   public void testRangesStart(){
+      org.jclouds.blobstore.options.GetOptions in = new org.jclouds.blobstore.options.GetOptions();
+      in.startAt(1024);
+
+      GetOptions expected = new GetOptions();
+      expected.startAt(1024);
+
+      assertEquals(fn.apply(in), expected);
+
+   }
    
    @Test(expectedExceptions = { NullPointerException.class, IllegalStateException.class })
    public void testNullIsBad() {
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java b/blobstore/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java
index e1ab5cce68..e6eb7a611c 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java
@@ -136,6 +136,21 @@ public class GetOptionsTest {
       assertEquals(options.getRanges(), ImmutableList.of("0-5", "10-100"));
    }
 
+
+   @Test
+   public void testRangeStartAt() {
+      GetOptions options = new GetOptions();
+      options.startAt(5);
+      assertEquals(options.getRanges(), ImmutableList.of("5-"));
+   }
+
+   @Test
+   public void testRangeTail() {
+      GetOptions options = new GetOptions();
+      options.tail(5);
+      assertEquals(options.getRanges(), ImmutableList.of("-5"));
+   }
+
    @Test
    public void testNoRange() {
       GetOptions options = new GetOptions();
diff --git a/core/src/main/java/org/jclouds/http/options/GetOptions.java b/core/src/main/java/org/jclouds/http/options/GetOptions.java
index b51a66b41c..6b9564ca4a 100644
--- a/core/src/main/java/org/jclouds/http/options/GetOptions.java
+++ b/core/src/main/java/org/jclouds/http/options/GetOptions.java
@@ -80,7 +80,7 @@ public class GetOptions extends BaseHttpRequestOptions {
     */
    public GetOptions startAt(long start) {
       checkArgument(start >= 0, "start must be >= 0");
-      ranges.add(String.format("%d-%d", start, Long.MAX_VALUE));
+      ranges.add(String.format("%d-", start));
       return this;
    }
 
diff --git a/core/src/test/java/org/jclouds/http/options/GetOptionsTest.java b/core/src/test/java/org/jclouds/http/options/GetOptionsTest.java
index 973572531e..b76a7b8999 100644
--- a/core/src/test/java/org/jclouds/http/options/GetOptionsTest.java
+++ b/core/src/test/java/org/jclouds/http/options/GetOptionsTest.java
@@ -155,13 +155,13 @@ public class GetOptionsTest {
    public void testStartAt() {
       GetOptions options = new GetOptions();
       options.startAt(100);
-      assertEquals(options.getRange(), "bytes=100-9223372036854775807");
+      assertEquals(options.getRange(), "bytes=100-");
    }
 
    @Test
    public void testStartAtStatic() {
       GetOptions options = startAt(100);
-      assertEquals(options.getRange(), "bytes=100-9223372036854775807");
+      assertEquals(options.getRange(), "bytes=100-");
    }
 
    @Test(expectedExceptions = IllegalArgumentException.class)