Merge latest dev branch into release70

Author: mirobers

ChangeLog.txt

@@ -1,4 +1,4 @@
-2018.01.11 Version 7.0.0
+2018.02.05 Version 7.0.0
  * Support for 2017-07-29 REST version. Please see our REST api documentation and blogs for information about the related added features.
  * Added support for soft delete feature. If a delete retention policy is enabled through the set service properties API, then blobs or snapshots can be deleted softly and retained for a specified number of days, before being permanently removed by garbage collection.
  * When a storage request fails, the error code may now be retrieved directly from the RequestResult and StorageException classes. This error code is populated even in cases where there is no StorageExtendedErrorInformation available, such as in calls to FetchAttributes.
@@ -7,6 +7,7 @@
  * Improved performance when streaming directly from a FileInputStream to avoid unnecessary buffering.
  * Switched to using fixed length streaming mode in the HTTP client to avoid unnecessary buffering.
  * Upgraded Key Vault dependency to 1.0.
+ * Fixed a bug preventing openInputStream from working on a blob snapshot.
 
 2017.11.01 Version 6.1.0
  * Added support for the last time the tier was modified.

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

@@ -43,6 +43,7 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -1031,6 +1032,10 @@ public void testBlobSnapshotValidationTest() throws StorageException, URISyntaxE
         byte[] retrievedBuff = outStream.toByteArray();
         assertEquals(length, retrievedBuff.length);
 
+        InputStream inputStream = blobSnapshot.openInputStream();
+        retrievedBuff = inputStream.readAllBytes();
+        assertEquals(length, retrievedBuff.length);
+
         // Read operation should work fine.
         blobSnapshot.downloadAttributes();
 
@@ -1041,6 +1046,11 @@ public void testBlobSnapshotValidationTest() throws StorageException, URISyntaxE
         blobSnapshotUsingRootUri.download(outStream);
         retrievedBuff = outStream.toByteArray();
         assertEquals(length, retrievedBuff.length);
+
+        inputStream = blobSnapshotUsingRootUri.openInputStream();
+        retrievedBuff = inputStream.readAllBytes();
+        assertEquals(length, retrievedBuff.length);
+
         assertEquals(blobSnapshot.getSnapshotID(), blobSnapshotUsingRootUri.getSnapshotID());
 
         // Expect an IllegalArgumentException from upload.
@@ -1081,6 +1091,33 @@ public void testBlobSnapshotValidationTest() throws StorageException, URISyntaxE
         catch (IllegalArgumentException e) {
             assertEquals("Cannot perform this operation on a blob representing a snapshot.", e.getMessage());
         }
+
+        // Expect an IllegalArgumentException from openOutputStream.
+        try {
+            blobSnapshotUsingRootUri.openOutputStream();
+            fail("Expect an IllegalArgumentException from openOutputStream");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("Cannot perform this operation on a blob representing a snapshot.", e.getMessage());
+        }
+
+        // Expect an IllegalArgumentException from uploadBlock.
+        try {
+            blobSnapshotUsingRootUri.uploadBlock("foo", new ByteArrayInputStream(new byte[0]), 0);
+            fail("Expect an IllegalArgumentException from uploadBlock");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("Cannot perform this operation on a blob representing a snapshot.", e.getMessage());
+        }
+
+        // Expect an IllegalArgumentException from commitBlockList.
+        try {
+            blobSnapshotUsingRootUri.commitBlockList(new ArrayList<BlockEntry>());
+            fail("Expect an IllegalArgumentException from commitBlockList");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("Cannot perform this operation on a blob representing a snapshot.", e.getMessage());
+        }
     }
 
     /**

microsoft-azure-storage/src/com/microsoft/azure/storage/AccessCondition.java

@@ -346,9 +346,6 @@ public void applySourceConditionToRequest(final HttpURLConnection request) {
      * @param request
      *            A <code>java.net.HttpURLConnection</code> object that represents the request to which the condition is
      *            being applied.
-     * 
-     * @throws StorageException
-     *             If there is an error parsing the date value of the access condition.
      */
     public void applyAppendConditionToRequest(final HttpURLConnection request) {
         if (this.ifMaxSizeLessThanOrEqual != null) {

microsoft-azure-storage/src/com/microsoft/azure/storage/LoggingProperties.java

@@ -27,7 +27,7 @@ public final class LoggingProperties {
     private String version = "1.0";
 
     /**
-     * An <code>EnumSet<code> of <code>LoggingOperations</code> that represents which storage operations should be logged.
+     * An <code>EnumSet</code> of <code>LoggingOperations</code> that represents which storage operations should be logged.
      */
     private EnumSet<LoggingOperations> logOperationTypes = EnumSet.noneOf(LoggingOperations.class);
 
@@ -37,9 +37,9 @@ public final class LoggingProperties {
     private Integer retentionIntervalInDays;
 
     /**
-     * Gets an <code>EnumSet<code> of <code>{@link LoggingOperations}</code> that represents which storage operations should be logged.
+     * Gets an <code>EnumSet</code> of <code>{@link LoggingOperations}</code> that represents which storage operations should be logged.
      * 
-     * @return An <code>EnumSet<code> of <code>{@link LoggingOperations}</code>.
+     * @return An <code>EnumSet</code> of <code>{@link LoggingOperations}</code>.
      */
     public EnumSet<LoggingOperations> getLogOperationTypes() {
         return this.logOperationTypes;
@@ -67,7 +67,7 @@ public String getVersion() {
      * Sets the <code>{@link LoggingOperations}</code> for which storage operations should be logged.
      * 
      * @param logOperationTypes
-     *        An <code>EnumSet<code> of <code>{@link LoggingOperations}</code> to set.
+     *        An <code>EnumSet</code> of <code>{@link LoggingOperations}</code> to set.
      */
     public void setLogOperationTypes(final EnumSet<LoggingOperations> logOperationTypes) {
         this.logOperationTypes = logOperationTypes;

microsoft-azure-storage/src/com/microsoft/azure/storage/OperationContext.java

@@ -186,7 +186,7 @@ public OperationContext() {
     /**
      * Gets the client side trace ID.
      * 
-     * @return A <code>String</cod> which represents the client request ID.
+     * @return A <code>String</code> which represents the client request ID.
      */
     public String getClientRequestID() {
         return this.clientRequestID;

microsoft-azure-storage/src/com/microsoft/azure/storage/RetryInfo.java

@@ -45,7 +45,7 @@ public RetryInfo() {
     }
 
     /**
-     * Initializes a new instance of the {@link "RetryInfo"} class.
+     * Initializes a new instance of the {@link RetryInfo} class.
      * 
      * @param retryContext
      *            The {@link RetryContext} object that was passed in to the retry policy.
@@ -114,7 +114,7 @@ public void setUpdatedLocationMode(LocationMode updatedLocationMode) {
     }
 
     /**
-     * Returns a string that represents the current {@link "RetryInfo"} instance.
+     * Returns a string that represents the current {@link RetryInfo} instance.
      * 
      * @return A <code>String</code> which represents the current <code>RetryInfo</code> instance.
      */

microsoft-azure-storage/src/com/microsoft/azure/storage/SharedAccessPolicyHandler.java

@@ -58,8 +58,6 @@ private SharedAccessPolicyHandler(final Class<T> cls) {
      * @return the HashMap of SharedAccessPolicies from the response
      * @throws SAXException
      * @throws ParserConfigurationException
-     * @throws ParseException
-     *             if a date is incorrectly encoded in the stream
      * @throws IOException
      */
     public static <T extends SharedAccessPolicy> HashMap<String, T> getAccessIdentifiers(final InputStream stream,

microsoft-azure-storage/src/com/microsoft/azure/storage/analytics/CloudAnalyticsClient.java

@@ -385,9 +385,7 @@ public Iterable<LogRecord> listLogRecords(StorageService service, Date startTime
      * @param logBlobs
      *            An {@link Iterable} of blobs to parse LogRecords from.
      * @return
-     *         An enumerable collection of objects that implement {@link LogRecords} and are retrieved lazily.
-     * @throws StorageException
-     * @throws URISyntaxException
+     *         An enumerable collection of objects that implement {@link LogRecord} and are retrieved lazily.
      */
     public static Iterable<LogRecord> parseLogBlobs(Iterable<ListBlobItem> logBlobs) {
         Utility.assertNotNull("logBlobs", logBlobs);
@@ -398,12 +396,10 @@ public static Iterable<LogRecord> parseLogBlobs(Iterable<ListBlobItem> logBlobs)
     /**
      * Returns an enumerable collection of log records, retrieved lazily.
      * 
-     * @param logBlobs
-     *            An {@link Iterable} of blobs to parse LogRecords from.
+     * @param logBlob
+     *            A single blob to parse LogRecords from.
      * @return
-     *         An enumerable collection of objects that implement {@link LogRecords} and are retrieved lazily.
-     * @throws StorageException
-     * @throws URISyntaxException
+     *         An enumerable collection of objects that implement {@link LogRecord} and are retrieved lazily.
      */
     public static Iterable<LogRecord> parseLogBlob(ListBlobItem logBlob) {
         Utility.assertNotNull("logBlob", logBlob);

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobContainerProperties.java

@@ -107,11 +107,11 @@ public LeaseDuration getLeaseDuration() {
 
     /**
      * Gets the public access level for the container.
-     * This field should only be set using the container's {@link #create(BlobContainerPublicAccessType,
-     * BlobRequestOptions, OperationContext) create} method or
-     * {@link #uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
-     * 
-     * @return A <code>{@link BlobContainerPublicAccessLevel}</code> that specifies the level of public access
+     * This field should only be set using the container's {@link CloudBlobContainer#create(BlobContainerPublicAccessType,
+     * BlobRequestOptions, com.microsoft.azure.storage.OperationContext) create} method or
+     * {@link CloudBlobContainer#uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
+     *
+     * @return A <code>{@link BlobContainerPublicAccessType}</code> that specifies the level of public access
      * that is allowed on the container.
      */
     public BlobContainerPublicAccessType getPublicAccess() {
@@ -170,9 +170,10 @@ protected void setLeaseDuration(final LeaseDuration leaseDuration) {
 
     /**
      * Sets the public access level on the container.
-     * This should only be set using the container's {@link #create(BlobContainerPublicAccessType,
-     * BlobRequestOptions, OperationContext) create} method or
-     * {@link #uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
+     * This should only be set using the container's {@link CloudBlobContainer#create(BlobContainerPublicAccessType,
+     * BlobRequestOptions, com.microsoft.azure.storage.OperationContext) create} method or
+     * {@link CloudBlobContainer#uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
+     *
      * @param publicAccess
      *            A <code>{@link BlobContainerPublicAccessType}</code> object
      *            which represents the public access level on the container.

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobInputStream.java

@@ -337,7 +337,7 @@ else if (numberOfBytesRead == 0) {
      * elements <code>b[0]</code> through <code>b[k-1]</code>, leaving elements <code>b[k]</code> through
      * <code>b[b.length-1]</code> unaffected.
      * 
-     * The <code>read(b) method for class {@link InputStream} has the same effect as:
+     * The <code>read(b)</code> method for class {@link InputStream} has the same effect as:
      * 
      * <code>read(b, 0, b.length)</code>
      *