Merge pull request #444 from Azure/legacy-dev

Legacy dev

Author: rickle-msft

ChangeLog.txt

@@ -1,3 +1,8 @@
+2019.03.01 Version 8.1.0
+ * Added support for the deep sync copy blob api.
+ * Added the option to disable etag validation on BlobInputStream reads.
+ * Added the ability to specify an offset and range on a BlobInputStream.
+
 2018.06.26 Version 8.0.0
  * Support for 2018-03-28 REST version. Please see our REST API documentation and blogs for information about the related added features.
  * Added support for static website properties.

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.0.0</version>
+	<version>8.1.0</version>
 </dependency>
 ```
 

microsoft-azure-storage-samples/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>8.0.0</version>
+			<version>8.1.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>8.0.0</version>
+            <version>8.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

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

@@ -602,14 +602,14 @@ public void testCopyBlockBlobTest() throws InvalidKeyException, URISyntaxExcepti
         this.doCloudBlockBlobCopy(false, false, false);
     }
 
-    /*@Test
+    @Test
     @Category({ DevFabricTests.class, DevStoreTests.class, SlowTests.class })
     public void testCopyBlockBlobSyncTest() throws InterruptedException, IOException, StorageException,
             InvalidKeyException, URISyntaxException {
         this.doCloudBlockBlobCopy(false, false, true);
-    }*/
+    }
 
-    /*@Test
+    @Test
     public void testCopyBlockBlobWithSyncMd5() throws URISyntaxException, StorageException, IOException, NoSuchAlgorithmException {
         // Create source on server. We must copy from a different account or the service will not validate the md5.
         CloudBlobContainer container = BlobTestHelper.getRandomCopySourceContainerReference();
@@ -679,7 +679,7 @@ public void testCopyBlockBlobWithSyncMd5() throws URISyntaxException, StorageExc
         destination.delete();
         source.delete();
         container.deleteIfExists();
-    }*/
+    }
 
     @Test
     public void testCopyWithChineseChars() throws StorageException, IOException, URISyntaxException {

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

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

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

@@ -740,7 +740,7 @@ protected final String startCopy(final URI source, final PremiumPageBlobTier pre
      *
      */
     @DoesServiceRequest
-    private final String startCopy(final URI source, String contentMd5, boolean syncCopy, final PremiumPageBlobTier premiumPageBlobTier, final AccessCondition sourceAccessCondition,
+    protected final String startCopy(final URI source, String contentMd5, boolean syncCopy, final PremiumPageBlobTier premiumPageBlobTier, final AccessCondition sourceAccessCondition,
             final AccessCondition destinationAccessCondition, BlobRequestOptions options, OperationContext opContext)
             throws StorageException {
         if (opContext == null) {

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

@@ -254,7 +254,7 @@ public final String startCopy(final CloudBlockBlob sourceBlob, final AccessCondi
      *
      */
     @DoesServiceRequest
-    private final String startCopy(final CloudBlockBlob sourceBlob, String contentMd5, boolean syncCopy, final AccessCondition sourceAccessCondition,
+    public final String startCopy(final CloudBlockBlob sourceBlob, String contentMd5, boolean syncCopy, final AccessCondition sourceAccessCondition,
             final AccessCondition destinationAccessCondition, BlobRequestOptions options, OperationContext opContext)
             throws StorageException, URISyntaxException {
         Utility.assertNotNull("sourceBlob", sourceBlob);
@@ -265,7 +265,8 @@ private final String startCopy(final CloudBlockBlob sourceBlob, String contentMd
             source = sourceBlob.getServiceClient().getCredentials().transformUri(sourceBlob.getSnapshotQualifiedUri());
         }
 
-        return this.startCopy(source, null /* premiumPageBlobTier */, sourceAccessCondition, destinationAccessCondition, options, opContext);
+        return this.startCopy(source, contentMd5, syncCopy, null /* premiumPageBlobTier */, sourceAccessCondition,
+                destinationAccessCondition, options, opContext);
     }
 
     /**

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

@@ -347,7 +347,7 @@ public static void assertContinuationType(final ResultContinuation continuationT
             if (!(continuationToken.getContinuationType() == ResultContinuationType.NONE || continuationToken
                     .getContinuationType() == continuationType)) {
                 final String errorMessage = String.format(Utility.LOCALE_US, SR.UNEXPECTED_CONTINUATION_TYPE,
-                        continuationToken.getContinuationType(), continuationType);
+                        continuationType, continuationToken.getContinuationType());
                 throw new IllegalArgumentException(errorMessage);
             }
         }

pom.xml

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