Constant fixes + testcases fo range md5.

Author: Ram B

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlockBlobTests.java

@@ -1710,6 +1710,26 @@ public void testBlobConditionalAccess() throws StorageException, IOException, UR
         assertFalse("ETage should be modified on write metadata", newETag.equals(currentETag));
     }
 
+    @Test
+    @Category({ DevFabricTests.class, DevStoreTests.class })
+    public void testBlobGetRangeContentMD5Bounds() throws StorageException, IOException, URISyntaxException {
+    {
+        CloudBlockBlob blob = (CloudBlockBlob) BlobTestHelper.uploadNewBlob(this.container, BlobType.BLOCK_BLOB,
+                "test", 5 * Constants.MB, null);
+        BlobRequestOptions options = new BlobRequestOptions();
+        OperationContext opContext = new OperationContext();
+        try {
+            BlobRequest.getBlob(blob.getUri(), options, opContext, null, "", 0L, 4L * Constants.MB, true);
+            BlobRequest.getBlob(blob.getUri(), options, opContext, null, "", 0L, 4L * Constants.MB + 1, true);
+            fail("The request for range ContentMD5 should have thrown an Exception for exceeding the limit.");
+        }
+        catch (IllegalArgumentException e)
+        {
+            assertEquals(e.getMessage(), String.format("The value of the parameter 'count' should be between 1 and %1d.", Constants.MAX_RANGE_CONTENT_MD5));
+        }
+    }
+    }
+
     private void doUploadDownloadStringTest(CloudBlockBlob blob, int length) throws StorageException, IOException {
         String stringToUse = this.getRandomUNCString(length);
         blob.uploadText(stringToUse, Constants.UTF8_CHARSET, null, null, null);

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileTests.java

@@ -1387,6 +1387,26 @@ public void testFileNamePlusEncoding() throws StorageException, URISyntaxExcepti
         assertEquals(prop1.getContentMD5(), prop2.getContentMD5());
         assertEquals(prop1.getContentType(), prop2.getContentType());
     }
+
+    @Test
+    @Category({ DevFabricTests.class, DevStoreTests.class })
+    public void testFileGetRangeContentMD5Bounds() throws StorageException, IOException, URISyntaxException {
+        {
+            CloudFile file = FileTestHelper.uploadNewFile(this.share, 5 * Constants.MB, null);
+
+            FileRequestOptions options = new FileRequestOptions();
+            OperationContext opContext = new OperationContext();
+            try {
+                FileRequest.getFile(file.getUri(), options, opContext, null, 0L, 4L * Constants.MB, true);
+                FileRequest.getFile(file.getUri(), options, opContext, null, 0L, 4L * Constants.MB + 1, true);
+                fail("The request for range ContentMD5 should have thrown an Exception for exceeding the limit.");
+            }
+            catch (IllegalArgumentException e)
+            {
+                assertEquals(e.getMessage(), String.format("The value of the parameter 'count' should be between 1 and %1d.", Constants.MAX_RANGE_CONTENT_MD5));
+            }
+        }
+    }
 
     private CloudFile doCloudBlobCopy(CloudBlob source, int length) throws Exception {
         Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));

microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java

@@ -1109,6 +1109,11 @@ public static class QueryConstants {
      */
     public static final String MARKER_ELEMENT = "Marker";
 
+    /**
+     * The maximum size for Range ContentMD5.
+     */
+    public static int MAX_RANGE_CONTENT_MD5 = 4 * MB;
+
     /**
      * The maximum size of a BlockBlob block.
      */
@@ -1167,7 +1172,7 @@ public static class QueryConstants {
     /**
      * The default minimum read size, in bytes, for a {@link BlobInputStream} or {@link FileInputStream}.
      */
-    public static final int DEFAULT_MINIMUM_READ_SIZE_IN_BYTES = Constants.MAX_BLOCK_SIZE;
+    public static final int DEFAULT_MINIMUM_READ_SIZE_IN_BYTES = 4 * Constants.MB;
 
     /**
      * The maximum size, in bytes, of a given stream mark operation.

microsoft-azure-storage/src/com/microsoft/azure/storage/SubStreamGenerator.java

@@ -1,3 +1,17 @@
+/**
+ * Copyright Microsoft Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.microsoft.azure.storage;
 
 import com.microsoft.azure.storage.blob.SubStream;

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobRequest.java

@@ -489,7 +489,7 @@ public static HttpURLConnection getBlob(final URI uri, final BlobRequestOptions
 
         if (offset != null && requestRangeContentMD5) {
             Utility.assertNotNull("count", count);
-            Utility.assertInBounds("count", count, 1, Constants.MAX_BLOCK_SIZE);
+            Utility.assertInBounds("count", count, 1, Constants.MAX_RANGE_CONTENT_MD5);
         }
 
         final UriQueryBuilder builder = new UriQueryBuilder();

microsoft-azure-storage/src/com/microsoft/azure/storage/file/FileRequest.java

@@ -350,7 +350,7 @@ public static HttpURLConnection getFile(final URI uri, final FileRequestOptions
 
         if (offset != null && requestRangeContentMD5) {
             Utility.assertNotNull("count", count);
-            Utility.assertInBounds("count", count, 1, Constants.MAX_BLOCK_SIZE);
+            Utility.assertInBounds("count", count, 1, Constants.MAX_RANGE_CONTENT_MD5);
         }
 
         final UriQueryBuilder builder = new UriQueryBuilder();