Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ef52222
change default serialization format to arrow
browndav-msft Sep 15, 2026
b38a3a2
consolidate setters for photon, photon on by default
browndav-msft Sep 15, 2026
c455b92
add ARROW enum check
browndav-msft Sep 15, 2026
f332e5c
change default tests to check for arrow and not xml
browndav-msft Sep 16, 2026
1907177
rerecord failing tests so arrow returned and not xml in recordings
browndav-msft Sep 16, 2026
fdd1dbd
recorded more failing tests for arrow
browndav-msft Sep 16, 2026
5efd0d4
change previous tests to check for xml explicitly, restore previous r…
browndav-msft Oct 6, 2026
f550396
restore recordings for failing tests, add xml explitly
browndav-msft Oct 6, 2026
ed6ed3e
spotless apply
browndav-msft Oct 6, 2026
9ae3cfc
Exercise default Arrow listing in restored tests for live CI
browndav-msft Oct 6, 2026
56b2c56
Revert "Exercise default Arrow listing in restored tests for live CI"
browndav-msft Oct 7, 2026
220293f
Use new Arrow recordings for encryption-scope and version listings
browndav-msft Oct 7, 2026
a9b43a3
Restore missing File Share range-listing recordings
browndav-msft Oct 8, 2026
25e4509
spotless apply
browndav-msft Oct 8, 2026
90cbc86
push updated recordings for failing tests
browndav-msft Oct 8, 2026
2f6d0ae
retain xml header request for single failing test, setAttributesTier
browndav-msft Oct 8, 2026
6bd6933
change hard asserts for HOT to what was reqeusted
browndav-msft Oct 8, 2026
5ee0d33
move tests from BlobContainerAsyncCLientTests to ContainerApiTests an…
browndav-msft Oct 8, 2026
d246328
add entry to changelog
browndav-msft Oct 8, 2026
b5c9161
Merge branch 'feature/storage/stg105base' of https://github.com/Azure…
ibrandes Oct 12, 2026
9618583
Merge branch 'feature/storage/stg105base' of https://github.com/Azure…
ibrandes Oct 27, 2026
b8c48fa
file share test recordings
ibrandes Oct 27, 2026
9b13efc
blob assets
ibrandes Oct 27, 2026
b8dd31b
updating recordings
ibrandes Oct 27, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-nio/assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions sdk/storage/azure-storage-blob/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

### Breaking Changes

- Changed the default response serialization format for `listBlobs` and `listBlobsByHierarchy` from XML to Apache Arrow
for both synchronous and asynchronous clients, with support for XML fallback responses from the service. To explicitly
request XML, use `new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML)`.

### Bugs Fixed

### Other Changes
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob/assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/storage/azure-storage-blob",
"Tag": "java/storage/azure-storage-blob_521aadfdd3"
"Tag": "java/storage/azure-storage-blob_5567e25d8f"
}
Original file line number Diff line number Diff line change
Expand Up @@ -1150,33 +1150,17 @@ PagedFlux<BlobItem> listBlobsFlatWithOptionalTimeout(ListBlobsOptions options, S
Duration timeout) {
ModelHelper.validateListBlobsOptions(options);
BiFunction<String, Integer, Mono<PagedResponse<BlobItem>>> 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);
}

Expand Down Expand Up @@ -1394,33 +1378,17 @@ PagedFlux<BlobItem> listBlobsHierarchyWithOptionalTimeout(String delimiter, List
Duration timeout) {
ModelHelper.validateListBlobsOptions(options);
BiFunction<String, Integer, Mono<PagedResponse<BlobItem>>> 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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1063,19 +1063,8 @@ public PagedIterable<BlobItem> listBlobs(ListBlobsOptions options, Duration time
public PagedIterable<BlobItem> listBlobs(ListBlobsOptions options, String continuationToken, Duration timeout) {
ModelHelper.validateListBlobsOptions(options);
BiFunction<String, Integer, PagedResponse<BlobItem>> 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.
Expand Down Expand Up @@ -1258,18 +1247,8 @@ public PagedIterable<BlobItem> listBlobsByHierarchy(String directory) {
public PagedIterable<BlobItem> listBlobsByHierarchy(String delimiter, ListBlobsOptions options, Duration timeout) {
ModelHelper.validateListBlobsOptions(options);
BiFunction<String, Integer, PagedResponse<BlobItem>> 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.
Expand All @@ -1291,8 +1270,7 @@ private PagedResponse<BlobItem> listBlobsHierarchySegment(String marker, String
ArrayList<ListBlobsIncludeItem> include
= options.getDetails().toList().isEmpty() ? null : options.getDetails().toList();

if (ModelHelper.resolveSerializationFormat(options.getStorageResponseSerializationFormat())
== StorageResponseSerializationFormat.ARROW) {
if (options.getStorageResponseSerializationFormat() == StorageResponseSerializationFormat.ARROW) {
Callable<ResponseBase<ContainersListBlobHierarchySegmentApacheArrowHeaders, InputStream>> operation
= () -> azureBlobStorage.getContainers()
.listBlobHierarchySegmentApacheArrowWithResponse(containerName, delimiter, options.getPrefix(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public final class ModelHelper {
* but it is not a public API change.
*/
private static final StorageResponseSerializationFormat DEFAULT_SERIALIZATION_FORMAT
= StorageResponseSerializationFormat.XML;
= StorageResponseSerializationFormat.ARROW;
Comment thread
browndav-msft marked this conversation as resolved.
Resolved
Comment thread
ibrandes marked this conversation as resolved.
Resolved
Comment thread
browndav-msft marked this conversation as resolved.
Resolved

// Change this value to switch AUTO session authentication behavior across all clients and policies.
private static final SessionMode DEFAULT_SESSION_MODE = SessionMode.DISABLED;
Expand Down Expand Up @@ -703,6 +703,34 @@ public static SessionMode resolveSessionMode(SessionMode mode) {
return format;
}

/**
* Copies list blobs options.
*
* @param options the listing options to copy, or {@code null}.
* @return the copied options.
*/
public static ListBlobsOptions copyListBlobsOptions(ListBlobsOptions options) {
if (options == null) {
return new ListBlobsOptions();
}
return new ListBlobsOptions().setMaxResultsPerPage(options.getMaxResultsPerPage())
.setPrefix(options.getPrefix())
.setStartFrom(options.getStartFrom())
.setEndBefore(options.getEndBefore())
.setDetails(options.getDetails())
.setStorageResponseSerializationFormat(options.getStorageResponseSerializationFormat());
}

/**
* Replaces the requested serialization format with the concrete wire format.
*
* @param options the listing options to update.
*/
public static void applyDefaultsToListBlobsOptions(ListBlobsOptions options) {
options.setStorageResponseSerializationFormat(
resolveSerializationFormat(options.getStorageResponseSerializationFormat()));
}

/**
* Validates that {@code endBefore}, when specified, is used with the Apache Arrow response format.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@
import com.azure.storage.blob.models.FileShareTokenIntent;
import com.azure.storage.blob.models.LeaseStateType;
import com.azure.storage.blob.models.LeaseStatusType;
import com.azure.storage.blob.models.ListBlobsOptions;
import com.azure.storage.blob.models.ObjectReplicationPolicy;
import com.azure.storage.blob.models.ObjectReplicationStatus;
import com.azure.storage.blob.models.ParallelTransferOptions;
import com.azure.storage.blob.models.RehydratePriority;
import com.azure.storage.blob.SessionContext.SessionMode;
import com.azure.storage.blob.models.StorageAccountInfo;
import com.azure.storage.blob.models.StorageResponseSerializationFormat;
import com.azure.storage.blob.models.SyncCopyStatusType;
import com.azure.storage.blob.options.BlobBeginCopyOptions;
import com.azure.storage.blob.options.BlobCopyFromUrlOptions;
Expand Down Expand Up @@ -2760,7 +2762,9 @@ public void setTierPageBlob(AccessTier tier) {

bc.setAccessTier(tier);
assertEquals(tier, bc.getProperties().getAccessTier());
assertEquals(tier, cc.listBlobs().iterator().next().getProperties().getAccessTier());
ListBlobsOptions options
= new ListBlobsOptions().setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML);
assertEquals(tier, cc.listBlobs(options, null).iterator().next().getProperties().getAccessTier());

// cleanup:
cc.delete();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@
import com.azure.storage.blob.models.FileShareTokenIntent;
import com.azure.storage.blob.models.LeaseStateType;
import com.azure.storage.blob.models.LeaseStatusType;
import com.azure.storage.blob.models.ListBlobsOptions;
import com.azure.storage.blob.models.ObjectReplicationPolicy;
import com.azure.storage.blob.models.ObjectReplicationStatus;
import com.azure.storage.blob.models.ParallelTransferOptions;
import com.azure.storage.blob.models.RehydratePriority;
import com.azure.storage.blob.models.StorageResponseSerializationFormat;
import com.azure.storage.blob.SessionContext.SessionMode;
import com.azure.storage.blob.options.BlobBeginCopyOptions;
import com.azure.storage.blob.options.BlobCopyFromUrlOptions;
Expand Down Expand Up @@ -2463,7 +2465,8 @@ public void setTierPageBlob(AccessTier tier) {
PageBlobAsyncClient bc = cc.getBlobAsyncClient(generateBlobName()).getPageBlobAsyncClient();
return bc.create(512).then(bc.setAccessTier(tier)).then(bc.getProperties()).flatMapMany(r -> {
assertEquals(tier, r.getAccessTier());
return cc.listBlobs();
return cc.listBlobs(new ListBlobsOptions()
.setStorageResponseSerializationFormat(StorageResponseSerializationFormat.XML));
});
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.storage.blob;

import com.azure.core.http.HttpHeaderName;
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
import com.azure.core.test.http.MockHttpResponse;
import com.azure.core.test.utils.MockTokenCredential;
import com.azure.storage.blob.models.BlobStorageException;
import com.azure.storage.blob.models.ListBlobsOptions;
import com.azure.storage.blob.models.StorageResponseSerializationFormat;
import com.azure.storage.common.implementation.Constants;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import reactor.core.publisher.Mono;

import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
import java.util.stream.Stream;

import static org.junit.jupiter.api.Assertions.assertEquals;

public class BlobContainerClientTests {
private AtomicReference<String> 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<Arguments> 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"));
}
}
Loading
Loading