Storage - Content Validation Decoder Implementation

sdk/storage/azure-storage-blob/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/storage/azure-storage-blob",
-  "Tag": "java/storage/azure-storage-blob_4e6c4fe966"
+  "Tag": "java/storage/azure-storage-blob_1f689f90f0"
 }

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BuilderHelper.java

@@ -39,6 +39,7 @@
 import com.azure.storage.common.policy.ResponseValidationPolicyBuilder;
 import com.azure.storage.common.policy.ScrubEtagPolicy;
 import com.azure.storage.common.policy.StorageBearerTokenChallengeAuthorizationPolicy;
+import com.azure.storage.common.policy.StorageContentValidationDecoderPolicy;
 import com.azure.storage.common.policy.StorageContentValidationPolicy;
 import com.azure.storage.common.policy.StorageSharedKeyCredentialPolicy;
 
@@ -117,6 +118,7 @@ public static HttpPipeline buildPipeline(StorageSharedKeyCredential storageShare
         policies.add(new MetadataValidationPolicy());
 
         policies.add(new StorageContentValidationPolicy());
+        policies.add(new StorageContentValidationDecoderPolicy());
 
         if (storageSharedKeyCredential != null) {
             policies.add(new StorageSharedKeyCredentialPolicy(storageSharedKeyCredential));

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java

@@ -1261,16 +1261,20 @@ Mono<BlobDownloadAsyncResponse> downloadStreamWithResponseInternal(BlobRange ran
         BlobRequestConditions requestConditions, boolean getRangeContentMd5,
         ContentValidationAlgorithm contentValidationAlgorithm, Context context) {
         BlobRange finalRange = range == null ? new BlobRange(0) : range;
+
         Boolean getMD5 = getRangeContentMd5 ? getRangeContentMd5 : null;
         BlobRequestConditions finalRequestConditions
             = requestConditions == null ? new BlobRequestConditions() : requestConditions;
         DownloadRetryOptions finalOptions = (options == null) ? new DownloadRetryOptions() : options;
 
+        context
+            = ContentValidationModeResolver.addStructuredMessageDecodingToContext(context, contentValidationAlgorithm);
+
         // The first range should eagerly convert headers as they'll be used to create response types.
         Context firstRangeContext = context == null
             ? new Context("azure-eagerly-convert-headers", true)
             : context.addData("azure-eagerly-convert-headers", true);
-
+        Context nextRangeContext = context;
         return downloadRange(finalRange, finalRequestConditions, finalRequestConditions.getIfMatch(), getMD5,
             firstRangeContext).map(response -> {
                 BlobsDownloadHeaders blobsDownloadHeaders = new BlobsDownloadHeaders(response.getHeaders());
@@ -1315,7 +1319,7 @@ Mono<BlobDownloadAsyncResponse> downloadStreamWithResponseInternal(BlobRange ran
 
                     try {
                         return downloadRange(new BlobRange(initialOffset + offset, newCount), finalRequestConditions,
-                            eTag, getMD5, context);
+                            eTag, getMD5, nextRangeContext);
                     } catch (Exception e) {
                         return Mono.error(e);
                     }

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContentValidationAsyncUploadTests.java

@@ -55,7 +55,7 @@ public class BlobContentValidationAsyncUploadTests extends BlobTestBase {
     private static final int UNDER_4MB = 2 * Constants.MB;
 
     private static final long LARGE_UPLOAD_MIN_BYTES = 500L * Constants.MB;
-    private static final long LARGE_UPLOAD_MAX_BYTES = 1L * Constants.GB;
+    private static final long LARGE_UPLOAD_MAX_BYTES = Constants.GB;
     private static final long LARGE_UPLOAD_BLOCK_SIZE_BYTES = 8L * Constants.MB;
     private static final int LARGE_UPLOAD_MAX_CONCURRENCY = 8;
 
@@ -163,7 +163,6 @@ public void uploadWithoutContentValidation() {
     /**
      * Blob parallel upload rejects using both computeMd5 (SDK-computed MD5) and CRC64 (transfer validation checksum algorithm) at once.
      */
-    @SuppressWarnings("deprecation")
     @Test
     public void uploadWithComputeMd5AndCrc64Throws() {
         BlobAsyncClient client = createBlobAsyncClientWithRequestSniffer(new CopyOnWriteArrayList<>());