From 1992f364db9e520a78d9abee7754d5558024e4e5 Mon Sep 17 00:00:00 2001 From: rickle-msft Date: Mon, 29 Oct 2018 12:30:31 -0700 Subject: [PATCH] Release prep --- ChangeLog.txt | 4 +--- README.md | 2 +- pom.xml | 2 +- .../azure/storage/blob/Constants.java | 2 +- .../azure/storage/ContainerAPITest.groovy | 20 +++++++++++++++++++ .../azure/storage/ServiceAPITest.groovy | 2 +- .../azure/storage/TransferManagerTest.groovy | 2 +- 7 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c2cac276b6fa1..6380a3f5c949c 100644 --- a/ChangeLog.txt +++ b/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. diff --git a/README.md b/README.md index 8c6f1b860f7e0..036bfd664f2fe 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w com.microsoft.azure azure-storage-blob - 10.1.0 + 10.2.0 ``` diff --git a/pom.xml b/pom.xml index 7cc9e943d89fb..cdd6ea63d70a2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.microsoft.azure azure-storage-blob - 10.1.0 + 10.2.0 Azure Storage Blob The Azure Storage Java Blob library. diff --git a/src/main/java/com/microsoft/azure/storage/blob/Constants.java b/src/main/java/com/microsoft/azure/storage/blob/Constants.java index a8bbd2933e501..2221cf63f74e9 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/Constants.java +++ b/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. diff --git a/src/test/java/com/microsoft/azure/storage/ContainerAPITest.groovy b/src/test/java/com/microsoft/azure/storage/ContainerAPITest.groovy index 4e9dbb3720d71..8e728ba3f3640 100644 --- a/src/test/java/com/microsoft/azure/storage/ContainerAPITest.groovy +++ b/src/test/java/com/microsoft/azure/storage/ContainerAPITest.groovy @@ -1694,6 +1694,16 @@ 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) @@ -1713,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: diff --git a/src/test/java/com/microsoft/azure/storage/ServiceAPITest.groovy b/src/test/java/com/microsoft/azure/storage/ServiceAPITest.groovy index dde7314a7506f..daa08c770adb9 100644 --- a/src/test/java/com/microsoft/azure/storage/ServiceAPITest.groovy +++ b/src/test/java/com/microsoft/azure/storage/ServiceAPITest.groovy @@ -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())) diff --git a/src/test/java/com/microsoft/azure/storage/TransferManagerTest.groovy b/src/test/java/com/microsoft/azure/storage/TransferManagerTest.groovy index 9989f750252ee..1e57ee275dffe 100644 --- a/src/test/java/com/microsoft/azure/storage/TransferManagerTest.groovy +++ b/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)