From 46d4af45b6e150fb17604ab4160fdc4a4fa826ff Mon Sep 17 00:00:00 2001 From: Kan Tang Date: Sat, 23 Jan 2021 07:10:41 -0800 Subject: [PATCH] Refined protocol layer. (#1443) * Refined protocol layer. * Resolves review comments. * Move more un-used things into details. --- .../azure-storage-files-datalake/CHANGELOG.md | 3 + .../files/datalake/datalake_responses.hpp | 17 +- .../protocol/datalake_rest_client.hpp | 421 +++---- .../sample/datalake_getting_started.cpp | 5 +- .../src/datalake_service_client.cpp | 8 +- .../test/datalake_file_system_client_test.cpp | 16 +- .../test/datalake_file_system_client_test.hpp | 2 +- .../test/datalake_service_client_test.cpp | 18 +- .../test/datalake_service_client_test.hpp | 2 +- .../azure-storage-files-shares/CHANGELOG.md | 3 + .../shares/protocol/share_rest_client.hpp | 1100 ++++++++--------- .../storage/files/shares/share_responses.hpp | 72 +- .../test/share_service_client_test.cpp | 4 +- 13 files changed, 824 insertions(+), 847 deletions(-) diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md index 2122877d4..e6355e495 100644 --- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md @@ -7,6 +7,9 @@ - Added `Owner`, `Permissions`, and `Group` to `GetDataLakePathAccessControlResult`. - `ReadDataLakeFileResult` now has a new field `FileSize`. - Added support for `GetAccessPolicy` and `SetAccessPolicy` in `DataLakeFileSystemClient`. +- Moved all protocol layer generated result types to `Details` namespace. +- Renamed `FileSystem` type returned from `ListDataLakeFileSystems` to be `FileSystemItem`. Member object name `FileSystems` is renamed to `Items`. +- Renamed `Path` type returned from `ListDataLakePaths` to be `PathItem`. Member object name `Paths` is renamed to `Items`. ### Breaking Changes diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp index dc8b6674e..812c81899 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp @@ -17,11 +17,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam using GetUserDelegationKeyResult = Blobs::Models::GetUserDelegationKeyResult; using UserDelegationKey = Blobs::Models::UserDelegationKey; - using ListFileSystemsSinglePageResult = ServiceListFileSystemsResult; + using ListFileSystemsSinglePageResult = Details::ServiceListFileSystemsResult; // FileSystemClient models: - using ListPathsSinglePageResult = FileSystemListPathsResult; + using ListPathsSinglePageResult = Details::FileSystemListPathsResult; using DataLakeSignedIdentifier = Blobs::Models::BlobSignedIdentifier; struct GetDataLakeFileSystemAccessPolicyResult @@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam bool Deleted = true; }; - using SetDataLakeFileSystemMetadataResult = FileSystemCreateResult; + using SetDataLakeFileSystemMetadataResult = Details::FileSystemCreateResult; // PathClient models: @@ -159,14 +159,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam Azure::Core::Nullable FileSize; }; - using SetDataLakePathAccessControlListResult = PathSetAccessControlResult; - using SetDataLakePathPermissionsResult = PathSetAccessControlResult; + using SetDataLakePathAccessControlListResult = Details::PathSetAccessControlResult; + using SetDataLakePathPermissionsResult = Details::PathSetAccessControlResult; // FileClient models: using UploadDataLakeFileFromResult = Blobs::Models::UploadBlockBlobResult; - using AppendDataLakeFileResult = PathAppendDataResult; - using FlushDataLakeFileResult = PathFlushDataResult; + using AppendDataLakeFileResult = Details::PathAppendDataResult; + using FlushDataLakeFileResult = Details::PathFlushDataResult; using ScheduleDataLakeFileDeletionResult = Blobs::Models::SetBlobExpiryResult; struct ReadDataLakeFileResult @@ -216,7 +216,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam Azure::Core::Nullable ContinuationToken; }; - using SetDataLakeDirectoryAccessControlRecursiveResult = PathSetAccessControlRecursiveResult; + using SetDataLakeDirectoryAccessControlRecursiveResult + = Details::PathSetAccessControlRecursiveResult; using CreateDataLakeDirectoryResult = CreateDataLakePathResult; using DeleteDataLakeDirectoryResult = DeleteDataLakePathResult; diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp index dfe925265..ef11a642e 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp @@ -4,6 +4,8 @@ #pragma once +#include "azure/storage/files/datalake/dll_import_export.hpp" + #include #include #include @@ -15,88 +17,15 @@ #include #include #include +#include #include #include #include #include #include -#include - -#include namespace Azure { namespace Storage { namespace Files { namespace DataLake { - namespace Details { - constexpr static const char* DefaultServiceApiVersion = "2020-02-10"; - constexpr static const char* PathDnsSuffixDefault = "dfs.core.windows.net"; - constexpr static const char* QueryFileSystemResource = "resource"; - constexpr static const char* QueryTimeout = "timeout"; - constexpr static const char* QueryRecursive = "recursive"; - constexpr static const char* QueryContinuationToken = "continuation"; - constexpr static const char* QueryPathSetAccessControlRecursiveMode = "mode"; - constexpr static const char* QueryForceFlag = "forceflag"; - constexpr static const char* QueryPath = "directory"; - constexpr static const char* QueryPrefix = "prefix"; - constexpr static const char* QueryPageSizeHint = "maxresults"; - constexpr static const char* QueryUpn = "upn"; - constexpr static const char* QueryPosition = "position"; - constexpr static const char* QueryRetainUncommittedData = "retainuncommitteddata"; - constexpr static const char* QueryClose = "close"; - constexpr static const char* QueryResource = "resource"; - constexpr static const char* QueryPathResourceType = "resource"; - constexpr static const char* QueryPathRenameMode = "mode"; - constexpr static const char* QueryPathGetPropertiesAction = "action"; - constexpr static const char* QueryAction = "action"; - constexpr static const char* QueryMaxRecords = "maxrecords"; - constexpr static const char* QueryComp = "comp"; - constexpr static const char* HeaderVersion = "x-ms-version"; - constexpr static const char* HeaderRequestId = "x-ms-client-request-id"; - constexpr static const char* HeaderIfMatch = "if-match"; - constexpr static const char* HeaderIfModifiedSince = "if-modified-since"; - constexpr static const char* HeaderIfNoneMatch = "if-none-match"; - constexpr static const char* HeaderIfUnmodifiedSince = "if-unmodified-since"; - constexpr static const char* HeaderLeaseId = "x-ms-lease-id"; - constexpr static const char* HeaderProposedLeaseId = "x-ms-proposed-lease-id"; - constexpr static const char* HeaderProperties = "x-ms-properties"; - constexpr static const char* HeaderSourceIfMatch = "x-ms-source-if-match"; - constexpr static const char* HeaderSourceIfModifiedSince = "x-ms-source-if-modified-since"; - constexpr static const char* HeaderSourceIfNoneMatch = "x-ms-source-if-none-match"; - constexpr static const char* HeaderSourceIfUnmodifiedSince = "x-ms-source-if-unmodified-since"; - constexpr static const char* HeaderSourceLeaseId = "x-ms-source-lease-id"; - constexpr static const char* HeaderCacheControl = "x-ms-cache-control"; - constexpr static const char* HeaderContentDisposition = "x-ms-content-disposition"; - constexpr static const char* HeaderContentEncoding = "x-ms-content-encoding"; - constexpr static const char* HeaderContentLanguage = "x-ms-content-language"; - constexpr static const char* HeaderContentType = "x-ms-content-type"; - constexpr static const char* HeaderTransactionalContentHashMd5 = "content-md5"; - constexpr static const char* HeaderContentHashMd5 = "x-ms-content-md5"; - constexpr static const char* HeaderTransactionalContentHashCrc64 = "x-ms-content-crc64"; - constexpr static const char* HeaderUmask = "x-ms-umask"; - constexpr static const char* HeaderPermissions = "x-ms-permissions"; - constexpr static const char* HeaderRenameSource = "x-ms-rename-source"; - constexpr static const char* HeaderOwner = "x-ms-owner"; - constexpr static const char* HeaderGroup = "x-ms-group"; - constexpr static const char* HeaderAcl = "x-ms-acl"; - constexpr static const char* HeaderContentLength = "content-length"; - constexpr static const char* HeaderExpiryOptions = "x-ms-expiry-option"; - constexpr static const char* HeaderExpiresOn = "x-ms-expiry-time"; - constexpr static const char* HeaderDate = "date"; - constexpr static const char* HeaderClientRequestId = "x-ms-client-request-id"; - constexpr static const char* HeaderContinuationToken = "x-ms-continuation"; - constexpr static const char* HeaderErrorCode = "x-ms-error-code"; - constexpr static const char* HeaderETag = "etag"; - constexpr static const char* HeaderLastModified = "last-modified"; - constexpr static const char* HeaderNamespaceEnabled = "x-ms-namespace-enabled"; - constexpr static const char* HeaderPathLeaseAction = "x-ms-lease-action"; - constexpr static const char* HeaderXMsLeaseDuration = "x-ms-lease-duration"; - constexpr static const char* HeaderXMsLeaseBreakPeriod = "x-ms-lease-break-period"; - constexpr static const char* HeaderLeaseTime = "x-ms-lease-time"; - constexpr static const char* HeaderAcceptRanges = "accept-ranges"; - constexpr static const char* HeaderResourceType = "x-ms-resource-type"; - constexpr static const char* HeaderLeaseState = "x-ms-lease-state"; - constexpr static const char* HeaderLeaseStatus = "x-ms-lease-status"; - constexpr static const char* HeaderRequestIsServerEncrypted = "x-ms-request-server-encrypted"; - } // namespace Details namespace Models { struct PathHttpHeaders { @@ -177,15 +106,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ErrorMessage; }; - struct SetAccessControlRecursiveResponse - { - int32_t DirectoriesSuccessful = int32_t(); - int32_t FilesSuccessful = int32_t(); - int32_t FailureCount = int32_t(); - std::vector FailedEntries; - }; - - struct Path + struct PathItem { std::string Name; bool IsDirectory = bool(); @@ -197,23 +118,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string Permissions; }; - struct PathList - { - std::vector Paths; - }; - - struct FileSystem + struct FileSystemItem { std::string Name; Core::DateTime LastModified; std::string ETag; }; - struct FileSystemList - { - std::vector Filesystems; - }; - class PublicAccessType { public: PublicAccessType() = default; @@ -222,9 +133,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { bool operator!=(const PublicAccessType& other) const { return !(*this == other); } const std::string& Get() const { return m_value; } - const static PublicAccessType FileSystem; - const static PublicAccessType Path; - const static PublicAccessType None; + AZ_STORAGE_FILES_DATALAKE_DLLEXPORT const static PublicAccessType FileSystem; + AZ_STORAGE_FILES_DATALAKE_DLLEXPORT const static PublicAccessType Path; + AZ_STORAGE_FILES_DATALAKE_DLLEXPORT const static PublicAccessType None; private: std::string m_value; @@ -363,9 +274,100 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string m_value; }; // extensible enum LeaseStatusType + } // namespace Models + namespace Details { + using namespace Models; + constexpr static const char* DefaultServiceApiVersion = "2020-02-10"; + constexpr static const char* PathDnsSuffixDefault = "dfs.core.windows.net"; + constexpr static const char* QueryFileSystemResource = "resource"; + constexpr static const char* QueryTimeout = "timeout"; + constexpr static const char* QueryRecursive = "recursive"; + constexpr static const char* QueryContinuationToken = "continuation"; + constexpr static const char* QueryPathSetAccessControlRecursiveMode = "mode"; + constexpr static const char* QueryForceFlag = "forceflag"; + constexpr static const char* QueryPath = "directory"; + constexpr static const char* QueryPrefix = "prefix"; + constexpr static const char* QueryPageSizeHint = "maxresults"; + constexpr static const char* QueryUpn = "upn"; + constexpr static const char* QueryPosition = "position"; + constexpr static const char* QueryRetainUncommittedData = "retainuncommitteddata"; + constexpr static const char* QueryClose = "close"; + constexpr static const char* QueryResource = "resource"; + constexpr static const char* QueryPathResourceType = "resource"; + constexpr static const char* QueryPathRenameMode = "mode"; + constexpr static const char* QueryPathGetPropertiesAction = "action"; + constexpr static const char* QueryAction = "action"; + constexpr static const char* QueryMaxRecords = "maxrecords"; + constexpr static const char* QueryComp = "comp"; + constexpr static const char* HeaderVersion = "x-ms-version"; + constexpr static const char* HeaderRequestId = "x-ms-client-request-id"; + constexpr static const char* HeaderIfMatch = "if-match"; + constexpr static const char* HeaderIfModifiedSince = "if-modified-since"; + constexpr static const char* HeaderIfNoneMatch = "if-none-match"; + constexpr static const char* HeaderIfUnmodifiedSince = "if-unmodified-since"; + constexpr static const char* HeaderLeaseId = "x-ms-lease-id"; + constexpr static const char* HeaderProposedLeaseId = "x-ms-proposed-lease-id"; + constexpr static const char* HeaderProperties = "x-ms-properties"; + constexpr static const char* HeaderSourceIfMatch = "x-ms-source-if-match"; + constexpr static const char* HeaderSourceIfModifiedSince = "x-ms-source-if-modified-since"; + constexpr static const char* HeaderSourceIfNoneMatch = "x-ms-source-if-none-match"; + constexpr static const char* HeaderSourceIfUnmodifiedSince = "x-ms-source-if-unmodified-since"; + constexpr static const char* HeaderSourceLeaseId = "x-ms-source-lease-id"; + constexpr static const char* HeaderCacheControl = "x-ms-cache-control"; + constexpr static const char* HeaderContentDisposition = "x-ms-content-disposition"; + constexpr static const char* HeaderContentEncoding = "x-ms-content-encoding"; + constexpr static const char* HeaderContentLanguage = "x-ms-content-language"; + constexpr static const char* HeaderContentType = "x-ms-content-type"; + constexpr static const char* HeaderTransactionalContentHashMd5 = "content-md5"; + constexpr static const char* HeaderContentHashMd5 = "x-ms-content-md5"; + constexpr static const char* HeaderTransactionalContentHashCrc64 = "x-ms-content-crc64"; + constexpr static const char* HeaderUmask = "x-ms-umask"; + constexpr static const char* HeaderPermissions = "x-ms-permissions"; + constexpr static const char* HeaderRenameSource = "x-ms-rename-source"; + constexpr static const char* HeaderOwner = "x-ms-owner"; + constexpr static const char* HeaderGroup = "x-ms-group"; + constexpr static const char* HeaderAcl = "x-ms-acl"; + constexpr static const char* HeaderContentLength = "content-length"; + constexpr static const char* HeaderExpiryOptions = "x-ms-expiry-option"; + constexpr static const char* HeaderExpiresOn = "x-ms-expiry-time"; + constexpr static const char* HeaderDate = "date"; + constexpr static const char* HeaderClientRequestId = "x-ms-client-request-id"; + constexpr static const char* HeaderContinuationToken = "x-ms-continuation"; + constexpr static const char* HeaderErrorCode = "x-ms-error-code"; + constexpr static const char* HeaderETag = "etag"; + constexpr static const char* HeaderLastModified = "last-modified"; + constexpr static const char* HeaderNamespaceEnabled = "x-ms-namespace-enabled"; + constexpr static const char* HeaderPathLeaseAction = "x-ms-lease-action"; + constexpr static const char* HeaderXMsLeaseDuration = "x-ms-lease-duration"; + constexpr static const char* HeaderXMsLeaseBreakPeriod = "x-ms-lease-break-period"; + constexpr static const char* HeaderLeaseTime = "x-ms-lease-time"; + constexpr static const char* HeaderAcceptRanges = "accept-ranges"; + constexpr static const char* HeaderResourceType = "x-ms-resource-type"; + constexpr static const char* HeaderLeaseState = "x-ms-lease-state"; + constexpr static const char* HeaderLeaseStatus = "x-ms-lease-status"; + constexpr static const char* HeaderRequestIsServerEncrypted = "x-ms-request-server-encrypted"; + + struct SetAccessControlRecursiveResponse + { + int32_t DirectoriesSuccessful = int32_t(); + int32_t FilesSuccessful = int32_t(); + int32_t FailureCount = int32_t(); + std::vector FailedEntries; + }; + + struct PathList + { + std::vector Items; + }; + + struct FileSystemList + { + std::vector Items; + }; + struct ServiceListFileSystemsResult { - std::vector Filesystems; + std::vector Items; Azure::Core::Nullable ContinuationToken; }; @@ -396,7 +398,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct FileSystemListPathsResult { - std::vector Paths; + std::vector Items; Azure::Core::Nullable ContinuationToken; }; @@ -449,7 +451,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { int32_t DirectoriesSuccessful = int32_t(); int32_t FilesSuccessful = int32_t(); int32_t FailureCount = int32_t(); - std::vector FailedEntries; + std::vector FailedEntries; Azure::Core::Nullable ContinuationToken; }; @@ -472,9 +474,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Core::DateTime LastModified; }; - } // namespace Models - namespace Details { - class DataLakeRestClient { public: class Service { @@ -489,7 +488,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response ListFileSystems( + static Azure::Core::Response ListFileSystems( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -535,8 +534,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } private: - static Azure::Core::Response - ListFileSystemsParseResult( + static Azure::Core::Response ListFileSystemsParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -545,8 +543,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // OK const auto& bodyBuffer = response.GetBody(); - Models::ServiceListFileSystemsResult result = bodyBuffer.empty() - ? Models::ServiceListFileSystemsResult() + ServiceListFileSystemsResult result = bodyBuffer.empty() + ? ServiceListFileSystemsResult() : ServiceListFileSystemsResultFromFileSystemList( FileSystemListFromJson(Azure::Core::Internal::Json::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::HeaderContinuationToken) @@ -554,7 +552,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -564,9 +562,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Models::FileSystem FileSystemFromJson(const Azure::Core::Internal::Json::json& node) + static FileSystemItem FileSystemItemFromJson(const Azure::Core::Internal::Json::json& node) { - Models::FileSystem result; + FileSystemItem result; result.Name = node["name"].get(); result.LastModified = Core::DateTime::Parse( node["lastModified"].get(), Core::DateTime::DateFormat::Rfc1123); @@ -574,22 +572,21 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static Models::FileSystemList FileSystemListFromJson( - const Azure::Core::Internal::Json::json& node) + static FileSystemList FileSystemListFromJson(const Azure::Core::Internal::Json::json& node) { - Models::FileSystemList result; + FileSystemList result; for (const auto& element : node["filesystems"]) { - result.Filesystems.emplace_back(FileSystemFromJson(element)); + result.Items.emplace_back(FileSystemItemFromJson(element)); } return result; } - static Models::ServiceListFileSystemsResult ServiceListFileSystemsResultFromFileSystemList( - Models::FileSystemList object) + static ServiceListFileSystemsResult ServiceListFileSystemsResultFromFileSystemList( + FileSystemList object) { - Models::ServiceListFileSystemsResult result; - result.Filesystems = std::move(object.Filesystems); + ServiceListFileSystemsResult result; + result.Items = std::move(object.Items); return result; } @@ -599,14 +596,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { public: struct CreateOptions { - Models::FileSystemResourceType Resource; + FileSystemResourceType Resource; Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; Azure::Core::Nullable Properties; }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -638,7 +635,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct SetPropertiesOptions { - Models::FileSystemResourceType Resource; + FileSystemResourceType Resource; Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; @@ -647,7 +644,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable IfUnmodifiedSince; }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -694,13 +691,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct GetPropertiesOptions { - Models::FileSystemResourceType Resource; + FileSystemResourceType Resource; Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -728,7 +725,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct DeleteOptions { - Models::FileSystemResourceType Resource; + FileSystemResourceType Resource; Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; @@ -736,7 +733,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable IfUnmodifiedSince; }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -777,7 +774,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct ListPathsOptions { - Models::FileSystemResourceType Resource; + FileSystemResourceType Resource; Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; @@ -788,7 +785,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable Upn; }; - static Azure::Core::Response ListPaths( + static Azure::Core::Response ListPaths( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -846,7 +843,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -854,13 +851,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Created - Models::FileSystemCreateResult result; + FileSystemCreateResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); result.NamespaceEnabled = response.GetHeaders().at(Details::HeaderNamespaceEnabled); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -870,8 +867,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response - SetPropertiesParseResult( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -879,12 +875,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - Models::FileSystemSetPropertiesResult result; + FileSystemSetPropertiesResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -894,8 +890,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response - GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -903,14 +898,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - Models::FileSystemGetPropertiesResult result; + FileSystemGetPropertiesResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); result.Properties = response.GetHeaders().at(Details::HeaderProperties); result.NamespaceEnabled = response.GetHeaders().at(Details::HeaderNamespaceEnabled); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -920,7 +915,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -928,8 +923,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Accepted - Models::FileSystemDeleteResult result; - return Azure::Core::Response( + FileSystemDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -939,7 +934,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response ListPathsParseResult( + static Azure::Core::Response ListPathsParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -948,8 +943,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // Ok const auto& bodyBuffer = response.GetBody(); - Models::FileSystemListPathsResult result = bodyBuffer.empty() - ? Models::FileSystemListPathsResult() + FileSystemListPathsResult result = bodyBuffer.empty() + ? FileSystemListPathsResult() : FileSystemListPathsResultFromPathList( PathListFromJson(Azure::Core::Internal::Json::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::HeaderContinuationToken) @@ -957,7 +952,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -967,9 +962,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Models::Path PathFromJson(const Azure::Core::Internal::Json::json& node) + static PathItem PathItemFromJson(const Azure::Core::Internal::Json::json& node) { - Models::Path result; + PathItem result; result.Name = node["name"].get(); if (node.contains("isDirectory")) { @@ -988,21 +983,20 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static Models::PathList PathListFromJson(const Azure::Core::Internal::Json::json& node) + static PathList PathListFromJson(const Azure::Core::Internal::Json::json& node) { - Models::PathList result; + PathList result; for (const auto& element : node["paths"]) { - result.Paths.emplace_back(PathFromJson(element)); + result.Items.emplace_back(PathItemFromJson(element)); } return result; } - static Models::FileSystemListPathsResult FileSystemListPathsResultFromPathList( - Models::PathList object) + static FileSystemListPathsResult FileSystemListPathsResultFromPathList(PathList object) { - Models::FileSystemListPathsResult result; - result.Paths = std::move(object.Paths); + FileSystemListPathsResult result; + result.Items = std::move(object.Items); return result; } @@ -1015,9 +1009,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; - Azure::Core::Nullable Resource; + Azure::Core::Nullable Resource; Azure::Core::Nullable ContinuationToken; - Azure::Core::Nullable Mode; + Azure::Core::Nullable Mode; Azure::Core::Nullable CacheControl; Azure::Core::Nullable ContentEncoding; Azure::Core::Nullable ContentLanguage; @@ -1039,7 +1033,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable SourceIfUnmodifiedSince; }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1179,7 +1173,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; - Models::PathLeaseAction XMsLeaseAction; + PathLeaseAction XMsLeaseAction; Azure::Core::Nullable XMsLeaseDuration; Azure::Core::Nullable XMsLeaseBreakPeriod; Azure::Core::Nullable LeaseIdOptional; @@ -1190,7 +1184,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable IfUnmodifiedSince; }; - static Azure::Core::Response Lease( + static Azure::Core::Response Lease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1262,7 +1256,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable ClientRequestId; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; - Azure::Core::Nullable Action; + Azure::Core::Nullable Action; Azure::Core::Nullable Upn; Azure::Core::Nullable LeaseIdOptional; Azure::Core::Nullable IfMatch; @@ -1271,7 +1265,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable IfUnmodifiedSince; }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1350,7 +1344,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable IfUnmodifiedSince; }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1428,7 +1422,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response SetAccessControl( + static Azure::Core::Response SetAccessControl( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1501,7 +1495,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { Azure::Core::Nullable Timeout; Azure::Core::Nullable ContinuationToken; - Models::PathSetAccessControlRecursiveMode Mode; + PathSetAccessControlRecursiveMode Mode; Azure::Core::Nullable ForceFlag; Azure::Core::Nullable MaxRecords; Azure::Core::Nullable Acl; @@ -1509,8 +1503,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response - SetAccessControlRecursive( + static Azure::Core::Response SetAccessControlRecursive( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1587,7 +1580,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response FlushData( + static Azure::Core::Response FlushData( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1706,7 +1699,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response AppendData( + static Azure::Core::Response AppendData( const Azure::Core::Http::Url& url, Azure::Core::Http::BodyStream& bodyStream, Azure::Core::Http::HttpPipeline& pipeline, @@ -1768,11 +1761,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; Azure::Core::Nullable ClientRequestId; - Models::PathExpiryOptions XMsExpiryOption; + PathExpiryOptions XMsExpiryOption; Azure::Core::Nullable PathExpiryTime; }; - static Azure::Core::Response SetExpiry( + static Azure::Core::Response SetExpiry( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1803,7 +1796,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1811,7 +1804,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The file or directory was created. - Models::PathCreateResult result; + PathCreateResult result; if (response.GetHeaders().find(Details::HeaderETag) != response.GetHeaders().end()) { result.ETag = response.GetHeaders().at(Details::HeaderETag); @@ -1834,7 +1827,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { result.ContentLength = std::stoll(response.GetHeaders().at(Details::HeaderContentLength)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1844,7 +1837,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response LeaseParseResult( + static Azure::Core::Response LeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1852,7 +1845,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The "renew", "change" or "release" action was successful. - Models::PathLeaseResult result; + PathLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -1861,13 +1854,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // A new lease has been created. The "acquire" action was successful. - Models::PathLeaseResult result; + PathLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -1876,19 +1869,19 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The "break" lease action was successful. - Models::PathLeaseResult result; + PathLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); result.LeaseTime = std::stoi(response.GetHeaders().at(Details::HeaderLeaseTime)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1898,7 +1891,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1906,7 +1899,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Returns all properties for the file or directory. - Models::PathGetPropertiesResult result; + PathGetPropertiesResult result; if (response.GetHeaders().find(Details::HeaderAcceptRanges) != response.GetHeaders().end()) { @@ -1979,15 +1972,15 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { != response.GetHeaders().end()) { result.LeaseState - = Models::LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); + = LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); } if (response.GetHeaders().find(Details::HeaderLeaseStatus) != response.GetHeaders().end()) { result.LeaseStatus - = Models::LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); + = LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1997,7 +1990,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2005,13 +1998,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The file was deleted. - Models::PathDeleteResult result; + PathDeleteResult result; if (response.GetHeaders().find(Details::HeaderContinuationToken) != response.GetHeaders().end()) { result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2021,8 +2014,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response - SetAccessControlParseResult( + static Azure::Core::Response SetAccessControlParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2030,12 +2022,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Set directory access control response. - Models::PathSetAccessControlResult result; + PathSetAccessControlResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2045,7 +2037,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response + static Azure::Core::Response SetAccessControlRecursiveParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) @@ -2055,8 +2047,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // Set directory access control recursive response. const auto& bodyBuffer = response.GetBody(); - Models::PathSetAccessControlRecursiveResult result = bodyBuffer.empty() - ? Models::PathSetAccessControlRecursiveResult() + PathSetAccessControlRecursiveResult result = bodyBuffer.empty() + ? PathSetAccessControlRecursiveResult() : PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse( SetAccessControlRecursiveResponseFromJson( Azure::Core::Internal::Json::json::parse(bodyBuffer))); @@ -2065,7 +2057,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2075,20 +2067,19 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Models::AclFailedEntry AclFailedEntryFromJson( - const Azure::Core::Internal::Json::json& node) + static AclFailedEntry AclFailedEntryFromJson(const Azure::Core::Internal::Json::json& node) { - Models::AclFailedEntry result; + AclFailedEntry result; result.Name = node["name"].get(); result.Type = node["type"].get(); result.ErrorMessage = node["errorMessage"].get(); return result; } - static Models::SetAccessControlRecursiveResponse SetAccessControlRecursiveResponseFromJson( + static SetAccessControlRecursiveResponse SetAccessControlRecursiveResponseFromJson( const Azure::Core::Internal::Json::json& node) { - Models::SetAccessControlRecursiveResponse result; + SetAccessControlRecursiveResponse result; result.DirectoriesSuccessful = node["directoriesSuccessful"].get(); result.FilesSuccessful = node["filesSuccessful"].get(); result.FailureCount = node["failureCount"].get(); @@ -2099,11 +2090,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static Models::PathSetAccessControlRecursiveResult + static PathSetAccessControlRecursiveResult PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse( - Models::SetAccessControlRecursiveResponse object) + SetAccessControlRecursiveResponse object) { - Models::PathSetAccessControlRecursiveResult result; + PathSetAccessControlRecursiveResult result; result.DirectoriesSuccessful = object.DirectoriesSuccessful; result.FilesSuccessful = object.FilesSuccessful; result.FailureCount = object.FailureCount; @@ -2111,7 +2102,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static Azure::Core::Response FlushDataParseResult( + static Azure::Core::Response FlushDataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2119,7 +2110,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The data was flushed (written) to the file successfully. - Models::PathFlushDataResult result; + PathFlushDataResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -2130,7 +2121,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { result.ContentLength = std::stoll(response.GetHeaders().at(Details::HeaderContentLength)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2140,7 +2131,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response AppendDataParseResult( + static Azure::Core::Response AppendDataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2148,7 +2139,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Append data to file control response. - Models::PathAppendDataResult result; + PathAppendDataResult result; if (response.GetHeaders().find(Details::HeaderContentHashMd5) != response.GetHeaders().end()) { @@ -2164,7 +2155,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } result.IsServerEncrypted = response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2174,7 +2165,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response SetExpiryParseResult( + static Azure::Core::Response SetExpiryParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2182,12 +2173,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The blob expiry was set successfully. - Models::PathSetExpiryResult result; + PathSetExpiryResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else diff --git a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp index 74dcc4599..4784989f6 100644 --- a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp +++ b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp @@ -88,7 +88,7 @@ void DataLakeGettingStarted() // List all file systems. std::string continuation; - std::vector fileSystems; + std::vector fileSystems; do { auto response = serviceClient.ListFileSystemsSinglePage(); @@ -96,8 +96,7 @@ void DataLakeGettingStarted() { continuation = response->ContinuationToken.GetValue(); } - fileSystems.insert( - fileSystems.end(), response->Filesystems.begin(), response->Filesystems.end()); + fileSystems.insert(fileSystems.end(), response->Items.begin(), response->Items.end()); } while (!continuation.empty()); // Delete file system. diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp index 59946e7c4..f51bac5ab 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp @@ -35,13 +35,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return blobOptions; } - std::vector FileSystemsFromContainerItems( + std::vector FileSystemsFromContainerItems( const std::vector& items) { - std::vector fileSystems; + std::vector fileSystems; for (const auto& item : items) { - Models::FileSystem fileSystem; + Models::FileSystemItem fileSystem; fileSystem.ETag = item.ETag; fileSystem.Name = item.Name; fileSystem.LastModified = item.LastModified; @@ -184,7 +184,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = m_blobServiceClient.ListBlobContainersSinglePage(blobOptions); auto response = Models::ListFileSystemsSinglePageResult(); response.ContinuationToken = std::move(result->ContinuationToken); - response.Filesystems = FileSystemsFromContainerItems(result->Items); + response.Items = FileSystemsFromContainerItems(result->Items); return Azure::Core::Response( std::move(response), result.ExtractRawResponse()); } diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp index fd5ccf819..4c1d621d7 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp @@ -50,11 +50,11 @@ namespace Azure { namespace Storage { namespace Test { void DataLakeFileSystemClientTest::TearDownTestSuite() { m_fileSystemClient->Delete(); } - std::vector DataLakeFileSystemClientTest::ListAllPaths( + std::vector DataLakeFileSystemClientTest::ListAllPaths( bool recursive, const std::string& directory) { - std::vector result; + std::vector result; std::string continuation; Files::DataLake::ListPathsSinglePageOptions options; if (!directory.empty()) @@ -64,7 +64,7 @@ namespace Azure { namespace Storage { namespace Test { do { auto response = m_fileSystemClient->ListPathsSinglePage(recursive, options); - result.insert(result.end(), response->Paths.begin(), response->Paths.end()); + result.insert(result.end(), response->Items.begin(), response->Items.end()); if (response->ContinuationToken.HasValue()) { continuation = response->ContinuationToken.GetValue(); @@ -239,7 +239,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) { return path.Name == name; }); EXPECT_NE(result.end(), iter); @@ -249,7 +249,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) { return path.Name == name; }); EXPECT_NE(result.end(), iter); @@ -263,7 +263,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) { return path.Name == name; }); EXPECT_NE(result.end(), iter); @@ -273,7 +273,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) { return path.Name == name; }); EXPECT_EQ(result.end(), iter); @@ -284,7 +284,7 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::ListPathsSinglePageOptions options; options.PageSizeHint = 2; auto response = m_fileSystemClient->ListPathsSinglePage(true, options); - EXPECT_LE(2U, response->Paths.size()); + EXPECT_LE(2U, response->Items.size()); } } diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp index ce47d99c3..4d49e0d19 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp @@ -12,7 +12,7 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static std::vector ListAllPaths( + static std::vector ListAllPaths( bool recursive, const std::string& directory = std::string()); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp index 10807d6d9..5a24fa868 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp @@ -53,10 +53,10 @@ namespace Azure { namespace Storage { namespace Test { } } - std::vector DataLakeServiceClientTest::ListAllFileSystems( - const std::string& prefix) + std::vector + DataLakeServiceClientTest::ListAllFileSystems(const std::string& prefix) { - std::vector result; + std::vector result; std::string continuation; Files::DataLake::ListFileSystemsSinglePageOptions options; if (!prefix.empty()) @@ -66,7 +66,7 @@ namespace Azure { namespace Storage { namespace Test { do { auto response = m_dataLakeServiceClient->ListFileSystemsSinglePage(options); - result.insert(result.end(), response->Filesystems.begin(), response->Filesystems.end()); + result.insert(result.end(), response->Items.begin(), response->Items.end()); if (response->ContinuationToken.HasValue()) { continuation = response->ContinuationToken.GetValue(); @@ -86,7 +86,7 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( result.begin(), result.end(), - [&name](const Files::DataLake::Models::FileSystem& fileSystem) { + [&name](const Files::DataLake::Models::FileSystemItem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixA.size()), m_fileSystemPrefixA); @@ -97,7 +97,7 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( result.begin(), result.end(), - [&name](const Files::DataLake::Models::FileSystem& fileSystem) { + [&name](const Files::DataLake::Models::FileSystemItem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixB.size()), m_fileSystemPrefixB); @@ -112,7 +112,7 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( result.begin(), result.end(), - [&name](const Files::DataLake::Models::FileSystem& fileSystem) { + [&name](const Files::DataLake::Models::FileSystemItem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixA.size()), m_fileSystemPrefixA); @@ -123,7 +123,7 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( result.begin(), result.end(), - [&name](const Files::DataLake::Models::FileSystem& fileSystem) { + [&name](const Files::DataLake::Models::FileSystemItem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(result.end(), iter); @@ -134,7 +134,7 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::ListFileSystemsSinglePageOptions options; options.PageSizeHint = 2; auto response = m_dataLakeServiceClient->ListFileSystemsSinglePage(options); - EXPECT_LE(2U, response->Filesystems.size()); + EXPECT_LE(2U, response->Items.size()); } } diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp index 9ed09bacf..448318884 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp @@ -12,7 +12,7 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static std::vector ListAllFileSystems( + static std::vector ListAllFileSystems( const std::string& prefix = std::string()); static std::shared_ptr m_dataLakeServiceClient; diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md index 993ebe6ab..251063eb1 100644 --- a/sdk/storage/azure-storage-files-shares/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-shares/CHANGELOG.md @@ -8,6 +8,9 @@ - `ContentRange` in `FileDownloadResult` is now `Azure::Core::Http::Range`. - `ContentLength` in `FileDownloadResult` is renamed to `FileSize`. - Renamed `GetUri` to `GetUrl`. +- Moved all protocol layer generated result types to `Details` namespace. +- Renamed `ShareItems` in `ListSharesResponse` to `Items`. +- Renamed `ShareItems` in `ServiceListSharesSinglePageResult` to `Items`. ## 12.0.0-beta.6 (2020-01-14) diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp index ea12d02e3..eb0fea9b3 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -24,108 +25,8 @@ #include #include -#include - namespace Azure { namespace Storage { namespace Files { namespace Shares { - namespace Details { - constexpr static const char* DefaultServiceApiVersion = "2020-02-10"; - constexpr static const char* QueryCopyId = "copyid"; - constexpr static const char* QueryListSharesInclude = "include"; - constexpr static const char* QueryContinuationToken = "marker"; - constexpr static const char* QueryPageSizeHint = "maxresults"; - constexpr static const char* QueryPrefix = "prefix"; - constexpr static const char* QueryPrevShareSnapshot = "prevsharesnapshot"; - constexpr static const char* QueryShareSnapshot = "sharesnapshot"; - constexpr static const char* QueryTimeout = "timeout"; - constexpr static const char* QueryRestype = "restype"; - constexpr static const char* QueryComp = "comp"; - constexpr static const char* HeaderVersion = "x-ms-version"; - constexpr static const char* HeaderRequestId = "x-ms-client-request-id"; - constexpr static const char* HeaderContentLength = "content-length"; - constexpr static const char* HeaderContentHashMd5 = "content-md5"; - constexpr static const char* HeaderCopyActionAbortConstant = "x-ms-copy-action"; - constexpr static const char* HeaderCopySource = "x-ms-copy-source"; - constexpr static const char* HeaderFilePermissionCopyMode = "x-ms-file-permission-copy-mode"; - constexpr static const char* HeaderIgnoreReadOnly = "x-ms-file-copy-ignore-read-only"; - constexpr static const char* HeaderFileAttributes = "x-ms-file-attributes"; - constexpr static const char* HeaderFileCreatedOn = "x-ms-file-creation-time"; - constexpr static const char* HeaderFileLastWrittenOn = "x-ms-file-last-write-time"; - constexpr static const char* HeaderSetArchiveAttribute = "x-ms-file-copy-set-archive"; - constexpr static const char* HeaderDeletedShareName = "x-ms-deleted-share-name"; - constexpr static const char* HeaderDeletedShareVersion = "x-ms-deleted-share-version"; - constexpr static const char* HeaderDeleteSnapshots = "x-ms-delete-snapshots"; - constexpr static const char* HeaderFileCacheControl = "x-ms-cache-control"; - constexpr static const char* HeaderFileContentDisposition = "x-ms-content-disposition"; - constexpr static const char* HeaderFileContentEncoding = "x-ms-content-encoding"; - constexpr static const char* HeaderFileContentLanguage = "x-ms-content-language"; - constexpr static const char* HeaderFileContentType = "x-ms-content-type"; - constexpr static const char* HeaderFilePermission = "x-ms-file-permission"; - constexpr static const char* HeaderFilePermissionKey = "x-ms-file-permission-key"; - constexpr static const char* HeaderFileRangeWriteFromUrl = "x-ms-write"; - constexpr static const char* HeaderFileRangeWriteFromUrlDefault = "update"; - constexpr static const char* HeaderFileTypeConstant = "x-ms-type"; - constexpr static const char* HeaderRangeGetContentMd5 = "x-ms-range-get-content-md5"; - constexpr static const char* HeaderHandleId = "x-ms-handle-id"; - constexpr static const char* HeaderBreakPeriod = "x-ms-lease-break-period"; - constexpr static const char* HeaderDuration = "x-ms-lease-duration"; - constexpr static const char* HeaderLeaseId = "x-ms-lease-id"; - constexpr static const char* HeaderMetadata = "x-ms-meta"; - constexpr static const char* HeaderProposedLeaseId = "x-ms-proposed-lease-id"; - constexpr static const char* HeaderRange = "x-ms-range"; - constexpr static const char* HeaderRecursive = "x-ms-recursive"; - constexpr static const char* HeaderQuota = "x-ms-share-quota"; - constexpr static const char* HeaderSourceContentHashCrc64 = "x-ms-source-content-crc64"; - constexpr static const char* HeaderSourceIfMatchHashCrc64 = "x-ms-source-if-match-crc64"; - constexpr static const char* HeaderSourceIfNoneMatchHashCrc64 - = "x-ms-source-if-none-match-crc64"; - constexpr static const char* HeaderSourceRange = "x-ms-source-range"; - constexpr static const char* HeaderErrorCode = "x-ms-error-code"; - constexpr static const char* HeaderETag = "etag"; - constexpr static const char* HeaderLastModified = "last-modified"; - constexpr static const char* HeaderDate = "date"; - constexpr static const char* HeaderProvisionedIops = "x-ms-share-provisioned-iops"; - constexpr static const char* HeaderProvisionedIngressMBps - = "x-ms-share-provisioned-ingress-mbps"; - constexpr static const char* HeaderProvisionedEgressMBps = "x-ms-share-provisioned-egress-mbps"; - constexpr static const char* HeaderNextAllowedQuotaDowngradeTime - = "x-ms-share-next-allowed-quota-downgrade-time"; - constexpr static const char* HeaderLeaseDuration = "x-ms-lease-duration"; - constexpr static const char* HeaderLeaseState = "x-ms-lease-state"; - constexpr static const char* HeaderLeaseStatus = "x-ms-lease-status"; - constexpr static const char* HeaderLeaseTime = "x-ms-lease-time"; - constexpr static const char* HeaderClientRequestId = "x-ms-client-request-id"; - constexpr static const char* HeaderAction = "x-ms-lease-action"; - constexpr static const char* HeaderSnapshot = "x-ms-snapshot"; - constexpr static const char* HeaderRequestIsServerEncrypted = "x-ms-request-server-encrypted"; - constexpr static const char* HeaderFileChangedOn = "x-ms-file-change-time"; - constexpr static const char* HeaderFileId = "x-ms-file-id"; - constexpr static const char* HeaderFileParentId = "x-ms-file-parent-id"; - constexpr static const char* HeaderIsServerEncrypted = "x-ms-server-encrypted"; - constexpr static const char* HeaderContentType = "content-type"; - constexpr static const char* HeaderContinuationToken = "x-ms-marker"; - constexpr static const char* HeaderNumberOfHandlesClosed = "x-ms-number-of-handles-closed"; - constexpr static const char* HeaderNumberOfHandlesFailedToClose - = "x-ms-number-of-handles-failed"; - constexpr static const char* HeaderXMsContentLength = "x-ms-content-length"; - constexpr static const char* HeaderContentRange = "content-range"; - constexpr static const char* HeaderTransactionalContentHashMd5 = "content-md5"; - constexpr static const char* HeaderContentEncoding = "content-encoding"; - constexpr static const char* HeaderCacheControl = "cache-control"; - constexpr static const char* HeaderContentDisposition = "content-disposition"; - constexpr static const char* HeaderContentLanguage = "content-language"; - constexpr static const char* HeaderAcceptRanges = "accept-ranges"; - constexpr static const char* HeaderCopyCompletedOn = "x-ms-copy-completion-time"; - constexpr static const char* HeaderCopyStatusDescription = "x-ms-copy-status-description"; - constexpr static const char* HeaderCopyId = "x-ms-copy-id"; - constexpr static const char* HeaderCopyProgress = "x-ms-copy-progress"; - constexpr static const char* HeaderCopyStatus = "x-ms-copy-status"; - constexpr static const char* HeaderFileType = "x-ms-type"; - constexpr static const char* HeaderXMsRange = "x-ms-range"; - constexpr static const char* HeaderFileRangeWrite = "x-ms-write"; - constexpr static const char* HeaderFileRangeWriteTypeDefault = "update"; - constexpr static const char* HeaderTransactionalContentHashCrc64 = "x-ms-content-crc64"; - } // namespace Details namespace Models { struct ShareFileHttpHeaders { @@ -245,14 +146,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileItem { std::string Name; - Models::FileProperty Properties; - }; - - // Abstract for entries that can be listed from Directory. - struct FilesAndDirectoriesListSinglePage - { - std::vector DirectoryItems; - std::vector FileItems; + FileProperty Properties; }; // A listed Azure Storage handle item. @@ -320,27 +214,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string m_value; }; // extensible enum LeaseStatusType - // An enumeration of directories and files. - struct ListFilesAndDirectoriesSinglePageResponse - { - std::string ServiceEndpoint; - std::string ShareName; - std::string ShareSnapshot; - std::string DirectoryPath; - std::string Prefix; - std::string PreviousContinuationToken; - int32_t PageSizeHint = int32_t(); - Models::FilesAndDirectoriesListSinglePage SinglePage; - std::string ContinuationToken; - }; - - // An enumeration of handles. - struct ListHandlesResponse - { - std::vector HandleList; - std::string ContinuationToken; - }; - // Properties of a share. struct ShareProperties { @@ -353,9 +226,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable NextAllowedQuotaDowngradeTime; Azure::Core::Nullable DeletedOn; int32_t RemainingRetentionDays = int32_t(); - Models::LeaseStatusType LeaseStatus; - Models::LeaseStateType LeaseState; - Models::LeaseDurationType LeaseDuration; + LeaseStatusType LeaseStatus; + LeaseStateType LeaseState; + LeaseDurationType LeaseDuration; }; // A listed Azure Storage share item. @@ -365,21 +238,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string Snapshot; bool Deleted = bool(); std::string Version; - Models::ShareProperties Properties; + ShareProperties Properties; Storage::Metadata ShareMetadata; }; - // An enumeration of shares. - struct ListSharesResponse - { - std::string ServiceEndpoint; - std::string Prefix; - std::string PreviousContinuationToken; - int32_t PageSizeHint = int32_t(); - std::vector ShareItems; - std::string ContinuationToken; - }; - // The retention policy. struct ShareRetentionPolicy { @@ -399,7 +261,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { bool Enabled = bool(); // Indicates whether metrics are enabled for the File service. Azure::Core::Nullable IncludeApis; // Indicates whether metrics should generate summary // statistics for called API operations. - Models::ShareRetentionPolicy RetentionPolicy; + ShareRetentionPolicy RetentionPolicy; }; // Settings for SMB multichannel @@ -425,13 +287,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // Settings for SMB protocol. struct SmbSettings { - Models::SmbMultichannel Multichannel; // Settings for SMB Multichannel. + SmbMultichannel Multichannel; // Settings for SMB Multichannel. }; // Protocol settings struct ShareProtocolSettings { - Models::SmbSettings Settings; // Settings for SMB protocol. + SmbSettings Settings; // Settings for SMB protocol. }; // The list of file ranges @@ -453,18 +315,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct SignedIdentifier { std::string Id; // A unique id. - Models::AccessPolicy Policy; // The access policy. + AccessPolicy Policy; // The access policy. }; // Storage service properties. struct StorageServiceProperties { - Models::Metrics HourMetrics; // A summary of request statistics grouped by API in hourly - // aggregates for files. - Models::Metrics MinuteMetrics; // A summary of request statistics grouped by API in minute - // aggregates for files. - std::vector Cors; // The set of CORS rules. - Azure::Core::Nullable Protocol; // Protocol settings + Metrics HourMetrics; // A summary of request statistics grouped by API in hourly aggregates + // for files. + Metrics MinuteMetrics; // A summary of request statistics grouped by API in minute aggregates + // for files. + std::vector Cors; // The set of CORS rules. + Azure::Core::Nullable Protocol; // Protocol settings }; // A permission (a security descriptor) at the share level. @@ -531,16 +393,213 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string m_value; }; // extensible enum FileRangeWriteType + enum class ListSharesIncludeType + { + None = 0, + Snapshots = 1, + Metadata = 2, + Deleted = 4, + }; + + inline ListSharesIncludeType operator|(ListSharesIncludeType lhs, ListSharesIncludeType rhs) + { + using type = std::underlying_type_t; + return static_cast(static_cast(lhs) | static_cast(rhs)); + } + + inline ListSharesIncludeType& operator|=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) + { + lhs = lhs | rhs; + return lhs; + } + + inline ListSharesIncludeType operator&(ListSharesIncludeType lhs, ListSharesIncludeType rhs) + { + using type = std::underlying_type_t; + return static_cast(static_cast(lhs) & static_cast(rhs)); + } + + inline ListSharesIncludeType& operator&=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) + { + lhs = lhs & rhs; + return lhs; + } + inline std::string ListSharesIncludeTypeToString(const ListSharesIncludeType& val) + { + ListSharesIncludeType value_list[] = { + ListSharesIncludeType::Snapshots, + ListSharesIncludeType::Metadata, + ListSharesIncludeType::Deleted, + }; + const char* string_list[] = { + "snapshots", + "metadata", + "deleted", + }; + std::string result; + for (std::size_t i = 0; i < sizeof(value_list) / sizeof(ListSharesIncludeType); ++i) + { + if ((val & value_list[i]) == value_list[i]) + { + if (!result.empty()) + { + result += ","; + } + result += string_list[i]; + } + } + return result; + } + + } // namespace Models + namespace Details { + using namespace Models; + constexpr static const char* DefaultServiceApiVersion = "2020-02-10"; + constexpr static const char* QueryCopyId = "copyid"; + constexpr static const char* QueryListSharesInclude = "include"; + constexpr static const char* QueryContinuationToken = "marker"; + constexpr static const char* QueryPageSizeHint = "maxresults"; + constexpr static const char* QueryPrefix = "prefix"; + constexpr static const char* QueryPrevShareSnapshot = "prevsharesnapshot"; + constexpr static const char* QueryShareSnapshot = "sharesnapshot"; + constexpr static const char* QueryTimeout = "timeout"; + constexpr static const char* QueryRestype = "restype"; + constexpr static const char* QueryComp = "comp"; + constexpr static const char* HeaderVersion = "x-ms-version"; + constexpr static const char* HeaderRequestId = "x-ms-client-request-id"; + constexpr static const char* HeaderContentLength = "content-length"; + constexpr static const char* HeaderContentHashMd5 = "content-md5"; + constexpr static const char* HeaderCopyActionAbortConstant = "x-ms-copy-action"; + constexpr static const char* HeaderCopySource = "x-ms-copy-source"; + constexpr static const char* HeaderFilePermissionCopyMode = "x-ms-file-permission-copy-mode"; + constexpr static const char* HeaderIgnoreReadOnly = "x-ms-file-copy-ignore-read-only"; + constexpr static const char* HeaderFileAttributes = "x-ms-file-attributes"; + constexpr static const char* HeaderFileCreatedOn = "x-ms-file-creation-time"; + constexpr static const char* HeaderFileLastWrittenOn = "x-ms-file-last-write-time"; + constexpr static const char* HeaderSetArchiveAttribute = "x-ms-file-copy-set-archive"; + constexpr static const char* HeaderDeletedShareName = "x-ms-deleted-share-name"; + constexpr static const char* HeaderDeletedShareVersion = "x-ms-deleted-share-version"; + constexpr static const char* HeaderDeleteSnapshots = "x-ms-delete-snapshots"; + constexpr static const char* HeaderFileCacheControl = "x-ms-cache-control"; + constexpr static const char* HeaderFileContentDisposition = "x-ms-content-disposition"; + constexpr static const char* HeaderFileContentEncoding = "x-ms-content-encoding"; + constexpr static const char* HeaderFileContentLanguage = "x-ms-content-language"; + constexpr static const char* HeaderFileContentType = "x-ms-content-type"; + constexpr static const char* HeaderFilePermission = "x-ms-file-permission"; + constexpr static const char* HeaderFilePermissionKey = "x-ms-file-permission-key"; + constexpr static const char* HeaderFileRangeWriteFromUrl = "x-ms-write"; + constexpr static const char* HeaderFileRangeWriteFromUrlDefault = "update"; + constexpr static const char* HeaderFileTypeConstant = "x-ms-type"; + constexpr static const char* HeaderRangeGetContentMd5 = "x-ms-range-get-content-md5"; + constexpr static const char* HeaderHandleId = "x-ms-handle-id"; + constexpr static const char* HeaderBreakPeriod = "x-ms-lease-break-period"; + constexpr static const char* HeaderDuration = "x-ms-lease-duration"; + constexpr static const char* HeaderLeaseId = "x-ms-lease-id"; + constexpr static const char* HeaderMetadata = "x-ms-meta"; + constexpr static const char* HeaderProposedLeaseId = "x-ms-proposed-lease-id"; + constexpr static const char* HeaderRange = "x-ms-range"; + constexpr static const char* HeaderRecursive = "x-ms-recursive"; + constexpr static const char* HeaderQuota = "x-ms-share-quota"; + constexpr static const char* HeaderSourceContentHashCrc64 = "x-ms-source-content-crc64"; + constexpr static const char* HeaderSourceIfMatchHashCrc64 = "x-ms-source-if-match-crc64"; + constexpr static const char* HeaderSourceIfNoneMatchHashCrc64 + = "x-ms-source-if-none-match-crc64"; + constexpr static const char* HeaderSourceRange = "x-ms-source-range"; + constexpr static const char* HeaderErrorCode = "x-ms-error-code"; + constexpr static const char* HeaderETag = "etag"; + constexpr static const char* HeaderLastModified = "last-modified"; + constexpr static const char* HeaderDate = "date"; + constexpr static const char* HeaderProvisionedIops = "x-ms-share-provisioned-iops"; + constexpr static const char* HeaderProvisionedIngressMBps + = "x-ms-share-provisioned-ingress-mbps"; + constexpr static const char* HeaderProvisionedEgressMBps = "x-ms-share-provisioned-egress-mbps"; + constexpr static const char* HeaderNextAllowedQuotaDowngradeTime + = "x-ms-share-next-allowed-quota-downgrade-time"; + constexpr static const char* HeaderLeaseDuration = "x-ms-lease-duration"; + constexpr static const char* HeaderLeaseState = "x-ms-lease-state"; + constexpr static const char* HeaderLeaseStatus = "x-ms-lease-status"; + constexpr static const char* HeaderLeaseTime = "x-ms-lease-time"; + constexpr static const char* HeaderClientRequestId = "x-ms-client-request-id"; + constexpr static const char* HeaderAction = "x-ms-lease-action"; + constexpr static const char* HeaderSnapshot = "x-ms-snapshot"; + constexpr static const char* HeaderRequestIsServerEncrypted = "x-ms-request-server-encrypted"; + constexpr static const char* HeaderFileChangedOn = "x-ms-file-change-time"; + constexpr static const char* HeaderFileId = "x-ms-file-id"; + constexpr static const char* HeaderFileParentId = "x-ms-file-parent-id"; + constexpr static const char* HeaderIsServerEncrypted = "x-ms-server-encrypted"; + constexpr static const char* HeaderContentType = "content-type"; + constexpr static const char* HeaderContinuationToken = "x-ms-marker"; + constexpr static const char* HeaderNumberOfHandlesClosed = "x-ms-number-of-handles-closed"; + constexpr static const char* HeaderNumberOfHandlesFailedToClose + = "x-ms-number-of-handles-failed"; + constexpr static const char* HeaderXMsContentLength = "x-ms-content-length"; + constexpr static const char* HeaderContentRange = "content-range"; + constexpr static const char* HeaderTransactionalContentHashMd5 = "content-md5"; + constexpr static const char* HeaderContentEncoding = "content-encoding"; + constexpr static const char* HeaderCacheControl = "cache-control"; + constexpr static const char* HeaderContentDisposition = "content-disposition"; + constexpr static const char* HeaderContentLanguage = "content-language"; + constexpr static const char* HeaderAcceptRanges = "accept-ranges"; + constexpr static const char* HeaderCopyCompletedOn = "x-ms-copy-completion-time"; + constexpr static const char* HeaderCopyStatusDescription = "x-ms-copy-status-description"; + constexpr static const char* HeaderCopyId = "x-ms-copy-id"; + constexpr static const char* HeaderCopyProgress = "x-ms-copy-progress"; + constexpr static const char* HeaderCopyStatus = "x-ms-copy-status"; + constexpr static const char* HeaderFileType = "x-ms-type"; + constexpr static const char* HeaderXMsRange = "x-ms-range"; + constexpr static const char* HeaderFileRangeWrite = "x-ms-write"; + constexpr static const char* HeaderFileRangeWriteTypeDefault = "update"; + constexpr static const char* HeaderTransactionalContentHashCrc64 = "x-ms-content-crc64"; + + // Abstract for entries that can be listed from Directory. + struct FilesAndDirectoriesListSinglePage + { + std::vector DirectoryItems; + std::vector FileItems; + }; + + // An enumeration of directories and files. + struct ListFilesAndDirectoriesSinglePageResponse + { + std::string ServiceEndpoint; + std::string ShareName; + std::string ShareSnapshot; + std::string DirectoryPath; + std::string Prefix; + std::string PreviousContinuationToken; + int32_t PageSizeHint = int32_t(); + FilesAndDirectoriesListSinglePage SinglePage; + std::string ContinuationToken; + }; + + // An enumeration of handles. + struct ListHandlesResponse + { + std::vector HandleList; + std::string ContinuationToken; + }; + + // An enumeration of shares. + struct ListSharesResponse + { + std::string ServiceEndpoint; + std::string Prefix; + std::string PreviousContinuationToken; + int32_t PageSizeHint = int32_t(); + std::vector Items; + std::string ContinuationToken; + }; + struct ServiceSetPropertiesResult { }; struct ServiceGetPropertiesResult { - Models::Metrics HourMetrics; - Models::Metrics MinuteMetrics; - std::vector Cors; - Azure::Core::Nullable Protocol; + Metrics HourMetrics; + Metrics MinuteMetrics; + std::vector Cors; + Azure::Core::Nullable Protocol; }; struct ServiceListSharesSinglePageResult @@ -549,7 +608,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string Prefix; std::string PreviousContinuationToken; int32_t PageSizeHint = int32_t(); - std::vector ShareItems; + std::vector Items; std::string ContinuationToken; }; @@ -648,7 +707,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareGetAccessPolicyResult { - std::vector SignedIdentifiers; + std::vector SignedIdentifiers; std::string ETag; Core::DateTime LastModified; }; @@ -734,14 +793,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string Prefix; std::string PreviousContinuationToken; int32_t PageSizeHint = int32_t(); - Models::FilesAndDirectoriesListSinglePage SinglePage; + FilesAndDirectoriesListSinglePage SinglePage; std::string ContinuationToken; ShareFileHttpHeaders HttpHeaders; }; struct DirectoryListHandlesResult { - std::vector HandleList; + std::vector HandleList; std::string ContinuationToken; ShareFileHttpHeaders HttpHeaders; }; @@ -914,7 +973,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileListHandlesResult { - std::vector HandleList; + std::vector HandleList; std::string ContinuationToken; ShareFileHttpHeaders HttpHeaders; }; @@ -926,68 +985,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { int32_t numberOfHandlesFailedToClose = int32_t(); }; - enum class ListSharesIncludeType - { - None = 0, - Snapshots = 1, - Metadata = 2, - Deleted = 4, - - }; - - inline ListSharesIncludeType operator|(ListSharesIncludeType lhs, ListSharesIncludeType rhs) - { - using type = std::underlying_type_t; - return static_cast(static_cast(lhs) | static_cast(rhs)); - } - - inline ListSharesIncludeType& operator|=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) - { - lhs = lhs | rhs; - return lhs; - } - - inline ListSharesIncludeType operator&(ListSharesIncludeType lhs, ListSharesIncludeType rhs) - { - using type = std::underlying_type_t; - return static_cast(static_cast(lhs) & static_cast(rhs)); - } - - inline ListSharesIncludeType& operator&=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) - { - lhs = lhs & rhs; - return lhs; - } - inline std::string ListSharesIncludeTypeToString(const Models::ListSharesIncludeType& val) - { - Models::ListSharesIncludeType value_list[] = { - ListSharesIncludeType::Snapshots, - ListSharesIncludeType::Metadata, - ListSharesIncludeType::Deleted, - }; - const char* string_list[] = { - "snapshots", - "metadata", - "deleted", - }; - std::string result; - for (std::size_t i = 0; i < sizeof(value_list) / sizeof(Models::ListSharesIncludeType); ++i) - { - if ((val & value_list[i]) == value_list[i]) - { - if (!result.empty()) - { - result += ","; - } - result += string_list[i]; - } - } - return result; - } - - } // namespace Models - namespace Details { - class ShareRestClient { private: static Azure::Core::Http::Range HttpRangeFromXml(Storage::Details::XmlReader& reader) @@ -1049,12 +1046,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { public: struct SetPropertiesOptions { - Models::StorageServiceProperties ServiceProperties; + StorageServiceProperties ServiceProperties; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1091,7 +1088,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1116,13 +1113,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable Prefix; Azure::Core::Nullable ContinuationToken; Azure::Core::Nullable MaxResults; - Azure::Core::Nullable ListSharesInclude; + Azure::Core::Nullable ListSharesInclude; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response - ListSharesSinglePage( + static Azure::Core::Response ListSharesSinglePage( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1155,7 +1151,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { request.GetUrl().AppendQueryParameter( Details::QueryListSharesInclude, - Storage::Details::UrlEncodeQueryParameter(Models::ListSharesIncludeTypeToString( + Storage::Details::UrlEncodeQueryParameter(ListSharesIncludeTypeToString( listSharesSinglePageOptions.ListSharesInclude.GetValue()))); } if (listSharesSinglePageOptions.Timeout.HasValue()) @@ -1171,7 +1167,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response SetPropertiesParseResult( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1179,8 +1175,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted) - Models::ServiceSetPropertiesResult result; - return Azure::Core::Response( + ServiceSetPropertiesResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1192,7 +1188,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void ShareRetentionPolicyToXml( Storage::Details::XmlWriter& writer, - const Models::ShareRetentionPolicy& object) + const ShareRetentionPolicy& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); @@ -1211,7 +1207,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static void MetricsToXml(Storage::Details::XmlWriter& writer, const Models::Metrics& object) + static void MetricsToXml(Storage::Details::XmlWriter& writer, const Metrics& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Version"}); @@ -1239,9 +1235,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void CorsRuleToXml( - Storage::Details::XmlWriter& writer, - const Models::CorsRule& object) + static void CorsRuleToXml(Storage::Details::XmlWriter& writer, const CorsRule& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "CorsRule"}); @@ -1277,7 +1271,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void SmbMultichannelToXml( Storage::Details::XmlWriter& writer, - const Models::SmbMultichannel& object) + const SmbMultichannel& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Multichannel"}); @@ -1289,9 +1283,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void SmbSettingsToXml( - Storage::Details::XmlWriter& writer, - const Models::SmbSettings& object) + static void SmbSettingsToXml(Storage::Details::XmlWriter& writer, const SmbSettings& object) { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "SMB"}); SmbMultichannelToXml(writer, object.Multichannel); @@ -1300,7 +1292,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void ShareProtocolSettingsToXml( Storage::Details::XmlWriter& writer, - const Models::ShareProtocolSettings& object) + const ShareProtocolSettings& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "ProtocolSettings"}); @@ -1310,7 +1302,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void StorageServicePropertiesToXml( Storage::Details::XmlWriter& writer, - const Models::StorageServiceProperties& object) + const StorageServiceProperties& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "StorageServiceProperties"}); @@ -1338,7 +1330,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1349,11 +1341,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::ServiceGetPropertiesResult result = bodyBuffer.empty() - ? Models::ServiceGetPropertiesResult() + ServiceGetPropertiesResult result = bodyBuffer.empty() + ? ServiceGetPropertiesResult() : ServiceGetPropertiesResultFromStorageServiceProperties( StorageServicePropertiesFromXml(reader)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1363,10 +1355,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::ShareRetentionPolicy ShareRetentionPolicyFromXml( - Storage::Details::XmlReader& reader) + static ShareRetentionPolicy ShareRetentionPolicyFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ShareRetentionPolicy(); + auto result = ShareRetentionPolicy(); enum class XmlTagName { Days, @@ -1424,9 +1415,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::Metrics MetricsFromXml(Storage::Details::XmlReader& reader) + static Metrics MetricsFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::Metrics(); + auto result = Metrics(); enum class XmlTagName { Enabled, @@ -1504,9 +1495,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::CorsRule CorsRuleFromXml(Storage::Details::XmlReader& reader) + static CorsRule CorsRuleFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::CorsRule(); + auto result = CorsRule(); enum class XmlTagName { AllowedHeaders, @@ -1591,9 +1582,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::SmbMultichannel SmbMultichannelFromXml(Storage::Details::XmlReader& reader) + static SmbMultichannel SmbMultichannelFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::SmbMultichannel(); + auto result = SmbMultichannel(); enum class XmlTagName { Enabled, @@ -1642,9 +1633,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::SmbSettings SmbSettingsFromXml(Storage::Details::XmlReader& reader) + static SmbSettings SmbSettingsFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::SmbSettings(); + auto result = SmbSettings(); enum class XmlTagName { Multichannel, @@ -1695,10 +1686,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ShareProtocolSettings ShareProtocolSettingsFromXml( + static ShareProtocolSettings ShareProtocolSettingsFromXml( Storage::Details::XmlReader& reader) { - auto result = Models::ShareProtocolSettings(); + auto result = ShareProtocolSettings(); enum class XmlTagName { SMB, @@ -1749,10 +1740,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::StorageServiceProperties StorageServicePropertiesFromXml( + static StorageServiceProperties StorageServicePropertiesFromXml( Storage::Details::XmlReader& reader) { - auto result = Models::StorageServiceProperties(); + auto result = StorageServiceProperties(); enum class XmlTagName { Cors, @@ -1850,11 +1841,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ServiceGetPropertiesResult - ServiceGetPropertiesResultFromStorageServiceProperties( - Models::StorageServiceProperties object) + static ServiceGetPropertiesResult ServiceGetPropertiesResultFromStorageServiceProperties( + StorageServiceProperties object) { - Models::ServiceGetPropertiesResult result; + ServiceGetPropertiesResult result; result.HourMetrics = std::move(object.HourMetrics); result.MinuteMetrics = std::move(object.MinuteMetrics); result.Cors = std::move(object.Cors); @@ -1862,7 +1852,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Azure::Core::Response + static Azure::Core::Response ListSharesSinglePageParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) @@ -1874,11 +1864,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::ServiceListSharesSinglePageResult result = bodyBuffer.empty() - ? Models::ServiceListSharesSinglePageResult() + ServiceListSharesSinglePageResult result = bodyBuffer.empty() + ? ServiceListSharesSinglePageResult() : ServiceListSharesSinglePageResultFromListSharesResponse( ListSharesResponseFromXml(reader)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1888,9 +1878,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::LeaseStatusType LeaseStatusTypeFromXml(Storage::Details::XmlReader& reader) + static LeaseStatusType LeaseStatusTypeFromXml(Storage::Details::XmlReader& reader) { - Models::LeaseStatusType result; + LeaseStatusType result; enum class XmlTagName { LeaseStatus, @@ -1932,16 +1922,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { if (path.size() == 1 && path[0] == XmlTagName::LeaseStatus) { - result = Models::LeaseStatusType(node.Value); + result = LeaseStatusType(node.Value); } } } return result; } - static Models::LeaseStateType LeaseStateTypeFromXml(Storage::Details::XmlReader& reader) + static LeaseStateType LeaseStateTypeFromXml(Storage::Details::XmlReader& reader) { - Models::LeaseStateType result; + LeaseStateType result; enum class XmlTagName { LeaseState, @@ -1983,17 +1973,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { if (path.size() == 1 && path[0] == XmlTagName::LeaseState) { - result = Models::LeaseStateType(node.Value); + result = LeaseStateType(node.Value); } } } return result; } - static Models::LeaseDurationType LeaseDurationTypeFromXml( - Storage::Details::XmlReader& reader) + static LeaseDurationType LeaseDurationTypeFromXml(Storage::Details::XmlReader& reader) { - Models::LeaseDurationType result; + LeaseDurationType result; enum class XmlTagName { LeaseDuration, @@ -2035,16 +2024,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { if (path.size() == 1 && path[0] == XmlTagName::LeaseDuration) { - result = Models::LeaseDurationType(node.Value); + result = LeaseDurationType(node.Value); } } } return result; } - static Models::ShareProperties SharePropertiesFromXml(Storage::Details::XmlReader& reader) + static ShareProperties SharePropertiesFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ShareProperties(); + auto result = ShareProperties(); enum class XmlTagName { DeletedTime, @@ -2233,9 +2222,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ShareItem ShareItemFromXml(Storage::Details::XmlReader& reader) + static ShareItem ShareItemFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ShareItem(); + auto result = ShareItem(); enum class XmlTagName { Deleted, @@ -2332,10 +2321,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ListSharesResponse ListSharesResponseFromXml( - Storage::Details::XmlReader& reader) + static ListSharesResponse ListSharesResponseFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ListSharesResponse(); + auto result = ListSharesResponse(); enum class XmlTagName { EnumerationResults, @@ -2405,7 +2393,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (path.size() == 3 && path[0] == XmlTagName::EnumerationResults && path[1] == XmlTagName::Shares && path[2] == XmlTagName::Share) { - result.ShareItems.emplace_back(ShareItemFromXml(reader)); + result.Items.emplace_back(ShareItemFromXml(reader)); path.pop_back(); } } @@ -2447,15 +2435,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ServiceListSharesSinglePageResult - ServiceListSharesSinglePageResultFromListSharesResponse(Models::ListSharesResponse object) + static ServiceListSharesSinglePageResult + ServiceListSharesSinglePageResultFromListSharesResponse(ListSharesResponse object) { - Models::ServiceListSharesSinglePageResult result; + ServiceListSharesSinglePageResult result; result.ServiceEndpoint = std::move(object.ServiceEndpoint); result.Prefix = std::move(object.Prefix); result.PreviousContinuationToken = std::move(object.PreviousContinuationToken); result.PageSizeHint = object.PageSizeHint; - result.ShareItems = std::move(object.ShareItems); + result.Items = std::move(object.Items); result.ContinuationToken = std::move(object.ContinuationToken); return result; @@ -2472,7 +2460,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2509,7 +2497,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2545,11 +2533,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ShareSnapshot; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; - Azure::Core::Nullable XMsDeleteSnapshots; + Azure::Core::Nullable XMsDeleteSnapshots; Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2594,7 +2582,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response AcquireLease( + static Azure::Core::Response AcquireLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2645,7 +2633,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response ReleaseLease( + static Azure::Core::Response ReleaseLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2690,7 +2678,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response ChangeLease( + static Azure::Core::Response ChangeLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2740,7 +2728,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response RenewLease( + static Azure::Core::Response RenewLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2785,7 +2773,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ShareSnapshot; }; - static Azure::Core::Response BreakLease( + static Azure::Core::Response BreakLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2836,7 +2824,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response CreateSnapshot( + static Azure::Core::Response CreateSnapshot( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2865,10 +2853,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; - Models::SharePermission Permission; + SharePermission Permission; }; - static Azure::Core::Response CreatePermission( + static Azure::Core::Response CreatePermission( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2905,7 +2893,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response GetPermission( + static Azure::Core::Response GetPermission( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2935,7 +2923,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response SetQuota( + static Azure::Core::Response SetQuota( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2973,7 +2961,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3010,7 +2998,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response GetAccessPolicy( + static Azure::Core::Response GetAccessPolicy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3037,13 +3025,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct SetAccessPolicyOptions { - std::vector ShareAcl; + std::vector ShareAcl; Azure::Core::Nullable Timeout; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response SetAccessPolicy( + static Azure::Core::Response SetAccessPolicy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3086,7 +3074,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response GetStatistics( + static Azure::Core::Response GetStatistics( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3120,7 +3108,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable DeletedShareVersion; }; - static Azure::Core::Response Restore( + static Azure::Core::Response Restore( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3156,7 +3144,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3164,12 +3152,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share created. - Models::ShareCreateResult result; + ShareCreateResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3179,7 +3167,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3187,7 +3175,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - Models::ShareGetPropertiesResult result; + ShareGetPropertiesResult result; for (auto i = response.GetHeaders().lower_bound(Details::HeaderMetadata); i != response.GetHeaders().end() @@ -3229,22 +3217,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetHeaders().find(Details::HeaderLeaseDuration) != response.GetHeaders().end()) { - result.LeaseDuration = Models::LeaseDurationType( - response.GetHeaders().at(Details::HeaderLeaseDuration)); + result.LeaseDuration + = LeaseDurationType(response.GetHeaders().at(Details::HeaderLeaseDuration)); } if (response.GetHeaders().find(Details::HeaderLeaseState) != response.GetHeaders().end()) { result.LeaseState - = Models::LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); + = LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); } if (response.GetHeaders().find(Details::HeaderLeaseStatus) != response.GetHeaders().end()) { result.LeaseStatus - = Models::LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); + = LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3254,7 +3242,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3262,8 +3250,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Accepted - Models::ShareDeleteResult result; - return Azure::Core::Response( + ShareDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3273,7 +3261,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AcquireLeaseParseResult( + static Azure::Core::Response AcquireLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3281,7 +3269,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The Acquire operation completed successfully. - Models::ShareAcquireLeaseResult result; + ShareAcquireLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -3291,7 +3279,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::HeaderLeaseTime)); } result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3301,7 +3289,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ReleaseLeaseParseResult( + static Azure::Core::Response ReleaseLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3309,7 +3297,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Release operation completed successfully. - Models::ShareReleaseLeaseResult result; + ShareReleaseLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -3318,7 +3306,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::HeaderLeaseTime)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3328,7 +3316,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ChangeLeaseParseResult( + static Azure::Core::Response ChangeLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3336,7 +3324,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Change operation completed successfully. - Models::ShareChangeLeaseResult result; + ShareChangeLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -3346,7 +3334,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::HeaderLeaseTime)); } result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3356,7 +3344,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response RenewLeaseParseResult( + static Azure::Core::Response RenewLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3364,7 +3352,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Renew operation completed successfully. - Models::ShareRenewLeaseResult result; + ShareRenewLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -3374,7 +3362,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::HeaderLeaseTime)); } result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3384,7 +3372,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response BreakLeaseParseResult( + static Azure::Core::Response BreakLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3392,7 +3380,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The Break operation completed successfully. - Models::ShareBreakLeaseResult result; + ShareBreakLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -3405,7 +3393,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3415,7 +3403,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response CreateSnapshotParseResult( + static Azure::Core::Response CreateSnapshotParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3423,13 +3411,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share snapshot created. - Models::ShareCreateSnapshotResult result; + ShareCreateSnapshotResult result; result.Snapshot = response.GetHeaders().at(Details::HeaderSnapshot); result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3439,8 +3427,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response - CreatePermissionParseResult( + static Azure::Core::Response CreatePermissionParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3448,9 +3435,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share level permission created. - Models::ShareCreatePermissionResult result; + ShareCreatePermissionResult result; result.FilePermissionKey = response.GetHeaders().at(Details::HeaderFilePermissionKey); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3462,12 +3449,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void SharePermissionToJson( Azure::Core::Internal::Json::json& node, - const Models::SharePermission& object) + const SharePermission& object) { node["permission"] = object.Permission; } - static Azure::Core::Response GetPermissionParseResult( + static Azure::Core::Response GetPermissionParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3476,11 +3463,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success const auto& bodyBuffer = response.GetBody(); - Models::ShareGetPermissionResult result = bodyBuffer.empty() - ? Models::ShareGetPermissionResult() + ShareGetPermissionResult result = bodyBuffer.empty() + ? ShareGetPermissionResult() : ShareGetPermissionResultFromSharePermission( SharePermissionFromJson(Azure::Core::Internal::Json::json::parse(bodyBuffer))); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3490,23 +3477,23 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::SharePermission SharePermissionFromJson( + static SharePermission SharePermissionFromJson( const Azure::Core::Internal::Json::json& node) { - Models::SharePermission result; + SharePermission result; result.Permission = node["permission"].get(); return result; } - static Models::ShareGetPermissionResult ShareGetPermissionResultFromSharePermission( - Models::SharePermission object) + static ShareGetPermissionResult ShareGetPermissionResultFromSharePermission( + SharePermission object) { - Models::ShareGetPermissionResult result; + ShareGetPermissionResult result; result.Permission = std::move(object.Permission); return result; } - static Azure::Core::Response SetQuotaParseResult( + static Azure::Core::Response SetQuotaParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3514,12 +3501,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - Models::ShareSetQuotaResult result; + ShareSetQuotaResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3529,7 +3516,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResult( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3537,12 +3524,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - Models::ShareSetMetadataResult result; + ShareSetMetadataResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3552,7 +3539,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetAccessPolicyParseResult( + static Azure::Core::Response GetAccessPolicyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3563,14 +3550,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::ShareGetAccessPolicyResult result = bodyBuffer.empty() - ? Models::ShareGetAccessPolicyResult() + ShareGetAccessPolicyResult result = bodyBuffer.empty() + ? ShareGetAccessPolicyResult() : ShareGetAccessPolicyResultFromSignedIdentifiers(SignedIdentifiersFromXml(reader)); result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3580,9 +3567,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::AccessPolicy AccessPolicyFromXml(Storage::Details::XmlReader& reader) + static AccessPolicy AccessPolicyFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::AccessPolicy(); + auto result = AccessPolicy(); enum class XmlTagName { Expiry, @@ -3651,9 +3638,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::SignedIdentifier SignedIdentifierFromXml(Storage::Details::XmlReader& reader) + static SignedIdentifier SignedIdentifierFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::SignedIdentifier(); + auto result = SignedIdentifier(); enum class XmlTagName { AccessPolicy, @@ -3713,10 +3700,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static std::vector SignedIdentifiersFromXml( + static std::vector SignedIdentifiersFromXml( Storage::Details::XmlReader& reader) { - auto result = std::vector(); + auto result = std::vector(); enum class XmlTagName { SignedIdentifier, @@ -3773,15 +3760,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ShareGetAccessPolicyResult ShareGetAccessPolicyResultFromSignedIdentifiers( - std::vector object) + static ShareGetAccessPolicyResult ShareGetAccessPolicyResultFromSignedIdentifiers( + std::vector object) { - Models::ShareGetAccessPolicyResult result; + ShareGetAccessPolicyResult result; result.SignedIdentifiers = std::move(object); return result; } - static Azure::Core::Response SetAccessPolicyParseResult( + static Azure::Core::Response SetAccessPolicyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3789,12 +3776,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - Models::ShareSetAccessPolicyResult result; + ShareSetAccessPolicyResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3806,7 +3793,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void AccessPolicyToXml( Storage::Details::XmlWriter& writer, - const Models::AccessPolicy& object) + const AccessPolicy& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AccessPolicy"}); @@ -3835,7 +3822,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void SignedIdentifierToXml( Storage::Details::XmlWriter& writer, - const Models::SignedIdentifier& object) + const SignedIdentifier& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "SignedIdentifier"}); @@ -3849,7 +3836,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void SignedIdentifiersToXml( Storage::Details::XmlWriter& writer, - const std::vector& object) + const std::vector& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "SignedIdentifiers"}); @@ -3859,7 +3846,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static Azure::Core::Response GetStatisticsParseResult( + static Azure::Core::Response GetStatisticsParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3870,14 +3857,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::ShareGetStatisticsResult result = bodyBuffer.empty() - ? Models::ShareGetStatisticsResult() + ShareGetStatisticsResult result = bodyBuffer.empty() + ? ShareGetStatisticsResult() : ShareGetStatisticsResultFromShareStats(ShareStatsFromXml(reader)); result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3887,9 +3874,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::ShareStats ShareStatsFromXml(Storage::Details::XmlReader& reader) + static ShareStats ShareStatsFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ShareStats(); + auto result = ShareStats(); enum class XmlTagName { ShareStats, @@ -3944,15 +3931,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ShareGetStatisticsResult ShareGetStatisticsResultFromShareStats( - Models::ShareStats object) + static ShareGetStatisticsResult ShareGetStatisticsResultFromShareStats(ShareStats object) { - Models::ShareGetStatisticsResult result; + ShareGetStatisticsResult result; result.ShareUsageBytes = object.ShareUsageBytes; return result; } - static Azure::Core::Response RestoreParseResult( + static Azure::Core::Response RestoreParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3960,12 +3946,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Created - Models::ShareRestoreResult result; + ShareRestoreResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3990,7 +3976,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string FileLastWriteTime; }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4034,7 +4020,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4066,7 +4052,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4096,7 +4082,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string FileLastWriteTime; }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4139,7 +4125,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4174,7 +4160,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response + static Azure::Core::Response ListFilesAndDirectoriesSinglePage( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, @@ -4236,7 +4222,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response ListHandles( + static Azure::Core::Response ListHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4292,7 +4278,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response ForceCloseHandles( + static Azure::Core::Response ForceCloseHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4334,7 +4320,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4342,7 +4328,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Directory created. - Models::DirectoryCreateResult result; + DirectoryCreateResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -4362,7 +4348,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Core::DateTime::DateFormat::Rfc3339); result.FileId = response.GetHeaders().at(Details::HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4372,7 +4358,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4380,7 +4366,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - Models::DirectoryGetPropertiesResult result; + DirectoryGetPropertiesResult result; for (auto i = response.GetHeaders().lower_bound(Details::HeaderMetadata); i != response.GetHeaders().end() @@ -4408,7 +4394,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FilePermissionKey = response.GetHeaders().at(Details::HeaderFilePermissionKey); result.FileId = response.GetHeaders().at(Details::HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4418,7 +4404,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4426,8 +4412,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted). - Models::DirectoryDeleteResult result; - return Azure::Core::Response( + DirectoryDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4437,7 +4423,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetPropertiesParseResult( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4445,7 +4431,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - Models::DirectorySetPropertiesResult result; + DirectorySetPropertiesResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -4465,7 +4451,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Core::DateTime::DateFormat::Rfc3339); result.FileId = response.GetHeaders().at(Details::HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4475,7 +4461,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResult( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4483,11 +4469,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success (OK). - Models::DirectorySetMetadataResult result; + DirectorySetMetadataResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.IsServerEncrypted = response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4497,7 +4483,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response + static Azure::Core::Response ListFilesAndDirectoriesSinglePageParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) @@ -4509,12 +4495,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::DirectoryListFilesAndDirectoriesSinglePageResult result = bodyBuffer.empty() - ? Models::DirectoryListFilesAndDirectoriesSinglePageResult() + DirectoryListFilesAndDirectoriesSinglePageResult result = bodyBuffer.empty() + ? DirectoryListFilesAndDirectoriesSinglePageResult() : DirectoryListFilesAndDirectoriesSinglePageResultFromListFilesAndDirectoriesSinglePageResponse( ListFilesAndDirectoriesSinglePageResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4524,9 +4510,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::DirectoryItem DirectoryItemFromXml(Storage::Details::XmlReader& reader) + static DirectoryItem DirectoryItemFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::DirectoryItem(); + auto result = DirectoryItem(); enum class XmlTagName { Name, @@ -4575,9 +4561,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::FileProperty FilePropertyFromXml(Storage::Details::XmlReader& reader) + static FileProperty FilePropertyFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::FileProperty(); + auto result = FileProperty(); enum class XmlTagName { ContentLength, @@ -4626,9 +4612,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::FileItem FileItemFromXml(Storage::Details::XmlReader& reader) + static FileItem FileItemFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::FileItem(); + auto result = FileItem(); enum class XmlTagName { Name, @@ -4688,10 +4674,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::FilesAndDirectoriesListSinglePage FilesAndDirectoriesListSinglePageFromXml( + static FilesAndDirectoriesListSinglePage FilesAndDirectoriesListSinglePageFromXml( Storage::Details::XmlReader& reader) { - auto result = Models::FilesAndDirectoriesListSinglePage(); + auto result = FilesAndDirectoriesListSinglePage(); enum class XmlTagName { Directory, @@ -4751,10 +4737,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ListFilesAndDirectoriesSinglePageResponse + static ListFilesAndDirectoriesSinglePageResponse ListFilesAndDirectoriesSinglePageResponseFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ListFilesAndDirectoriesSinglePageResponse(); + auto result = ListFilesAndDirectoriesSinglePageResponse(); enum class XmlTagName { Entries, @@ -4880,11 +4866,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::DirectoryListFilesAndDirectoriesSinglePageResult + static DirectoryListFilesAndDirectoriesSinglePageResult DirectoryListFilesAndDirectoriesSinglePageResultFromListFilesAndDirectoriesSinglePageResponse( - Models::ListFilesAndDirectoriesSinglePageResponse object) + ListFilesAndDirectoriesSinglePageResponse object) { - Models::DirectoryListFilesAndDirectoriesSinglePageResult result; + DirectoryListFilesAndDirectoriesSinglePageResult result; result.ServiceEndpoint = std::move(object.ServiceEndpoint); result.ShareName = std::move(object.ShareName); result.ShareSnapshot = std::move(object.ShareSnapshot); @@ -4897,7 +4883,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Azure::Core::Response ListHandlesParseResult( + static Azure::Core::Response ListHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4908,12 +4894,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::DirectoryListHandlesResult result = bodyBuffer.empty() - ? Models::DirectoryListHandlesResult() + DirectoryListHandlesResult result = bodyBuffer.empty() + ? DirectoryListHandlesResult() : DirectoryListHandlesResultFromListHandlesResponse( ListHandlesResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4923,9 +4909,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) + static HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::HandleItem(); + auto result = HandleItem(); enum class XmlTagName { ClientIp, @@ -5039,10 +5025,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ListHandlesResponse ListHandlesResponseFromXml( - Storage::Details::XmlReader& reader) + static ListHandlesResponse ListHandlesResponseFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ListHandlesResponse(); + auto result = ListHandlesResponse(); enum class XmlTagName { Entries, @@ -5113,17 +5098,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::DirectoryListHandlesResult DirectoryListHandlesResultFromListHandlesResponse( - Models::ListHandlesResponse object) + static DirectoryListHandlesResult DirectoryListHandlesResultFromListHandlesResponse( + ListHandlesResponse object) { - Models::DirectoryListHandlesResult result; + DirectoryListHandlesResult result; result.HandleList = std::move(object.HandleList); result.ContinuationToken = std::move(object.ContinuationToken); return result; } - static Azure::Core::Response - ForceCloseHandlesParseResult( + static Azure::Core::Response ForceCloseHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5131,7 +5115,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - Models::DirectoryForceCloseHandlesResult result; + DirectoryForceCloseHandlesResult result; if (response.GetHeaders().find(Details::HeaderContinuationToken) != response.GetHeaders().end()) { @@ -5141,7 +5125,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { = std::stoi(response.GetHeaders().at(Details::HeaderNumberOfHandlesClosed)); result.numberOfHandlesFailedToClose = std::stoi(response.GetHeaders().at(Details::HeaderNumberOfHandlesFailedToClose)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5174,7 +5158,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5258,7 +5242,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response Download( + static Azure::Core::Response Download( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5298,7 +5282,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5335,7 +5319,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5376,7 +5360,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response SetHttpHeaders( + static Azure::Core::Response SetHttpHeaders( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5464,7 +5448,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5502,7 +5486,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response AcquireLease( + static Azure::Core::Response AcquireLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5544,7 +5528,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response ReleaseLease( + static Azure::Core::Response ReleaseLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5580,7 +5564,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response ChangeLease( + static Azure::Core::Response ChangeLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5621,7 +5605,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable ClientRequestId; }; - static Azure::Core::Response BreakLease( + static Azure::Core::Response BreakLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5655,14 +5639,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { Azure::Core::Nullable Timeout; std::string XMsRange; - Models::FileRangeWriteType XMsWrite; + FileRangeWriteType XMsWrite; int64_t ContentLength = int64_t(); Azure::Core::Nullable ContentMd5; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response UploadRange( + static Azure::Core::Response UploadRange( const Azure::Core::Http::Url& url, Azure::Core::Http::BodyStream& bodyStream, Azure::Core::Http::HttpPipeline& pipeline, @@ -5703,7 +5687,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string TargetRange; std::string CopySource; Azure::Core::Nullable SourceRange; - Models::FileRangeWriteFromUrlType XMsWrite; + FileRangeWriteFromUrlType XMsWrite; int64_t ContentLength = int64_t(); Azure::Core::Nullable SourceContentCrc64; Azure::Core::Nullable SourceIfMatchCrc64; @@ -5712,7 +5696,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response UploadRangeFromUrl( + static Azure::Core::Response UploadRangeFromUrl( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5780,7 +5764,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response GetRangeList( + static Azure::Core::Response GetRangeList( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5830,7 +5814,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string CopySource; Azure::Core::Nullable FilePermission; Azure::Core::Nullable FilePermissionKey; - Azure::Core::Nullable XMsFilePermissionCopyMode; + Azure::Core::Nullable XMsFilePermissionCopyMode; Azure::Core::Nullable FileCopyIgnoreReadOnly; Azure::Core::Nullable FileCopyFileAttributes; Azure::Core::Nullable FileCopyFileCreationTime; @@ -5839,7 +5823,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response StartCopy( + static Azure::Core::Response StartCopy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5919,7 +5903,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable LeaseIdOptional; }; - static Azure::Core::Response AbortCopy( + static Azure::Core::Response AbortCopy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5956,7 +5940,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response ListHandles( + static Azure::Core::Response ListHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6005,7 +5989,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::DefaultServiceApiVersion; }; - static Azure::Core::Response ForceCloseHandles( + static Azure::Core::Response ForceCloseHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6041,7 +6025,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6049,7 +6033,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, File created. - Models::FileCreateResult result; + FileCreateResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6069,7 +6053,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Core::DateTime::DateFormat::Rfc3339); result.FileId = response.GetHeaders().at(Details::HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6079,7 +6063,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DownloadParseResult( + static Azure::Core::Response DownloadParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6087,7 +6071,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Succeeded to read the entire file. - Models::FileDownloadResult result; + FileDownloadResult result; result.BodyStream = response.GetBodyStream(); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6195,7 +6179,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { != response.GetHeaders().end()) { result.CopyStatus - = Models::CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); + = CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); } if (response.GetHeaders().find(Details::HeaderContentHashMd5) != response.GetHeaders().end()) @@ -6225,28 +6209,28 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetHeaders().find(Details::HeaderLeaseDuration) != response.GetHeaders().end()) { - result.LeaseDuration = Models::LeaseDurationType( - response.GetHeaders().at(Details::HeaderLeaseDuration)); + result.LeaseDuration + = LeaseDurationType(response.GetHeaders().at(Details::HeaderLeaseDuration)); } if (response.GetHeaders().find(Details::HeaderLeaseState) != response.GetHeaders().end()) { result.LeaseState - = Models::LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); + = LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); } if (response.GetHeaders().find(Details::HeaderLeaseStatus) != response.GetHeaders().end()) { result.LeaseStatus - = Models::LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); + = LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::PartialContent) { // Succeeded to read a specified range of the file. - Models::FileDownloadResult result; + FileDownloadResult result; result.BodyStream = response.GetBodyStream(); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6354,7 +6338,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { != response.GetHeaders().end()) { result.CopyStatus - = Models::CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); + = CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); } if (response.GetHeaders().find(Details::HeaderContentHashMd5) != response.GetHeaders().end()) @@ -6384,22 +6368,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetHeaders().find(Details::HeaderLeaseDuration) != response.GetHeaders().end()) { - result.LeaseDuration = Models::LeaseDurationType( - response.GetHeaders().at(Details::HeaderLeaseDuration)); + result.LeaseDuration + = LeaseDurationType(response.GetHeaders().at(Details::HeaderLeaseDuration)); } if (response.GetHeaders().find(Details::HeaderLeaseState) != response.GetHeaders().end()) { result.LeaseState - = Models::LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); + = LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); } if (response.GetHeaders().find(Details::HeaderLeaseStatus) != response.GetHeaders().end()) { result.LeaseStatus - = Models::LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); + = LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6409,7 +6393,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6417,7 +6401,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - Models::FileGetPropertiesResult result; + FileGetPropertiesResult result; result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6500,7 +6484,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { != response.GetHeaders().end()) { result.CopyStatus - = Models::CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); + = CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); } if (response.GetHeaders().find(Details::HeaderIsServerEncrypted) != response.GetHeaders().end()) @@ -6524,22 +6508,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetHeaders().find(Details::HeaderLeaseDuration) != response.GetHeaders().end()) { - result.LeaseDuration = Models::LeaseDurationType( - response.GetHeaders().at(Details::HeaderLeaseDuration)); + result.LeaseDuration + = LeaseDurationType(response.GetHeaders().at(Details::HeaderLeaseDuration)); } if (response.GetHeaders().find(Details::HeaderLeaseState) != response.GetHeaders().end()) { result.LeaseState - = Models::LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); + = LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState)); } if (response.GetHeaders().find(Details::HeaderLeaseStatus) != response.GetHeaders().end()) { result.LeaseStatus - = Models::LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); + = LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6549,7 +6533,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6557,8 +6541,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted). - Models::FileDeleteResult result; - return Azure::Core::Response( + FileDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6568,7 +6552,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetHttpHeadersParseResult( + static Azure::Core::Response SetHttpHeadersParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6576,7 +6560,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - Models::FileSetHttpHeadersResult result; + FileSetHttpHeadersResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6596,7 +6580,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Core::DateTime::DateFormat::Rfc3339); result.FileId = response.GetHeaders().at(Details::HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6606,7 +6590,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResult( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6614,11 +6598,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success (OK). - Models::FileSetMetadataResult result; + FileSetMetadataResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.IsServerEncrypted = response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6628,7 +6612,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AcquireLeaseParseResult( + static Azure::Core::Response AcquireLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6636,13 +6620,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The Acquire operation completed successfully. - Models::FileAcquireLeaseResult result; + FileAcquireLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6652,7 +6636,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ReleaseLeaseParseResult( + static Azure::Core::Response ReleaseLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6660,12 +6644,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Release operation completed successfully. - Models::FileReleaseLeaseResult result; + FileReleaseLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6675,7 +6659,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ChangeLeaseParseResult( + static Azure::Core::Response ChangeLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6683,13 +6667,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Change operation completed successfully. - Models::FileChangeLeaseResult result; + FileChangeLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6699,7 +6683,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response BreakLeaseParseResult( + static Azure::Core::Response BreakLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6707,7 +6691,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The Break operation completed successfully. - Models::FileBreakLeaseResult result; + FileBreakLeaseResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6716,7 +6700,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6726,7 +6710,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response UploadRangeParseResult( + static Azure::Core::Response UploadRangeParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6734,7 +6718,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success (Created). - Models::FileUploadRangeResult result; + FileUploadRangeResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6752,7 +6736,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.IsServerEncrypted = response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true"; } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6762,8 +6746,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response - UploadRangeFromUrlParseResult( + static Azure::Core::Response UploadRangeFromUrlParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6771,7 +6754,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success (Created). - Models::FileUploadRangeFromUrlResult result; + FileUploadRangeFromUrlResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6781,7 +6764,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { HashAlgorithm::Crc64); result.IsServerEncrypted = response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6791,7 +6774,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetRangeListParseResult( + static Azure::Core::Response GetRangeListParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6802,8 +6785,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::FileGetRangeListResult result = bodyBuffer.empty() - ? Models::FileGetRangeListResult() + FileGetRangeListResult result = bodyBuffer.empty() + ? FileGetRangeListResult() : FileGetRangeListResultFromShareFileRangeList(ShareFileRangeListFromXml(reader)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6811,7 +6794,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.ETag = response.GetHeaders().at(Details::HeaderETag); result.FileContentLength = std::stoll(response.GetHeaders().at(Details::HeaderXMsContentLength)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6821,10 +6804,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::ShareFileRangeList ShareFileRangeListFromXml( - Storage::Details::XmlReader& reader) + static ShareFileRangeList ShareFileRangeListFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ShareFileRangeList(); + auto result = ShareFileRangeList(); enum class XmlTagName { ClearRange, @@ -6891,16 +6873,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::FileGetRangeListResult FileGetRangeListResultFromShareFileRangeList( - Models::ShareFileRangeList object) + static FileGetRangeListResult FileGetRangeListResultFromShareFileRangeList( + ShareFileRangeList object) { - Models::FileGetRangeListResult result; + FileGetRangeListResult result; result.Ranges = std::move(object.Ranges); result.ClearRanges = std::move(object.ClearRanges); return result; } - static Azure::Core::Response StartCopyParseResult( + static Azure::Core::Response StartCopyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6908,7 +6890,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The copy file has been accepted with the specified copy status. - Models::FileStartCopyResult result; + FileStartCopyResult result; result.ETag = response.GetHeaders().at(Details::HeaderETag); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -6921,9 +6903,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { != response.GetHeaders().end()) { result.CopyStatus - = Models::CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); + = CopyStatusType(response.GetHeaders().at(Details::HeaderCopyStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6933,7 +6915,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AbortCopyParseResult( + static Azure::Core::Response AbortCopyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6941,8 +6923,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::NoContent) { // The delete request was accepted and the file will be deleted. - Models::FileAbortCopyResult result; - return Azure::Core::Response( + FileAbortCopyResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6952,7 +6934,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ListHandlesParseResult( + static Azure::Core::Response ListHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6963,11 +6945,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - Models::FileListHandlesResult result = bodyBuffer.empty() - ? Models::FileListHandlesResult() + FileListHandlesResult result = bodyBuffer.empty() + ? FileListHandlesResult() : FileListHandlesResultFromListHandlesResponse(ListHandlesResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6977,9 +6959,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Models::HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) + static HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::HandleItem(); + auto result = HandleItem(); enum class XmlTagName { ClientIp, @@ -7093,10 +7075,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::ListHandlesResponse ListHandlesResponseFromXml( - Storage::Details::XmlReader& reader) + static ListHandlesResponse ListHandlesResponseFromXml(Storage::Details::XmlReader& reader) { - auto result = Models::ListHandlesResponse(); + auto result = ListHandlesResponse(); enum class XmlTagName { Entries, @@ -7167,17 +7148,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Models::FileListHandlesResult FileListHandlesResultFromListHandlesResponse( - Models::ListHandlesResponse object) + static FileListHandlesResult FileListHandlesResultFromListHandlesResponse( + ListHandlesResponse object) { - Models::FileListHandlesResult result; + FileListHandlesResult result; result.HandleList = std::move(object.HandleList); result.ContinuationToken = std::move(object.ContinuationToken); return result; } - static Azure::Core::Response - ForceCloseHandlesParseResult( + static Azure::Core::Response ForceCloseHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7185,7 +7165,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - Models::FileForceCloseHandlesResult result; + FileForceCloseHandlesResult result; if (response.GetHeaders().find(Details::HeaderContinuationToken) != response.GetHeaders().end()) { @@ -7195,7 +7175,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { = std::stoi(response.GetHeaders().at(Details::HeaderNumberOfHandlesClosed)); result.numberOfHandlesFailedToClose = std::stoi(response.GetHeaders().at(Details::HeaderNumberOfHandlesFailedToClose)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp index b3a72f612..73445cef7 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp @@ -11,8 +11,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names // ServiceClient models: - using ListSharesSinglePageResult = ServiceListSharesSinglePageResult; - using SetServicePropertiesResult = ServiceSetPropertiesResult; + using ListSharesSinglePageResult = Details::ServiceListSharesSinglePageResult; + using SetServicePropertiesResult = Details::ServiceSetPropertiesResult; using GetServicePropertiesResult = StorageServiceProperties; // ShareClient models: @@ -27,20 +27,20 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names { bool Deleted = true; }; - using CreateShareSnapshotResult = ShareCreateSnapshotResult; - using GetSharePropertiesResult = ShareGetPropertiesResult; - using SetShareQuotaResult = ShareSetQuotaResult; - using SetShareMetadataResult = ShareSetMetadataResult; - using SetShareAccessPolicyResult = ShareSetAccessPolicyResult; - using GetShareStatisticsResult = ShareGetStatisticsResult; - using CreateSharePermissionResult = ShareCreatePermissionResult; - using GetShareAccessPolicyResult = ShareGetAccessPolicyResult; - using GetSharePermissionResult = ShareGetPermissionResult; - using AcquireShareLeaseResult = ShareAcquireLeaseResult; - using RenewShareLeaseResult = ShareRenewLeaseResult; - using ReleaseShareLeaseResult = ShareReleaseLeaseResult; - using BreakShareLeaseResult = ShareBreakLeaseResult; - using ChangeShareLeaseResult = ShareChangeLeaseResult; + using CreateShareSnapshotResult = Details::ShareCreateSnapshotResult; + using GetSharePropertiesResult = Details::ShareGetPropertiesResult; + using SetShareQuotaResult = Details::ShareSetQuotaResult; + using SetShareMetadataResult = Details::ShareSetMetadataResult; + using SetShareAccessPolicyResult = Details::ShareSetAccessPolicyResult; + using GetShareStatisticsResult = Details::ShareGetStatisticsResult; + using CreateSharePermissionResult = Details::ShareCreatePermissionResult; + using GetShareAccessPolicyResult = Details::ShareGetAccessPolicyResult; + using GetSharePermissionResult = Details::ShareGetPermissionResult; + using AcquireShareLeaseResult = Details::ShareAcquireLeaseResult; + using RenewShareLeaseResult = Details::ShareRenewLeaseResult; + using ReleaseShareLeaseResult = Details::ShareReleaseLeaseResult; + using BreakShareLeaseResult = Details::ShareBreakLeaseResult; + using ChangeShareLeaseResult = Details::ShareChangeLeaseResult; // DirectoryClient models: struct CreateShareDirectoryResult @@ -63,10 +63,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names bool Deleted = true; }; - using GetShareDirectoryPropertiesResult = DirectoryGetPropertiesResult; - using SetShareDirectoryPropertiesResult = DirectorySetPropertiesResult; - using SetShareDirectoryMetadataResult = DirectorySetMetadataResult; - using ForceCloseAllShareDirectoryHandlesResult = DirectoryForceCloseHandlesResult; + using GetShareDirectoryPropertiesResult = Details::DirectoryGetPropertiesResult; + using SetShareDirectoryPropertiesResult = Details::DirectorySetPropertiesResult; + using SetShareDirectoryMetadataResult = Details::DirectorySetMetadataResult; + using ForceCloseAllShareDirectoryHandlesResult = Details::DirectoryForceCloseHandlesResult; struct ForceCloseShareDirectoryHandleResult { @@ -138,23 +138,23 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names Azure::Core::Nullable LastWrittenOn; }; - using DownloadShareFileResult = FileDownloadResult; - using StartCopyShareFileResult = FileStartCopyResult; - using AbortCopyShareFileResult = FileAbortCopyResult; - using GetShareFilePropertiesResult = FileGetPropertiesResult; - using SetShareFilePropertiesResult = FileSetHttpHeadersResult; - using ResizeFileResult = FileSetHttpHeadersResult; - using SetShareFileMetadataResult = FileSetMetadataResult; - using UploadShareFileRangeResult = FileUploadRangeResult; - using ClearShareFileRangeResult = FileUploadRangeResult; - using UploadFileRangeFromUrlResult = FileUploadRangeFromUrlResult; - using GetShareFileRangeListResult = FileGetRangeListResult; + using DownloadShareFileResult = Details::FileDownloadResult; + using StartCopyShareFileResult = Details::FileStartCopyResult; + using AbortCopyShareFileResult = Details::FileAbortCopyResult; + using GetShareFilePropertiesResult = Details::FileGetPropertiesResult; + using SetShareFilePropertiesResult = Details::FileSetHttpHeadersResult; + using ResizeFileResult = Details::FileSetHttpHeadersResult; + using SetShareFileMetadataResult = Details::FileSetMetadataResult; + using UploadShareFileRangeResult = Details::FileUploadRangeResult; + using ClearShareFileRangeResult = Details::FileUploadRangeResult; + using UploadFileRangeFromUrlResult = Details::FileUploadRangeFromUrlResult; + using GetShareFileRangeListResult = Details::FileGetRangeListResult; using ListShareFileHandlesSinglePageResult = ListShareDirectoryHandlesSinglePageResult; - using ForceCloseAllShareFileHandlesResult = FileForceCloseHandlesResult; - using AcquireShareFileLeaseResult = FileAcquireLeaseResult; - using ReleaseShareFileLeaseResult = FileReleaseLeaseResult; - using BreakShareFileLeaseResult = FileBreakLeaseResult; - using ChangeShareFileLeaseResult = FileChangeLeaseResult; + using ForceCloseAllShareFileHandlesResult = Details::FileForceCloseHandlesResult; + using AcquireShareFileLeaseResult = Details::FileAcquireLeaseResult; + using ReleaseShareFileLeaseResult = Details::FileReleaseLeaseResult; + using BreakShareFileLeaseResult = Details::FileBreakLeaseResult; + using ChangeShareFileLeaseResult = Details::FileChangeLeaseResult; struct DownloadShareFileToResult { diff --git a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp index 004871ffd..7af57ff71 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp @@ -76,7 +76,7 @@ namespace Azure { namespace Storage { namespace Test { do { auto response = m_fileShareServiceClient->ListSharesSinglePage(options); - result.insert(result.end(), response->ShareItems.begin(), response->ShareItems.end()); + result.insert(result.end(), response->Items.begin(), response->Items.end()); continuation = response->ContinuationToken; options.ContinuationToken = continuation; } while (!continuation.empty()); @@ -133,7 +133,7 @@ namespace Azure { namespace Storage { namespace Test { Files::Shares::ListSharesSinglePageOptions options; options.PageSizeHint = 2; auto response = m_fileShareServiceClient->ListSharesSinglePage(options); - EXPECT_LE(2U, response->ShareItems.size()); + EXPECT_LE(2U, response->Items.size()); } }