diff --git a/sdk/storage/azure-storage-blob-nio/assets.json b/sdk/storage/azure-storage-blob-nio/assets.json index c4e1de25c56ac..a77d0da94f84a 100644 --- a/sdk/storage/azure-storage-blob-nio/assets.json +++ b/sdk/storage/azure-storage-blob-nio/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "java", "TagPrefix": "java/storage/azure-storage-blob-nio", - "Tag": "java/storage/azure-storage-blob-nio_56e1e15f3a" + "Tag": "java/storage/azure-storage-blob-nio_ae6515d756" } diff --git a/sdk/storage/azure-storage-blob-nio/src/test/java/com/azure/storage/blob/nio/AzureFileSystemProviderTests.java b/sdk/storage/azure-storage-blob-nio/src/test/java/com/azure/storage/blob/nio/AzureFileSystemProviderTests.java index 2231ca4825dec..45d68cf8adbd1 100644 --- a/sdk/storage/azure-storage-blob-nio/src/test/java/com/azure/storage/blob/nio/AzureFileSystemProviderTests.java +++ b/sdk/storage/azure-storage-blob-nio/src/test/java/com/azure/storage/blob/nio/AzureFileSystemProviderTests.java @@ -4,12 +4,14 @@ package com.azure.storage.blob.nio; import com.azure.core.credential.AzureSasCredential; +import com.azure.core.http.HttpHeaderName; import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpMethod; import com.azure.core.http.HttpPipelineCallContext; import com.azure.core.http.HttpPipelineNextPolicy; import com.azure.core.http.HttpRequest; import com.azure.core.http.HttpResponse; +import com.azure.core.http.policy.AddHeadersPolicy; import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.test.http.MockHttpResponse; import com.azure.storage.blob.BlobClient; @@ -1407,6 +1409,9 @@ public void setAttributesMetadata(String key1, String value1, String key2, Strin @ParameterizedTest @MethodSource("setAttributesTierSupplier") public void setAttributesTier(AccessTier tier) throws IOException { + // Tier behavior is independent of listing format; retain this test's XML recordings. + config = initializeConfigMap( + new AddHeadersPolicy(new HttpHeaders().set(HttpHeaderName.ACCEPT, "application/xml"))); AzureFileSystem fs = createFS(config); Path path = fs.getPath(generateBlobName()); OutputStream os = fs.provider().newOutputStream(path); diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md index af41c87482980..594ab922cade9 100644 --- a/sdk/storage/azure-storage-blob/CHANGELOG.md +++ b/sdk/storage/azure-storage-blob/CHANGELOG.md @@ -9,6 +9,10 @@ ### Breaking Changes +- Changed the default response serialization format for `listBlobs` and `listBlobsByHierarchy` from XML to Apache Arrow + for both synchronous and asynchronous clients, with support for XML fallback responses from the service. To explicitly + request XML, use `new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)`. + ### Bugs Fixed ### Other Changes diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 4f911d4d98e9e..da94dc5dc2038 100644 --- a/sdk/storage/azure-storage-blob/assets.json +++ b/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_521aadfdd3" + "Tag": "java/storage/azure-storage-blob_5567e25d8f" } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java index 8a06c12f1060b..56834e6c8a2dc 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java @@ -1150,33 +1150,17 @@ PagedFlux listBlobsFlatWithOptionalTimeout(ListBlobsOptions options, S Duration timeout) { ModelHelper.validateListBlobsOptions(options); BiFunction>> func = (marker, pageSize) -> { - ListBlobsOptions finalOptions; + ListBlobsOptions finalOptions = ModelHelper.copyListBlobsOptions(options); + ModelHelper.applyDefaultsToListBlobsOptions(finalOptions); /* If pageSize was not set in a .byPage(int) method, the page size from options will be preserved. Otherwise, prefer the new value. - */ + */ if (pageSize != null) { - if (options == null) { - finalOptions = new ListBlobsOptions().setMaxResultsPerPage(pageSize); - } else { - // Note that this prefers the value passed to .byPage(int) over the value on the options - finalOptions = new ListBlobsOptions().setMaxResultsPerPage(pageSize) - .setPrefix(options.getPrefix()) - .setDetails(options.getDetails()) - .setStartFrom(options.getStartFrom()); - if (ModelHelper.resolveSerializationFormat(options.getStorageResponseSerializationFormat()) - == StorageResponseSerializationFormat.ARROW) { - finalOptions.setStorageResponseSerializationFormat(StorageResponseSerializationFormat.ARROW) - .setEndBefore(options.getEndBefore()); - } - } - } else { - finalOptions = options; + finalOptions.setMaxResultsPerPage(pageSize); } - if (finalOptions != null - && ModelHelper.resolveSerializationFormat(finalOptions.getStorageResponseSerializationFormat()) - == StorageResponseSerializationFormat.ARROW) { + if (finalOptions.getStorageResponseSerializationFormat() == StorageResponseSerializationFormat.ARROW) { return listBlobsFlatSegmentArrow(marker, finalOptions, timeout); } @@ -1394,33 +1378,17 @@ PagedFlux listBlobsHierarchyWithOptionalTimeout(String delimiter, List Duration timeout) { ModelHelper.validateListBlobsOptions(options); BiFunction>> func = (marker, pageSize) -> { - ListBlobsOptions finalOptions; + ListBlobsOptions finalOptions = ModelHelper.copyListBlobsOptions(options); + ModelHelper.applyDefaultsToListBlobsOptions(finalOptions); /* If pageSize was not set in a .byPage(int) method, the page size from options will be preserved. Otherwise, prefer the new value. - */ + */ if (pageSize != null) { - if (options == null) { - finalOptions = new ListBlobsOptions().setMaxResultsPerPage(pageSize); - } else { - // Note that this prefers the value passed to .byPage(int) over the value on the options - finalOptions = new ListBlobsOptions().setMaxResultsPerPage(pageSize) - .setPrefix(options.getPrefix()) - .setDetails(options.getDetails()) - .setStartFrom(options.getStartFrom()); - if (ModelHelper.resolveSerializationFormat(options.getStorageResponseSerializationFormat()) - == StorageResponseSerializationFormat.ARROW) { - finalOptions.setStorageResponseSerializationFormat(StorageResponseSerializationFormat.ARROW) - .setEndBefore(options.getEndBefore()); - } - } - } else { - finalOptions = options; + finalOptions.setMaxResultsPerPage(pageSize); } - if (finalOptions != null - && ModelHelper.resolveSerializationFormat(finalOptions.getStorageResponseSerializationFormat()) - == StorageResponseSerializationFormat.ARROW) { + if (finalOptions.getStorageResponseSerializationFormat() == StorageResponseSerializationFormat.ARROW) { return listBlobsHierarchySegmentArrow(marker, delimiter, finalOptions, timeout); } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerClient.java index 1d8af9f3f2e14..640db5ebbb261 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerClient.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerClient.java @@ -1063,19 +1063,8 @@ public PagedIterable listBlobs(ListBlobsOptions options, Duration time public PagedIterable listBlobs(ListBlobsOptions options, String continuationToken, Duration timeout) { ModelHelper.validateListBlobsOptions(options); BiFunction> retriever = (nextMarker, pageSize) -> { - ListBlobsOptions finalOptions = new ListBlobsOptions(); - if (options != null) { - finalOptions.setMaxResultsPerPage(options.getMaxResultsPerPage()) - .setPrefix(options.getPrefix()) - .setStartFrom(options.getStartFrom()) - .setDetails(options.getDetails()); - - if (options.getStorageResponseSerializationFormat() == StorageResponseSerializationFormat.ARROW) { - finalOptions.setStorageResponseSerializationFormat(StorageResponseSerializationFormat.ARROW) - .setEndBefore(options.getEndBefore()); - } - - } + ListBlobsOptions finalOptions = ModelHelper.copyListBlobsOptions(options); + ModelHelper.applyDefaultsToListBlobsOptions(finalOptions); /* If pageSize was not set in a .byPage(int) method, the page size from options will be preserved. Otherwise, prefer the new value. @@ -1258,18 +1247,8 @@ public PagedIterable listBlobsByHierarchy(String directory) { public PagedIterable listBlobsByHierarchy(String delimiter, ListBlobsOptions options, Duration timeout) { ModelHelper.validateListBlobsOptions(options); BiFunction> func = (marker, pageSize) -> { - ListBlobsOptions finalOptions = new ListBlobsOptions(); - if (options != null) { - finalOptions.setMaxResultsPerPage(options.getMaxResultsPerPage()) - .setPrefix(options.getPrefix()) - .setDetails(options.getDetails()) - .setStartFrom(options.getStartFrom()); - if (ModelHelper.resolveSerializationFormat(options.getStorageResponseSerializationFormat()) - == StorageResponseSerializationFormat.ARROW) { - finalOptions.setStorageResponseSerializationFormat(StorageResponseSerializationFormat.ARROW) - .setEndBefore(options.getEndBefore()); - } - } + ListBlobsOptions finalOptions = ModelHelper.copyListBlobsOptions(options); + ModelHelper.applyDefaultsToListBlobsOptions(finalOptions); /* If pageSize was not set in a .byPage(int) method, the page size from options will be preserved. Otherwise, prefer the new value. @@ -1291,8 +1270,7 @@ private PagedResponse listBlobsHierarchySegment(String marker, String ArrayList include = options.getDetails().toList().isEmpty() ? null : options.getDetails().toList(); - if (ModelHelper.resolveSerializationFormat(options.getStorageResponseSerializationFormat()) - == StorageResponseSerializationFormat.ARROW) { + if (options.getStorageResponseSerializationFormat() == StorageResponseSerializationFormat.ARROW) { Callable> operation = () -> azureBlobStorage.getContainers() .listBlobHierarchySegmentApacheArrowWithResponse(containerName, delimiter, options.getPrefix(), diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java index 92f85d26066a9..20ce9fb3ca23e 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java @@ -94,7 +94,7 @@ public final class ModelHelper { * but it is not a public API change. */ private static final StorageResponseSerializationFormat DEFAULT_SERIALIZATION_FORMAT - = StorageResponseSerializationFormat.XML; + = StorageResponseSerializationFormat.ARROW; // Change this value to switch AUTO session authentication behavior across all clients and policies. private static final SessionMode DEFAULT_SESSION_MODE = SessionMode.DISABLED; @@ -703,6 +703,34 @@ public static SessionMode resolveSessionMode(SessionMode mode) { return format; } + /** + * Copies list blobs options. + * + * @param options the listing options to copy, or {@code null}. + * @return the copied options. + */ + public static ListBlobsOptions copyListBlobsOptions(ListBlobsOptions options) { + if (options == null) { + return new ListBlobsOptions(); + } + return new ListBlobsOptions().setMaxResultsPerPage(options.getMaxResultsPerPage()) + .setPrefix(options.getPrefix()) + .setStartFrom(options.getStartFrom()) + .setEndBefore(options.getEndBefore()) + .setDetails(options.getDetails()) + .setStorageResponseSerializationFormat(options.getStorageResponseSerializationFormat()); + } + + /** + * Replaces the requested serialization format with the concrete wire format. + * + * @param options the listing options to update. + */ + public static void applyDefaultsToListBlobsOptions(ListBlobsOptions options) { + options.setStorageResponseSerializationFormat( + resolveSerializationFormat(options.getStorageResponseSerializationFormat())); + } + /** * Validates that {@code endBefore}, when specified, is used with the Apache Arrow response format. * diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobApiTests.java index 5b4e51e2e4e76..c0315e23702c1 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobApiTests.java @@ -47,12 +47,14 @@ import com.azure.storage.blob.models.FileShareTokenIntent; import com.azure.storage.blob.models.LeaseStateType; import com.azure.storage.blob.models.LeaseStatusType; +import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.ObjectReplicationPolicy; import com.azure.storage.blob.models.ObjectReplicationStatus; import com.azure.storage.blob.models.ParallelTransferOptions; import com.azure.storage.blob.models.RehydratePriority; import com.azure.storage.blob.SessionContext.SessionMode; import com.azure.storage.blob.models.StorageAccountInfo; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import com.azure.storage.blob.models.SyncCopyStatusType; import com.azure.storage.blob.options.BlobBeginCopyOptions; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; @@ -2760,7 +2762,9 @@ public void setTierPageBlob(AccessTier tier) { bc.setAccessTier(tier); assertEquals(tier, bc.getProperties().getAccessTier()); - assertEquals(tier, cc.listBlobs().iterator().next().getProperties().getAccessTier()); + ListBlobsOptions options + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + assertEquals(tier, cc.listBlobs(options, null).iterator().next().getProperties().getAccessTier()); // cleanup: cc.delete(); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAsyncApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAsyncApiTests.java index af42389fad12d..1fc9590c69edd 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAsyncApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAsyncApiTests.java @@ -45,10 +45,12 @@ import com.azure.storage.blob.models.FileShareTokenIntent; import com.azure.storage.blob.models.LeaseStateType; import com.azure.storage.blob.models.LeaseStatusType; +import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.ObjectReplicationPolicy; import com.azure.storage.blob.models.ObjectReplicationStatus; import com.azure.storage.blob.models.ParallelTransferOptions; import com.azure.storage.blob.models.RehydratePriority; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import com.azure.storage.blob.SessionContext.SessionMode; import com.azure.storage.blob.options.BlobBeginCopyOptions; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; @@ -2463,7 +2465,8 @@ public void setTierPageBlob(AccessTier tier) { PageBlobAsyncClient bc = cc.getBlobAsyncClient(generateBlobName()).getPageBlobAsyncClient(); return bc.create(512).then(bc.setAccessTier(tier)).then(bc.getProperties()).flatMapMany(r -> { assertEquals(tier, r.getAccessTier()); - return cc.listBlobs(); + return cc.listBlobs(new ListBlobsOptions() + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)); }); }); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerClientTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerClientTests.java new file mode 100644 index 0000000000000..4860813bb131c --- /dev/null +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerClientTests.java @@ -0,0 +1,84 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.storage.blob; + +import com.azure.core.http.HttpHeaderName; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.test.http.MockHttpResponse; +import com.azure.core.test.utils.MockTokenCredential; +import com.azure.storage.blob.models.BlobStorageException; +import com.azure.storage.blob.models.ListBlobsOptions; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; +import com.azure.storage.common.implementation.Constants; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import reactor.core.publisher.Mono; + +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class BlobContainerClientTests { + private AtomicReference acceptHeader; + private BlobContainerClient client; + + @BeforeEach + public void setup() { + acceptHeader = new AtomicReference<>(); + HttpPipeline pipeline = new HttpPipelineBuilder().httpClient(request -> { + acceptHeader.set(request.getHeaders().getValue(HttpHeaderName.ACCEPT)); + // Fail after capturing the request so the test doesn't need a format-specific response body. + return Mono.just(new MockHttpResponse(request, 500)); + }).build(); + client = new BlobContainerClientBuilder().endpoint("https://account.blob.core.windows.net/container") + .credential(new MockTokenCredential()) + .pipeline(pipeline) + .buildClient(); + } + + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + public void listBlobsUsesResolvedSerializationFormat(ListBlobsOptions options, String expectedAcceptHeader) { + sendRequest(() -> client.listBlobs(options, null).iterableByPage(1).iterator().hasNext()); + assertEquals(expectedAcceptHeader, acceptHeader.get()); + } + + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + public void listBlobsByHierarchyUsesResolvedSerializationFormat(ListBlobsOptions options, + String expectedAcceptHeader) { + sendRequest(() -> client.listBlobsByHierarchy("/", options, null).iterableByPage(1).iterator().hasNext()); + assertEquals(expectedAcceptHeader, acceptHeader.get()); + } + + private static void sendRequest(Supplier request) { + try { + request.get(); + } catch (BlobStorageException exception) { + if (exception.getStatusCode() != 500) { + throw exception; + } + } + } + + private static Stream serializationFormatSupplier() { + String arrowAcceptHeader + = Constants.ContentTypeConstants.APPLICATION_VND_APACHE_ARROW_STREAM + ",application/xml"; + return Stream.of(Arguments.of(null, arrowAcceptHeader), Arguments.of(new ListBlobsOptions(), arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.AUTO), + arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.ARROW), + arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), + "application/xml")); + } +} diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobErrorDeserializationTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobErrorDeserializationTests.java deleted file mode 100644 index a9561ee4882fc..0000000000000 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobErrorDeserializationTests.java +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -package com.azure.storage.blob; - -import com.azure.core.http.HttpHeaderName; -import com.azure.core.http.HttpHeaders; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.test.http.MockHttpResponse; -import com.azure.core.test.utils.MockTokenCredential; -import com.azure.storage.blob.models.BlobStorageException; -import org.junit.jupiter.api.Test; -import reactor.core.publisher.Mono; - -import java.nio.charset.StandardCharsets; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -/** - * Tests cases where the service returns a response that would result in a {@link BlobStorageException} being thrown - * with a response body that needs to be deserialized. - */ -public class BlobErrorDeserializationTests { - @Test - public void errorResponseBody() { - String errorResponse = "ContainerAlreadyExists" - + "The specified container already exists."; - HttpPipeline httpPipeline = new HttpPipelineBuilder().httpClient(request -> Mono.just( - new MockHttpResponse(request, 409, new HttpHeaders().set(HttpHeaderName.CONTENT_TYPE, "application/xml"), - errorResponse.getBytes(StandardCharsets.UTF_8)))) - .build(); - BlobContainerClient containerClient - = new BlobContainerClientBuilder().endpoint("https://account.blob.core.windows.net/container") - .credential(new MockTokenCredential()) - .pipeline(httpPipeline) - .buildClient(); - - BlobStorageException exception = assertThrows(BlobStorageException.class, containerClient::create); - assertTrue(exception.getMessage().contains("The specified container already exists.")); - // assertEquals(BlobErrorCode.CONTAINER_ALREADY_EXISTS, exception.getErrorCode()); - } -} diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobTestBase.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobTestBase.java index ffcf085da08cc..1edf8e058413e 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobTestBase.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobTestBase.java @@ -202,6 +202,11 @@ public void beforeTest() { super.beforeTest(); prefix = StorageCommonTestUtils.getCrc32(testContextManager.getTestPlaybackRecordingName()); + // Mock-only tests do not need service clients or a live container. + if (testContextManager.doNotRecordTest()) { + return; + } + if (getTestMode() != TestMode.LIVE) { interceptorManager .addSanitizers(Arrays.asList(new TestProxySanitizer("sig=(.*)", "REDACTED", TestProxySanitizerType.URL), @@ -253,7 +258,7 @@ public void beforeTest() { @Override protected void afterTest() { super.afterTest(); - if (getTestMode() == TestMode.PLAYBACK) { + if (getTestMode() == TestMode.PLAYBACK || testContextManager.doNotRecordTest()) { return; } diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNAsyncTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNAsyncTests.java index b27f9215b80c2..fcfddc9b2eb41 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNAsyncTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNAsyncTests.java @@ -10,6 +10,7 @@ import com.azure.storage.blob.models.BlobProperties; import com.azure.storage.blob.models.BlobStorageException; import com.azure.storage.blob.models.CustomerProvidedKey; +import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.PageBlobItem; import com.azure.storage.blob.models.PageRange; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; @@ -102,8 +103,10 @@ public void containerListBlobsFlat() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); + ListBlobsOptions options = new ListBlobsOptions(); StepVerifier - .create(cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobs())) + .create( + cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobs(options))) .assertNext(r -> assertEquals(scope2, r.getProperties().getEncryptionScope())) .verifyComplete(); } @@ -117,8 +120,11 @@ public void containerListBlobsHierarchical() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); - StepVerifier.create( - cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobsByHierarchy(""))) + ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); + StepVerifier + .create(cpkncesContainer.create() + .then(cpknAppendBlob.create()) + .thenMany(cpkncesContainer.listBlobsByHierarchy("/", options))) .assertNext(r -> assertEquals(scope2, r.getProperties().getEncryptionScope())) .verifyComplete(); } diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTests.java index 0ef86cea8f0cc..5536fa14e1178 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTests.java @@ -11,6 +11,7 @@ import com.azure.storage.blob.models.BlobStorageException; import com.azure.storage.blob.models.BlockBlobItem; import com.azure.storage.blob.models.CustomerProvidedKey; +import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.PageBlobItem; import com.azure.storage.blob.models.PageRange; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; @@ -101,7 +102,8 @@ public void containerListBlobsFlat() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - Iterator items = cpkncesContainer.listBlobs().iterator(); + ListBlobsOptions options = new ListBlobsOptions(); + Iterator items = cpkncesContainer.listBlobs(options, null).iterator(); BlobItem blob = items.next(); Assertions.assertFalse(items.hasNext()); @@ -118,7 +120,8 @@ public void containerListBlobsHierarchical() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - Iterator items = cpkncesContainer.listBlobsByHierarchy("").iterator(); + ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); + Iterator items = cpkncesContainer.listBlobsByHierarchy("/", options, null).iterator(); BlobItem blob = items.next(); Assertions.assertFalse(items.hasNext()); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerApiTests.java index f0bddc1d288a0..a1711f3411b13 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerApiTests.java @@ -14,9 +14,13 @@ import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.util.BinaryData; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.Response; +import com.azure.core.test.annotation.DoNotRecord; +import com.azure.core.test.http.MockHttpResponse; import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Context; import com.azure.identity.DefaultAzureCredentialBuilder; @@ -73,6 +77,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; +import reactor.core.publisher.Mono; import com.azure.storage.blob.implementation.AzureBlobStorageImpl; import com.azure.storage.blob.implementation.AzureBlobStorageImplBuilder; @@ -81,7 +86,6 @@ import com.azure.storage.blob.implementation.util.ModelHelper; import com.azure.storage.blob.models.ListBlobsIncludeItem; import com.azure.core.http.rest.ResponseBase; -import reactor.core.publisher.Mono; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -100,6 +104,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -785,6 +790,60 @@ public void listPageBlobsFlat() { ccPremium.delete(); } + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + @DoNotRecord + public void listBlobsUsesResolvedSerializationFormat(ListBlobsOptions options, String expectedAcceptHeader) { + AtomicReference acceptHeader = new AtomicReference<>(); + BlobContainerClient client = createSerializationFormatClient(acceptHeader); + + BlobStorageException exception = assertThrows(BlobStorageException.class, + () -> client.listBlobs(options, null).iterableByPage(1).iterator().hasNext()); + assertEquals(500, exception.getStatusCode()); + assertEquals(expectedAcceptHeader, acceptHeader.get()); + } + + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + @DoNotRecord + public void listBlobsByHierarchyUsesResolvedSerializationFormat(ListBlobsOptions options, + String expectedAcceptHeader) { + AtomicReference acceptHeader = new AtomicReference<>(); + BlobContainerClient client = createSerializationFormatClient(acceptHeader); + + BlobStorageException exception = assertThrows(BlobStorageException.class, + () -> client.listBlobsByHierarchy("/", options, null).iterableByPage(1).iterator().hasNext()); + assertEquals(500, exception.getStatusCode()); + assertEquals(expectedAcceptHeader, acceptHeader.get()); + } + + private static BlobContainerClient createSerializationFormatClient(AtomicReference acceptHeader) { + HttpPipeline pipeline = new HttpPipelineBuilder().httpClient(request -> { + acceptHeader.set(request.getHeaders().getValue(HttpHeaderName.ACCEPT)); + // Fail after capturing the request so the test doesn't need a format-specific response body. + return Mono.just(new MockHttpResponse(request, 500)); + }).build(); + return new BlobContainerClientBuilder().endpoint("https://account.blob.core.windows.net/container") + .credential(new MockTokenCredential()) + .pipeline(pipeline) + .buildClient(); + } + + private static Stream serializationFormatSupplier() { + String arrowAcceptHeader + = Constants.ContentTypeConstants.APPLICATION_VND_APACHE_ARROW_STREAM + ",application/xml"; + return Stream.of(Arguments.of(null, arrowAcceptHeader), Arguments.of(new ListBlobsOptions(), arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.AUTO), + arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.ARROW), + arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), + "application/xml")); + } + @Test public void listBlobsFlatMin() { assertDoesNotThrow(() -> cc.listBlobs().iterator().hasNext()); @@ -2298,8 +2357,7 @@ public void listBlobsArrowPagination() { @Test @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2026-06-06") - public void listBlobsArrowNullUseArrowUsesXml() { - // Default apacheArrowEnabled is null — should use XML path without error + public void listBlobsArrowNullDefaultsToArrow() { String blobName = generateBlobName(); cc.getBlobClient(blobName).getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize()); @@ -2356,16 +2414,18 @@ public void listBlobsArrowDeserializer() throws Exception { .listBlobFlatSegmentApacheArrowWithResponse(containerName, null, null, null, include, null, null, null, null, com.azure.core.util.Context.NONE); - // Verify Content-Type is Arrow - String contentType = response.getDeserializedHeaders().getContentType(); - assertTrue( - StorageImplUtils.hasMatchingHeaderValue(contentType, - Constants.ContentTypeConstants.APPLICATION_VND_APACHE_ARROW_STREAM), - "Expected Arrow content type but got: " + contentType); + ArrowBlobListDeserializer.ArrowListBlobsResult result; + try (InputStream body = response.getValue()) { + String contentType = response.getDeserializedHeaders().getContentType(); + assertTrue( + StorageImplUtils.hasMatchingHeaderValue(contentType, + Constants.ContentTypeConstants.APPLICATION_VND_APACHE_ARROW_STREAM), + "Expected Arrow content type but got: " + contentType); + result = ArrowBlobListDeserializer.deserialize(body); + } - // Deserialize using ArrowBlobListDeserializer - ArrowBlobListDeserializer.ArrowListBlobsResult result - = ArrowBlobListDeserializer.deserialize(response.getValue()); + BlobProperties properties = cc.getBlobClient(blobName).getProperties(); + assertNotNull(properties.getAccessTier()); // Verify pagination — single blob, no next page assertNull(result.getNextMarker()); @@ -2387,7 +2447,7 @@ public void listBlobsArrowDeserializer() throws Exception { assertNotNull(item.getProperties().getLastModified()); assertNotNull(item.getProperties().getCreationTime()); assertEquals(BlobType.BLOCK_BLOB, item.getProperties().getBlobType()); - assertEquals(AccessTier.HOT, item.getProperties().getAccessTier()); + assertEquals(properties.getAccessTier(), item.getProperties().getAccessTier()); assertTrue(item.getProperties().isAccessTierInferred()); assertTrue(item.getProperties().isServerEncrypted()); assertEquals(LeaseStateType.AVAILABLE, item.getProperties().getLeaseState()); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAsyncApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAsyncApiTests.java index 7c954f1324c40..0a67520eef627 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAsyncApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAsyncApiTests.java @@ -7,10 +7,14 @@ import com.azure.core.http.HttpHeaderName; import com.azure.core.http.HttpMethod; import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.Response; import com.azure.core.test.TestMode; +import com.azure.core.test.annotation.DoNotRecord; +import com.azure.core.test.http.MockHttpResponse; import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.BinaryData; import com.azure.core.util.Context; @@ -63,6 +67,7 @@ import java.time.Duration; import java.time.OffsetDateTime; import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -779,6 +784,62 @@ public void listPageBlobsFlat() { premiumBlobServiceAsyncClient.deleteBlobContainer(containerName).block(); } + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + @DoNotRecord + public void listBlobsUsesResolvedSerializationFormat(ListBlobsOptions options, String expectedAcceptHeader) { + AtomicReference acceptHeader = new AtomicReference<>(); + BlobContainerAsyncClient client = createSerializationFormatClient(acceptHeader); + + StepVerifier.create(client.listBlobs(options).byPage(1)).verifyErrorSatisfies(error -> { + BlobStorageException exception = assertInstanceOf(BlobStorageException.class, error); + assertEquals(500, exception.getStatusCode()); + }); + assertEquals(expectedAcceptHeader, acceptHeader.get()); + } + + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + @DoNotRecord + public void listBlobsByHierarchyUsesResolvedSerializationFormat(ListBlobsOptions options, + String expectedAcceptHeader) { + AtomicReference acceptHeader = new AtomicReference<>(); + BlobContainerAsyncClient client = createSerializationFormatClient(acceptHeader); + + StepVerifier.create(client.listBlobsByHierarchy("/", options).byPage(1)).verifyErrorSatisfies(error -> { + BlobStorageException exception = assertInstanceOf(BlobStorageException.class, error); + assertEquals(500, exception.getStatusCode()); + }); + assertEquals(expectedAcceptHeader, acceptHeader.get()); + } + + private static BlobContainerAsyncClient createSerializationFormatClient(AtomicReference acceptHeader) { + HttpPipeline pipeline = new HttpPipelineBuilder().httpClient(request -> { + acceptHeader.set(request.getHeaders().getValue(HttpHeaderName.ACCEPT)); + // Fail after capturing the request so the test doesn't need a format-specific response body. + return Mono.just(new MockHttpResponse(request, 500)); + }).build(); + return new BlobContainerClientBuilder().endpoint("https://account.blob.core.windows.net/container") + .credential(new MockTokenCredential()) + .pipeline(pipeline) + .buildAsyncClient(); + } + + private static Stream serializationFormatSupplier() { + String arrowAcceptHeader + = Constants.ContentTypeConstants.APPLICATION_VND_APACHE_ARROW_STREAM + ",application/xml"; + return Stream.of(Arguments.of(null, arrowAcceptHeader), Arguments.of(new ListBlobsOptions(), arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.AUTO), + arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.ARROW), + arrowAcceptHeader), + Arguments.of( + new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), + "application/xml")); + } + @Test public void listBlobsFlatMin() { StepVerifier.create(ccAsync.listBlobs()).verifyComplete(); @@ -2260,8 +2321,7 @@ public void listBlobsArrowPagination() { @Test @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2026-06-06") - public void listBlobsArrowNullUseArrowUsesXml() { - // Default apacheArrowEnabled is null — should use XML path without error + public void listBlobsArrowNullDefaultsToArrow() { String blobName = generateBlobName(); BlockBlobAsyncClient bc = ccAsync.getBlobAsyncClient(blobName).getBlockBlobAsyncClient(); @@ -2347,20 +2407,20 @@ public void listBlobsArrowDeserializer() { .then(impl.getContainers() .listBlobFlatSegmentApacheArrowWithResponseAsync(containerName, null, null, null, include, null, null, null, null)) - .flatMap(response -> { - // Verify Content-Type is Arrow + .flatMap(response -> FluxUtil.collectBytesInByteBufferStream(response.getValue()).map(bytes -> { String contentType = response.getDeserializedHeaders().getContentType(); assertTrue( StorageImplUtils.hasMatchingHeaderValue(contentType, Constants.ContentTypeConstants.APPLICATION_VND_APACHE_ARROW_STREAM), "Expected Arrow content type but got: " + contentType); + return ArrowBlobListDeserializer.deserialize(new ByteArrayInputStream(bytes)); + })); - // Collect the Flux body into a byte[] and feed it to the deserializer. - return FluxUtil.collectBytesInByteBufferStream(response.getValue()) - .map(bytes -> ArrowBlobListDeserializer.deserialize(new ByteArrayInputStream(bytes))); - }); + StepVerifier.create(testMono.zipWhen(result -> bc.getProperties())).assertNext(response -> { + ArrowBlobListDeserializer.ArrowListBlobsResult result = response.getT1(); + BlobProperties properties = response.getT2(); + assertNotNull(properties.getAccessTier()); - StepVerifier.create(testMono).assertNext(result -> { // Verify pagination — single blob, no next page assertNull(result.getNextMarker()); @@ -2381,7 +2441,7 @@ public void listBlobsArrowDeserializer() { assertNotNull(item.getProperties().getLastModified()); assertNotNull(item.getProperties().getCreationTime()); assertEquals(BlobType.BLOCK_BLOB, item.getProperties().getBlobType()); - assertEquals(AccessTier.HOT, item.getProperties().getAccessTier()); + assertEquals(properties.getAccessTier(), item.getProperties().getAccessTier()); assertTrue(item.getProperties().isAccessTierInferred()); assertTrue(item.getProperties().isServerEncrypted()); assertEquals(LeaseStateType.AVAILABLE, item.getProperties().getLeaseState()); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAsyncApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAsyncApiTests.java index aceec08acab5a..8918aa162a9e6 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAsyncApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAsyncApiTests.java @@ -26,8 +26,10 @@ import com.azure.storage.blob.models.CustomerProvidedKey; import com.azure.storage.blob.models.GeoReplicationStatus; import com.azure.storage.blob.models.ListBlobContainersOptions; +import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.ParallelTransferOptions; import com.azure.storage.blob.models.StaticWebsite; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import com.azure.storage.blob.models.TaggedBlobItem; import com.azure.storage.blob.options.BlobParallelUploadOptions; import com.azure.storage.blob.options.FindBlobsOptions; @@ -936,6 +938,7 @@ public void restoreContainerIntoOtherContainer() { Mono> response = cc1.create() .then(cc1.getBlobAsyncClient(blobName).upload(DATA.getDefaultFlux(), null)) + .then(cc1.delete()) .then(primaryBlobServiceAsyncClient .listBlobContainers(new ListBlobContainersOptions().setPrefix(cc1.getBlobContainerName()) .setDetails(new BlobContainerListDetails().setRetrieveDeleted(true))) @@ -943,7 +946,10 @@ public void restoreContainerIntoOtherContainer() { .flatMap(blobContainerItem -> Mono.delay(Duration.ofMillis(delay)) .then(primaryBlobServiceAsyncClient.undeleteBlobContainerWithResponse( new UndeleteBlobContainerOptions(blobContainerItem.getName(), blobContainerItem.getVersion()))) - .flatMap(r -> r.getValue().listBlobs().collectList())); + .flatMap(r -> r.getValue() + .listBlobs(new ListBlobsOptions() + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)) + .collectList())); StepVerifier.create(response).assertNext(r -> { assertEquals(1, r.size()); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteAsyncTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteAsyncTests.java index 0fd6a18fd9fa3..6ea0014e10e0b 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteAsyncTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteAsyncTests.java @@ -6,6 +6,7 @@ import com.azure.core.http.HttpHeaderName; import com.azure.storage.blob.models.BlobListDetails; import com.azure.storage.blob.models.ListBlobsOptions; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -51,7 +52,9 @@ public void undelete() { @Test public void listBlobsFlatOptionsDeleted() { ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) + .setPrefix(prefix) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier.create(blobClient.delete().thenMany(containerClient.listBlobs(options))) .assertNext(r -> assertEquals(blobClient.getBlobName(), r.getName())) .verifyComplete(); @@ -60,7 +63,9 @@ public void listBlobsFlatOptionsDeleted() { @Test public void listBlobsHierOptionsDeleted() { ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) + .setPrefix(prefix) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier.create(blobClient.delete().thenMany(containerClient.listBlobsByHierarchy("", options))) .assertNext(r -> assertEquals(blobClient.getBlobName(), r.getName())) .verifyComplete(); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteTests.java index 6c7e5a553925a..3c3b28f2ae782 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SoftDeleteTests.java @@ -8,6 +8,7 @@ import com.azure.storage.blob.models.BlobItem; import com.azure.storage.blob.models.BlobListDetails; import com.azure.storage.blob.models.ListBlobsOptions; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -68,7 +69,9 @@ public void listBlobsFlatOptionsDeleted() { blobClient.delete(); ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) + .setPrefix(prefix) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); Iterator blobs = containerClient.listBlobs(options, null).iterator(); assertEquals(blobClient.getBlobName(), blobs.next().getName()); @@ -80,7 +83,9 @@ public void listBlobsHierOptionsDeleted() { blobClient.delete(); ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) + .setPrefix(prefix) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); Iterator blobs = containerClient.listBlobsByHierarchy("", options, null).iterator(); assertEquals(blobClient.getBlobName(), blobs.next().getName()); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningAsyncTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningAsyncTests.java index 0932185a0a181..5201f745959b9 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningAsyncTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningAsyncTests.java @@ -19,6 +19,7 @@ import com.azure.storage.blob.models.BlockBlobItem; import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.PageBlobItem; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import com.azure.storage.blob.sas.BlobSasPermission; import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; import com.azure.storage.blob.specialized.BlobAsyncClientBase; @@ -311,19 +312,21 @@ public void getBlobPropertiesByVersion() { @Test public void listBlobsWithVersion() { - Mono>> response = blobClient - .getBlockBlobAsyncClient() - .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize()) - .flatMap(blobItemV1 -> blobClient.getBlockBlobAsyncClient() - .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true) - .flatMap(blobItemV2 -> blobClient.getBlockBlobAsyncClient() + Mono>> response + = blobClient.getBlockBlobAsyncClient() + .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize()) + .flatMap(blobItemV1 -> blobClient.getBlockBlobAsyncClient() .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true) - .flatMap(blobItemV3 -> blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)), - null) - .collectList() - .flatMap(list -> Mono.zip(Mono.just(blobItemV1), Mono.just(blobItemV2), Mono.just(blobItemV3), - Mono.just(list)))))); + .flatMap(blobItemV2 -> blobClient.getBlockBlobAsyncClient() + .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true) + .flatMap(blobItemV3 -> blobContainerClient + .listBlobs( + new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), + null) + .collectList() + .flatMap(list -> Mono.zip(Mono.just(blobItemV1), Mono.just(blobItemV2), + Mono.just(blobItemV3), Mono.just(list)))))); StepVerifier.create(response).assertNext(tuple -> { BlockBlobItem blobItemV1 = tuple.getT1(); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningTests.java index 801b5db4d319b..07a6b0ffedb33 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningTests.java @@ -19,6 +19,7 @@ import com.azure.storage.blob.models.BlockBlobItem; import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.PageBlobItem; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import com.azure.storage.blob.sas.BlobContainerSasPermission; import com.azure.storage.blob.sas.BlobSasPermission; import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; @@ -250,7 +251,8 @@ public void listBlobsWithVersion() { = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); PagedIterable blobs = blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)), null); + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); Iterator iterator = blobs.stream().iterator(); assertEquals(3, blobs.stream().count()); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseApiTests.java index 7bb4be87dd5cf..59ea7f67c2644 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseApiTests.java @@ -25,7 +25,9 @@ import com.azure.storage.blob.models.BlobQuerySerialization; import com.azure.storage.blob.models.BlobRequestConditions; import com.azure.storage.blob.models.BlobStorageException; +import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.RehydratePriority; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobBeginCopyOptions; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.options.BlobQueryOptions; @@ -891,7 +893,10 @@ public void setTierSmartGetBlobs() { blob1.setAccessTier(AccessTier.SMART); blob2.setAccessTier(AccessTier.SMART); - cc.listBlobs().forEach(blobItem -> { + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + + cc.listBlobs(listOptions, null).forEach(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { assertEquals(AccessTier.SMART, blobItem.getProperties().getAccessTier()); assertNotNull(blobItem.getProperties().getSmartAccessTier()); @@ -930,7 +935,10 @@ public void setTierSmartRehydrateGetBlobs() { blob1.setAccessTierWithResponse(options, null, Context.NONE); blob2.setAccessTierWithResponse(options, null, Context.NONE); - cc.listBlobs().forEach(blobItem -> { + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + + cc.listBlobs(listOptions, null).forEach(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { assertEquals(REHYDRATE_PENDING_TO_SMART, blobItem.getProperties().getArchiveStatus()); } diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAsyncApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAsyncApiTests.java index 013efed6743e3..77315371dc7d6 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAsyncApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAsyncApiTests.java @@ -27,7 +27,9 @@ import com.azure.storage.blob.models.BlobRequestConditions; import com.azure.storage.blob.models.BlobStorageException; import com.azure.storage.blob.models.BlockBlobItem; +import com.azure.storage.blob.models.ListBlobsOptions; import com.azure.storage.blob.models.RehydratePriority; +import com.azure.storage.blob.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobBeginCopyOptions; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.options.BlobQueryOptions; @@ -676,7 +678,10 @@ public void setTierSmartGetBlobs() { blob1.upload(DATA.getDefaultBinaryData()).then(blob1.setAccessTier(AccessTier.SMART)).block(); blob2.upload(DATA.getDefaultBinaryData()).then(blob2.setAccessTier(AccessTier.SMART)).block(); - StepVerifier.create(ccAsync.listBlobs().concatMap(blobItem -> { + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + + StepVerifier.create(ccAsync.listBlobs(listOptions, null).concatMap(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { assertEquals(AccessTier.SMART, blobItem.getProperties().getAccessTier()); assertNotNull(blobItem.getProperties().getSmartAccessTier()); @@ -718,7 +723,10 @@ public void setTierSmartRehydrateGetBlobs() { .then(blob2.setAccessTierWithResponse(options)) .block(); - StepVerifier.create(ccAsync.listBlobs().concatMap(blobItem -> { + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + + StepVerifier.create(ccAsync.listBlobs(listOptions, null).concatMap(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { assertEquals(REHYDRATE_PENDING_TO_SMART, blobItem.getProperties().getArchiveStatus()); } diff --git a/sdk/storage/azure-storage-file-share/assets.json b/sdk/storage/azure-storage-file-share/assets.json index 92a17c9561e63..b26b8c25bf705 100644 --- a/sdk/storage/azure-storage-file-share/assets.json +++ b/sdk/storage/azure-storage-file-share/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "java", "TagPrefix": "java/storage/azure-storage-file-share", - "Tag": "java/storage/azure-storage-file-share_679d0d8151" + "Tag": "java/storage/azure-storage-file-share_e2a4ab86de" }