Merge pull request #174 from Azure/master

Bringing master to dev

Author: jofriedm-msft

ChangeLog.txt

@@ -1,5 +1,5 @@
-2017.XX.XX Version X.X.X
- * Fixed a bug where the tranactional MD5 check would fail when downloading a range of blob or file and the recovery action is performed on a subsection of the range.
+2017.06.13 Version 5.3.0
+ * Fixed a bug where the transactional MD5 check would fail when downloading a range of blob or file and the recovery action is performed on a subsection of the range.
  * Fixed leaking connections for table requests.
  * Fixed a bug where retries happened immediately when experiencing a network exception uploading data or getting the response.
  * Fixed a bug where the response stream was not being closed on nonretryable exceptions.

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.2.0</version>
+	<version>5.3.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.2.0</version>
+			<version>5.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>

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

@@ -661,7 +661,7 @@ public static class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        public static final String USER_AGENT_VERSION = "5.2.0";
+        public static final String USER_AGENT_VERSION = "5.3.0";
 
         /**
          * The default type for content-type and accept

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

@@ -145,7 +145,7 @@ public void write(byte[] data, int offset, int length) throws IOException {
 
     @Override
     public void write(InputStream sourceStream, long writeLength) throws IOException, StorageException {
-        Utility.writeToOutputStream(sourceStream, this, writeLength, false, false, this.opContext, this.options, false, null /* descriptor */);
+        Utility.writeToOutputStream(sourceStream, this, writeLength, false, false, this.opContext, this.options, false);
     }
 
     @Override

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

@@ -641,7 +641,7 @@ public void write(final byte[] data, final int offset, final int length) throws
      */
     @DoesServiceRequest
     public void write(final InputStream sourceStream, final long writeLength) throws IOException, StorageException {
-        Utility.writeToOutputStream(sourceStream, this, writeLength, false, false, this.opContext, this.options, false, null /* descriptor */);
+        Utility.writeToOutputStream(sourceStream, this, writeLength, false, false, this.opContext, this.options, false);
     }
 
     /**

microsoft-azure-storage/src/com/microsoft/azure/storage/core/Utility.java

@@ -1287,44 +1287,6 @@ public static StreamMd5AndLength writeToOutputStream(final InputStream sourceStr
                 options, shouldFlush, null /*StorageRequest*/, null /* descriptor */);
     }
 
-    /**
-     * Reads data from an input stream and writes it to an output stream, calculates the length of the data written, and
-     * optionally calculates the MD5 hash for the data.
-     *
-     * @param sourceStream
-     *            An <code>InputStream</code> object that represents the input stream to use as the source.
-     * @param outStream
-     *            An <code>OutputStream</code> object that represents the output stream to use as the destination.
-     * @param writeLength
-     *            The number of bytes to read from the stream.
-     * @param rewindSourceStream
-     *            <code>true</code> if the input stream should be rewound <strong>before</strong> it is read; otherwise,
-     *            <code>false</code>
-     * @param calculateMD5
-     *            <code>true</code> if an MD5 hash will be calculated; otherwise, <code>false</code>.
-     * @param opContext
-     *            An {@link OperationContext} object that represents the context for the current operation. This object
-     *            is used to track requests to the storage service, and to provide additional runtime information about
-     *            the operation.
-     * @param options
-     *            A {@link RequestOptions} object that specifies any additional options for the request. Namely, the
-     *            maximum execution time.
-     * @param request
-     *            Used by download resume to set currentRequestByteCount on the request. Otherwise, null is always used.
-     * @return A {@link StreamMd5AndLength} object that contains the output stream length, and optionally the MD5 hash.
-     *
-     * @throws IOException
-     *             If an I/O error occurs.
-     * @throws StorageException
-     *             If a storage service error occurred.
-     */
-    public static StreamMd5AndLength writeToOutputStream(final InputStream sourceStream, final OutputStream outStream,
-                                                         long writeLength, final boolean rewindSourceStream, final boolean calculateMD5, OperationContext opContext,
-                                                         final RequestOptions options, final Boolean shouldFlush, StorageRequest<?, ?, Integer> request)
-            throws IOException, StorageException {
-        return writeToOutputStream(sourceStream, outStream, writeLength, rewindSourceStream, calculateMD5, opContext, options, shouldFlush, request, null /* descriptor */);
-    }
-
     /**
      * Reads data from an input stream and writes it to an output stream, calculates the length of the data written, and
      * optionally calculates the MD5 hash for the data.

microsoft-azure-storage/src/com/microsoft/azure/storage/file/FileOutputStream.java

@@ -404,7 +404,7 @@ public void write(final byte[] data, final int offset, final int length) throws
      */
     @DoesServiceRequest
     public void write(final InputStream sourceStream, final long writeLength) throws IOException, StorageException {
-        Utility.writeToOutputStream(sourceStream, this, writeLength, false, false, this.opContext, this.options, false, null /* descriptor */);
+        Utility.writeToOutputStream(sourceStream, this, writeLength, false, false, this.opContext, this.options, false);
     }
 
     /**

pom.xml

@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>5.2.0</version>
+	<version>5.3.0</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft Azure Storage Client SDK</name>