Merge pull request Azure#391 from rickle-msft/dev

Dev

ChangeLog.txt

@@ -1,10 +1,8 @@
-XXXX.XX.XX Version XX.X.X
+2018.10.29 Version 10.2.0
 * Added overloads which only accept the required parameters.
-* TransferManager options now throw if an IProgressReceiver is passed as it is not currently supported. Support will be added in a later release.
 * Added CopyFromURL, which will do a synchronous server-side copy, meaning the service will not return an HTTP response until it has completed the copy.
 * Added support for IProgressReceiver in TransferManager operations. This parameter was previously ignored but is now supported.
 * Removed internal dependency on javafx to be compatible with openjdk.
-* Fixed a bug that would cause downloading large files with the TransferManager to fail and a bug in BlobURL.download() logic for setting up reliable download.
 * Fixed a bug that would cause downloading large files with the TransferManager to fail.
 * Fixed a bug in BlobURL.download() logic for setting up reliable download. This had the potential to download the wrong range when a download stream was retried.
 

ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+### Which service(blob, file, queue, table) does this issue concern?
+
+
+### Which version of the SDK was used?
+
+
+### What problem was encountered?
+
+
+### Have you found a mitigation/solution?

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.1.0</version>
+	<version>10.2.0</version>
 </dependency>
 ```
 

pom.xml

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

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

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

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

@@ -1677,6 +1677,15 @@ class ContainerAPITest extends APISpec {
     def "Root explicit"() {
         setup:
         cu = primaryServiceURL.createContainerURL(ContainerURL.ROOT_CONTAINER_NAME)
+        // Create root container if not exist.
+        try {
+            cu.create(null, null, null).blockingGet()
+        }
+        catch (StorageException se) {
+            if (se.errorCode() != StorageErrorCode.CONTAINER_ALREADY_EXISTS) {
+                throw se
+            }
+        }
         BlobURL bu = cu.createAppendBlobURL("rootblob")
 
         expect:
@@ -1685,10 +1694,20 @@ class ContainerAPITest extends APISpec {
 
     def "Root implicit"() {
         setup:
+        cu = primaryServiceURL.createContainerURL(ContainerURL.ROOT_CONTAINER_NAME)
+        // Create root container if not exist.
+        try {
+            cu.create(null, null, null).blockingGet()
+        }
+        catch (StorageException se) {
+            if (se.errorCode() != StorageErrorCode.CONTAINER_ALREADY_EXISTS) {
+                throw se
+            }
+        }
         PipelineOptions po = new PipelineOptions()
         po.withClient(getHttpClient())
         HttpPipeline pipeline = StorageURL.createPipeline(primaryCreds, po)
-        AppendBlobURL bu = new AppendBlobURL(new URL("http://xclientdev3.blob.core.windows.net/rootblob"),
+        AppendBlobURL bu = new AppendBlobURL(new URL("http://" + primaryCreds.getAccountName() + ".blob.core.windows.net/rootblob"),
                 pipeline)
 
         when:
@@ -1704,6 +1723,16 @@ class ContainerAPITest extends APISpec {
 
     def "Web container"() {
         setup:
+        cu = primaryServiceURL.createContainerURL(ContainerURL.STATIC_WEBSITE_CONTAINER_NAME)
+        // Create root container if not exist.
+        try {
+            cu.create(null, null, null).blockingGet()
+        }
+        catch (StorageException se) {
+            if (se.errorCode() != StorageErrorCode.CONTAINER_ALREADY_EXISTS) {
+                throw se
+            }
+        }
         def webContainer = primaryServiceURL.createContainerURL(ContainerURL.STATIC_WEBSITE_CONTAINER_NAME)
 
         when:

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

@@ -315,7 +315,7 @@ class ServiceAPITest extends APISpec {
     def "Get stats"() {
         setup:
         BlobURLParts parts = URLParser.parse(primaryServiceURL.toURL())
-        parts.withHost("xclientdev3-secondary.blob.core.windows.net")
+        parts.withHost(primaryCreds.getAccountName() + "-secondary.blob.core.windows.net")
         ServiceURL secondary = new ServiceURL(parts.toURL(),
                 StorageURL.createPipeline(primaryCreds, new PipelineOptions()))
         ServiceGetStatisticsResponse response = secondary.getStatistics(null).blockingGet()
@@ -331,7 +331,7 @@ class ServiceAPITest extends APISpec {
     def "Get stats min"() {
         setup:
         BlobURLParts parts = URLParser.parse(primaryServiceURL.toURL())
-        parts.withHost("xclientdev3-secondary.blob.core.windows.net")
+        parts.withHost(primaryCreds.getAccountName() + "-secondary.blob.core.windows.net")
         ServiceURL secondary = new ServiceURL(parts.toURL(),
                 StorageURL.createPipeline(primaryCreds, new PipelineOptions()))
 

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

@@ -685,7 +685,7 @@ class TransferManagerTest extends APISpec {
     }
 
     def "Download options progress receiver"() {
-        def fileSize = 8L * 1026 * 1024 + 10
+        def fileSize = 8 * 1026 * 1024 + 10
         def channel = AsynchronousFileChannel.open(getRandomFile(fileSize).toPath(),
                 StandardOpenOption.READ, StandardOpenOption.WRITE)
         TransferManager.uploadFileToBlockBlob(channel, bu, BlockBlobURL.MAX_STAGE_BLOCK_BYTES, null)