Last minute cleanup before release

Author: rickle-msft

BreakingChanges.txt

@@ -1,4 +1,4 @@
-XXXX.XX.XX Version X.X.X
+2018.08.22 Version 10.0.4-rc
 * Changed BlobURL.startCopy sourceAccessConditions parameter to be HTTPAccessConditions as lease is not actually supported.
 * UploadFromFile now takes an AsynchronousFileChannel.
 * UploadByteBuffersToBlockBlob, UploadByteBufferToBlockBlob, and DownloadToBuffer have been removed.

ChangeLog.txt

@@ -1,4 +1,4 @@
-XXXX.XX.XX Version XX.X.X
+2018.08.22 Version 10.0.4-rc
 * Support for the 2017-11-09 REST version. Please see our REST api documentation and blogs for information about the related added features.
 * Support for 2018-03-28 REST version. Please see our REST api documentation and blogs for information about the related added features.
 * Support for the getAccountInfo api on ServiceURL, ContainerURL, and BlobURL.

README.md

@@ -31,7 +31,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage-blob</artifactId>
-	<version>10.0.3-Preview</version>
+	<version>10.0.4-rc</version>
 </dependency>
 ```
 

pom.xml

@@ -14,7 +14,7 @@
 
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-storage-blob</artifactId>
-    <version>10.0.3-Preview</version>
+    <version>10.0.4-rc</version>
 
     <name>Azure Storage Blob</name>
     <description>The Azure Storage Java Blob library.</description>

src/main/java/com/microsoft/azure/storage/blob/Constants.java

@@ -121,7 +121,7 @@ static final class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        static final String USER_AGENT_VERSION = "10.0.3-Preview";
+        static final String USER_AGENT_VERSION = "10.0.4-rc";
 
         private HeaderConstants() {
             // Private to prevent construction.

src/main/java/com/microsoft/azure/storage/blob/TransferManager.java

@@ -188,6 +188,9 @@ public static Single<BlobDownloadHeaders> downloadBlobToFile(AsynchronousFileCha
 
             int numChunks = calculateNumBlocks(dataSize, o.chunkSize);
 
+            // In case it is an empty blob, this ensures we still actually perform a download operation.
+            numChunks = numChunks == 0 ? 1 : numChunks;
+
             return Observable.range(0, numChunks)
                     .flatMap(i -> {
                         // Calculate whether we need a full chunk or something smaller because we are at the end.

src/test/java/com/microsoft/azure/storage/Samples.java

@@ -1087,6 +1087,9 @@ For the blob, show each block (ID and size) that is a committed part of it. It i
                          to include blocks that have been staged but not committed.
                          */
                         blobURL.getBlockList(BlockListType.ALL, null))
+                .flatMap(response ->
+                        // Delete the container
+                        containerURL.delete(null))
                 /*
                 This will synchronize all the above operations. This is strongly discouraged for use in production as
                 it eliminates the benefits of asynchronous IO. We use it here to enable the sample to complete and
@@ -1469,6 +1472,7 @@ Passing RetryReaderOptions to a call to body() will ensure the download stream i
                 .lastOrError() // Place holder for processing all the intermediary data.
                 // After the last piece of data, clean up by deleting the container and all its contents.
                 .flatMap(buffer ->
+                        // Delete the container
                         containerURL.delete(null))
                 /*
                 This will synchronize all the above operations. This is strongly discouraged for use in production as

src/test/java/com/microsoft/azure/storage/TransferManagerTest.groovy

@@ -297,13 +297,17 @@ class TransferManagerTest extends APISpec {
         def testPipeline = HttpPipeline.build(new RequestRetryFactory(new RequestRetryOptions(null, 3, null, null, null,
                 null)), mockFactory)
         bu = bu.withPipeline(testPipeline)
+        def channel = AsynchronousFileChannel.open(file.toPath())
 
         when:
-        TransferManager.uploadFileToBlockBlob(AsynchronousFileChannel.open(file.toPath()), bu, 50, null).blockingGet()
+        TransferManager.uploadFileToBlockBlob(channel, bu, 50, null).blockingGet()
 
         then:
         def e = thrown(StorageException)
         e.statusCode() == 500
+
+        cleanup:
+        channel.close()
     }
 
     def "Upload options fail"() {
@@ -340,8 +344,8 @@ class TransferManagerTest extends APISpec {
         getRandomFile(20)                      | _ // small file
         getRandomFile(16 * 1024 * 1024)        | _ // medium file in several chunks
         getRandomFile(8L * 1026 * 1024 + 10)   | _ // medium file not aligned to block
-        getRandomFile(5L * 1024 * 1024 * 1024) | _ // file size exceeds max int
         getRandomFile(0)                       | _ // empty file
+        getRandomFile(5L * 1024 * 1024 * 1024) | _ // file size exceeds max int
     }
 
     def compareFiles(AsynchronousFileChannel channel1, long offset, long count, AsynchronousFileChannel channel2) {