Merge pull request #8 from gcheng/Jerusalem

Merge the MD5 update to dev for.
Azure · Jul 30, 2012 · 796a21a · 796a21a
2 parents 0040bcf + a542866
commit 796a21a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/.../src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java b/.../src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java
@@ -651,6 +651,9 @@ public GetBlobResult getBlob(String container, String blob, GetBlobOptions optio
         builder = addOptionalHeader(builder, "x-ms-lease-id", options.getLeaseId());
         builder = addOptionalRangeHeader(builder, options.getRangeStart(), options.getRangeEnd());
         builder = addOptionalAccessContitionHeader(builder, options.getAccessCondition());
+        if (options.isComputeRangeMD5()) {
+            builder = addOptionalHeader(builder, "x-ms-range-get-content-md5", "true");
+        }
 
         ClientResponse response = builder.get(ClientResponse.class);
         ThrowIfNotSuccess(response);

diff --git a/...pi/src/test/java/com/microsoft/windowsazure/services/blob/BlobServiceIntegrationTest.java b/...pi/src/test/java/com/microsoft/windowsazure/services/blob/BlobServiceIntegrationTest.java
@@ -1226,6 +1226,32 @@ public void getBlobWithIfNotModifiedSinceAccessConditionWorks() throws Exception
         // Assert
     }
 
+    @Test
+    public void getBlobWithMD5Range() throws Exception {
+        // Arrange
+        Configuration config = createConfiguration();
+        BlobContract service = BlobService.create(config);
+        String expectedMd5 = "+zxkkqBt6HehE3r5suhS1w==";
+
+        // Act
+        String container = TEST_CONTAINER_FOR_BLOBS;
+        String blob = "test";
+        service.createPageBlob(container, blob, 4096);
+
+        GetBlobOptions options = new GetBlobOptions();
+        options = options.setRangeStart(50L);
+        options = options.setRangeEnd(200L);
+        options = options.setComputeRangeMD5(true);
+        GetBlobResult getBlobResult = service.getBlob(container, blob, options);
+
+        // Assert
+        assertNotNull(getBlobResult);
+        BlobProperties blobProperties = getBlobResult.getProperties();
+        String actualMd5 = blobProperties.getContentMD5();
+        assertEquals(expectedMd5, actualMd5);
+
+    }
+
     @Test
     public void getBlobPropertiesWorks() throws Exception {
         // Arrange