Move protocol layer options and methods to details namespace. (#923)

* Move protocol layer options and methods to details namespace.

* Moved FromJson, FromString, ToString to details namespace.
This commit is contained in:
Kan Tang 2020-11-10 23:44:10 -08:00 committed by GitHub
parent f99e4a57c7
commit 8c45574292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 9434 additions and 9774 deletions

View File

@ -160,7 +160,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
auto destinationDfsUri = m_dfsUri;
destinationDfsUri.SetPath(destinationFileSystem.GetValue() + '/' + destinationPath);
DataLakeRestClient::Path::CreateOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::CreateOptions protocolLayerOptions;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.Mode = options.Mode;
protocolLayerOptions.SourceLeaseId = options.SourceAccessConditions.LeaseId;
@ -174,7 +174,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.SourceIfModifiedSince = options.SourceAccessConditions.IfModifiedSince;
protocolLayerOptions.SourceIfUnmodifiedSince = options.SourceAccessConditions.IfUnmodifiedSince;
protocolLayerOptions.RenameSource = "/" + m_dfsUri.GetPath();
auto result = DataLakeRestClient::Path::Create(
auto result = Details::DataLakeRestClient::Path::Create(
destinationDfsUri, *m_pipeline, options.Context, protocolLayerOptions);
// At this point, there is not more exception thrown, meaning the rename is successful.
auto ret = RenameDirectoryResult();
@ -187,7 +187,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
bool Recursive,
const DeleteDirectoryOptions& options) const
{
DataLakeRestClient::Path::DeleteOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::DeleteOptions protocolLayerOptions;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
protocolLayerOptions.IfMatch = options.AccessConditions.IfMatch;
@ -195,7 +195,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
protocolLayerOptions.RecursiveOptional = Recursive;
return DataLakeRestClient::Path::Delete(
return Details::DataLakeRestClient::Path::Delete(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -205,13 +205,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::vector<Acl> acls,
const SetDirectoryAccessControlRecursiveOptions& options) const
{
DataLakeRestClient::Path::SetAccessControlRecursiveOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::SetAccessControlRecursiveOptions protocolLayerOptions;
protocolLayerOptions.Mode = mode;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.MaxRecords = options.MaxRecords;
protocolLayerOptions.ForceFlag = options.ForceFlag;
protocolLayerOptions.Acl = Acl::SerializeAcls(acls);
return DataLakeRestClient::Path::SetAccessControlRecursive(
return Details::DataLakeRestClient::Path::SetAccessControlRecursive(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
}

View File

@ -210,12 +210,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
int64_t offset,
const AppendFileDataOptions& options) const
{
DataLakeRestClient::Path::AppendDataOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::AppendDataOptions protocolLayerOptions;
protocolLayerOptions.Position = offset;
protocolLayerOptions.ContentLength = content->Length();
protocolLayerOptions.TransactionalContentMd5 = options.ContentMd5;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return DataLakeRestClient::Path::AppendData(
return Details::DataLakeRestClient::Path::AppendData(
m_dfsUri, *content, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -223,7 +223,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
int64_t endingOffset,
const FlushFileDataOptions& options) const
{
DataLakeRestClient::Path::FlushDataOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::FlushDataOptions protocolLayerOptions;
protocolLayerOptions.Position = endingOffset;
protocolLayerOptions.RetainUncommittedData = options.RetainUncommittedData;
protocolLayerOptions.Close = options.Close;
@ -239,7 +239,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.IfNoneMatch = options.AccessConditions.IfNoneMatch;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
return DataLakeRestClient::Path::FlushData(
return Details::DataLakeRestClient::Path::FlushData(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -257,7 +257,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
auto destinationDfsUri = m_dfsUri;
destinationDfsUri.SetPath(destinationFileSystem.GetValue() + '/' + destinationPath);
DataLakeRestClient::Path::CreateOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::CreateOptions protocolLayerOptions;
protocolLayerOptions.Mode = options.Mode;
protocolLayerOptions.SourceLeaseId = options.SourceAccessConditions.LeaseId;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
@ -270,7 +270,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.SourceIfModifiedSince = options.SourceAccessConditions.IfModifiedSince;
protocolLayerOptions.SourceIfUnmodifiedSince = options.SourceAccessConditions.IfUnmodifiedSince;
protocolLayerOptions.RenameSource = "/" + m_dfsUri.GetPath();
auto result = DataLakeRestClient::Path::Create(
auto result = Details::DataLakeRestClient::Path::Create(
destinationDfsUri, *m_pipeline, options.Context, protocolLayerOptions);
// At this point, there is not more exception thrown, meaning the rename is successful.
auto ret = RenameFileResult();
@ -279,13 +279,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Response<DeleteFileResult> FileClient::Delete(const FileDeleteOptions& options) const
{
DataLakeRestClient::Path::DeleteOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::DeleteOptions protocolLayerOptions;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
protocolLayerOptions.IfMatch = options.AccessConditions.IfMatch;
protocolLayerOptions.IfNoneMatch = options.AccessConditions.IfNoneMatch;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
auto result = DataLakeRestClient::Path::Delete(
auto result = Details::DataLakeRestClient::Path::Delete(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
auto ret = DeleteFileResult();
return Azure::Core::Response<DeleteFileResult>(std::move(ret), result.ExtractRawResponse());

View File

@ -245,13 +245,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
bool recursive,
const ListPathsOptions& options) const
{
DataLakeRestClient::FileSystem::ListPathsOptions protocolLayerOptions;
Details::DataLakeRestClient::FileSystem::ListPathsOptions protocolLayerOptions;
protocolLayerOptions.Upn = options.UserPrincipalName;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.MaxResults = options.MaxResults;
protocolLayerOptions.Directory = options.Directory;
protocolLayerOptions.RecursiveRequired = recursive;
return DataLakeRestClient::FileSystem::ListPaths(
return Details::DataLakeRestClient::FileSystem::ListPaths(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
}

View File

@ -194,7 +194,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::vector<Acl> acls,
const SetPathAccessControlOptions& options) const
{
DataLakeRestClient::Path::SetAccessControlOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::SetAccessControlOptions protocolLayerOptions;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
protocolLayerOptions.Owner = options.Owner;
protocolLayerOptions.Group = options.Group;
@ -204,7 +204,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.IfNoneMatch = options.AccessConditions.IfNoneMatch;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
return DataLakeRestClient::Path::SetAccessControl(
return Details::DataLakeRestClient::Path::SetAccessControl(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -237,7 +237,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
PathResourceType type,
const CreatePathOptions& options) const
{
DataLakeRestClient::Path::CreateOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::CreateOptions protocolLayerOptions;
protocolLayerOptions.Resource = type;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
protocolLayerOptions.CacheControl = options.HttpHeaders.CacheControl;
@ -252,7 +252,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.Properties = Details::SerializeMetadata(options.Metadata);
protocolLayerOptions.Umask = options.Umask;
protocolLayerOptions.Permissions = options.Permissions;
auto result = DataLakeRestClient::Path::Create(
auto result = Details::DataLakeRestClient::Path::Create(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
auto ret = CreatePathResult();
ret.ETag = std::move(result->ETag.GetValue());
@ -263,7 +263,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Response<DeletePathResult> PathClient::Delete(const DeletePathOptions& options) const
{
DataLakeRestClient::Path::DeleteOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::DeleteOptions protocolLayerOptions;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
protocolLayerOptions.IfMatch = options.AccessConditions.IfMatch;
@ -271,7 +271,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
protocolLayerOptions.RecursiveOptional = options.Recursive;
return DataLakeRestClient::Path::Delete(
return Details::DataLakeRestClient::Path::Delete(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -321,14 +321,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Response<GetPathAccessControlResult> PathClient::GetAccessControls(
const GetPathAccessControlOptions& options) const
{
DataLakeRestClient::Path::GetPropertiesOptions protocolLayerOptions;
Details::DataLakeRestClient::Path::GetPropertiesOptions protocolLayerOptions;
protocolLayerOptions.Action = PathGetPropertiesAction::GetAccessControl;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
protocolLayerOptions.IfMatch = options.AccessConditions.IfMatch;
protocolLayerOptions.IfNoneMatch = options.AccessConditions.IfNoneMatch;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
auto result = DataLakeRestClient::Path::GetProperties(
auto result = Details::DataLakeRestClient::Path::GetProperties(
m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions);
Azure::Core::Nullable<std::vector<Acl>> acl;
if (result->Acl.HasValue())

View File

@ -142,39 +142,39 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<CreateShareResult> ShareClient::Create(
const CreateShareOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::CreateOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::CreateOptions();
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.ShareQuota = options.ShareQuota;
return ShareRestClient::Share::Create(
return Details::ShareRestClient::Share::Create(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<DeleteShareResult> ShareClient::Delete(
const DeleteShareOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::DeleteOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::DeleteOptions();
if (options.IncludeSnapshots.HasValue() and options.IncludeSnapshots.GetValue())
{
protocolLayerOptions.XMsDeleteSnapshots = DeleteSnapshotsOptionType::Include;
}
return ShareRestClient::Share::Delete(
return Details::ShareRestClient::Share::Delete(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<CreateShareSnapshotResult> ShareClient::CreateSnapshot(
const CreateShareSnapshotOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::CreateSnapshotOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::CreateSnapshotOptions();
protocolLayerOptions.Metadata = options.Metadata;
return ShareRestClient::Share::CreateSnapshot(
return Details::ShareRestClient::Share::CreateSnapshot(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<GetSharePropertiesResult> ShareClient::GetProperties(
const GetSharePropertiesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::GetPropertiesOptions();
return ShareRestClient::Share::GetProperties(
auto protocolLayerOptions = Details::ShareRestClient::Share::GetPropertiesOptions();
return Details::ShareRestClient::Share::GetProperties(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -182,9 +182,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
int32_t quota,
const SetShareQuotaOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::SetQuotaOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::SetQuotaOptions();
protocolLayerOptions.ShareQuota = quota;
return ShareRestClient::Share::SetQuota(
return Details::ShareRestClient::Share::SetQuota(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -192,17 +192,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::map<std::string, std::string> metadata,
const SetShareMetadataOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::SetMetadataOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::SetMetadataOptions();
protocolLayerOptions.Metadata = metadata;
return ShareRestClient::Share::SetMetadata(
return Details::ShareRestClient::Share::SetMetadata(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<GetShareAccessPolicyResult> ShareClient::GetAccessPolicy(
const GetShareAccessPolicyOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::GetAccessPolicyOptions();
return ShareRestClient::Share::GetAccessPolicy(
auto protocolLayerOptions = Details::ShareRestClient::Share::GetAccessPolicyOptions();
return Details::ShareRestClient::Share::GetAccessPolicy(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -210,17 +210,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::vector<SignedIdentifier>& accessPolicy,
const SetShareAccessPolicyOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::SetAccessPolicyOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::SetAccessPolicyOptions();
protocolLayerOptions.ShareAcl = accessPolicy;
return ShareRestClient::Share::SetAccessPolicy(
return Details::ShareRestClient::Share::SetAccessPolicy(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<GetShareStatisticsResult> ShareClient::GetStatistics(
const GetShareStatsOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::GetStatisticsOptions();
return ShareRestClient::Share::GetStatistics(
auto protocolLayerOptions = Details::ShareRestClient::Share::GetStatisticsOptions();
return Details::ShareRestClient::Share::GetStatistics(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -228,9 +228,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& permission,
const CreateSharePermissionOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::CreatePermissionOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::CreatePermissionOptions();
protocolLayerOptions.Permission.Permission = permission;
return ShareRestClient::Share::CreatePermission(
return Details::ShareRestClient::Share::CreatePermission(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -238,9 +238,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& permissionKey,
const GetSharePermissionOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Share::GetPermissionOptions();
auto protocolLayerOptions = Details::ShareRestClient::Share::GetPermissionOptions();
protocolLayerOptions.FilePermissionKeyRequired = permissionKey;
return ShareRestClient::Share::GetPermission(
return Details::ShareRestClient::Share::GetPermission(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -248,11 +248,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
ShareClient::ListFilesAndDirectoriesSegment(
const ListFilesAndDirectoriesSegmentOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::ListFilesAndDirectoriesSegmentOptions();
auto protocolLayerOptions
= Details::ShareRestClient::Directory::ListFilesAndDirectoriesSegmentOptions();
protocolLayerOptions.Prefix = options.Prefix;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.MaxResults = options.MaxResults;
auto result = ShareRestClient::Directory::ListFilesAndDirectoriesSegment(
auto result = Details::ShareRestClient::Directory::ListFilesAndDirectoriesSegment(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
ListFilesAndDirectoriesSegmentResult ret;
ret.ServiceEndpoint = std::move(result->ServiceEndpoint);
@ -275,10 +276,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
int32_t duration,
const AcquireShareLeaseOptions& options) const
{
ShareRestClient::Share::AcquireLeaseOptions protocolLayerOptions;
Details::ShareRestClient::Share::AcquireLeaseOptions protocolLayerOptions;
protocolLayerOptions.ProposedLeaseIdOptional = proposedLeaseId;
protocolLayerOptions.LeaseDuration = duration;
return ShareRestClient::Share::AcquireLease(
return Details::ShareRestClient::Share::AcquireLease(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -287,10 +288,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& proposedLeaseId,
const ChangeShareLeaseOptions& options) const
{
ShareRestClient::Share::ChangeLeaseOptions protocolLayerOptions;
Details::ShareRestClient::Share::ChangeLeaseOptions protocolLayerOptions;
protocolLayerOptions.LeaseIdRequired = leaseId;
protocolLayerOptions.ProposedLeaseIdOptional = proposedLeaseId;
return ShareRestClient::Share::ChangeLease(
return Details::ShareRestClient::Share::ChangeLease(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -298,18 +299,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& leaseId,
const ReleaseShareLeaseOptions& options) const
{
ShareRestClient::Share::ReleaseLeaseOptions protocolLayerOptions;
Details::ShareRestClient::Share::ReleaseLeaseOptions protocolLayerOptions;
protocolLayerOptions.LeaseIdRequired = leaseId;
return ShareRestClient::Share::ReleaseLease(
return Details::ShareRestClient::Share::ReleaseLease(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<BreakShareLeaseResult> ShareClient::BreakLease(
const BreakShareLeaseOptions& options) const
{
ShareRestClient::Share::BreakLeaseOptions protocolLayerOptions;
Details::ShareRestClient::Share::BreakLeaseOptions protocolLayerOptions;
protocolLayerOptions.LeaseBreakPeriod = options.BreakPeriod;
return ShareRestClient::Share::BreakLease(
return Details::ShareRestClient::Share::BreakLease(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -317,9 +318,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& leaseId,
const RenewShareLeaseOptions& options) const
{
ShareRestClient::Share::RenewLeaseOptions protocolLayerOptions;
Details::ShareRestClient::Share::RenewLeaseOptions protocolLayerOptions;
protocolLayerOptions.LeaseIdRequired = leaseId;
return ShareRestClient::Share::RenewLease(
return Details::ShareRestClient::Share::RenewLease(
m_shareUri, *m_pipeline, options.Context, protocolLayerOptions);
}

View File

@ -145,7 +145,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<CreateDirectoryResult> DirectoryClient::Create(
const CreateDirectoryOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::CreateOptions();
auto protocolLayerOptions = Details::ShareRestClient::Directory::CreateOptions();
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes);
if (protocolLayerOptions.FileAttributes.empty())
@ -180,23 +180,23 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
protocolLayerOptions.FilePermission = std::string(c_FileInheritPermission);
}
return ShareRestClient::Directory::Create(
return Details::ShareRestClient::Directory::Create(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<DeleteDirectoryResult> DirectoryClient::Delete(
const DeleteDirectoryOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::DeleteOptions();
return ShareRestClient::Directory::Delete(
auto protocolLayerOptions = Details::ShareRestClient::Directory::DeleteOptions();
return Details::ShareRestClient::Directory::Delete(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<GetDirectoryPropertiesResult> DirectoryClient::GetProperties(
const GetDirectoryPropertiesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::GetPropertiesOptions();
return ShareRestClient::Directory::GetProperties(
auto protocolLayerOptions = Details::ShareRestClient::Directory::GetPropertiesOptions();
return Details::ShareRestClient::Directory::GetProperties(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -204,7 +204,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
FileShareSmbProperties smbProperties,
const SetDirectoryPropertiesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::SetPropertiesOptions();
auto protocolLayerOptions = Details::ShareRestClient::Directory::SetPropertiesOptions();
protocolLayerOptions.FileAttributes = FileAttributesToString(smbProperties.Attributes);
if (smbProperties.CreationTime.HasValue())
{
@ -234,7 +234,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
protocolLayerOptions.FilePermission = std::string(c_FileInheritPermission);
}
return ShareRestClient::Directory::SetProperties(
return Details::ShareRestClient::Directory::SetProperties(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -242,9 +242,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::map<std::string, std::string>& metadata,
const SetDirectoryMetadataOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::SetMetadataOptions();
auto protocolLayerOptions = Details::ShareRestClient::Directory::SetMetadataOptions();
protocolLayerOptions.Metadata = metadata;
return ShareRestClient::Directory::SetMetadata(
return Details::ShareRestClient::Directory::SetMetadata(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -252,11 +252,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
DirectoryClient::ListFilesAndDirectoriesSegment(
const ListFilesAndDirectoriesSegmentOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::ListFilesAndDirectoriesSegmentOptions();
auto protocolLayerOptions
= Details::ShareRestClient::Directory::ListFilesAndDirectoriesSegmentOptions();
protocolLayerOptions.Prefix = options.Prefix;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.MaxResults = options.MaxResults;
auto result = ShareRestClient::Directory::ListFilesAndDirectoriesSegment(
auto result = Details::ShareRestClient::Directory::ListFilesAndDirectoriesSegment(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
ListFilesAndDirectoriesSegmentResult ret;
ret.ServiceEndpoint = std::move(result->ServiceEndpoint);
@ -277,11 +278,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<ListDirectoryHandlesSegmentResult> DirectoryClient::ListHandlesSegment(
const ListDirectoryHandlesSegmentOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::ListHandlesOptions();
auto protocolLayerOptions = Details::ShareRestClient::Directory::ListHandlesOptions();
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.MaxResults = options.MaxResults;
protocolLayerOptions.Recursive = options.Recursive;
auto result = ShareRestClient::Directory::ListHandles(
auto result = Details::ShareRestClient::Directory::ListHandles(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
ListDirectoryHandlesSegmentResult ret;
ret.ContinuationToken = std::move(result->ContinuationToken);
@ -295,9 +296,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& handleId,
const ForceCloseDirectoryHandleOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::ForceCloseHandlesOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::ForceCloseHandlesOptions();
protocolLayerOptions.HandleId = handleId;
auto result = ShareRestClient::File::ForceCloseHandles(
auto result = Details::ShareRestClient::File::ForceCloseHandles(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
return Azure::Core::Response<ForceCloseDirectoryHandleResult>(
ForceCloseDirectoryHandleResult(), result.ExtractRawResponse());
@ -306,11 +307,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<ForceCloseAllDirectoryHandlesResult> DirectoryClient::ForceCloseAllHandles(
const ForceCloseAllDirectoryHandlesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Directory::ForceCloseHandlesOptions();
auto protocolLayerOptions = Details::ShareRestClient::Directory::ForceCloseHandlesOptions();
protocolLayerOptions.HandleId = c_FileAllHandles;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.Recursive = options.Recursive;
return ShareRestClient::Directory::ForceCloseHandles(
return Details::ShareRestClient::Directory::ForceCloseHandles(
m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions);
}

View File

@ -133,7 +133,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
int64_t fileSize,
const CreateFileOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::CreateOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::CreateOptions();
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes);
if (protocolLayerOptions.FileAttributes.empty())
@ -194,22 +194,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
protocolLayerOptions.FileContentMd5 = options.HttpHeaders.ContentMd5;
}
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::Create(
return Details::ShareRestClient::File::Create(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<DeleteFileResult> FileClient::Delete(const DeleteFileOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::DeleteOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::DeleteOptions();
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::Delete(
return Details::ShareRestClient::File::Delete(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<DownloadFileResult> FileClient::Download(
const DownloadFileOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::DownloadOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::DownloadOptions();
if (options.Offset.HasValue())
{
if (options.Length.HasValue())
@ -227,7 +227,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
protocolLayerOptions.GetRangeContentMd5 = options.GetRangeContentMd5;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
auto downloadResponse = ShareRestClient::File::Download(
auto downloadResponse = Details::ShareRestClient::File::Download(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
{
@ -269,7 +269,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::string copySource,
const StartCopyFileOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::StartCopyOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::StartCopyOptions();
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.CopySource = std::move(copySource);
protocolLayerOptions.FileCopyFileAttributes
@ -319,7 +319,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
protocolLayerOptions.FileCopyIgnoreReadOnly = options.IgnoreReadOnly;
protocolLayerOptions.FileCopySetArchiveAttribute = options.SetArchiveAttribute;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::StartCopy(
return Details::ShareRestClient::File::StartCopy(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -327,19 +327,19 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::string copyId,
const AbortCopyFileOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::AbortCopyOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::AbortCopyOptions();
protocolLayerOptions.CopyId = std::move(copyId);
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::AbortCopy(
return Details::ShareRestClient::File::AbortCopy(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<GetFilePropertiesResult> FileClient::GetProperties(
const GetFilePropertiesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::GetPropertiesOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::GetPropertiesOptions();
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::GetProperties(
return Details::ShareRestClient::File::GetProperties(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -348,7 +348,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
FileShareSmbProperties smbProperties,
const SetFilePropertiesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::SetHttpHeadersOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::SetHttpHeadersOptions();
protocolLayerOptions.FileAttributes = FileAttributesToString(smbProperties.Attributes);
if (smbProperties.CreationTime.HasValue())
{
@ -402,7 +402,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
protocolLayerOptions.FileContentDisposition = httpHeaders.ContentDisposition;
}
return ShareRestClient::File::SetHttpHeaders(
return Details::ShareRestClient::File::SetHttpHeaders(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -410,10 +410,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::map<std::string, std::string>& metadata,
const SetFileMetadataOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::SetMetadataOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::SetMetadataOptions();
protocolLayerOptions.Metadata = metadata;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::SetMetadata(
return Details::ShareRestClient::File::SetMetadata(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -422,14 +422,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Http::BodyStream* content,
const UploadFileRangeOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::UploadRangeOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::UploadRangeOptions();
protocolLayerOptions.XMsWrite = FileRangeWriteType::Update;
protocolLayerOptions.ContentLength = content->Length();
protocolLayerOptions.XMsRange = std::string("bytes=") + std::to_string(offset)
+ std::string("-") + std::to_string(offset + content->Length() - 1);
protocolLayerOptions.ContentMd5 = options.TransactionalMd5;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::UploadRange(
return Details::ShareRestClient::File::UploadRange(
m_shareFileUri, *content, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -438,14 +438,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
int64_t length,
const ClearFileRangeOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::UploadRangeOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::UploadRangeOptions();
protocolLayerOptions.XMsWrite = FileRangeWriteType::Clear;
protocolLayerOptions.ContentLength = 0;
protocolLayerOptions.XMsRange = std::string("bytes=") + std::to_string(offset)
+ std::string("-") + std::to_string(offset + length - 1);
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::UploadRange(
return Details::ShareRestClient::File::UploadRange(
m_shareFileUri,
*Azure::Core::Http::NullBodyStream::GetNullBodyStream(),
*m_pipeline,
@ -456,7 +456,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<GetFileRangeListResult> FileClient::GetRangeList(
const GetFileRangeListOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::GetRangeListOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::GetRangeListOptions();
if (options.Offset.HasValue())
{
if (options.Length.HasValue())
@ -474,17 +474,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
protocolLayerOptions.PrevShareSnapshot = options.PrevShareSnapshot;
protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId;
return ShareRestClient::File::GetRangeList(
return Details::ShareRestClient::File::GetRangeList(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<ListFileHandlesSegmentResult> FileClient::ListHandlesSegment(
const ListFileHandlesSegmentOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::ListHandlesOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::ListHandlesOptions();
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.MaxResults = options.MaxResults;
auto result = ShareRestClient::File::ListHandles(
auto result = Details::ShareRestClient::File::ListHandles(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
ListFileHandlesSegmentResult ret;
ret.ContinuationToken = std::move(result->ContinuationToken);
@ -498,9 +498,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& handleId,
const ForceCloseFileHandleOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::ForceCloseHandlesOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::ForceCloseHandlesOptions();
protocolLayerOptions.HandleId = handleId;
auto result = ShareRestClient::File::ForceCloseHandles(
auto result = Details::ShareRestClient::File::ForceCloseHandles(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
return Azure::Core::Response<ForceCloseFileHandleResult>(
ForceCloseFileHandleResult(), result.ExtractRawResponse());
@ -509,10 +509,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<ForceCloseAllFileHandlesResult> FileClient::ForceCloseAllHandles(
const ForceCloseAllFileHandlesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::File::ForceCloseHandlesOptions();
auto protocolLayerOptions = Details::ShareRestClient::File::ForceCloseHandlesOptions();
protocolLayerOptions.HandleId = c_FileAllHandles;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
return ShareRestClient::File::ForceCloseHandles(
return Details::ShareRestClient::File::ForceCloseHandles(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -520,10 +520,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& proposedLeaseId,
const AcquireFileLeaseOptions& options) const
{
ShareRestClient::File::AcquireLeaseOptions protocolLayerOptions;
Details::ShareRestClient::File::AcquireLeaseOptions protocolLayerOptions;
protocolLayerOptions.ProposedLeaseIdOptional = proposedLeaseId;
protocolLayerOptions.LeaseDuration = -1;
return ShareRestClient::File::AcquireLease(
return Details::ShareRestClient::File::AcquireLease(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -532,10 +532,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& proposedLeaseId,
const ChangeFileLeaseOptions& options) const
{
ShareRestClient::File::ChangeLeaseOptions protocolLayerOptions;
Details::ShareRestClient::File::ChangeLeaseOptions protocolLayerOptions;
protocolLayerOptions.LeaseIdRequired = leaseId;
protocolLayerOptions.ProposedLeaseIdOptional = proposedLeaseId;
return ShareRestClient::File::ChangeLease(
return Details::ShareRestClient::File::ChangeLease(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -543,17 +543,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
const std::string& leaseId,
const ReleaseFileLeaseOptions& options) const
{
ShareRestClient::File::ReleaseLeaseOptions protocolLayerOptions;
Details::ShareRestClient::File::ReleaseLeaseOptions protocolLayerOptions;
protocolLayerOptions.LeaseIdRequired = leaseId;
return ShareRestClient::File::ReleaseLease(
return Details::ShareRestClient::File::ReleaseLease(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<BreakFileLeaseResult> FileClient::BreakLease(
const BreakFileLeaseOptions& options) const
{
ShareRestClient::File::BreakLeaseOptions protocolLayerOptions;
return ShareRestClient::File::BreakLease(
Details::ShareRestClient::File::BreakLeaseOptions protocolLayerOptions;
return Details::ShareRestClient::File::BreakLease(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -812,7 +812,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::size_t bufferSize,
const UploadFileFromOptions& options) const
{
ShareRestClient::File::CreateOptions protocolLayerOptions;
Details::ShareRestClient::File::CreateOptions protocolLayerOptions;
protocolLayerOptions.XMsContentLength = bufferSize;
protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes);
if (protocolLayerOptions.FileAttributes.empty())
@ -873,7 +873,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
protocolLayerOptions.FileContentMd5 = options.HttpHeaders.ContentMd5;
}
protocolLayerOptions.Metadata = options.Metadata;
auto createResult = ShareRestClient::File::Create(
auto createResult = Details::ShareRestClient::File::Create(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
int64_t chunkSize = options.ChunkSize.HasValue() ? options.ChunkSize.GetValue()
@ -903,7 +903,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
Storage::Details::FileReader fileReader(file);
ShareRestClient::File::CreateOptions protocolLayerOptions;
Details::ShareRestClient::File::CreateOptions protocolLayerOptions;
protocolLayerOptions.XMsContentLength = fileReader.GetFileSize();
protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes);
if (protocolLayerOptions.FileAttributes.empty())
@ -964,7 +964,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
protocolLayerOptions.FileContentMd5 = options.HttpHeaders.ContentMd5;
}
protocolLayerOptions.Metadata = options.Metadata;
auto createResult = ShareRestClient::File::Create(
auto createResult = Details::ShareRestClient::File::Create(
m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions);
int64_t chunkSize = options.ChunkSize.HasValue() ? options.ChunkSize.GetValue()

View File

@ -115,12 +115,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<ListSharesSegmentResult> ServiceClient::ListSharesSegment(
const ListSharesSegmentOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Service::ListSharesSegmentOptions();
auto protocolLayerOptions = Details::ShareRestClient::Service::ListSharesSegmentOptions();
protocolLayerOptions.ListSharesInclude = options.ListSharesInclude;
protocolLayerOptions.ContinuationToken = options.ContinuationToken;
protocolLayerOptions.MaxResults = options.MaxResults;
protocolLayerOptions.Prefix = options.Prefix;
return ShareRestClient::Service::ListSharesSegment(
return Details::ShareRestClient::Service::ListSharesSegment(
m_serviceUri, *m_pipeline, options.Context, protocolLayerOptions);
}
@ -128,17 +128,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
StorageServiceProperties properties,
const SetServicePropertiesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Service::SetPropertiesOptions();
auto protocolLayerOptions = Details::ShareRestClient::Service::SetPropertiesOptions();
protocolLayerOptions.ServiceProperties = std::move(properties);
return ShareRestClient::Service::SetProperties(
return Details::ShareRestClient::Service::SetProperties(
m_serviceUri, *m_pipeline, options.Context, protocolLayerOptions);
}
Azure::Core::Response<GetServicePropertiesResult> ServiceClient::GetProperties(
const GetServicePropertiesOptions& options) const
{
auto protocolLayerOptions = ShareRestClient::Service::GetPropertiesOptions();
auto result = ShareRestClient::Service::GetProperties(
auto protocolLayerOptions = Details::ShareRestClient::Service::GetPropertiesOptions();
auto result = Details::ShareRestClient::Service::GetProperties(
m_serviceUri, *m_pipeline, options.Context, protocolLayerOptions);
StorageServiceProperties ret;
ret.Cors = std::move(result->Cors);