Merge pull request #207 from Azure/master

5.5.0 Release

Author: jofriedm-msft

CONTRIBUTING.md

@@ -1,16 +1,20 @@
 If you intend to contribute to the project, please make sure you've followed the instructions provided in the [Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).
 ## Project Setup
-The Azure Storage development team uses Eclipse so instructions will be tailored to that preference. However, any preferred IDE or other toolset should be usable.
+The Azure Storage development team uses Intellij. However, any preferred IDE or other toolset should be usable.
 
 ### Install
 * Java SE 6+
-* [Eclipse](https://eclipse.org/downloads/)
-* [Maven plugin for Eclipse](http://www.eclipse.org/m2e/index.html). Some Eclipse packages (ex Eclipse IDE for Java Developers) may come with this plugin already installed.
 * [Maven](https://maven.apache.org/install.html)
 * Clone the source code from GitHub
 
-### Open Solution
-Open the project from Eclipse using File->Import->Maven->Existing Maven Projects and navigating to the azure-storage-java folder. Select the listed pom. This imports the source and the test files and downloads the required dependencies via Maven. If you'd like to import the samples, follow the same procedure but navigate to the azure-storage-java\microsoft-azure-storage-samples folder and select that pom. Both projects can be opened at the same time and will be shown in the Package Explorer.
+#### IntelliJ Installation
+* [IntelliJ](https://www.jetbrains.com/idea/download)
+* [Importing project from Maven for IntelliJ](https://www.jetbrains.com/help/idea//2017.1/importing-project-from-maven-model.html)
+
+#### Eclipse Installation
+* [Eclipse](https://eclipse.org/downloads/)
+* [Maven plugin for Eclipse](http://www.eclipse.org/m2e/index.html). Some Eclipse packages (ex Eclipse IDE for Java Developers) may come with this plugin already installed.
+* Open the project from Eclipse using File->Import->Maven->Existing Maven Projects and navigating to the azure-storage-java folder. Select the listed pom. This imports the source and the test files and downloads the required dependencies via Maven. If you'd like to import the samples, follow the same procedure but navigate to the azure-storage-java\microsoft-azure-storage-samples folder and select that pom. Both projects can be opened at the same time and will be shown in the Package Explorer.
 
 ## Tests
 
@@ -38,7 +42,7 @@ The following are the minimum requirements for any pull request that must be met
 * Thoroughly test your feature
 
 ### Branching Policy
-Changes should be based on the **dev** branch, not master as master is considered publicly released code. If after discussion with us breaking changes are considered for the library, we will create a **dev_breaking** branch based on dev which can be used to store these changes until the next breaking release. Each breaking change should be recorded in [BreakingChanges.md](BreakingChanges.md). 
+Changes should be based on the **dev** branch for non-breaking changes and **dev_breaking** for breaking changes. Do not submit pull requests against master as master is considered publicly released code. Each breaking change should be recorded in [BreakingChanges.md](BreakingChanges.md). 
 
 ### Adding Features for Java 6+
 We strive to release each new feature in a backward compatible manner. Therefore, we ask that all contributions be written to work in Java 6, 7 and 8.

ChangeLog.txt

@@ -1,3 +1,7 @@
+2017.08.28 Version 5.5.0
+ * Fixed a bug when using a SAS token where the token was being omitted from calls to delete a directory in the file service.
+ * For Standard Storage Accounts only, added the ability to set the tier of individual block blobs. The tier can currently only be set through uploadTier()
+
 2017.07.13 Version 5.4.0
  * Support for 2017-04-17 REST version. Please see our REST API documentation and blogs for information about the related added features.
  * Added ErrorReceivingResponseEvent which fires when a network error occurs before the responseReceivedEvent fires. If the responseReceivedEvent fires sucessfully, this new event will not fire.

README.md

@@ -30,7 +30,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>5.4.0</version>
+	<version>5.5.0</version>
 </dependency>
 ```
 

microsoft-azure-storage-samples/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>5.4.0</version>
+			<version>5.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>

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>5.4.0</version>
+            <version>5.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

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

@@ -48,15 +48,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.EnumSet;
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.TimeZone;
+import java.util.*;
 
 import com.microsoft.azure.storage.StorageErrorCodeStrings;
 import com.microsoft.azure.storage.TestRunners.CloudTests;
@@ -1942,4 +1934,82 @@ private void doCloudBlockBlobCopy(boolean sourceIsSas, boolean destinationIsSas)
         destination.delete();
         source.delete();
     }
+
+    @Test
+    @Category({ DevFabricTests.class, DevStoreTests.class })
+    public void testCloudBlockBlobUploadStandardTier() throws StorageException, IOException, URISyntaxException {
+        for (StandardBlobTier standardBlobTier : StandardBlobTier.values()) {
+            if (standardBlobTier == StandardBlobTier.UNKNOWN) {
+                continue;
+            }
+
+            final String blobName = BlobTestHelper.generateRandomBlobNameWithPrefix("testBlob");
+            final CloudBlockBlob blob = this.container.getBlockBlobReference(blobName);
+            blob.uploadText("text");
+
+            blob.uploadStandardBlobTier(standardBlobTier);
+            assertEquals(standardBlobTier, blob.getProperties().getStandardBlobTier());
+            assertNull(blob.getProperties().getPremiumPageBlobTier());
+            assertNull(blob.getProperties().getRehydrationStatus());
+
+            CloudBlockBlob blob2 = this.container.getBlockBlobReference(blobName);
+            blob2.downloadAttributes();
+            assertEquals(standardBlobTier, blob2.getProperties().getStandardBlobTier());
+            assertNull(blob2.getProperties().getPremiumPageBlobTier());
+            assertNull(blob2.getProperties().getRehydrationStatus());
+
+            CloudBlockBlob blob3 = (CloudBlockBlob)this.container.listBlobs().iterator().next();
+            assertEquals(standardBlobTier, blob3.getProperties().getStandardBlobTier());
+            assertNull(blob3.getProperties().getPremiumPageBlobTier());
+            assertNull(blob3.getProperties().getRehydrationStatus());
+
+            blob.deleteIfExists();
+        }
+    }
+
+    @Test
+    @Category({ DevFabricTests.class, DevStoreTests.class })
+    public void testCloudBlockBlobRehydrateBlob() throws StorageException, IOException, URISyntaxException {
+        final String blobName1 = BlobTestHelper.generateRandomBlobNameWithPrefix("testBlob1");
+        final String blobName2 = BlobTestHelper.generateRandomBlobNameWithPrefix("testBlob2");
+        final CloudBlockBlob blob = this.container.getBlockBlobReference(blobName1);
+        blob.uploadText("text");
+        blob.uploadStandardBlobTier(StandardBlobTier.ARCHIVE);
+        final CloudBlockBlob blob2 = this.container.getBlockBlobReference(blobName2);
+        blob2.uploadText("text");
+        blob2.uploadStandardBlobTier(StandardBlobTier.ARCHIVE);
+
+        CloudBlockBlob blobRef1 = this.container.getBlockBlobReference(blobName1);
+        blobRef1.uploadStandardBlobTier(StandardBlobTier.COOL);
+        assertNull(blobRef1.getProperties().getRehydrationStatus());
+        assertEquals(StandardBlobTier.ARCHIVE, blobRef1.getProperties().getStandardBlobTier());
+        assertNull(blobRef1.getProperties().getPremiumPageBlobTier());
+
+        blob.downloadAttributes();
+        assertEquals(RehydrationStatus.PENDING_TO_COOL, blob.getProperties().getRehydrationStatus());
+        assertEquals(StandardBlobTier.ARCHIVE, blob.getProperties().getStandardBlobTier());
+        assertNull(blob.getProperties().getPremiumPageBlobTier());
+
+        CloudBlockBlob blobRef2 = this.container.getBlockBlobReference(blobName2);
+        blobRef2.uploadStandardBlobTier(StandardBlobTier.HOT);
+        assertNull(blobRef2.getProperties().getRehydrationStatus());
+        assertEquals(StandardBlobTier.ARCHIVE, blobRef2.getProperties().getStandardBlobTier());
+        assertNull(blobRef2.getProperties().getPremiumPageBlobTier());
+
+        blob2.downloadAttributes();
+        assertEquals(RehydrationStatus.PENDING_TO_HOT, blob2.getProperties().getRehydrationStatus());
+        assertEquals(StandardBlobTier.ARCHIVE, blob2.getProperties().getStandardBlobTier());
+        assertNull(blob2.getProperties().getPremiumPageBlobTier());
+
+        Iterator it = this.container.listBlobs().iterator();
+        CloudBlockBlob listBlob = (CloudBlockBlob)it.next();
+        assertEquals(RehydrationStatus.PENDING_TO_COOL, listBlob.getProperties().getRehydrationStatus());
+        assertEquals(StandardBlobTier.ARCHIVE, listBlob.getProperties().getStandardBlobTier());
+        assertNull(listBlob.getProperties().getPremiumPageBlobTier());
+
+        CloudBlockBlob listBlob2 = (CloudBlockBlob)it.next();
+        assertEquals(RehydrationStatus.PENDING_TO_HOT, listBlob2.getProperties().getRehydrationStatus());
+        assertEquals(StandardBlobTier.ARCHIVE, listBlob2.getProperties().getStandardBlobTier());
+        assertNull(listBlob2.getProperties().getPremiumPageBlobTier());
+    }
 }

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

@@ -1242,39 +1242,47 @@ public void testCloudPageBlobSetPremiumBlobTierOnCreate() throws URISyntaxExcept
 
             // Test create API
             CloudPageBlob blob = container.getPageBlobReference(blobName);
-            assertNull(blob.getProperties().getInferredBlobTier());
+            assertNull(blob.getProperties().isBlobTierInferred());
             blob.create(1024, PremiumPageBlobTier.P4, null, null, null);
             assertEquals(PremiumPageBlobTier.P4, blob.getProperties().getPremiumPageBlobTier());
-            assertFalse(blob.getProperties().getInferredBlobTier());
+            assertFalse(blob.getProperties().isBlobTierInferred());
+            assertNull(blob.getProperties().getStandardBlobTier());
+            assertNull(blob.getProperties().getRehydrationStatus());
 
             CloudPageBlob blob2 = container.getPageBlobReference(blobName);
             blob2.downloadAttributes();
             assertEquals(PremiumPageBlobTier.P4, blob2.getProperties().getPremiumPageBlobTier());
-            assertNull(blob2.getProperties().getInferredBlobTier());
+            assertNull(blob2.getProperties().isBlobTierInferred());
+            assertNull(blob2.getProperties().getStandardBlobTier());
+            assertNull(blob2.getProperties().getRehydrationStatus());
 
             // Test upload from byte array API
             byte[] buffer = BlobTestHelper.getRandomBuffer(1024);
             CloudPageBlob blob3 = container.getPageBlobReference("blob3");
             blob3.uploadFromByteArray(buffer, 0, 1024, PremiumPageBlobTier.P6, null, null, null);
             assertEquals(PremiumPageBlobTier.P6, blob3.getProperties().getPremiumPageBlobTier());
-            assertFalse(blob3.getProperties().getInferredBlobTier());
+            assertFalse(blob3.getProperties().isBlobTierInferred());
+            assertNull(blob3.getProperties().getStandardBlobTier());
+            assertNull(blob3.getProperties().getRehydrationStatus());
 
             CloudPageBlob blob3Ref = container.getPageBlobReference("blob3");
             blob3Ref.downloadAttributes();
             assertEquals(PremiumPageBlobTier.P6, blob3Ref.getProperties().getPremiumPageBlobTier());
-            assertNull(blob3Ref.getProperties().getInferredBlobTier());
+            assertNull(blob3Ref.getProperties().isBlobTierInferred());
 
             // Test upload from stream API
             ByteArrayInputStream srcStream = new ByteArrayInputStream(buffer);
             CloudPageBlob blob4 = container.getPageBlobReference("blob4");
             blob4.upload(srcStream, 1024, PremiumPageBlobTier.P10, null, null, null);
             assertEquals(PremiumPageBlobTier.P10, blob4.getProperties().getPremiumPageBlobTier());
-            assertFalse(blob4.getProperties().getInferredBlobTier());
+            assertFalse(blob4.getProperties().isBlobTierInferred());
+            assertNull(blob4.getProperties().getStandardBlobTier());
+            assertNull(blob4.getProperties().getRehydrationStatus());
 
             CloudPageBlob blob4Ref = container.getPageBlobReference("blob4");
             blob4Ref.downloadAttributes();
             assertEquals(PremiumPageBlobTier.P10, blob4Ref.getProperties().getPremiumPageBlobTier());
-            assertNull(blob4Ref.getProperties().getInferredBlobTier());
+            assertNull(blob4Ref.getProperties().isBlobTierInferred());
 
             // Test upload from file API
             File sourceFile = File.createTempFile("sourceFile", ".tmp");
@@ -1286,12 +1294,14 @@ public void testCloudPageBlobSetPremiumBlobTierOnCreate() throws URISyntaxExcept
             CloudPageBlob blob5 = container.getPageBlobReference("blob5");
             blob5.uploadFromFile(sourceFile.getAbsolutePath(), PremiumPageBlobTier.P20, null, null, null);
             assertEquals(PremiumPageBlobTier.P20, blob5.getProperties().getPremiumPageBlobTier());
-            assertFalse(blob5.getProperties().getInferredBlobTier());
+            assertFalse(blob5.getProperties().isBlobTierInferred());
+            assertNull(blob5.getProperties().getStandardBlobTier());
+            assertNull(blob5.getProperties().getRehydrationStatus());
 
             CloudPageBlob blob5Ref = container.getPageBlobReference("blob5");
             blob5Ref.downloadAttributes();
             assertEquals(PremiumPageBlobTier.P20, blob5Ref.getProperties().getPremiumPageBlobTier());
-            assertNull(blob5Ref.getProperties().getInferredBlobTier());
+            assertNull(blob5Ref.getProperties().isBlobTierInferred());
         }
         finally {
             container.deleteIfExists();
@@ -1307,19 +1317,21 @@ public void testCloudPageBlobSetBlobTier() throws URISyntaxException, StorageExc
             String blobName = BlobTestHelper.generateRandomBlobNameWithPrefix("testblob");
             CloudPageBlob blob = container.getPageBlobReference(blobName);
             blob.create(1024);
-            assertNull(blob.getProperties().getInferredBlobTier());
+            assertNull(blob.getProperties().isBlobTierInferred());
             blob.downloadAttributes();
-            assertTrue(blob.getProperties().getInferredBlobTier());
+            assertTrue(blob.getProperties().isBlobTierInferred());
             assertEquals(PremiumPageBlobTier.P10, blob.getProperties().getPremiumPageBlobTier());
 
             blob.uploadPremiumPageBlobTier(PremiumPageBlobTier.P40);
             assertEquals(PremiumPageBlobTier.P40, blob.properties.getPremiumPageBlobTier());
-            assertFalse(blob.getProperties().getInferredBlobTier());
+            assertFalse(blob.getProperties().isBlobTierInferred());
+            assertNull(blob.getProperties().getStandardBlobTier());
+            assertNull(blob.getProperties().getRehydrationStatus());
 
             CloudPageBlob blob2 = container.getPageBlobReference(blobName);
             blob2.downloadAttributes();
             assertEquals(PremiumPageBlobTier.P40, blob2.properties.getPremiumPageBlobTier());
-            assertNull(blob2.getProperties().getInferredBlobTier());
+            assertNull(blob2.getProperties().isBlobTierInferred());
 
             boolean pageBlobWithTierFound = false;
             for (ListBlobItem blobItem : container.listBlobs()) {
@@ -1328,7 +1340,9 @@ public void testCloudPageBlobSetBlobTier() throws URISyntaxException, StorageExc
                 if (blob.getName().equals(blobName) && !pageBlobWithTierFound) {
                     // Check that the blob is found exactly once
                     assertEquals(PremiumPageBlobTier.P40, blob3.properties.getPremiumPageBlobTier());
-                    assertFalse(blob3.getProperties().getInferredBlobTier());
+                    assertNull(blob3.getProperties().isBlobTierInferred());
+                    assertNull(blob3.getProperties().getStandardBlobTier());
+                    assertNull(blob3.getProperties().getRehydrationStatus());
                     pageBlobWithTierFound = true;
                 } else if (blob.getName().equals(blobName)) {
                     fail("Page blob found twice");
@@ -1379,14 +1393,18 @@ public void testCloudPageBlobSetBlobTierOnCopy() throws URISyntaxException, Stor
             assertEquals(BlobType.PAGE_BLOB, copy.getProperties().getBlobType());
             assertEquals(PremiumPageBlobTier.P30, copy.getProperties().getPremiumPageBlobTier());
             assertEquals(PremiumPageBlobTier.P10, source.getProperties().getPremiumPageBlobTier());
-            assertFalse(source.getProperties().getInferredBlobTier());
-            assertFalse(copy.getProperties().getInferredBlobTier());
+            assertFalse(source.getProperties().isBlobTierInferred());
+            assertFalse(copy.getProperties().isBlobTierInferred());
+            assertNull(source.getProperties().getStandardBlobTier());
+            assertNull(source.getProperties().getRehydrationStatus());
+            assertNull(copy.getProperties().getStandardBlobTier());
+            assertNull(copy.getProperties().getRehydrationStatus());
             BlobTestHelper.waitForCopy(copy);
 
             CloudPageBlob copyRef = container.getPageBlobReference("copy");
             copyRef.downloadAttributes();
             assertEquals(PremiumPageBlobTier.P30, copyRef.getProperties().getPremiumPageBlobTier());
-            assertNull(copyRef.getProperties().getInferredBlobTier());
+            assertNull(copyRef.getProperties().isBlobTierInferred());
 
             // copy where source does not have a tier
             CloudPageBlob source2 = container.getPageBlobReference("source2");
@@ -1397,8 +1415,12 @@ public void testCloudPageBlobSetBlobTierOnCopy() throws URISyntaxException, Stor
             assertEquals(BlobType.PAGE_BLOB, copy3.getProperties().getBlobType());
             assertEquals(PremiumPageBlobTier.P60, copy3.getProperties().getPremiumPageBlobTier());
             assertNull(source2.getProperties().getPremiumPageBlobTier());
-            assertNull(source2.getProperties().getInferredBlobTier());
-            assertFalse(copy3.getProperties().getInferredBlobTier());
+            assertNull(source2.getProperties().isBlobTierInferred());
+            assertFalse(copy3.getProperties().isBlobTierInferred());
+            assertNull(source2.getProperties().getStandardBlobTier());
+            assertNull(source2.getProperties().getRehydrationStatus());
+            assertNull(copy3.getProperties().getStandardBlobTier());
+            assertNull(copy3.getProperties().getRehydrationStatus());
         }
         finally {
             container.deleteIfExists();