Skip to content

[Storage] File Share Typespec Migration #50103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Isabelle (ibrandes) wants to merge 14 commits into
base: feature/storage/typespecMigration
Choose a base branch
from
Draft

[Storage] File Share Typespec Migration #50103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0304f6a
checkpoint
ibrandes Jul 27, 2026
e5ffacc
checkpoint 2 - conv layer customization
ibrandes Jul 27, 2026
d8edfdb
Merge branch 'feature/storage/typespecMigration' of https://github.co…
ibrandes Aug 10, 2026
dc99c1a
swapping to handwritten seriveversion
ibrandes Aug 10, 2026
291dea0
resolving service version generated file discrepancy, test impl with …
ibrandes Aug 10, 2026
a4ec9b8
checkpoint
ibrandes Aug 10, 2026
211f5ba
share checkpoint
ibrandes Aug 10, 2026
fb5507d
service checkpoint
ibrandes Aug 11, 2026
695fc45
directories checkpoint
ibrandes Aug 11, 2026
9b6cc7b
files checkpoint
ibrandes Aug 11, 2026
aacd64e
lease and errors
ibrandes Aug 11, 2026
356e1f5
swapping string replacement for ast customization where applicable
ibrandes Aug 11, 2026
0e6d82a
simplifying customizations
ibrandes Aug 11, 2026
9095898
fixing test error and regen
ibrandes Aug 11, 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
90 changes: 54 additions & 36 deletions ...azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
import com.azure.core.http.rest.PagedFlux;
import com.azure.core.http.rest.PagedResponse;
import com.azure.core.http.rest.PagedResponseBase;
import com.azure.core.http.rest.RequestOptions;
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.SimpleResponse;
import com.azure.core.util.BinaryData;
import com.azure.core.util.Context;
import com.azure.core.util.FluxUtil;
import com.azure.core.util.logging.ClientLogger;
Expand All @@ -23,6 +25,7 @@
import com.azure.storage.file.share.implementation.AzureFileStorageImpl;
import com.azure.storage.file.share.implementation.models.SharePermission;
import com.azure.storage.file.share.implementation.util.ModelHelper;
import com.azure.storage.file.share.implementation.util.RequestOptionsHelper;
import com.azure.storage.file.share.implementation.util.ShareSasImplUtil;
import com.azure.storage.file.share.models.FilePermissionFormat;
import com.azure.storage.file.share.models.ShareFileHttpHeaders;
Expand Down Expand Up @@ -367,11 +370,8 @@ Mono<Response<ShareInfo>> createWithResponse(ShareCreateOptions options, Context
String enabledProtocol = options.getProtocols() == null ? null : options.getProtocols().toString();
enabledProtocol = "".equals(enabledProtocol) ? null : enabledProtocol;
return azureFileStorageClient.getShares()
.createNoCustomHeadersWithResponseAsync(shareName, null, options.getMetadata(), options.getQuotaInGb(),
options.getAccessTier(), enabledProtocol, options.getRootSquash(),
options.isSnapshotVirtualDirectoryAccessEnabled(), options.isPaidBurstingEnabled(),
options.getPaidBurstingMaxBandwidthMibps(), options.getPaidBurstingMaxIops(),
options.getProvisionedMaxIops(), options.getProvisionedMaxBandwidthMibps(), null, context)
.createWithResponseAsync(
RequestOptionsHelper.createShareRequestOptions(shareName, options, enabledProtocol, context))
.map(ModelHelper::mapToShareInfoResponse);
}

Expand Down Expand Up @@ -519,9 +519,12 @@ public Mono<Response<ShareSnapshotInfo>> createSnapshotWithResponse(Map<String,
}

Mono<Response<ShareSnapshotInfo>> createSnapshotWithResponse(Map<String, String> metadata, Context context) {
context = context == null ? Context.NONE : context;
Context finalContext = context == null ? Context.NONE : context;
RequestOptions requestOptions = new RequestOptions().setContext(finalContext);
RequestOptionsHelper.addMetadata(requestOptions, metadata);
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
return azureFileStorageClient.getShares()
.createSnapshotWithResponseAsync(shareName, null, metadata, context)
.createSnapshotWithResponseAsync(requestOptions)
.map(ModelHelper::mapCreateSnapshotResponse);
}

Expand Down Expand Up @@ -620,11 +623,13 @@ Mono<Response<Void>> deleteWithResponse(ShareDeleteOptions options, Context cont
options = options == null ? new ShareDeleteOptions() : options;
ShareRequestConditions requestConditions
= options.getRequestConditions() == null ? new ShareRequestConditions() : options.getRequestConditions();
context = context == null ? Context.NONE : context;
return azureFileStorageClient.getShares()
.deleteNoCustomHeadersWithResponseAsync(shareName, snapshot, null,
ModelHelper.toDeleteSnapshotsOptionType(options.getDeleteSnapshotsOptions()),
requestConditions.getLeaseId(), context);
Context finalContext = context == null ? Context.NONE : context;
RequestOptions requestOptions = new RequestOptions().setContext(finalContext);
RequestOptionsHelper.addSnapshot(requestOptions, snapshot);
RequestOptionsHelper.addDeleteSnapshotsHeader(requestOptions, options.getDeleteSnapshotsOptions());
RequestOptionsHelper.addLeaseId(requestOptions, requestConditions.getLeaseId());
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
return azureFileStorageClient.getShares().deleteWithResponseAsync(requestOptions);
}

/**
Expand Down Expand Up @@ -802,9 +807,13 @@ Mono<Response<ShareProperties>> getPropertiesWithResponse(ShareGetPropertiesOpti
options = options == null ? new ShareGetPropertiesOptions() : options;
ShareRequestConditions requestConditions
= options.getRequestConditions() == null ? new ShareRequestConditions() : options.getRequestConditions();
context = context == null ? Context.NONE : context;
Context finalContext = context == null ? Context.NONE : context;
RequestOptions requestOptions = new RequestOptions().setContext(finalContext);
RequestOptionsHelper.addSnapshot(requestOptions, snapshot);
RequestOptionsHelper.addLeaseId(requestOptions, requestConditions.getLeaseId());
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
return azureFileStorageClient.getShares()
.getPropertiesWithResponseAsync(shareName, snapshot, null, requestConditions.getLeaseId(), context)
.getPropertiesWithResponseAsync(requestOptions)
.map(ModelHelper::mapGetPropertiesResponse);
}

Expand Down Expand Up @@ -936,11 +945,8 @@ Mono<Response<ShareInfo>> setPropertiesWithResponse(ShareSetPropertiesOptions op
= options.getRequestConditions() == null ? new ShareRequestConditions() : options.getRequestConditions();
context = context == null ? Context.NONE : context;
return azureFileStorageClient.getShares()
.setPropertiesNoCustomHeadersWithResponseAsync(shareName, null, options.getQuotaInGb(),
options.getAccessTier(), requestConditions.getLeaseId(), options.getRootSquash(),
options.isSnapshotVirtualDirectoryAccessEnabled(), options.isPaidBurstingEnabled(),
options.getPaidBurstingMaxBandwidthMibps(), options.getPaidBurstingMaxIops(),
options.getProvisionedMaxIops(), options.getProvisionedMaxBandwidthMibps(), null, context)
.setPropertiesWithResponseAsync(RequestOptionsHelper.setSharePropertiesRequestOptions(shareName, options,
requestConditions.getLeaseId(), context))
.map(ModelHelper::mapToShareInfoResponse);
}

Expand Down Expand Up @@ -1062,10 +1068,13 @@ Mono<Response<ShareInfo>> setMetadataWithResponse(ShareSetMetadataOptions option
options = options == null ? new ShareSetMetadataOptions() : options;
ShareRequestConditions requestConditions
= options.getRequestConditions() == null ? new ShareRequestConditions() : options.getRequestConditions();
context = context == null ? Context.NONE : context;
Context finalContext = context == null ? Context.NONE : context;
RequestOptions requestOptions = new RequestOptions().setContext(finalContext);
RequestOptionsHelper.addMetadata(requestOptions, options.getMetadata());
RequestOptionsHelper.addLeaseId(requestOptions, requestConditions.getLeaseId());
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
return azureFileStorageClient.getShares()
.setMetadataNoCustomHeadersWithResponseAsync(shareName, null, options.getMetadata(),
requestConditions.getLeaseId(), context)
.setMetadataWithResponseAsync(requestOptions)
.map(ModelHelper::mapToShareInfoResponse);
}

Expand Down Expand Up @@ -1127,11 +1136,13 @@ public PagedFlux<ShareSignedIdentifier> getAccessPolicy(ShareGetAccessPolicyOpti
? new ShareRequestConditions()
: finalOptions.getRequestConditions();
try {
RequestOptions requestOptions = new RequestOptions().setContext(Context.NONE);
RequestOptionsHelper.addLeaseId(requestOptions, requestConditions.getLeaseId());
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
Function<String, Mono<PagedResponse<ShareSignedIdentifier>>> retriever
= marker -> this.azureFileStorageClient.getShares()
.getAccessPolicyWithResponseAsync(shareName, null, requestConditions.getLeaseId(), Context.NONE)
.map(response -> new PagedResponseBase<>(response.getRequest(), response.getStatusCode(),
response.getHeaders(), response.getValue().items(), null, response.getDeserializedHeaders()));
.getAccessPolicyWithResponseAsync(requestOptions)
.map(ModelHelper::mapGetAccessPolicyResponse);

return new PagedFlux<>(() -> retriever.apply(null), retriever);
} catch (RuntimeException ex) {
Expand Down Expand Up @@ -1254,9 +1265,10 @@ Mono<Response<ShareInfo>> setAccessPolicyWithResponse(ShareSetAccessPolicyOption

context = context == null ? Context.NONE : context;

RequestOptions requestOptions = RequestOptionsHelper.setAccessPolicyRequestOptions(shareName, permissions,
requestConditions.getLeaseId(), context);
return azureFileStorageClient.getShares()
.setAccessPolicyNoCustomHeadersWithResponseAsync(shareName, null, requestConditions.getLeaseId(),
permissions, context)
.setAccessPolicyWithResponseAsync(requestOptions)
.map(ModelHelper::mapToShareInfoResponse);
}

Expand Down Expand Up @@ -1345,9 +1357,12 @@ Mono<Response<ShareStatistics>> getStatisticsWithResponse(ShareGetStatisticsOpti
options = options == null ? new ShareGetStatisticsOptions() : options;
ShareRequestConditions requestConditions
= options.getRequestConditions() == null ? new ShareRequestConditions() : options.getRequestConditions();
context = context == null ? Context.NONE : context;
Context finalContext = context == null ? Context.NONE : context;
RequestOptions requestOptions = new RequestOptions().setContext(finalContext);
RequestOptionsHelper.addLeaseId(requestOptions, requestConditions.getLeaseId());
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
return azureFileStorageClient.getShares()
.getStatisticsNoCustomHeadersWithResponseAsync(shareName, null, requestConditions.getLeaseId(), context)
.getStatisticsWithResponseAsync(requestOptions)
.map(ModelHelper::mapGetStatisticsResponse);
}

Expand Down Expand Up @@ -2135,12 +2150,12 @@ public Mono<Response<String>> createPermissionWithResponse(ShareFilePermission f
Mono<Response<String>> createPermissionWithResponse(String filePermission,
FilePermissionFormat filePermissionFormat, Context context) {
// NOTE: Should we check for null or empty?
SharePermission sharePermission
= new SharePermission().setPermission(filePermission).setFormat(filePermissionFormat);
SharePermission sharePermission = new SharePermission(filePermission).setFormat(filePermissionFormat);
RequestOptions requestOptions = new RequestOptions().setContext(context);
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
return azureFileStorageClient.getShares()
.createPermissionWithResponseAsync(shareName, sharePermission, null, context)
.map(response -> new SimpleResponse<>(response,
response.getDeserializedHeaders().getXMsFilePermissionKey()));
.createPermissionWithResponseAsync(BinaryData.fromObject(sharePermission), requestOptions)
.map(ModelHelper::mapCreatePermissionResponse);
}

/**
Expand Down Expand Up @@ -2244,9 +2259,12 @@ public Mono<Response<String>> getPermissionWithResponse(String filePermissionKey

Mono<Response<String>> getPermissionWithResponse(String filePermissionKey,
FilePermissionFormat filePermissionFormat, Context context) {
RequestOptions requestOptions = new RequestOptions().setContext(context);
RequestOptionsHelper.addFilePermissionFormat(requestOptions, filePermissionFormat);
RequestOptionsHelper.scopeRequestToResourcePath(requestOptions, shareName);
return azureFileStorageClient.getShares()
.getPermissionWithResponseAsync(shareName, filePermissionKey, filePermissionFormat, null, context)
.map(response -> new SimpleResponse<>(response, response.getValue().getPermission()));
.getPermissionWithResponseAsync(filePermissionKey, requestOptions)
.map(ModelHelper::mapGetPermissionResponse);
}

/**
Expand Down
Loading
Loading