From ef52222dd67b0354dbfad39f740d841502e66ddf Mon Sep 17 00:00:00 2001 From: browndav Date: Tue, 15 Sep 2026 13:49:18 -0400 Subject: [PATCH 01/22] change default serialization format to arrow --- .../com/azure/storage/blob/implementation/util/ModelHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e5c79d643864f..bd0de2ada3143 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 @@ -93,7 +93,7 @@ public final class ModelHelper { * but it is not a public API change. */ private static final StorageResponseSerializationFormat DEFAULT_SERIALIZATION_FORMAT - = StorageResponseSerializationFormat.XML; + = StorageResponseSerializationFormat.ARROW; /** * Determines whether the passed authority is IP style, that is, it is of the format {@code :}. From b38a3a2825bbed44000d3043921507eefd982c9c Mon Sep 17 00:00:00 2001 From: browndav Date: Tue, 15 Sep 2026 19:09:12 -0400 Subject: [PATCH 02/22] consolidate setters for photon, photon on by default --- .../blob/BlobContainerAsyncClient.java | 52 +++--------- .../storage/blob/BlobContainerClient.java | 32 ++------ .../blob/implementation/util/ModelHelper.java | 28 +++++++ .../blob/BlobContainerAsyncClientTests.java | 81 +++++++++++++++++++ .../blob/BlobContainerClientTests.java | 81 +++++++++++++++++++ .../blob/BlobErrorDeserializationTests.java | 43 ---------- 6 files changed, 205 insertions(+), 112 deletions(-) create mode 100644 sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java create mode 100644 sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerClientTests.java delete mode 100644 sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobErrorDeserializationTests.java 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 6f3a12dd90a5a..1caeec6b80fa6 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 @@ -1122,33 +1122,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); } @@ -1366,33 +1350,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 67dc02480be42..4700c6f22dcde 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 @@ -1035,19 +1035,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. @@ -1230,18 +1219,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. @@ -1263,8 +1242,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 bd0de2ada3143..28243d87611d4 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 @@ -689,6 +689,34 @@ public static BlobStorageException mapToBlobStorageException(BlobStorageExceptio 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/BlobContainerAsyncClientTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java new file mode 100644 index 0000000000000..fa5ecdbc90678 --- /dev/null +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java @@ -0,0 +1,81 @@ +// 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 BlobContainerAsyncClientTests { + private AtomicReference acceptHeader; + private BlobContainerAsyncClient 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) + .buildAsyncClient(); + } + + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + public void listBlobsUsesResolvedSerializationFormat(ListBlobsOptions options, String expectedAcceptHeader) { + sendRequest(() -> client.listBlobs(options).byPage(1).blockFirst()); + assertEquals(expectedAcceptHeader, acceptHeader.get()); + } + + @ParameterizedTest + @MethodSource("serializationFormatSupplier") + public void listBlobsByHierarchyUsesResolvedSerializationFormat(ListBlobsOptions options, + String expectedAcceptHeader) { + sendRequest(() -> client.listBlobsByHierarchy("/", options).byPage(1).blockFirst()); + 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.XML), + "application/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..9c08bc15f4bb0 --- /dev/null +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerClientTests.java @@ -0,0 +1,81 @@ +// 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.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()); - } -} From c455b9222baed51a265a0ede0a3b43cae974b997 Mon Sep 17 00:00:00 2001 From: browndav Date: Tue, 15 Sep 2026 19:20:16 -0400 Subject: [PATCH 03/22] add ARROW enum check --- .../com/azure/storage/blob/BlobContainerAsyncClientTests.java | 3 +++ .../java/com/azure/storage/blob/BlobContainerClientTests.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java index fa5ecdbc90678..770c5950fb4df 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java @@ -74,6 +74,9 @@ private static Stream serializationFormatSupplier() { 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/BlobContainerClientTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerClientTests.java index 9c08bc15f4bb0..4860813bb131c 100644 --- 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 @@ -74,6 +74,9 @@ private static Stream serializationFormatSupplier() { 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")); From f332e5c156a4354c424307407c1c9ad55176056b Mon Sep 17 00:00:00 2001 From: browndav Date: Wed, 16 Sep 2026 13:19:42 -0400 Subject: [PATCH 04/22] change default tests to check for arrow and not xml --- .../test/java/com/azure/storage/blob/ContainerApiTests.java | 3 +-- .../java/com/azure/storage/blob/ContainerAsyncApiTests.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 5bdf5cbd0c0e3..62cee0c83da78 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 @@ -2279,8 +2279,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()); 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 568603acdb9ab..009e335012c2c 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 @@ -2250,8 +2250,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(); From 1907177a44d5b68c959b4f7d28fcd1a4f04396af Mon Sep 17 00:00:00 2001 From: browndav Date: Wed, 16 Sep 2026 13:20:33 -0400 Subject: [PATCH 05/22] rerecord failing tests so arrow returned and not xml in recordings --- sdk/storage/azure-storage-blob/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 222d2cf555710..a06882fe6f419 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_018b1a065c" + "Tag": "java/storage/azure-storage-blob_c3f371489b" } From fdd1dbd08125b4a896bafc8fdff593cfae0fdd84 Mon Sep 17 00:00:00 2001 From: browndav Date: Wed, 16 Sep 2026 14:05:13 -0400 Subject: [PATCH 06/22] recorded more failing tests for arrow --- sdk/storage/azure-storage-blob/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index a06882fe6f419..76b666e436e9e 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_c3f371489b" + "Tag": "java/storage/azure-storage-blob_e4e816b0d8" } From 5efd0d43901f65d93795ffd7075a78ef76d42e2a Mon Sep 17 00:00:00 2001 From: browndav Date: Tue, 6 Oct 2026 12:12:18 -0400 Subject: [PATCH 07/22] change previous tests to check for xml explicitly, restore previous recordings --- sdk/storage/azure-storage-blob/assets.json | 2 +- .../storage/blob/specialized/BlobBaseApiTests.java | 12 ++++++++++-- .../blob/specialized/BlobBaseAsyncApiTests.java | 12 ++++++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 76b666e436e9e..0c5fabeaae881 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_e4e816b0d8" + "Tag": "java/storage/azure-storage-blob_350543f6d8" } 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()); } From f550396901a509c036c3ed0e63c4812378f14f80 Mon Sep 17 00:00:00 2001 From: browndav Date: Tue, 6 Oct 2026 14:07:49 -0400 Subject: [PATCH 08/22] restore recordings for failing tests, add xml explitly --- sdk/storage/azure-storage-blob/assets.json | 2 +- .../java/com/azure/storage/blob/BlobApiTests.java | 6 +++++- .../com/azure/storage/blob/BlobAsyncApiTests.java | 5 ++++- .../java/com/azure/storage/blob/CPKNAsyncTests.java | 13 ++++++++++--- .../test/java/com/azure/storage/blob/CPKNTests.java | 10 ++++++++-- .../azure/storage/blob/ServiceAsyncApiTests.java | 6 +++++- .../azure/storage/blob/SoftDeleteAsyncTests.java | 11 +++++++---- .../com/azure/storage/blob/SoftDeleteTests.java | 11 +++++++---- .../azure/storage/blob/VersioningAsyncTests.java | 7 +++++-- .../com/azure/storage/blob/VersioningTests.java | 11 +++++++---- 10 files changed, 59 insertions(+), 23 deletions(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 0c5fabeaae881..1f1bc707ca659 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_350543f6d8" + "Tag": "java/storage/azure-storage-blob_6bde428684" } 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 44a32b6a420f8..daed8586d6917 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 @@ -46,11 +46,13 @@ 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.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; @@ -2753,7 +2755,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 049e4254e92a4..3f3ec379265c1 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 @@ -44,10 +44,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.options.BlobBeginCopyOptions; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.options.BlobDownloadToFileOptions; @@ -2457,7 +2459,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/CPKNAsyncTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNAsyncTests.java index b27f9215b80c2..ceb366680afd8 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,8 +10,10 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobSasPermission; import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; @@ -102,8 +104,10 @@ public void containerListBlobsFlat() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); + ListBlobsOptions options + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); 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 +121,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("") + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + 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..8bb62530dd886 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,8 +11,10 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobContainerSasPermission; import com.azure.storage.blob.sas.BlobSasPermission; @@ -101,7 +103,9 @@ public void containerListBlobsFlat() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - Iterator items = cpkncesContainer.listBlobs().iterator(); + ListBlobsOptions options + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + Iterator items = cpkncesContainer.listBlobs(options, null).iterator(); BlobItem blob = items.next(); Assertions.assertFalse(items.hasNext()); @@ -118,7 +122,9 @@ public void containerListBlobsHierarchical() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - Iterator items = cpkncesContainer.listBlobsByHierarchy("").iterator(); + ListBlobsOptions options = new ListBlobsOptions().setPrefix("") + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + 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/ServiceAsyncApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAsyncApiTests.java index aceec08acab5a..27c4e416bf3d1 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,8 @@ 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..53f9f96c03078 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; @@ -50,8 +51,9 @@ public void undelete() { @Test public void listBlobsFlatOptionsDeleted() { - ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + ListBlobsOptions options = 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(); @@ -59,8 +61,9 @@ public void listBlobsFlatOptionsDeleted() { @Test public void listBlobsHierOptionsDeleted() { - ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + ListBlobsOptions options = 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..a6f4e0dd514f7 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; @@ -67,8 +68,9 @@ public void undelete() { public void listBlobsFlatOptionsDeleted() { blobClient.delete(); - ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + ListBlobsOptions options = 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()); @@ -79,8 +81,9 @@ public void listBlobsFlatOptionsDeleted() { public void listBlobsHierOptionsDeleted() { blobClient.delete(); - ListBlobsOptions options - = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)).setPrefix(prefix); + ListBlobsOptions options = 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..ac503f14946f6 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; @@ -319,7 +320,8 @@ public void listBlobsWithVersion() { .flatMap(blobItemV2 -> blobClient.getBlockBlobAsyncClient() .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true) .flatMap(blobItemV3 -> blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)), + .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), @@ -350,7 +352,8 @@ public void listBlobsWithoutVersion() { .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .flatMapMany(r -> Flux.zip( blobContainerClient.listBlobs( - new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null), + new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null), Flux.just(r))); StepVerifier.create(response) 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..ac3c2304c499b 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; @@ -249,8 +250,9 @@ public void listBlobsWithVersion() { BlockBlobItem blobItemV3 = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); - PagedIterable blobs = blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)), null); + PagedIterable blobs = blobContainerClient.listBlobs( + new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); Iterator iterator = blobs.stream().iterator(); assertEquals(3, blobs.stream().count()); @@ -272,8 +274,9 @@ public void listBlobsWithoutVersion() { BlockBlobItem blobItemV3 = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); - PagedIterable blobs = blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null); + PagedIterable blobs = blobContainerClient.listBlobs( + new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); assertEquals(1, blobs.stream().count()); assertEquals(blobItemV3.getVersionId(), blobs.stream().iterator().next().getVersionId()); From ed6ed3e6b887b435bca45eaf2939468ae597ca53 Mon Sep 17 00:00:00 2001 From: browndav Date: Tue, 6 Oct 2026 14:26:47 -0400 Subject: [PATCH 09/22] spotless apply --- .../azure/storage/blob/CPKNAsyncTests.java | 10 +++--- .../storage/blob/ServiceAsyncApiTests.java | 6 ++-- .../storage/blob/SoftDeleteAsyncTests.java | 14 +++++---- .../azure/storage/blob/SoftDeleteTests.java | 14 +++++---- .../storage/blob/VersioningAsyncTests.java | 31 ++++++++++--------- .../azure/storage/blob/VersioningTests.java | 8 ++--- 6 files changed, 46 insertions(+), 37 deletions(-) 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 ceb366680afd8..546a57959a0d3 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 @@ -107,7 +107,8 @@ public void containerListBlobsFlat() { ListBlobsOptions options = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier - .create(cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobs(options))) + .create( + cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobs(options))) .assertNext(r -> assertEquals(scope2, r.getProperties().getEncryptionScope())) .verifyComplete(); } @@ -123,9 +124,10 @@ public void containerListBlobsHierarchical() { ListBlobsOptions options = new ListBlobsOptions().setPrefix("") .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); - StepVerifier.create(cpkncesContainer.create() - .then(cpknAppendBlob.create()) - .thenMany(cpkncesContainer.listBlobsByHierarchy("/", options))) + 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/ServiceAsyncApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAsyncApiTests.java index 27c4e416bf3d1..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 @@ -946,8 +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(new ListBlobsOptions() - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)).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 53f9f96c03078..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 @@ -51,9 +51,10 @@ public void undelete() { @Test public void listBlobsFlatOptionsDeleted() { - ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options + = 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(); @@ -61,9 +62,10 @@ public void listBlobsFlatOptionsDeleted() { @Test public void listBlobsHierOptionsDeleted() { - ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options + = 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 a6f4e0dd514f7..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 @@ -68,9 +68,10 @@ public void undelete() { public void listBlobsFlatOptionsDeleted() { blobClient.delete(); - ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options + = 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()); @@ -81,9 +82,10 @@ public void listBlobsFlatOptionsDeleted() { public void listBlobsHierOptionsDeleted() { blobClient.delete(); - ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options + = 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 ac503f14946f6..91166a8378c07 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 @@ -312,20 +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)) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), - 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(); @@ -351,8 +352,8 @@ public void listBlobsWithoutVersion() { .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .flatMapMany(r -> Flux.zip( - blobContainerClient.listBlobs( - new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) + blobContainerClient + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null), Flux.just(r))); 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 ac3c2304c499b..2e3afeec422fe 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 @@ -250,8 +250,8 @@ public void listBlobsWithVersion() { BlockBlobItem blobItemV3 = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); - PagedIterable blobs = blobContainerClient.listBlobs( - new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) + PagedIterable blobs = blobContainerClient + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); Iterator iterator = blobs.stream().iterator(); @@ -274,8 +274,8 @@ public void listBlobsWithoutVersion() { BlockBlobItem blobItemV3 = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); - PagedIterable blobs = blobContainerClient.listBlobs( - new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) + PagedIterable blobs = blobContainerClient + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); assertEquals(1, blobs.stream().count()); From 9ae3cfc339bc5d7cd629010b07e5b2e8c230c5bc Mon Sep 17 00:00:00 2001 From: browndav Date: Tue, 6 Oct 2026 15:20:15 -0400 Subject: [PATCH 10/22] Exercise default Arrow listing in restored tests for live CI Remove explicit XML overrides added during recording restoration. Preserve the restored assets, container deletion fix, and hierarchy request parameters. Existing XML recordings are intentionally not updated; this isolated experiment is intended for live CI and can be reverted afterward. --- .../src/test/java/com/azure/storage/blob/BlobApiTests.java | 4 +--- .../java/com/azure/storage/blob/BlobAsyncApiTests.java | 4 +--- .../test/java/com/azure/storage/blob/CPKNAsyncTests.java | 7 ++----- .../src/test/java/com/azure/storage/blob/CPKNTests.java | 7 ++----- .../java/com/azure/storage/blob/ServiceAsyncApiTests.java | 4 +--- .../java/com/azure/storage/blob/SoftDeleteAsyncTests.java | 7 ++----- .../test/java/com/azure/storage/blob/SoftDeleteTests.java | 7 ++----- .../java/com/azure/storage/blob/VersioningAsyncTests.java | 7 ++----- .../test/java/com/azure/storage/blob/VersioningTests.java | 7 ++----- .../azure/storage/blob/specialized/BlobBaseApiTests.java | 7 ++----- .../storage/blob/specialized/BlobBaseAsyncApiTests.java | 7 ++----- 11 files changed, 19 insertions(+), 49 deletions(-) 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 daed8586d6917..643d07281df0b 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 @@ -52,7 +52,6 @@ import com.azure.storage.blob.models.ParallelTransferOptions; import com.azure.storage.blob.models.RehydratePriority; 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; @@ -2755,8 +2754,7 @@ public void setTierPageBlob(AccessTier tier) { bc.setAccessTier(tier); assertEquals(tier, bc.getProperties().getAccessTier()); - ListBlobsOptions options - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions(); assertEquals(tier, cc.listBlobs(options, null).iterator().next().getProperties().getAccessTier()); // cleanup: 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 3f3ec379265c1..22bc5175ab5a5 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 @@ -49,7 +49,6 @@ 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.options.BlobBeginCopyOptions; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.options.BlobDownloadToFileOptions; @@ -2459,8 +2458,7 @@ 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(new ListBlobsOptions() - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)); + return cc.listBlobs(new ListBlobsOptions()); }); }); 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 546a57959a0d3..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 @@ -13,7 +13,6 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobSasPermission; import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; @@ -104,8 +103,7 @@ public void containerListBlobsFlat() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); - ListBlobsOptions options - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions(); StepVerifier .create( cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobs(options))) @@ -122,8 +120,7 @@ public void containerListBlobsHierarchical() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); - ListBlobsOptions options = new ListBlobsOptions().setPrefix("") - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); StepVerifier .create(cpkncesContainer.create() .then(cpknAppendBlob.create()) 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 8bb62530dd886..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 @@ -14,7 +14,6 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobContainerSasPermission; import com.azure.storage.blob.sas.BlobSasPermission; @@ -103,8 +102,7 @@ public void containerListBlobsFlat() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - ListBlobsOptions options - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions(); Iterator items = cpkncesContainer.listBlobs(options, null).iterator(); BlobItem blob = items.next(); @@ -122,8 +120,7 @@ public void containerListBlobsHierarchical() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - ListBlobsOptions options = new ListBlobsOptions().setPrefix("") - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); Iterator items = cpkncesContainer.listBlobsByHierarchy("/", options, null).iterator(); BlobItem blob = items.next(); 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 8918aa162a9e6..a108582a33781 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 @@ -29,7 +29,6 @@ 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; @@ -947,8 +946,7 @@ public void restoreContainerIntoOtherContainer() { .then(primaryBlobServiceAsyncClient.undeleteBlobContainerWithResponse( new UndeleteBlobContainerOptions(blobContainerItem.getName(), blobContainerItem.getVersion()))) .flatMap(r -> r.getValue() - .listBlobs(new ListBlobsOptions() - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)) + .listBlobs(new ListBlobsOptions()) .collectList())); StepVerifier.create(response).assertNext(r -> { 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 6ea0014e10e0b..ae24c742d6ad6 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,7 +6,6 @@ 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; @@ -53,8 +52,7 @@ public void undelete() { public void listBlobsFlatOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + .setPrefix(prefix); StepVerifier.create(blobClient.delete().thenMany(containerClient.listBlobs(options))) .assertNext(r -> assertEquals(blobClient.getBlobName(), r.getName())) .verifyComplete(); @@ -64,8 +62,7 @@ public void listBlobsFlatOptionsDeleted() { public void listBlobsHierOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + .setPrefix(prefix); 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 3c3b28f2ae782..760b78f0aed7b 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,7 +8,6 @@ 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; @@ -70,8 +69,7 @@ public void listBlobsFlatOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + .setPrefix(prefix); Iterator blobs = containerClient.listBlobs(options, null).iterator(); assertEquals(blobClient.getBlobName(), blobs.next().getName()); @@ -84,8 +82,7 @@ public void listBlobsHierOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + .setPrefix(prefix); 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 91166a8378c07..e26a5ed88c88b 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,7 +19,6 @@ 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; @@ -321,8 +320,7 @@ public void listBlobsWithVersion() { .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true) .flatMap(blobItemV3 -> blobContainerClient .listBlobs( - new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), + new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)), null) .collectList() .flatMap(list -> Mono.zip(Mono.just(blobItemV1), Mono.just(blobItemV2), @@ -353,8 +351,7 @@ public void listBlobsWithoutVersion() { .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .flatMapMany(r -> Flux.zip( blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null), + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null), Flux.just(r))); StepVerifier.create(response) 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 2e3afeec422fe..801b5db4d319b 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,7 +19,6 @@ 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; @@ -251,8 +250,7 @@ public void listBlobsWithVersion() { = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); PagedIterable blobs = blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)), null); Iterator iterator = blobs.stream().iterator(); assertEquals(3, blobs.stream().count()); @@ -275,8 +273,7 @@ public void listBlobsWithoutVersion() { = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); PagedIterable blobs = blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null); assertEquals(1, blobs.stream().count()); assertEquals(blobItemV3.getVersionId(), blobs.stream().iterator().next().getVersionId()); 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 59ea7f67c2644..5860198446fbc 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 @@ -27,7 +27,6 @@ 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; @@ -893,8 +892,7 @@ public void setTierSmartGetBlobs() { blob1.setAccessTier(AccessTier.SMART); blob2.setAccessTier(AccessTier.SMART); - ListBlobsOptions listOptions - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions listOptions = new ListBlobsOptions(); cc.listBlobs(listOptions, null).forEach(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { @@ -935,8 +933,7 @@ public void setTierSmartRehydrateGetBlobs() { blob1.setAccessTierWithResponse(options, null, Context.NONE); blob2.setAccessTierWithResponse(options, null, Context.NONE); - ListBlobsOptions listOptions - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions listOptions = new ListBlobsOptions(); cc.listBlobs(listOptions, null).forEach(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { 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 77315371dc7d6..2e8a81f89a263 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 @@ -29,7 +29,6 @@ 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; @@ -678,8 +677,7 @@ public void setTierSmartGetBlobs() { blob1.upload(DATA.getDefaultBinaryData()).then(blob1.setAccessTier(AccessTier.SMART)).block(); blob2.upload(DATA.getDefaultBinaryData()).then(blob2.setAccessTier(AccessTier.SMART)).block(); - ListBlobsOptions listOptions - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions listOptions = new ListBlobsOptions(); StepVerifier.create(ccAsync.listBlobs(listOptions, null).concatMap(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { @@ -723,8 +721,7 @@ public void setTierSmartRehydrateGetBlobs() { .then(blob2.setAccessTierWithResponse(options)) .block(); - ListBlobsOptions listOptions - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions listOptions = new ListBlobsOptions(); StepVerifier.create(ccAsync.listBlobs(listOptions, null).concatMap(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { From 56b2c5617a1cb262c8d486628be64bc9df3fea20 Mon Sep 17 00:00:00 2001 From: browndav Date: Wed, 7 Oct 2026 11:16:40 -0400 Subject: [PATCH 11/22] Revert "Exercise default Arrow listing in restored tests for live CI" This reverts commit 9ae3cfc339bc5d7cd629010b07e5b2e8c230c5bc. --- .../src/test/java/com/azure/storage/blob/BlobApiTests.java | 4 +++- .../java/com/azure/storage/blob/BlobAsyncApiTests.java | 4 +++- .../test/java/com/azure/storage/blob/CPKNAsyncTests.java | 7 +++++-- .../src/test/java/com/azure/storage/blob/CPKNTests.java | 7 +++++-- .../java/com/azure/storage/blob/ServiceAsyncApiTests.java | 4 +++- .../java/com/azure/storage/blob/SoftDeleteAsyncTests.java | 7 +++++-- .../test/java/com/azure/storage/blob/SoftDeleteTests.java | 7 +++++-- .../java/com/azure/storage/blob/VersioningAsyncTests.java | 7 +++++-- .../test/java/com/azure/storage/blob/VersioningTests.java | 7 +++++-- .../azure/storage/blob/specialized/BlobBaseApiTests.java | 7 +++++-- .../storage/blob/specialized/BlobBaseAsyncApiTests.java | 7 +++++-- 11 files changed, 49 insertions(+), 19 deletions(-) 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 643d07281df0b..daed8586d6917 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 @@ -52,6 +52,7 @@ import com.azure.storage.blob.models.ParallelTransferOptions; import com.azure.storage.blob.models.RehydratePriority; 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; @@ -2754,7 +2755,8 @@ public void setTierPageBlob(AccessTier tier) { bc.setAccessTier(tier); assertEquals(tier, bc.getProperties().getAccessTier()); - ListBlobsOptions options = new ListBlobsOptions(); + ListBlobsOptions options + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); assertEquals(tier, cc.listBlobs(options, null).iterator().next().getProperties().getAccessTier()); // cleanup: 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 22bc5175ab5a5..3f3ec379265c1 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 @@ -49,6 +49,7 @@ 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.options.BlobBeginCopyOptions; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.options.BlobDownloadToFileOptions; @@ -2458,7 +2459,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(new ListBlobsOptions()); + return cc.listBlobs(new ListBlobsOptions() + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)); }); }); 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 fcfddc9b2eb41..546a57959a0d3 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 @@ -13,6 +13,7 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobSasPermission; import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; @@ -103,7 +104,8 @@ public void containerListBlobsFlat() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); - ListBlobsOptions options = new ListBlobsOptions(); + ListBlobsOptions options + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier .create( cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobs(options))) @@ -120,7 +122,8 @@ public void containerListBlobsHierarchical() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); - ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); + ListBlobsOptions options = new ListBlobsOptions().setPrefix("") + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier .create(cpkncesContainer.create() .then(cpknAppendBlob.create()) 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 5536fa14e1178..8bb62530dd886 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 @@ -14,6 +14,7 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobContainerSasPermission; import com.azure.storage.blob.sas.BlobSasPermission; @@ -102,7 +103,8 @@ public void containerListBlobsFlat() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - ListBlobsOptions options = new ListBlobsOptions(); + ListBlobsOptions options + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); Iterator items = cpkncesContainer.listBlobs(options, null).iterator(); BlobItem blob = items.next(); @@ -120,7 +122,8 @@ public void containerListBlobsHierarchical() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); + ListBlobsOptions options = new ListBlobsOptions().setPrefix("") + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); Iterator items = cpkncesContainer.listBlobsByHierarchy("/", options, null).iterator(); BlobItem blob = items.next(); 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 a108582a33781..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 @@ -29,6 +29,7 @@ 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; @@ -946,7 +947,8 @@ public void restoreContainerIntoOtherContainer() { .then(primaryBlobServiceAsyncClient.undeleteBlobContainerWithResponse( new UndeleteBlobContainerOptions(blobContainerItem.getName(), blobContainerItem.getVersion()))) .flatMap(r -> r.getValue() - .listBlobs(new ListBlobsOptions()) + .listBlobs(new ListBlobsOptions() + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)) .collectList())); StepVerifier.create(response).assertNext(r -> { 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 ae24c742d6ad6..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; @@ -52,7 +53,8 @@ public void undelete() { public void listBlobsFlatOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix); + .setPrefix(prefix) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier.create(blobClient.delete().thenMany(containerClient.listBlobs(options))) .assertNext(r -> assertEquals(blobClient.getBlobName(), r.getName())) .verifyComplete(); @@ -62,7 +64,8 @@ public void listBlobsFlatOptionsDeleted() { public void listBlobsHierOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix); + .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 760b78f0aed7b..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; @@ -69,7 +70,8 @@ public void listBlobsFlatOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix); + .setPrefix(prefix) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); Iterator blobs = containerClient.listBlobs(options, null).iterator(); assertEquals(blobClient.getBlobName(), blobs.next().getName()); @@ -82,7 +84,8 @@ public void listBlobsHierOptionsDeleted() { ListBlobsOptions options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveDeletedBlobs(true)) - .setPrefix(prefix); + .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 e26a5ed88c88b..91166a8378c07 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; @@ -320,7 +321,8 @@ public void listBlobsWithVersion() { .upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true) .flatMap(blobItemV3 -> blobContainerClient .listBlobs( - new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)), + new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(true)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null) .collectList() .flatMap(list -> Mono.zip(Mono.just(blobItemV1), Mono.just(blobItemV2), @@ -351,7 +353,8 @@ public void listBlobsWithoutVersion() { .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .flatMapMany(r -> Flux.zip( blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null), + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null), Flux.just(r))); StepVerifier.create(response) 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..2e3afeec422fe 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()); @@ -273,7 +275,8 @@ public void listBlobsWithoutVersion() { = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); PagedIterable blobs = blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null); + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) + .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); assertEquals(1, blobs.stream().count()); assertEquals(blobItemV3.getVersionId(), blobs.stream().iterator().next().getVersionId()); 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 5860198446fbc..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 @@ -27,6 +27,7 @@ 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; @@ -892,7 +893,8 @@ public void setTierSmartGetBlobs() { blob1.setAccessTier(AccessTier.SMART); blob2.setAccessTier(AccessTier.SMART); - ListBlobsOptions listOptions = new ListBlobsOptions(); + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); cc.listBlobs(listOptions, null).forEach(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { @@ -933,7 +935,8 @@ public void setTierSmartRehydrateGetBlobs() { blob1.setAccessTierWithResponse(options, null, Context.NONE); blob2.setAccessTierWithResponse(options, null, Context.NONE); - ListBlobsOptions listOptions = new ListBlobsOptions(); + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); cc.listBlobs(listOptions, null).forEach(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { 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 2e8a81f89a263..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 @@ -29,6 +29,7 @@ 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; @@ -677,7 +678,8 @@ public void setTierSmartGetBlobs() { blob1.upload(DATA.getDefaultBinaryData()).then(blob1.setAccessTier(AccessTier.SMART)).block(); blob2.upload(DATA.getDefaultBinaryData()).then(blob2.setAccessTier(AccessTier.SMART)).block(); - ListBlobsOptions listOptions = new ListBlobsOptions(); + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier.create(ccAsync.listBlobs(listOptions, null).concatMap(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { @@ -721,7 +723,8 @@ public void setTierSmartRehydrateGetBlobs() { .then(blob2.setAccessTierWithResponse(options)) .block(); - ListBlobsOptions listOptions = new ListBlobsOptions(); + ListBlobsOptions listOptions + = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); StepVerifier.create(ccAsync.listBlobs(listOptions, null).concatMap(blobItem -> { if (blobItem.getName().equals(blobName1) || blobItem.getName().equals(blobName2)) { From 220293fe523440c53931b6a1b40c30fdea0dcc23 Mon Sep 17 00:00:00 2001 From: browndav Date: Wed, 7 Oct 2026 14:10:43 -0400 Subject: [PATCH 12/22] Use new Arrow recordings for encryption-scope and version listings Remove explicit XML overrides for the six cases with new Arrow responses. Keep XML for tests still using their existing XML recordings. Replaced recordings: - CPKNTests.containerListBlobsFlat.json - CPKNTests.containerListBlobsHierarchical.json - CPKNAsyncTests.containerListBlobsFlat.json - CPKNAsyncTests.containerListBlobsHierarchical.json - VersioningTests.listBlobsWithoutVersion.json - VersioningAsyncTests.listBlobsWithoutVersion.json Update blob assets tag from 6bde428684 to b0417a0e0b. --- sdk/storage/azure-storage-blob/assets.json | 2 +- .../test/java/com/azure/storage/blob/CPKNAsyncTests.java | 7 ++----- .../src/test/java/com/azure/storage/blob/CPKNTests.java | 7 ++----- .../java/com/azure/storage/blob/VersioningAsyncTests.java | 3 +-- .../test/java/com/azure/storage/blob/VersioningTests.java | 3 +-- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 1f1bc707ca659..7d049f96f9e5e 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_6bde428684" + "Tag": "java/storage/azure-storage-blob_b0417a0e0b" } 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 546a57959a0d3..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 @@ -13,7 +13,6 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobSasPermission; import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; @@ -104,8 +103,7 @@ public void containerListBlobsFlat() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); - ListBlobsOptions options - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions(); StepVerifier .create( cpkncesContainer.create().then(cpknAppendBlob.create()).thenMany(cpkncesContainer.listBlobs(options))) @@ -122,8 +120,7 @@ public void containerListBlobsHierarchical() { AppendBlobAsyncClient cpknAppendBlob = cpkncesContainer.getBlobAsyncClient(generateBlobName()).getAppendBlobAsyncClient(); - ListBlobsOptions options = new ListBlobsOptions().setPrefix("") - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); StepVerifier .create(cpkncesContainer.create() .then(cpknAppendBlob.create()) 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 8bb62530dd886..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 @@ -14,7 +14,6 @@ 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.models.StorageResponseSerializationFormat; import com.azure.storage.blob.options.BlobCopyFromUrlOptions; import com.azure.storage.blob.sas.BlobContainerSasPermission; import com.azure.storage.blob.sas.BlobSasPermission; @@ -103,8 +102,7 @@ public void containerListBlobsFlat() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - ListBlobsOptions options - = new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions(); Iterator items = cpkncesContainer.listBlobs(options, null).iterator(); BlobItem blob = items.next(); @@ -122,8 +120,7 @@ public void containerListBlobsHierarchical() { AppendBlobClient cpknAppendBlob = cpkncesContainer.getBlobClient(generateBlobName()).getAppendBlobClient(); cpknAppendBlob.create(); - ListBlobsOptions options = new ListBlobsOptions().setPrefix("") - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML); + ListBlobsOptions options = new ListBlobsOptions().setPrefix(""); Iterator items = cpkncesContainer.listBlobsByHierarchy("/", options, null).iterator(); BlobItem blob = items.next(); 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 91166a8378c07..fc088b8985290 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 @@ -353,8 +353,7 @@ public void listBlobsWithoutVersion() { .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .flatMapMany(r -> Flux.zip( blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null), + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null), Flux.just(r))); StepVerifier.create(response) 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 2e3afeec422fe..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 @@ -275,8 +275,7 @@ public void listBlobsWithoutVersion() { = blobClient.getBlockBlobClient().upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize(), true); PagedIterable blobs = blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)) - .setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML), null); + .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null); assertEquals(1, blobs.stream().count()); assertEquals(blobItemV3.getVersionId(), blobs.stream().iterator().next().getVersionId()); From a9b43a39b3d789787330767d23f592fd38b99a62 Mon Sep 17 00:00:00 2001 From: browndav Date: Wed, 7 Oct 2026 20:44:55 -0400 Subject: [PATCH 13/22] Restore missing File Share range-listing recordings Recover the 16 FileApiTests and FileAsyncApiTests listAllRanges recordings from the original feature-branch assets tag 0f234e8e09. Publish them alongside existing File Share fixtures as tag 74b3ffac97 without changing test code or existing recordings. --- sdk/storage/azure-storage-file-share/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage-file-share/assets.json b/sdk/storage/azure-storage-file-share/assets.json index eabc0bb2c022e..091502d17ab6c 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_741d1f4fbd" + "Tag": "java/storage/azure-storage-file-share_74b3ffac97" } From 25e4509dc2b6bededf9a817eee9314d78de4770a Mon Sep 17 00:00:00 2001 From: browndav Date: Wed, 7 Oct 2026 22:28:23 -0400 Subject: [PATCH 14/22] spotless apply --- .../java/com/azure/storage/blob/VersioningAsyncTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fc088b8985290..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 @@ -352,8 +352,8 @@ public void listBlobsWithoutVersion() { .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .then(blobClient.getBlockBlobAsyncClient().upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize(), true)) .flatMapMany(r -> Flux.zip( - blobContainerClient - .listBlobs(new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null), + blobContainerClient.listBlobs( + new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveVersions(false)), null), Flux.just(r))); StepVerifier.create(response) From 90cbc86835c9ef3d3a7acaf50f069394e4fb687e Mon Sep 17 00:00:00 2001 From: browndav Date: Thu, 8 Oct 2026 11:13:18 -0400 Subject: [PATCH 15/22] push updated recordings for failing tests --- sdk/storage/azure-storage-blob-nio/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" } From 2f6d0ae8bbb40d4829808a7477bbeee5d142eb83 Mon Sep 17 00:00:00 2001 From: browndav Date: Thu, 8 Oct 2026 12:14:20 -0400 Subject: [PATCH 16/22] retain xml header request for single failing test, setAttributesTier --- .../azure/storage/blob/nio/AzureFileSystemProviderTests.java | 5 +++++ 1 file changed, 5 insertions(+) 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); From 6bd69334a1f2db832169754355590eb1f6ac3f0b Mon Sep 17 00:00:00 2001 From: browndav Date: Thu, 8 Oct 2026 16:37:54 -0400 Subject: [PATCH 17/22] change hard asserts for HOT to what was reqeusted --- sdk/storage/azure-storage-blob/assets.json | 2 +- .../azure/storage/blob/ContainerApiTests.java | 22 ++++++++++--------- .../storage/blob/ContainerAsyncApiTests.java | 16 +++++++------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 7d049f96f9e5e..742d2071e4699 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_b0417a0e0b" + "Tag": "java/storage/azure-storage-blob_c62a4242bc" } 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 62cee0c83da78..7745c69e040b7 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 @@ -2336,16 +2336,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()); @@ -2367,7 +2369,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 009e335012c2c..f9398fd610d4e 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 @@ -2336,20 +2336,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()); @@ -2370,7 +2370,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()); From 5ee0d33154c3c737c84e29104c8e293aa8e56bca Mon Sep 17 00:00:00 2001 From: browndav Date: Thu, 8 Oct 2026 17:01:37 -0400 Subject: [PATCH 18/22] move tests from BlobContainerAsyncCLientTests to ContainerApiTests and sync variant --- .../blob/BlobContainerAsyncClientTests.java | 84 ------------------- .../com/azure/storage/blob/BlobTestBase.java | 7 +- .../azure/storage/blob/ContainerApiTests.java | 60 +++++++++++++ .../storage/blob/ContainerAsyncApiTests.java | 61 ++++++++++++++ 4 files changed, 127 insertions(+), 85 deletions(-) delete mode 100644 sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java deleted file mode 100644 index 770c5950fb4df..0000000000000 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobContainerAsyncClientTests.java +++ /dev/null @@ -1,84 +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.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 BlobContainerAsyncClientTests { - private AtomicReference acceptHeader; - private BlobContainerAsyncClient 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) - .buildAsyncClient(); - } - - @ParameterizedTest - @MethodSource("serializationFormatSupplier") - public void listBlobsUsesResolvedSerializationFormat(ListBlobsOptions options, String expectedAcceptHeader) { - sendRequest(() -> client.listBlobs(options).byPage(1).blockFirst()); - assertEquals(expectedAcceptHeader, acceptHeader.get()); - } - - @ParameterizedTest - @MethodSource("serializationFormatSupplier") - public void listBlobsByHierarchyUsesResolvedSerializationFormat(ListBlobsOptions options, - String expectedAcceptHeader) { - sendRequest(() -> client.listBlobsByHierarchy("/", options).byPage(1).blockFirst()); - 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/BlobTestBase.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobTestBase.java index 71345472c3936..81dc30b42d0b7 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 @@ -195,6 +195,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), @@ -242,7 +247,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/ContainerApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerApiTests.java index 7745c69e040b7..9e57c7d1e62e7 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 @@ -4,9 +4,13 @@ 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.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; @@ -59,6 +63,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; @@ -82,6 +87,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; @@ -766,6 +772,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()); 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 f9398fd610d4e..36ecc7340df64 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 @@ -4,10 +4,14 @@ 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.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.Context; import com.azure.core.util.FluxUtil; @@ -53,6 +57,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; @@ -769,6 +774,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(); From d246328f2cf4336321ca5340d6339a1cb9ab056a Mon Sep 17 00:00:00 2001 From: browndav Date: Thu, 8 Oct 2026 17:36:04 -0400 Subject: [PATCH 19/22] add entry to changelog --- sdk/storage/azure-storage-blob/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md index 5e1c739c8a934..16738c1da9cec 100644 --- a/sdk/storage/azure-storage-blob/CHANGELOG.md +++ b/sdk/storage/azure-storage-blob/CHANGELOG.md @@ -6,6 +6,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 - Fixed SDK-generated ETag consistency locks for retries, chunked downloads, input streams, and seekable reads to send From b8c48fae16b6ec515f13e6e6daeb7c9f89241ed4 Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 27 Oct 2026 13:49:16 -0700 Subject: [PATCH 20/22] file share test recordings --- sdk/storage/azure-storage-file-share/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" } From 9b13efcc44753ff3d2053c93508f1cfd9ca8fc04 Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 27 Oct 2026 14:32:13 -0700 Subject: [PATCH 21/22] blob assets --- sdk/storage/azure-storage-blob/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 4f911d4d98e9e..115e7b4cd003c 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_fbd52b4b2c" } From b8dd31b607c6c93f70407b732a700ad5868abddb Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 27 Oct 2026 15:01:32 -0700 Subject: [PATCH 22/22] updating recordings --- sdk/storage/azure-storage-blob/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 115e7b4cd003c..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_fbd52b4b2c" + "Tag": "java/storage/azure-storage-blob_5567e25d8f" }