Merge pull request #144 from jofriedm-msft/dev

Fixed MD5 and OpenWriteExisting bugs.

Author: pemari-msft

BreakingChanges.txt

@@ -1,13 +1,18 @@
+Changes in X.X.X
+
+BLOB/FILE
+ * Fixed a bug which allowed setting content MD5 to true when calling openWriteExisting() on a page blob or file.
+
 Changes in 5.0.0
 
 BLOB
  * getQualifiedUri() has been deprecated. Please use getSnapshotQualifiedUri() instead. This new function will return the blob including the snapshot (if present) and no SAS token.
  * getQualifiedStorageUri() has been deprecated. Please use getSnapshotQualifiedStorageUri() instead. This new function will return the blob including the snapshot (if present) and no SAS token.
  * Fixed a bug where copying from a blob that included a SAS token and a snapshot did not use the SAS token.
- 
+
  FILE
  * Fixed a bug where copying from a blob that included a SAS token and a snapshot did not use the SAS token.
- 
+
 QUEUE
  * For addMessage() the CloudQueueMessage message passed in will be populated with the pop receipt, insertion/expiration time, and message ID.
 
@@ -164,8 +169,8 @@ Changes in 0.5.0
 
  OTHER
  * The packaging structure has changed to
-	1. com.microsoft.windowsazure.storage � RetryPolicies, LocationMode, StorageException, Storage Credentials etc. Basically all public classes that are common across services.
-	2. com.microsoft.windowsazure.storage.core � These classes are reserved for internal use and users never have to include this namespace in their projects. 
+	1. com.microsoft.windowsazure.storage � RetryPolicies, LocationMode, StorageException, Storage Credentials etc. Basically all public classes that are common across services.
+	2. com.microsoft.windowsazure.storage.core � These classes are reserved for internal use and users never have to include this namespace in their projects. 
 	3. com.microsoft.windowsazure.storage.blob
 	4. com.microsoft.windowsazure.storage.queue
 	5. com.microsoft.windowsazure.storage.table

ChangeLog.txt

@@ -1,5 +1,7 @@
 2017.XX.XX Version X.X.X
  * Changed blob constants to support up to 256 MB on put blob for block blobs. The default value for put blob threshold has also been updated to half of the maximum, or 128 MB currently.
+ * Fixed a bug that prevented setting content MD5 to true when creating a new file.
+ * Fixed a bug where access conditions, options, and operation context were not being passed when calling openWriteExisting() on a page blob or a file.
 
 2017.01.18 Version 5.0.0
  * Prefix support for listing files and directories.

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

@@ -211,6 +211,32 @@ public void testPageBlobDownloadRangeValidationTest() throws StorageException, U
         assertEquals(100, downloadLength);
     }
 
+    /**
+     * Test requesting stored content MD5 with OpenWriteExisting().
+     * 
+     * @throws URISyntaxException
+     * @throws StorageException
+     */
+    @Test
+    public void testPageOpenWriteExistingWithMD5() throws URISyntaxException, StorageException, IOException {
+        final String pageBlobName = BlobTestHelper.generateRandomBlobNameWithPrefix("testPageBlob");
+        final CloudPageBlob pageBlobRef = this.container.getPageBlobReference(pageBlobName);
+        pageBlobRef.create(512);
+
+        BlobRequestOptions options = new BlobRequestOptions();
+        options.setStoreBlobContentMD5(true);
+        options.setDisableContentMD5Validation(false);
+
+        try
+        {
+            pageBlobRef.openWriteExisting(null, options, null);
+            fail("Expect failure due to requesting MD5 calculation");
+        }
+        catch (IllegalArgumentException e)
+        {
+        }
+    }
+
     @Test
     public void testPageBlobUploadFromStreamTest() throws URISyntaxException, StorageException, IOException {
         final String pageBlobName = BlobTestHelper.generateRandomBlobNameWithPrefix("testPageBlob");

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

@@ -724,6 +724,45 @@ public void testFileUploadMD5Validation() throws URISyntaxException, StorageExce
         assertEquals(calculatedMD5, fileRef2.getProperties().getContentMD5());
     }
 
+    @Test
+    public void testFileContentMD5NewFileTest() throws URISyntaxException, StorageException, IOException {
+        final String fileName = FileTestHelper.generateRandomFileName();
+        final CloudFile file = this.share.getRootDirectoryReference().getFileReference(fileName);
+
+        FileRequestOptions options = new FileRequestOptions();
+        options.setStoreFileContentMD5(true);
+        options.setDisableContentMD5Validation(false);
+
+        File tempFile = File.createTempFile("sourceFile", ".tmp");
+        file.uploadFromFile(tempFile.getAbsolutePath(), null, options, null);
+    }
+
+    /**
+     * Test requesting stored content MD5 with OpenWriteExisting().
+     * 
+     * @throws URISyntaxException
+     * @throws StorageException
+     */
+    @Test
+    public void testCloudFileOpenWriteExistingWithMD5() throws URISyntaxException, StorageException, IOException {
+        String fileName = FileTestHelper.generateRandomFileName();
+        final CloudFile fileRef = this.share.getRootDirectoryReference().getFileReference(fileName);
+        fileRef.create(512);
+
+        FileRequestOptions options = new FileRequestOptions();
+        options.setStoreFileContentMD5(true);
+        options.setDisableContentMD5Validation(false);
+
+        try
+        {
+            fileRef.openWriteExisting(null, options, null);
+            fail("Expect failure due to requesting MD5 calculation");
+        }
+        catch (IllegalArgumentException e)
+        {
+        }
+    }
+
     @Test
     public void testFileEmptyHeaderSigningTest() throws URISyntaxException, StorageException, IOException {
         final String fileName = FileTestHelper.generateRandomFileName();

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

@@ -832,8 +832,7 @@ public BlobOutputStream openWriteExisting() throws StorageException {
     @DoesServiceRequest
     public BlobOutputStream openWriteExisting(AccessCondition accessCondition, BlobRequestOptions options,
             OperationContext opContext) throws StorageException {
-        return this
-                .openOutputStreamInternal(null /* length */, null /* accessCondition */, null /* options */, null /* opContext */);
+        return this.openOutputStreamInternal(null /* length */, accessCondition, options, opContext);
     }
 
     /**

microsoft-azure-storage/src/com/microsoft/azure/storage/core/SR.java

@@ -92,7 +92,7 @@ public class SR {
     public static final String INVALID_DATE_STRING = "Invalid Date String: %s.";
     public static final String INVALID_EDMTYPE_VALUE = "Invalid value '%s' for EdmType.";
     public static final String INVALID_ENCRYPTION_ALGORITHM = "Invalid Encryption Algorithm found on the resource. This version of the client library does not support the specified encryption algorithm.";
-    public static final String INVALID_FILE_LENGTH = "File length must be greater than 0 bytes.";
+    public static final String INVALID_FILE_LENGTH = "File length must be greater than or equal to 0 bytes.";
     public static final String INVALID_GEO_REPLICATION_STATUS = "Null or Invalid geo-replication status in response: %s.";
     public static final String INVALID_IP_ADDRESS = "Error when parsing IPv4 address: IP address '%s' is invalid.";
     public static final String INVALID_KEY = "Storage Key is not a valid base64 encoded string.";

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

@@ -1855,8 +1855,7 @@ public FileOutputStream openWriteExisting() throws StorageException {
     @DoesServiceRequest
     public FileOutputStream openWriteExisting(AccessCondition accessCondition, FileRequestOptions options,
             OperationContext opContext) throws StorageException {
-        return this
-                .openOutputStreamInternal(null /* length */, null /* accessCondition */, null /* options */, null /* opContext */);
+        return this.openOutputStreamInternal(null /* length */, accessCondition, options, opContext);
     }
 
     /**
@@ -1946,13 +1945,13 @@ private FileOutputStream openOutputStreamInternal(Long length, AccessCondition a
         options = FileRequestOptions.populateAndApplyDefaults(options, this.fileServiceClient, false /* setStartTime */);
 
         if (length != null) {
+            this.create(length, accessCondition, options, opContext);
+        }
+        else {
             if (options.getStoreFileContentMD5()) {
                 throw new IllegalArgumentException(SR.FILE_MD5_NOT_POSSIBLE);
             }
 
-            this.create(length, accessCondition, options, opContext);
-        }
-        else {
             this.downloadAttributes(accessCondition, options, opContext);
             length = this.getProperties().getLength();
         }
@@ -2557,8 +2556,8 @@ public void upload(final InputStream sourceStream, final long length) throws Sto
      * @param sourceStream
      *            An {@link InputStream} object to read from.
      * @param length
-     *            A <code>long</code> which represents the length, in bytes, of the stream data. This must be great than
-     *            zero.
+     *            A <code>long</code> which represents the length, in bytes, of the stream data. This must be greater than
+     *            or equal to zero.
      * @param accessCondition
      *            An {@link AccessCondition} object which represents the access conditions for the file.
      * @param options
@@ -2584,7 +2583,7 @@ public void upload(final InputStream sourceStream, final long length, final Acce
 
         options = FileRequestOptions.populateAndApplyDefaults(options, this.fileServiceClient);
 
-        if (length <= 0) {
+        if (length < 0) {
             throw new IllegalArgumentException(SR.INVALID_FILE_LENGTH);
         }