Release prep/cleanup

rickle-msft · rickle-msft · commit 0540f45557e5 · 2019-08-06T11:23:46.000-07:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,12 +1,12 @@
-XXXX.XX.XX Version X.X.X
+2019.08.05 Version 8.4.0
  * Support for 2019-02-02 REST version. Please see our REST API documentation and blogs for information about the related added features.
- * Added support for setting rehydrate priority for SetBlobTier and CopyBlob APIs
+ * Added support for setting rehydrate priority for SetBlobTier and CopyBlob APIs.
  * Added support for PutRangeFromURL API to writes bytes from one Azure File endpoint into the specified range of another Azure File endpoint.
- * Added set directory properties, create permission and get permission APIs.
- * Added required headers for create file, create directory, set file properties, get file properties, get directory properties, get file APIs.
- * Updated get file properties, get directory properties and get file calls to update SMB properties.
- * Support for 2018-11-09 REST version. Please see our REST API documentation and blogs for information about the related added features.
- * Added support for setting access tier for PutBlob/PutBlockList and CopyBlob APIs
+ * Added setDirectoryProperties, createPermission, and getPermission APIs to the File package.
+ * Added required headers for creatFile, createDirectory, setFileProperties, getFileProperties, getDirectoryProperties, getFile APIs.
+ * Updated getFileProperties, getDirectoryProperties, and getFile calls to update SMB properties.
+ * Added support for setting access tier for PutBlob/PutBlockList and CopyBlob APIs.
+ * Added support for batching blob operations. Currently the only batchable apis are deleteBlob and setBlobTier.
 
 2019.04.23 Version 8.3.0
  * Fixed a bug in the range download to InputStream that would throw an exception if the source blob was empty.
diff --git a/README.md b/README.md
@@ -39,7 +39,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</artifactId>
-	<version>8.3.0</version>
+	<version>8.4.0</version>
 </dependency>
 ```
 
diff --git a/microsoft-azure-storage-samples/pom.xml b/microsoft-azure-storage-samples/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>8.3.0</version>
+			<version>8.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
-            <version>8.3.0</version>
+            <version>8.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
diff --git a/microsoft-azure-storage-test/res/TestConfigurations.xml b/microsoft-azure-storage-test/res/TestConfigurations.xml
@@ -30,6 +30,7 @@
     <ActiveDirectoryApplicationId>[APPLICATION_ID]</ActiveDirectoryApplicationId>
     <ActiveDirectoryApplicationSecret>[APPLICATION_SECRET]</ActiveDirectoryApplicationSecret>
     <ActiveDirectoryTenantId>[TENANT_ID]</ActiveDirectoryTenantId>
+    <ActiveDirectoryAuthEndpoint>[ENDPOINT]</ActiveDirectoryAuthEndpoint>
   </TenantConfiguration>
 </TenantConfigurations>
 </TestConfigurations>
diff --git a/microsoft-azure-storage-test/src/com/microsoft/azure/storage/OAuthTests.java b/microsoft-azure-storage-test/src/com/microsoft/azure/storage/OAuthTests.java
@@ -40,7 +40,7 @@ public void testOAuthTokenWithBlobClient() throws StorageException, URISyntaxExc
             blobClient.downloadServiceProperties();
             fail();
         } catch (StorageException e) {
-            assertEquals("AuthenticationFailed", e.getErrorCode());
+            assertEquals("InvalidAuthenticationInfo", e.getErrorCode());
         }
 
         // change the token again to see it succeed
diff --git a/microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobClientTests.java b/microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobClientTests.java
@@ -521,7 +521,7 @@ public void testBatchBlobSetTier() throws Exception {
                 blob.uploadText("content");
 
                 blobs.add(blob);
-                batchTierOp.addSubOperation(blob, StandardBlobTier.HOT);
+                batchTierOp.addSubOperation(blob, StandardBlobTier.HOT, RehydratePriority.HIGH, null);
             }
 
             // execute batch
diff --git a/microsoft-azure-storage-test/src/com/microsoft/azure/storage/queue/CloudQueueTests.java b/microsoft-azure-storage-test/src/com/microsoft/azure/storage/queue/CloudQueueTests.java
@@ -576,7 +576,7 @@ public void testDeleteQueueIfExists() throws URISyntaxException, StorageExceptio
             }
         }
         finally {
-            queue.delete();
+            queue.deleteIfExists(); // Cannot simply delete or it will throw a "queue being deleted" error.
         }
     }
 
diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/BatchException.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/BatchException.java
@@ -13,7 +13,8 @@
  * Exception for when one or more sub-requests within a batch request fail. This exception is a map of the
  * {@link StorageException}s to the parent objects of the sub-request. Extensions of {@link Throwable} cannot use
  * generics, so this class uses several data structures with wildcards. Since only groups of the same request type can
- * be batched together, the batch caller will know the intended type in context, and can safely cast the result.
+ * be batched together, the batch caller will know the intended type in context, and can safely cast the result. Please
+ * refer to the samples project for an example on how to appropriately handle batch exceptions.
  */
 public class BatchException extends StorageException {
 
diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java
@@ -765,7 +765,7 @@ public static class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        public static final String USER_AGENT_VERSION = "8.3.0";
+        public static final String USER_AGENT_VERSION = "8.4.0";
 
         /**
          * The default type for content-type and accept
diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobSetTierBatchOperation.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobSetTierBatchOperation.java
@@ -6,16 +6,18 @@
 public final class BlobSetTierBatchOperation extends BlobBatchOperation<CloudBlob, Void> {
 
     public void addSubOperation(CloudBlockBlob blockBlob, StandardBlobTier tier) {
-        this.addSubOperation(blockBlob, tier, null /* options */);
+        this.addSubOperation(blockBlob, tier, null, null /* options */);
     }
 
-    public void addSubOperation(CloudBlockBlob blockBlob, StandardBlobTier tier, BlobRequestOptions options) {
+    public void addSubOperation(CloudBlockBlob blockBlob, StandardBlobTier tier, RehydratePriority rehydratePriority,
+            BlobRequestOptions options) {
         Utility.assertNotNull("blockBlob", blockBlob);
         Utility.assertNotNull("tier", tier);
 
         options = BlobRequestOptions.populateAndApplyDefaults(options, BlobType.BLOCK_BLOB, blockBlob.blobServiceClient);
 
-        super.addSubOperation(blockBlob.uploadBlobTierImpl(tier.toString(), options), blockBlob);
+        super.addSubOperation(blockBlob.uploadBlobTierImpl(tier.toString(),
+                rehydratePriority == null ? null : rehydratePriority.toString(), options), blockBlob);
     }
 
     public void addSubOperation(CloudPageBlob pageBlob, PremiumPageBlobTier tier) {
@@ -28,7 +30,7 @@ public void addSubOperation(CloudPageBlob pageBlob, PremiumPageBlobTier tier, Bl
 
         options = BlobRequestOptions.populateAndApplyDefaults(options, BlobType.PAGE_BLOB, pageBlob.blobServiceClient);
 
-        super.addSubOperation(pageBlob.uploadBlobTierImpl(tier.toString(), options), pageBlob);
+        super.addSubOperation(pageBlob.uploadBlobTierImpl(tier.toString(), null, options), pageBlob);
     }
 
     @Override
diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlockBlob.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlockBlob.java
@@ -1691,8 +1691,8 @@ public void uploadStandardBlobTier(final StandardBlobTier standardBlobTier, Blob
      *             If a storage service error occurred.
      */
     @DoesServiceRequest
-    public void uploadStandardBlobTier(final StandardBlobTier standardBlobTier, RehydratePriority rehydratePriority, BlobRequestOptions options,
-                                       OperationContext opContext) throws StorageException {
+    public void uploadStandardBlobTier(final StandardBlobTier standardBlobTier, RehydratePriority rehydratePriority,
+            BlobRequestOptions options, OperationContext opContext) throws StorageException {
         assertNoWriteOperationForSnapshot();
 
         Utility.assertNotNull("standardBlobTier", standardBlobTier);
@@ -1704,7 +1704,9 @@ public void uploadStandardBlobTier(final StandardBlobTier standardBlobTier, Rehy
         options = BlobRequestOptions.populateAndApplyDefaults(options, BlobType.BLOCK_BLOB, this.blobServiceClient);
 
         ExecutionEngine.executeWithRetry(this.blobServiceClient, this,
-                this.uploadBlobTierImpl(rehydratePriority == null? null : rehydratePriority.toString(), standardBlobTier.toString(), options), options.getRetryPolicyFactory(), opContext);
+                this.uploadBlobTierImpl(standardBlobTier.toString(),
+                        rehydratePriority == null ? null : rehydratePriority.toString(), options),
+                options.getRetryPolicyFactory(), opContext);
     }
 
     /**
diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudPageBlob.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudPageBlob.java
@@ -1785,7 +1785,8 @@ public void uploadPremiumPageBlobTier(final PremiumPageBlobTier premiumBlobTier,
         options = BlobRequestOptions.populateAndApplyDefaults(options, BlobType.PAGE_BLOB, this.blobServiceClient);
 
         ExecutionEngine.executeWithRetry(this.blobServiceClient, this,
-                this.uploadBlobTierImpl(null /* rehydratePriority */, premiumBlobTier.toString(), options), options.getRetryPolicyFactory(), opContext);
+                this.uploadBlobTierImpl(premiumBlobTier.toString(), null /* rehydratePriority */, options),
+                options.getRetryPolicyFactory(), opContext);
         this.properties.setPremiumPageBlobTier(premiumBlobTier);
         this.properties.setBlobTierInferred(false);
     }
diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/file/FileRequest.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/file/FileRequest.java
@@ -31,7 +31,6 @@
 import com.microsoft.azure.storage.core.ListingContext;
 import com.microsoft.azure.storage.core.UriQueryBuilder;
 import com.microsoft.azure.storage.core.Utility;
-import com.sun.xml.internal.bind.v2.runtime.reflect.opt.Const;
 
 /**
  * RESERVED FOR INTERNAL USE. Provides a set of methods for constructing requests for file operations.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>8.3.0</version>
+	<version>8.4.0</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft Azure Storage Client SDK</name>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void testOAuthTokenWithBlobClient() throws StorageException, URISyntaxExc`
`40`	`40`	`blobClient.downloadServiceProperties();`
`41`	`41`	`fail();`
`42`	`42`	`} catch (StorageException e) {`
`43`		`- assertEquals("AuthenticationFailed", e.getErrorCode());`
	`43`	`+ assertEquals("InvalidAuthenticationInfo", e.getErrorCode());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// change the token again to see it succeed`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ public void testBatchBlobSetTier() throws Exception {`
`521`	`521`	`blob.uploadText("content");`
`522`	`522`
`523`	`523`	`blobs.add(blob);`
`524`		`- batchTierOp.addSubOperation(blob, StandardBlobTier.HOT);`
	`524`	`+ batchTierOp.addSubOperation(blob, StandardBlobTier.HOT, RehydratePriority.HIGH, null);`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`// execute batch`
Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ public void testDeleteQueueIfExists() throws URISyntaxException, StorageExceptio`
`576`	`576`	`}`
`577`	`577`	`}`
`578`	`578`	`finally {`
`579`		`- queue.delete();`
	`579`	`+ queue.deleteIfExists(); // Cannot simply delete or it will throw a "queue being deleted" error.`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`