From 3042f69d5b6af70c8f9f826ca80b1ac1d9e48b42 Mon Sep 17 00:00:00 2001 From: Kan Tang Date: Tue, 18 Aug 2020 09:28:31 +0800 Subject: [PATCH] Rename return types for Datalake and file services. (#464) --- .../datalake/datalake_directory_client.hpp | 21 +- .../inc/datalake/datalake_file_client.hpp | 67 ++- .../datalake/datalake_file_system_client.hpp | 31 +- sdk/storage/inc/datalake/datalake_options.hpp | 40 +- .../inc/datalake/datalake_path_client.hpp | 44 +- .../inc/datalake/datalake_responses.hpp | 51 +- .../inc/datalake/datalake_service_client.hpp | 12 +- .../protocol/datalake_rest_client.hpp | 253 ++++---- .../inc/shares/protocol/share_rest_client.hpp | 567 +++++++++--------- sdk/storage/inc/shares/share_client.hpp | 61 +- sdk/storage/inc/shares/share_options.hpp | 2 +- sdk/storage/inc/shares/share_responses.hpp | 26 +- .../inc/shares/share_service_client.hpp | 12 +- .../sample/datalake_getting_started.cpp | 2 +- .../datalake/datalake_directory_client.cpp | 13 +- .../src/datalake/datalake_file_client.cpp | 52 +- .../datalake/datalake_file_system_client.cpp | 37 +- .../src/datalake/datalake_path_client.cpp | 46 +- .../src/datalake/datalake_service_client.cpp | 8 +- sdk/storage/src/shares/share_client.cpp | 25 +- .../src/shares/share_service_client.cpp | 6 +- .../datalake_directory_client_test.cpp | 26 +- .../datalake/datalake_file_client_test.cpp | 30 +- .../datalake_file_system_client_test.cpp | 11 +- .../datalake/datalake_path_client_test.cpp | 16 +- .../datalake/datalake_service_client_test.cpp | 10 +- sdk/storage/test/shares/share_client_test.cpp | 6 +- .../test/shares/share_service_client_test.cpp | 4 +- 28 files changed, 754 insertions(+), 725 deletions(-) diff --git a/sdk/storage/inc/datalake/datalake_directory_client.hpp b/sdk/storage/inc/datalake/datalake_directory_client.hpp index 01fb1ae32..b8de51b69 100644 --- a/sdk/storage/inc/datalake/datalake_directory_client.hpp +++ b/sdk/storage/inc/datalake/datalake_directory_client.hpp @@ -92,11 +92,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @brief Create a directory. By default, the destination is overwritten and * if the destination already exists and has a lease the lease is broken. * @param options Optional parameters to create the directory the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information of the + * created directory * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Create( - const DirectoryCreateOptions& options = DirectoryCreateOptions()) const + Azure::Core::Response Create( + const CreateDirectoryOptions& options = CreateDirectoryOptions()) const { return PathClient::Create(PathResourceType::Directory, options); } @@ -107,26 +108,28 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @param destinationDirectoryPath The destinationPath this current directory is renaming to. * @param options Optional parameters to rename a resource to the resource the destination * directory points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * renaming the directory. * @remark This operation will not change the URL this directory client points too, to use the * new name, customer needs to initialize a new directory client with the new name/path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Rename( + Azure::Core::Response Rename( const std::string& destinationDirectoryPath, - const DirectoryRenameOptions& options = DirectoryRenameOptions()) const; + const RenameDirectoryOptions& options = RenameDirectoryOptions()) const; /** * @brief Deletes the directory. * @param Recursive If "true", all paths beneath the directory will be deleted. If "false" and * the directory is non-empty, an error occurs. * @param options Optional parameters to delete the directory the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * deleting the directory. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Delete( + Azure::Core::Response Delete( bool Recursive, - const DirectoryDeleteOptions& options = DirectoryDeleteOptions()) const; + const DeleteDirectoryOptions& options = DeleteDirectoryOptions()) const; private: explicit DirectoryClient( diff --git a/sdk/storage/inc/datalake/datalake_file_client.hpp b/sdk/storage/inc/datalake/datalake_file_client.hpp index 5bf4399e9..179f0fcc3 100644 --- a/sdk/storage/inc/datalake/datalake_file_client.hpp +++ b/sdk/storage/inc/datalake/datalake_file_client.hpp @@ -94,13 +94,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * written, and there must not be a request entity body included with the * request. * @param options Optional parameters to append data to the resource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * appending some data to the path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response AppendData( + Azure::Core::Response AppendData( Azure::Core::Http::BodyStream* content, int64_t offset, - const PathAppendDataOptions& options = PathAppendDataOptions()) const; + const AppendFileDataOptions& options = AppendFileDataOptions()) const; /** * @brief Flushes previous uploaded data to a file. @@ -113,22 +114,24 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * written, and there must not be a request entity body included with the * request. * @param options Optional parameters to flush data to the resource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * flushing the data appended to the path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response FlushData( + Azure::Core::Response FlushData( int64_t endingOffset, - const PathFlushDataOptions& options = PathFlushDataOptions()) const; + const FlushFileDataOptions& options = FlushFileDataOptions()) const; /** * @brief Create a file. By default, the destination is overwritten and * if the destination already exists and has a lease the lease is broken. * @param options Optional parameters to create the resource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * creating the file. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Create( - const FileCreateOptions& options = FileCreateOptions()) const + Azure::Core::Response Create( + const CreateFileOptions& options = CreateFileOptions()) const { return PathClient::Create(PathResourceType::File, options); } @@ -139,32 +142,34 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @param destinationFilePath The path of the file this file is renaming to. * @param options Optional parameters to rename a resource to the resource the destination path * points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * renaming the file. * @remark This operation will not change the URL this file client points too, to use the * new name, customer needs to initialize a new file client with the new name/path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Rename( + Azure::Core::Response Rename( const std::string& destinationFilePath, - const FileRenameOptions& options = FileRenameOptions()) const; + const RenameFileOptions& options = RenameFileOptions()) const; /** * @brief Deletes the file. * @param options Optional parameters to delete the file the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Delete( + Azure::Core::Response Delete( const FileDeleteOptions& options = FileDeleteOptions()) const; /** * @brief Read the contents of a file. For read operations, range requests are supported. * @param options Optional parameters to read the content from the resource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information and content returned + * when reading from a file. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response Read( - const FileReadOptions& options = FileReadOptions()) const; + Azure::Core::Response Read( + const ReadFileOptions& options = ReadFileOptions()) const; /** * @brief Creates a new file, or updates the content of an existing file. Updating @@ -172,25 +177,27 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @param buffer A memory buffer containing the content to upload. * @param bufferSize Size of the memory buffer. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * uploading a file from a buffer. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response UploadFromBuffer( + Azure::Core::Response UploadFrom( const uint8_t* buffer, std::size_t bufferSize, - const UploadFileOptions& options = UploadFileOptions()) const; + const UploadFileFromOptions& options = UploadFileFromOptions()) const; /** * @brief Creates a new file, or updates the content of an existing file. Updating * an existing file overwrites any existing metadata on the file. * @param file A file containing the content to upload. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * uploading a file from a local file. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response UploadFromFile( + Azure::Core::Response UploadFrom( const std::string& file, - const UploadFileOptions& options = UploadFileOptions()) const; + const UploadFileFromOptions& options = UploadFileFromOptions()) const; /** * @brief Downloads a file or a file range from the service to a memory buffer using parallel @@ -199,25 +206,27 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @param bufferSize Size of the memory buffer. Size must be larger or equal to size of the file * or file range. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * downloading a file to a local buffer. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response DownloadToBuffer( + Azure::Core::Response DownloadTo( uint8_t* buffer, std::size_t bufferSize, - const DownloadFileOptions& options = DownloadFileOptions()) const; + const DownloadFileToOptions& options = DownloadFileToOptions()) const; /** * @brief Downloads a file or a file range from the service to a file using parallel * requests. * @param file A file path to write the downloaded content to. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * downloading a file to a local file. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response DownloadToFile( + Azure::Core::Response DownloadTo( const std::string& file, - const DownloadFileOptions& options = DownloadFileOptions()) const; + const DownloadFileToOptions& options = DownloadFileToOptions()) const; private: Blobs::BlockBlobClient m_blockBlobClient; diff --git a/sdk/storage/inc/datalake/datalake_file_system_client.hpp b/sdk/storage/inc/datalake/datalake_file_system_client.hpp index c953f61ff..f3d1b6a0d 100644 --- a/sdk/storage/inc/datalake/datalake_file_system_client.hpp +++ b/sdk/storage/inc/datalake/datalake_file_system_client.hpp @@ -108,41 +108,45 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Creates the file system. * @param options Optional parameters to create this file system. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information of create a + * file system. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response Create( - const FileSystemCreateOptions& options = FileSystemCreateOptions()) const; + Azure::Core::Response Create( + const CreateFileSystemOptions& options = CreateFileSystemOptions()) const; /** * @brief Deletes the file system. * @param options Optional parameters to delete this file system. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned + * when deleting file systems. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response Delete( - const FileSystemDeleteOptions& options = FileSystemDeleteOptions()) const; + Azure::Core::Response Delete( + const DeleteFileSystemOptions& options = DeleteFileSystemOptions()) const; /** * @brief Sets the metadata of file system. * @param metadata User-defined metadata to be stored with the filesystem. Note that the string * may only contain ASCII characters in the ISO-8859-1 character set. * @param options Optional parameters to set the metadata to this file system. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information + * returned when setting the metadata onto the file system. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response SetMetadata( + Azure::Core::Response SetMetadata( const std::map& metadata, - const FileSystemSetMetadataOptions& options = FileSystemSetMetadataOptions()) const; + const SetFileSystemMetadataOptions& options = SetFileSystemMetadataOptions()) const; /** * @brief Gets the properties of file system. * @param options Optional parameters to get the metadata of this file system. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information when + * getting the file system's properties. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response GetProperties( - const FileSystemGetPropertiesOptions& options = FileSystemGetPropertiesOptions()) const; + Azure::Core::Response GetProperties( + const GetFileSystemPropertiesOptions& options = GetFileSystemPropertiesOptions()) const; /** * @brief List the paths in this file system. @@ -150,7 +154,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * filesystem are listed. If "directory" is specified, the list will only * include paths that share the same root. * @param options Optional parameters to list the paths in file system. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the results when listing + * the paths under a file system. * @remark This request is sent to dfs endpoint. */ Azure::Core::Response ListPaths( diff --git a/sdk/storage/inc/datalake/datalake_options.hpp b/sdk/storage/inc/datalake/datalake_options.hpp index 30168f7ec..f842e241b 100644 --- a/sdk/storage/inc/datalake/datalake_options.hpp +++ b/sdk/storage/inc/datalake/datalake_options.hpp @@ -15,7 +15,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { - using DownloadFileOptions = Blobs::DownloadBlobToOptions; + using DownloadFileToOptions = Blobs::DownloadBlobToOptions; using GetUserDelegationKeyOptions = Blobs::GetUserDelegationKeyOptions; /** @@ -79,7 +79,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for ServiceClient::ListFilesSystems */ - struct ListFileSystemsOptions + struct ListFileSystemsSegmentOptions { /** * @brief Context for cancelling long running operations. @@ -112,7 +112,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for FileSystemClient::Create */ - struct FileSystemCreateOptions + struct CreateFileSystemOptions { /** * @brief Context for cancelling long running operations. @@ -130,7 +130,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for FileSystemClient::Delete */ - struct FileSystemDeleteOptions + struct DeleteFileSystemOptions { /** * @brief Context for cancelling long running operations. @@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for FileSystemClient::GetProperties */ - struct FileSystemGetPropertiesOptions + struct GetFileSystemPropertiesOptions { /** * @brief Context for cancelling long running operations. @@ -162,7 +162,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for FileSystemClient::SetMetadata */ - struct FileSystemSetMetadataOptions + struct SetFileSystemMetadataOptions { /** * @brief Context for cancelling long running operations. @@ -223,7 +223,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for PathClient::AppendData */ - struct PathAppendDataOptions + struct AppendFileDataOptions { /** * @brief Context for cancelling long running operations. @@ -244,7 +244,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for PathClient::FlushData */ - struct PathFlushDataOptions + struct FlushFileDataOptions { /** * @brief Context for cancelling long running operations. @@ -298,7 +298,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for PathClient::SetAccessControl */ - struct SetAccessControlOptions + struct SetPathAccessControlOptions { /** * @brief Context for cancelling long running operations. @@ -368,7 +368,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * More details: * https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/create */ - struct PathCreateOptions + struct CreatePathOptions { /** * @brief Context for cancelling long running operations. @@ -423,7 +423,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * More details: * https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/delete */ - struct PathDeleteOptions + struct DeletePathOptions { /** * @brief Context for cancelling long running operations. @@ -458,7 +458,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * More details: * https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/getproperties */ - struct PathGetPropertiesOptions + struct GetPathPropertiesOptions { /** * @brief Context for cancelling long running operations. @@ -474,7 +474,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for PathClient::GetAccessControl */ - struct PathAccessControlOptions + struct GetPathAccessControlOptions { /** * @brief Context for cancelling long running operations. @@ -493,7 +493,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * More details: * https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/read */ - struct FileReadOptions + struct ReadFileOptions { /** * @brief Context for cancelling long running operations. @@ -529,7 +529,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for FileClient::Create */ - struct FileRenameOptions + struct RenameFileOptions { /** * @brief Context for cancelling long running operations. @@ -582,7 +582,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * More details: * https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/create */ - struct DirectoryRenameOptions + struct RenameDirectoryOptions { /** * @brief Context for cancelling long running operations. @@ -625,7 +625,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Optional parameters for DirectoryClient::Delete */ - struct DirectoryDeleteOptions + struct DeleteDirectoryOptions { /** * @brief Context for cancelling long running operations. @@ -647,13 +647,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { PathAccessConditions AccessConditions; }; - using FileCreateOptions = PathCreateOptions; - using DirectoryCreateOptions = PathCreateOptions; + using CreateFileOptions = CreatePathOptions; + using CreateDirectoryOptions = CreatePathOptions; /** * @brief Optional parameters for FileClient::UploadFromBuffer and FileClient::UploadFromFile */ - struct UploadFileOptions + struct UploadFileFromOptions { /** * @brief Context for cancelling long running operations. diff --git a/sdk/storage/inc/datalake/datalake_path_client.hpp b/sdk/storage/inc/datalake/datalake_path_client.hpp index f856c71fe..c39d4df04 100644 --- a/sdk/storage/inc/datalake/datalake_path_client.hpp +++ b/sdk/storage/inc/datalake/datalake_path_client.hpp @@ -86,21 +86,23 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @brief Creates a file or directory. By default, the destination is overwritten and * if the destination already exists and has a lease the lease is broken. * @param options Optional parameters to create the resource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * creating a path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Create( + Azure::Core::Response Create( PathResourceType type, - const PathCreateOptions& options = PathCreateOptions()) const; + const CreatePathOptions& options = CreatePathOptions()) const; /** * @brief Deletes the resource the path points to. * @param options Optional parameters to delete the reource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response which is current empty but preserved for + * future usage. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Delete( - const PathDeleteOptions& options = PathDeleteOptions()) const; + Azure::Core::Response Delete( + const DeletePathOptions& options = DeletePathOptions()) const; /** * @brief Sets the owner, group, permissions, or access control list for a file or directory. @@ -113,21 +115,23 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * permissions. * @param options Optional parameters to set an access control to the resource the path points * to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned + * when setting path's access control. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response SetAccessControl( + Azure::Core::Response SetAccessControl( std::vector acls, - const SetAccessControlOptions& options = SetAccessControlOptions()) const; + const SetPathAccessControlOptions& options = SetPathAccessControlOptions()) const; /** * @brief Sets the properties of a resource the path points to. * @param options Optional parameters to set the http headers to the resource the path points * to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned + * when setting the path's Http headers. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response SetHttpHeaders( + Azure::Core::Response SetHttpHeaders( DataLakeHttpHeaders httpHeaders, const SetPathHttpHeadersOptions& options = SetPathHttpHeadersOptions()) const; @@ -137,28 +141,30 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * access control list for a path. * @param options Optional parameters to get the properties from the resource the path points * to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the properties of the path. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response GetProperties( - const PathGetPropertiesOptions& options = PathGetPropertiesOptions()) const; + Azure::Core::Response GetProperties( + const GetPathPropertiesOptions& options = GetPathPropertiesOptions()) const; /** * @brief Returns all access control list stored for the given path. * @param options Optional parameters to get the ACLs from the resource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the access control list + * of the path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response GetAccessControls( - const PathAccessControlOptions& options = PathAccessControlOptions()) const; + Azure::Core::Response GetAccessControls( + const GetPathAccessControlOptions& options = GetPathAccessControlOptions()) const; /** * @brief Sets the metadata of a resource the path points to. * @param options Optional parameters to set the metadata to the resource the path points to. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the information returned when + * setting the metadata. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response SetMetadata( + Azure::Core::Response SetMetadata( const std::map& metadata, const SetPathMetadataOptions& options = SetPathMetadataOptions()) const; diff --git a/sdk/storage/inc/datalake/datalake_responses.hpp b/sdk/storage/inc/datalake/datalake_responses.hpp index 68344df63..c9f05e157 100644 --- a/sdk/storage/inc/datalake/datalake_responses.hpp +++ b/sdk/storage/inc/datalake/datalake_responses.hpp @@ -10,26 +10,27 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // ServiceClient models: - using UserDelegationKey = Blobs::GetUserDelegationKeyResult; - using ListFileSystemsResult = ServiceListFileSystemsResponse; + using GetUserDelegationKeyResult = Blobs::GetUserDelegationKeyResult; + using ListFileSystemsSegmentResult = ServiceListFileSystemsResult; // FileSystemClient models: - using FileSystemDeleteInfo = FileSystemDeleteResponse; - using ListPathsResult = FileSystemListPathsResponse; + using DeleteFileSystemResult = FileSystemDeleteResult; + using ListPathsResult = FileSystemListPathsResult; - struct FileSystemProperties + struct GetFileSystemPropertiesResult { std::string ETag; std::string LastModified; std::map Metadata; }; - using FileSystemInfo = FileSystemCreateResponse; + using CreateFileSystemResult = FileSystemCreateResult; + using SetFileSystemMetadataResult = FileSystemCreateResult; // PathClient models: - using PathDeleteInfo = PathDeleteResponse; + using DeletePathResult = PathDeleteResult; struct Acl { @@ -67,7 +68,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { static std::string SerializeAcls(const std::vector& dataLakeAclsArray); }; - struct PathProperties + struct GetPathPropertiesResult { std::string ETag; std::string LastModified; @@ -88,41 +89,41 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable CopyCompletionTime; }; - struct PathAccessControl + struct GetPathAccessControlResult { std::string ETag; std::string LastModified; std::vector Acls; }; - struct SetPathHttpHeadersInfo + struct SetPathHttpHeadersResult { std::string ETag; std::string LastModified; }; - struct SetPathMetadataInfo + struct SetPathMetadataResult { std::string ETag; std::string LastModified; }; - struct PathInfo + struct CreatePathResult { Azure::Core::Nullable ETag; Azure::Core::Nullable LastModified; Azure::Core::Nullable ContentLength; }; - using PathSetAccessControlInfo = PathSetAccessControlResponse; + using SetPathAccessControlResult = PathSetAccessControlResult; // FileClient models: - using FileContentInfo = Blobs::UploadBlockBlobResult; - using PathAppendDataInfo = PathAppendDataResponse; - using PathFlushDataInfo = PathFlushDataResponse; + using UploadFileFromResult = Blobs::UploadBlockBlobResult; + using AppendFileDataResult = PathAppendDataResult; + using FlushFileDataResult = PathFlushDataResult; - struct FileReadInfo + struct ReadFileResult { std::unique_ptr Body; DataLakeHttpHeaders HttpHeaders; @@ -138,17 +139,17 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::map Metadata; }; - struct FileRenameInfo + struct RenameFileResult { Azure::Core::Nullable ETag; Azure::Core::Nullable LastModified; }; - struct FileDeleteInfo + struct DeleteFileResult { }; - struct FileDownloadInfo + struct DownloadFileToResult { std::string ETag; std::string LastModified; @@ -159,19 +160,19 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable EncryptionKeySha256; }; - using FileInfo = PathInfo; + using CreateFileResult = CreatePathResult; // DirectoryClient models: - struct DirectoryRenameInfo + struct RenameDirectoryResult { Azure::Core::Nullable ETag; Azure::Core::Nullable LastModified; Azure::Core::Nullable Continuation; }; - using DirectorySetAccessControlRecursiveInfo = PathSetAccessControlRecursiveResponse; - using DirectoryInfo = PathInfo; - using DirectoryDeleteInfo = PathDeleteResponse; + using DirectorySetAccessControlRecursiveInfo = PathSetAccessControlRecursiveResult; + using CreateDirectoryResult = CreatePathResult; + using DeleteDirectoryResult = PathDeleteResult; }}}} // namespace Azure::Storage::Files::DataLake diff --git a/sdk/storage/inc/datalake/datalake_service_client.hpp b/sdk/storage/inc/datalake/datalake_service_client.hpp index 1149b92d2..6a02fe1e5 100644 --- a/sdk/storage/inc/datalake/datalake_service_client.hpp +++ b/sdk/storage/inc/datalake/datalake_service_client.hpp @@ -89,11 +89,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief List the file systems from the service. * @param options Optional parameters to list the file systems. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the listed result of + * file systems and continuation token for unfinished list result. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response ListFileSystems( - const ListFileSystemsOptions& options = ListFileSystemsOptions()) const; + Azure::Core::Response ListFileSystemsSegement( + const ListFileSystemsSegmentOptions& options = ListFileSystemsSegmentOptions()) const; /** * @brief Retrieves a key that can be used to delegate Active Directory authorization to @@ -105,10 +106,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * specified in UTC. * @param options Optional parameters to execute * this function. - * @return Azure::Core::Response + * @return Azure::Core::Response containing the user delegation key + * related information. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response GetUserDelegationKey( + Azure::Core::Response GetUserDelegationKey( const std::string& startsOn, const std::string& expiresOn, const GetUserDelegationKeyOptions& options = GetUserDelegationKeyOptions()) const diff --git a/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp b/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp index 7a6f7fd35..2a00711b3 100644 --- a/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp +++ b/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp @@ -608,35 +608,35 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { "Cannot convert " + pathGetPropertiesAction + " to PathGetPropertiesAction"); } - struct ServiceListFileSystemsResponse + struct ServiceListFileSystemsResult { Azure::Core::Nullable Continuation; std::vector Filesystems; - static ServiceListFileSystemsResponse ServiceListFileSystemsResponseFromFileSystemList( + static ServiceListFileSystemsResult ServiceListFileSystemsResultFromFileSystemList( FileSystemList object) { - ServiceListFileSystemsResponse result; + ServiceListFileSystemsResult result; result.Filesystems = std::move(object.Filesystems); return result; } }; - struct FileSystemCreateResponse + struct FileSystemCreateResult { std::string ETag; std::string LastModified; std::string NamespaceEnabled; }; - struct FileSystemSetPropertiesResponse + struct FileSystemSetPropertiesResult { std::string ETag; std::string LastModified; }; - struct FileSystemGetPropertiesResponse + struct FileSystemGetPropertiesResult { std::string ETag; std::string LastModified; @@ -644,25 +644,25 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string NamespaceEnabled; }; - struct FileSystemDeleteResponse + struct FileSystemDeleteResult { }; - struct FileSystemListPathsResponse + struct FileSystemListPathsResult { Azure::Core::Nullable Continuation; std::vector Paths; - static FileSystemListPathsResponse FileSystemListPathsResponseFromPathList(PathList object) + static FileSystemListPathsResult FileSystemListPathsResultFromPathList(PathList object) { - FileSystemListPathsResponse result; + FileSystemListPathsResult result; result.Paths = std::move(object.Paths); return result; } }; - struct PathCreateResponse + struct PathCreateResult { Azure::Core::Nullable ETag; Azure::Core::Nullable LastModified; @@ -670,7 +670,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable ContentLength; }; - struct PathUpdateResponse + struct PathUpdateResult { std::string ETag; std::string LastModified; @@ -686,10 +686,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { int32_t FailureCount = int32_t(); std::vector FailedEntries; - static PathUpdateResponse PathUpdateResponseFromSetAccessControlRecursiveResponse( + static PathUpdateResult PathUpdateResultFromSetAccessControlRecursiveResponse( SetAccessControlRecursiveResponse object) { - PathUpdateResponse result; + PathUpdateResult result; result.DirectoriesSuccessful = object.DirectoriesSuccessful; result.FilesSuccessful = object.FilesSuccessful; result.FailureCount = object.FailureCount; @@ -699,7 +699,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } }; - struct PathLeaseResponse + struct PathLeaseResult { std::string ETag; std::string LastModified; @@ -707,7 +707,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string LeaseTime; }; - struct PathReadResponse + struct PathReadResult { std::unique_ptr BodyStream; std::string AcceptRanges; @@ -725,7 +725,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable ContentMD5; }; - struct PathGetPropertiesResponse + struct PathGetPropertiesResult { Azure::Core::Nullable AcceptRanges; DataLakeHttpHeaders HttpHeaders; @@ -745,18 +745,18 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable LeaseStatus; }; - struct PathDeleteResponse + struct PathDeleteResult { Azure::Core::Nullable Continuation; }; - struct PathSetAccessControlResponse + struct PathSetAccessControlResult { std::string ETag; std::string LastModified; }; - struct PathSetAccessControlRecursiveResponse + struct PathSetAccessControlRecursiveResult { Azure::Core::Nullable Continuation; int32_t DirectoriesSuccessful = int32_t(); @@ -764,11 +764,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { int32_t FailureCount = int32_t(); std::vector FailedEntries; - static PathSetAccessControlRecursiveResponse - PathSetAccessControlRecursiveResponseFromSetAccessControlRecursiveResponse( + static PathSetAccessControlRecursiveResult + PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse( SetAccessControlRecursiveResponse object) { - PathSetAccessControlRecursiveResponse result; + PathSetAccessControlRecursiveResult result; result.DirectoriesSuccessful = object.DirectoriesSuccessful; result.FilesSuccessful = object.FilesSuccessful; result.FailureCount = object.FailureCount; @@ -778,14 +778,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } }; - struct PathFlushDataResponse + struct PathFlushDataResult { std::string ETag; std::string LastModified; int64_t ContentLength = int64_t(); }; - struct PathAppendDataResponse + struct PathAppendDataResult { }; @@ -821,7 +821,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // for this request. }; - static Azure::Core::Response ListFileSystems( + static Azure::Core::Response ListFileSystems( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -857,11 +857,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } request.AddHeader( Details::c_HeaderApiVersionParameter, listFileSystemsOptions.ApiVersionParameter); - return ListFileSystemsParseResponse(context, pipeline.Send(context, request)); + return ListFileSystemsParseResult(context, pipeline.Send(context, request)); } private: - static Azure::Core::Response ListFileSystemsParseResponse( + static Azure::Core::Response ListFileSystemsParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -870,16 +870,16 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // OK const auto& bodyBuffer = response.GetBody(); - ServiceListFileSystemsResponse result = bodyBuffer.empty() - ? ServiceListFileSystemsResponse() - : ServiceListFileSystemsResponse::ServiceListFileSystemsResponseFromFileSystemList( + ServiceListFileSystemsResult result = bodyBuffer.empty() + ? ServiceListFileSystemsResult() + : ServiceListFileSystemsResult::ServiceListFileSystemsResultFromFileSystemList( FileSystemList::CreateFromJson(nlohmann::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) != response.GetHeaders().end()) { result.Continuation = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -916,7 +916,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // values for all properties. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -940,7 +940,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { request.AddHeader(Details::c_HeaderProperties, createOptions.Properties.GetValue()); } - return CreateParseResponse(context, pipeline.Send(context, request)); + return CreateParseResult(context, pipeline.Send(context, request)); } struct SetPropertiesOptions @@ -974,7 +974,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // been modified since the specified date/time. }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1010,7 +1010,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Details::c_HeaderIfUnmodifiedSince, setPropertiesOptions.IfUnmodifiedSince.GetValue()); } - return SetPropertiesParseResponse(context, pipeline.Send(context, request)); + return SetPropertiesParseResult(context, pipeline.Send(context, request)); } struct GetPropertiesOptions @@ -1028,7 +1028,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // for this request. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1048,7 +1048,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } request.AddHeader( Details::c_HeaderApiVersionParameter, getPropertiesOptions.ApiVersionParameter); - return GetPropertiesParseResponse(context, pipeline.Send(context, request)); + return GetPropertiesParseResult(context, pipeline.Send(context, request)); } struct DeleteOptions @@ -1072,7 +1072,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // been modified since the specified date/time. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1101,7 +1101,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { request.AddHeader( Details::c_HeaderIfUnmodifiedSince, deleteOptions.IfUnmodifiedSince.GetValue()); } - return DeleteParseResponse(context, pipeline.Send(context, request)); + return DeleteParseResult(context, pipeline.Send(context, request)); } struct ListPathsOptions @@ -1142,7 +1142,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // friendly names. }; - static Azure::Core::Response ListPaths( + static Azure::Core::Response ListPaths( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1185,11 +1185,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { request.AddQueryParameter( Details::c_QueryUpn, (listPathsOptions.Upn.GetValue() ? "true" : "false")); } - return ListPathsParseResponse(context, pipeline.Send(context, request)); + return ListPathsParseResult(context, pipeline.Send(context, request)); } private: - static Azure::Core::Response CreateParseResponse( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1197,11 +1197,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Created - FileSystemCreateResponse result; + FileSystemCreateResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.NamespaceEnabled = response.GetHeaders().at(Details::c_HeaderXMsNamespaceEnabled); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1210,7 +1210,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response SetPropertiesParseResponse( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1218,10 +1218,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - FileSystemSetPropertiesResponse result; + FileSystemSetPropertiesResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1230,7 +1230,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response GetPropertiesParseResponse( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1238,12 +1238,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - FileSystemGetPropertiesResponse result; + FileSystemGetPropertiesResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.Properties = response.GetHeaders().at(Details::c_HeaderXMsProperties); result.NamespaceEnabled = response.GetHeaders().at(Details::c_HeaderXMsNamespaceEnabled); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1252,7 +1252,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response DeleteParseResponse( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1260,8 +1260,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Accepted - FileSystemDeleteResponse result; - return Azure::Core::Response( + FileSystemDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1270,7 +1270,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response ListPathsParseResponse( + static Azure::Core::Response ListPathsParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1279,16 +1279,16 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // Ok const auto& bodyBuffer = response.GetBody(); - FileSystemListPathsResponse result = bodyBuffer.empty() - ? FileSystemListPathsResponse() - : FileSystemListPathsResponse::FileSystemListPathsResponseFromPathList( + FileSystemListPathsResult result = bodyBuffer.empty() + ? FileSystemListPathsResult() + : FileSystemListPathsResult::FileSystemListPathsResultFromPathList( PathList::CreateFromJson(nlohmann::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) != response.GetHeaders().end()) { result.Continuation = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1402,7 +1402,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // has not been modified since the specified date/time. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1525,7 +1525,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Details::c_HeaderSourceIfUnmodifiedSince, createOptions.SourceIfUnmodifiedSince.GetValue()); } - return CreateParseResponse(context, pipeline.Send(context, request)); + return CreateParseResult(context, pipeline.Send(context, request)); } struct UpdateOptions @@ -1658,7 +1658,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // been modified since the specified date/time. }; - static Azure::Core::Response Update( + static Azure::Core::Response Update( std::string url, Azure::Core::Http::BodyStream& bodyStream, Azure::Core::Http::HttpPipeline& pipeline, @@ -1785,7 +1785,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { request.AddHeader( Details::c_HeaderIfUnmodifiedSince, updateOptions.IfUnmodifiedSince.GetValue()); } - return UpdateParseResponse(context, pipeline.Send(context, request)); + return UpdateParseResult(context, pipeline.Send(context, request)); } struct LeaseOptions @@ -1843,7 +1843,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // been modified since the specified date/time. }; - static Azure::Core::Response Lease( + static Azure::Core::Response Lease( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1905,7 +1905,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { request.AddHeader( Details::c_HeaderIfUnmodifiedSince, leaseOptions.IfUnmodifiedSince.GetValue()); } - return LeaseParseResponse(context, pipeline.Send(context, request)); + return LeaseParseResult(context, pipeline.Send(context, request)); } struct ReadOptions @@ -1947,7 +1947,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // been modified since the specified date/time. }; - static Azure::Core::Response Read( + static Azure::Core::Response Read( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1998,7 +1998,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { request.AddHeader( Details::c_HeaderIfUnmodifiedSince, readOptions.IfUnmodifiedSince.GetValue()); } - return ReadParseResponse(context, pipeline.Send(context, request)); + return ReadParseResult(context, pipeline.Send(context, request)); } struct GetPropertiesOptions @@ -2042,7 +2042,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // been modified since the specified date/time. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2097,7 +2097,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Details::c_HeaderIfUnmodifiedSince, getPropertiesOptions.IfUnmodifiedSince.GetValue()); } - return GetPropertiesParseResponse(context, pipeline.Send(context, request)); + return GetPropertiesParseResult(context, pipeline.Send(context, request)); } struct DeleteOptions @@ -2136,7 +2136,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // been modified since the specified date/time. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2188,7 +2188,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { request.AddHeader( Details::c_HeaderIfUnmodifiedSince, deleteOptions.IfUnmodifiedSince.GetValue()); } - return DeleteParseResponse(context, pipeline.Send(context, request)); + return DeleteParseResult(context, pipeline.Send(context, request)); } struct SetAccessControlOptions @@ -2233,7 +2233,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // for this request. }; - static Azure::Core::Response SetAccessControl( + static Azure::Core::Response SetAccessControl( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2295,7 +2295,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } request.AddHeader( Details::c_HeaderApiVersionParameter, setAccessControlOptions.ApiVersionParameter); - return SetAccessControlParseResponse(context, pipeline.Send(context, request)); + return SetAccessControlParseResult(context, pipeline.Send(context, request)); } struct SetAccessControlRecursiveOptions @@ -2334,7 +2334,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // for this request. }; - static Azure::Core::Response SetAccessControlRecursive( + static Azure::Core::Response SetAccessControlRecursive( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2376,7 +2376,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { request.AddHeader( Details::c_HeaderApiVersionParameter, setAccessControlRecursiveOptions.ApiVersionParameter); - return SetAccessControlRecursiveParseResponse(context, pipeline.Send(context, request)); + return SetAccessControlRecursiveParseResult(context, pipeline.Send(context, request)); } struct FlushDataOptions @@ -2458,7 +2458,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // for this request. }; - static Azure::Core::Response FlushData( + static Azure::Core::Response FlushData( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2551,7 +2551,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } request.AddHeader( Details::c_HeaderApiVersionParameter, flushDataOptions.ApiVersionParameter); - return FlushDataParseResponse(context, pipeline.Send(context, request)); + return FlushDataParseResult(context, pipeline.Send(context, request)); } struct AppendDataOptions @@ -2589,7 +2589,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // for this request. }; - static Azure::Core::Response AppendData( + static Azure::Core::Response AppendData( std::string url, Azure::Core::Http::BodyStream& bodyStream, Azure::Core::Http::HttpPipeline& pipeline, @@ -2633,11 +2633,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } request.AddHeader( Details::c_HeaderApiVersionParameter, appendDataOptions.ApiVersionParameter); - return AppendDataParseResponse(context, pipeline.Send(context, request)); + return AppendDataParseResult(context, pipeline.Send(context, request)); } private: - static Azure::Core::Response CreateParseResponse( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2645,7 +2645,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The file or directory was created. - PathCreateResponse result; + PathCreateResult result; if (response.GetHeaders().find(Details::c_HeaderETag) != response.GetHeaders().end()) { result.ETag = response.GetHeaders().at(Details::c_HeaderETag); @@ -2666,8 +2666,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { result.ContentLength = std::stoll(response.GetHeaders().at(Details::c_HeaderContentLength)); } - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else { @@ -2675,7 +2674,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response UpdateParseResponse( + static Azure::Core::Response UpdateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2685,9 +2684,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // The data was flushed (written) to the file or the properties were set successfully. // Response body is optional and is valid only for "SetAccessControlRecursive" const auto& bodyBuffer = response.GetBody(); - PathUpdateResponse result = bodyBuffer.empty() - ? PathUpdateResponse() - : PathUpdateResponse::PathUpdateResponseFromSetAccessControlRecursiveResponse( + PathUpdateResult result = bodyBuffer.empty() + ? PathUpdateResult() + : PathUpdateResult::PathUpdateResultFromSetAccessControlRecursiveResponse( SetAccessControlRecursiveResponse::CreateFromJson( nlohmann::json::parse(bodyBuffer))); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); @@ -2742,19 +2741,17 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.Continuation = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The uploaded data was accepted. - PathUpdateResponse result; + PathUpdateResult result; if (response.GetHeaders().find("content-md5") != response.GetHeaders().end()) { result.ContentMD5 = response.GetHeaders().at("content-md5"); } - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else { @@ -2762,7 +2759,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response LeaseParseResponse( + static Azure::Core::Response LeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2770,7 +2767,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. - PathLeaseResponse result; + PathLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderXMsLeaseId) @@ -2778,13 +2775,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.LeaseId = response.GetHeaders().at(Details::c_HeaderXMsLeaseId); } - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + 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. - PathLeaseResponse result; + PathLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderXMsLeaseId) @@ -2792,18 +2788,16 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.LeaseId = response.GetHeaders().at(Details::c_HeaderXMsLeaseId); } - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + 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. - PathLeaseResponse result; + PathLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.LeaseTime = response.GetHeaders().at(Details::c_HeaderXMsLeaseTime); - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else { @@ -2811,7 +2805,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response ReadParseResponse( + static Azure::Core::Response ReadParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2819,7 +2813,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - PathReadResponse result; + PathReadResult result; result.BodyStream = response.GetBodyStream(); if (response.GetHeaders().find(Details::c_HeaderAcceptRanges) != response.GetHeaders().end()) @@ -2878,12 +2872,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { = LeaseStateTypeFromString(response.GetHeaders().at(Details::c_HeaderXMsLeaseState)); result.LeaseStatus = LeaseStatusTypeFromString( response.GetHeaders().at(Details::c_HeaderXMsLeaseStatus)); - return Azure::Core::Response(std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::PartialContent) { // Partial content - PathReadResponse result; + PathReadResult result; result.BodyStream = response.GetBodyStream(); if (response.GetHeaders().find(Details::c_HeaderAcceptRanges) != response.GetHeaders().end()) @@ -2947,7 +2941,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { = LeaseStateTypeFromString(response.GetHeaders().at(Details::c_HeaderXMsLeaseState)); result.LeaseStatus = LeaseStatusTypeFromString( response.GetHeaders().at(Details::c_HeaderXMsLeaseStatus)); - return Azure::Core::Response(std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else { @@ -2955,7 +2949,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response GetPropertiesParseResponse( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2963,7 +2957,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. - PathGetPropertiesResponse result; + PathGetPropertiesResult result; if (response.GetHeaders().find(Details::c_HeaderAcceptRanges) != response.GetHeaders().end()) { @@ -3050,7 +3044,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { result.LeaseStatus = LeaseStatusTypeFromString( response.GetHeaders().at(Details::c_HeaderXMsLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3059,7 +3053,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response DeleteParseResponse( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3067,14 +3061,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The file was deleted. - PathDeleteResponse result; + PathDeleteResult result; if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) != response.GetHeaders().end()) { result.Continuation = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else { @@ -3082,7 +3075,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response SetAccessControlParseResponse( + static Azure::Core::Response SetAccessControlParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3090,10 +3083,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Set directory access control response. - PathSetAccessControlResponse result; + PathSetAccessControlResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3102,8 +3095,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response - SetAccessControlRecursiveParseResponse( + static Azure::Core::Response + SetAccessControlRecursiveParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3112,10 +3105,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // Set directory access control recursive response. const auto& bodyBuffer = response.GetBody(); - PathSetAccessControlRecursiveResponse result = bodyBuffer.empty() - ? PathSetAccessControlRecursiveResponse() - : PathSetAccessControlRecursiveResponse:: - PathSetAccessControlRecursiveResponseFromSetAccessControlRecursiveResponse( + PathSetAccessControlRecursiveResult result = bodyBuffer.empty() + ? PathSetAccessControlRecursiveResult() + : PathSetAccessControlRecursiveResult:: + PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse( SetAccessControlRecursiveResponse::CreateFromJson( nlohmann::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) @@ -3123,7 +3116,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.Continuation = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3132,7 +3125,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response FlushDataParseResponse( + static Azure::Core::Response FlushDataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3140,7 +3133,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. - PathFlushDataResponse result; + PathFlushDataResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderContentLength) @@ -3149,7 +3142,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { result.ContentLength = std::stoll(response.GetHeaders().at(Details::c_HeaderContentLength)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3158,7 +3151,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response AppendDataParseResponse( + static Azure::Core::Response AppendDataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3166,8 +3159,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Append data to file control response. - PathAppendDataResponse result; - return Azure::Core::Response( + PathAppendDataResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else diff --git a/sdk/storage/inc/shares/protocol/share_rest_client.hpp b/sdk/storage/inc/shares/protocol/share_rest_client.hpp index eaad38e85..cd718f723 100644 --- a/sdk/storage/inc/shares/protocol/share_rest_client.hpp +++ b/sdk/storage/inc/shares/protocol/share_rest_client.hpp @@ -730,18 +730,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { throw std::runtime_error("Cannot convert " + fileRangeWriteType + " to FileRangeWriteType"); } - struct ServiceSetPropertiesResponse + struct ServiceSetPropertiesResult { }; - struct ServiceGetPropertiesResponse + struct ServiceGetPropertiesResult { Metrics HourMetrics; Metrics MinuteMetrics; std::vector Cors; }; - struct ServiceListSharesSegmentResponse + struct ServiceListSharesSegmentResult { std::string ServiceEndpoint; std::string Prefix; @@ -751,13 +751,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string NextMarker; }; - struct ShareCreateResponse + struct ShareCreateResult { std::string ETag; std::string LastModified; }; - struct ShareGetPropertiesResponse + struct ShareGetPropertiesResult { std::map Metadata; std::string ETag; @@ -769,66 +769,66 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable NextAllowedQuotaDowngradeTime; }; - struct ShareDeleteResponse + struct ShareDeleteResult { }; - struct ShareCreateSnapshotResponse + struct ShareCreateSnapshotResult { std::string Snapshot; std::string ETag; std::string LastModified; }; - struct ShareCreatePermissionResponse + struct ShareCreatePermissionResult { std::string FilePermissionKey; }; - struct ShareGetPermissionResponse + struct ShareGetPermissionResult { std::string Permission; }; - struct ShareSetQuotaResponse + struct ShareSetQuotaResult { std::string ETag; std::string LastModified; }; - struct ShareSetMetadataResponse + struct ShareSetMetadataResult { std::string ETag; std::string LastModified; }; - struct ShareGetAccessPolicyResponse + struct ShareGetAccessPolicyResult { std::vector SignedIdentifiers; std::string ETag; std::string LastModified; }; - struct ShareSetAccessPolicyResponse + struct ShareSetAccessPolicyResult { std::string ETag; std::string LastModified; }; - struct ShareGetStatisticsResponse + struct ShareGetStatisticsResult { int64_t ShareUsageBytes = int64_t(); std::string ETag; std::string LastModified; }; - struct ShareRestoreResponse + struct ShareRestoreResult { std::string ETag; std::string LastModified; }; - struct DirectoryCreateResponse + struct DirectoryCreateResult { std::string ETag; std::string LastModified; @@ -842,7 +842,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string FileParentId; }; - struct DirectoryGetPropertiesResponse + struct DirectoryGetPropertiesResult { std::map Metadata; std::string ETag; @@ -857,11 +857,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string FileParentId; }; - struct DirectoryDeleteResponse + struct DirectoryDeleteResult { }; - struct DirectorySetPropertiesResponse + struct DirectorySetPropertiesResult { std::string ETag; std::string LastModified; @@ -875,13 +875,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string FileParentId; }; - struct DirectorySetMetadataResponse + struct DirectorySetMetadataResult { std::string ETag; bool IsServerEncrypted = bool(); }; - struct DirectoryListFilesAndDirectoriesSegmentResponse + struct DirectoryListFilesAndDirectoriesSegmentResult { std::string ServiceEndpoint; std::string ShareName; @@ -895,21 +895,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { FileShareHttpHeaders HttpHeaders; }; - struct DirectoryListHandlesResponse + struct DirectoryListHandlesResult { std::vector HandleList; std::string NextMarker; FileShareHttpHeaders HttpHeaders; }; - struct DirectoryForceCloseHandlesResponse + struct DirectoryForceCloseHandlesResult { std::string marker; int32_t numberOfHandlesClosed = int32_t(); int32_t numberOfHandlesFailedToClose = int32_t(); }; - struct FileCreateResponse + struct FileCreateResult { std::string ETag; std::string LastModified; @@ -923,7 +923,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string FileParentId; }; - struct FileDownloadResponse + struct FileDownloadResult { std::unique_ptr BodyStream; std::string LastModified; @@ -954,7 +954,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { LeaseStatusType LeaseStatus = LeaseStatusType::Unknown; }; - struct FileGetPropertiesResponse + struct FileGetPropertiesResult { std::string LastModified; std::map Metadata; @@ -982,11 +982,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { LeaseStatusType LeaseStatus = LeaseStatusType::Unknown; }; - struct FileDeleteResponse + struct FileDeleteResult { }; - struct FileSetHTTPHeadersResponse + struct FileSetHTTPHeadersResult { std::string ETag; std::string LastModified; @@ -1000,40 +1000,40 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string FileParentId; }; - struct FileSetMetadataResponse + struct FileSetMetadataResult { std::string ETag; bool IsServerEncrypted = bool(); }; - struct FileAcquireLeaseResponse + struct FileAcquireLeaseResult { std::string ETag; std::string LastModified; std::string LeaseId; }; - struct FileReleaseLeaseResponse + struct FileReleaseLeaseResult { std::string ETag; std::string LastModified; }; - struct FileChangeLeaseResponse + struct FileChangeLeaseResult { std::string ETag; std::string LastModified; std::string LeaseId; }; - struct FileBreakLeaseResponse + struct FileBreakLeaseResult { std::string ETag; std::string LastModified; std::string LeaseId; }; - struct FileUploadRangeResponse + struct FileUploadRangeResult { std::string ETag; std::string LastModified; @@ -1041,7 +1041,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { bool IsServerEncrypted = bool(); }; - struct FileUploadRangeFromURLResponse + struct FileUploadRangeFromURLResult { std::string ETag; std::string LastModified; @@ -1049,7 +1049,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { bool IsServerEncrypted = bool(); }; - struct FileGetRangeListResponse + struct FileGetRangeListResult { std::vector RangeList; std::string LastModified; @@ -1057,7 +1057,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { int64_t FileContentLength = int64_t(); }; - struct FileStartCopyResponse + struct FileStartCopyResult { std::string ETag; std::string LastModified; @@ -1065,18 +1065,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { CopyStatusType CopyStatus = CopyStatusType::Unknown; }; - struct FileAbortCopyResponse + struct FileAbortCopyResult { }; - struct FileListHandlesResponse + struct FileListHandlesResult { std::vector HandleList; std::string NextMarker; FileShareHttpHeaders HttpHeaders; }; - struct FileForceCloseHandlesResponse + struct FileForceCloseHandlesResult { std::string marker; int32_t numberOfHandlesClosed = int32_t(); @@ -1099,7 +1099,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1125,7 +1125,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(setPropertiesOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, setPropertiesOptions.ApiVersionParameter); - return SetPropertiesParseResponse(context, pipeline.Send(context, request)); + return SetPropertiesParseResult(context, pipeline.Send(context, request)); } struct GetPropertiesOptions @@ -1139,7 +1139,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1154,7 +1154,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(getPropertiesOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, getPropertiesOptions.ApiVersionParameter); - return GetPropertiesParseResponse(context, pipeline.Send(context, request)); + return GetPropertiesParseResult(context, pipeline.Send(context, request)); } struct ListSharesSegmentOptions @@ -1183,7 +1183,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response ListSharesSegment( + static Azure::Core::Response ListSharesSegment( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1219,11 +1219,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(listSharesSegmentOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, listSharesSegmentOptions.ApiVersionParameter); - return ListSharesSegmentParseResponse(context, pipeline.Send(context, request)); + return ListSharesSegmentParseResult(context, pipeline.Send(context, request)); } private: - static Azure::Core::Response SetPropertiesParseResponse( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1231,8 +1231,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted) - ServiceSetPropertiesResponse result; - return Azure::Core::Response( + ServiceSetPropertiesResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1312,7 +1312,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } writer.Write(XmlNode{XmlNodeType::EndTag}); }; - static Azure::Core::Response GetPropertiesParseResponse( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1323,11 +1323,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ServiceGetPropertiesResponse result = bodyBuffer.empty() - ? ServiceGetPropertiesResponse() - : ServiceGetPropertiesResponseFromStorageServiceProperties( + ServiceGetPropertiesResult result = bodyBuffer.empty() + ? ServiceGetPropertiesResult() + : ServiceGetPropertiesResultFromStorageServiceProperties( StorageServicePropertiesFromXml(reader)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1651,17 +1651,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ServiceGetPropertiesResponse ServiceGetPropertiesResponseFromStorageServiceProperties( + static ServiceGetPropertiesResult ServiceGetPropertiesResultFromStorageServiceProperties( StorageServiceProperties object) { - ServiceGetPropertiesResponse result; + ServiceGetPropertiesResult result; result.HourMetrics = std::move(object.HourMetrics); result.MinuteMetrics = std::move(object.MinuteMetrics); result.Cors = std::move(object.Cors); return result; } - static Azure::Core::Response ListSharesSegmentParseResponse( + static Azure::Core::Response ListSharesSegmentParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1672,11 +1672,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ServiceListSharesSegmentResponse result = bodyBuffer.empty() - ? ServiceListSharesSegmentResponse() - : ServiceListSharesSegmentResponseFromListSharesResponse( + ServiceListSharesSegmentResult result = bodyBuffer.empty() + ? ServiceListSharesSegmentResult() + : ServiceListSharesSegmentResultFromListSharesResponse( ListSharesResponseFromXml(reader)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2055,10 +2055,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ServiceListSharesSegmentResponse - ServiceListSharesSegmentResponseFromListSharesResponse(ListSharesResponse object) + static ServiceListSharesSegmentResult ServiceListSharesSegmentResultFromListSharesResponse( + ListSharesResponse object) { - ServiceListSharesSegmentResponse result; + ServiceListSharesSegmentResult result; result.ServiceEndpoint = std::move(object.ServiceEndpoint); result.Prefix = std::move(object.Prefix); result.Marker = std::move(object.Marker); @@ -2087,7 +2087,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2111,7 +2111,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_HeaderQuota, std::to_string(createOptions.ShareQuota.GetValue())); } request.AddHeader(Details::c_HeaderVersion, createOptions.ApiVersionParameter); - return CreateParseResponse(context, pipeline.Send(context, request)); + return CreateParseResult(context, pipeline.Send(context, request)); } struct GetPropertiesOptions @@ -2128,7 +2128,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2147,7 +2147,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(getPropertiesOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, getPropertiesOptions.ApiVersionParameter); - return GetPropertiesParseResponse(context, pipeline.Send(context, request)); + return GetPropertiesParseResult(context, pipeline.Send(context, request)); } struct DeleteOptions @@ -2167,7 +2167,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // its snapshots. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2192,7 +2192,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_HeaderDeleteSnapshots, DeleteSnapshotsOptionTypeToString(deleteOptions.XMsDeleteSnapshots.GetValue())); } - return DeleteParseResponse(context, pipeline.Send(context, request)); + return DeleteParseResult(context, pipeline.Send(context, request)); } struct CreateSnapshotOptions @@ -2208,7 +2208,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response CreateSnapshot( + static Azure::Core::Response CreateSnapshot( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2228,7 +2228,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader(Details::c_HeaderMetadata + ("-" + pair.first), pair.second); } request.AddHeader(Details::c_HeaderVersion, createSnapshotOptions.ApiVersionParameter); - return CreateSnapshotParseResponse(context, pipeline.Send(context, request)); + return CreateSnapshotParseResult(context, pipeline.Send(context, request)); } struct CreatePermissionOptions @@ -2243,7 +2243,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { SharePermission Permission; // A permission (a security descriptor) at the share level. }; - static Azure::Core::Response CreatePermission( + static Azure::Core::Response CreatePermission( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2268,7 +2268,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(createPermissionOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, createPermissionOptions.ApiVersionParameter); - return CreatePermissionParseResponse(context, pipeline.Send(context, request)); + return CreatePermissionParseResult(context, pipeline.Send(context, request)); } struct GetPermissionOptions @@ -2284,7 +2284,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response GetPermission( + static Azure::Core::Response GetPermission( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2301,7 +2301,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(getPermissionOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, getPermissionOptions.ApiVersionParameter); - return GetPermissionParseResponse(context, pipeline.Send(context, request)); + return GetPermissionParseResult(context, pipeline.Send(context, request)); } struct SetQuotaOptions @@ -2317,7 +2317,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ShareQuota; // Specifies the maximum size of the share, in gigabytes. }; - static Azure::Core::Response SetQuota( + static Azure::Core::Response SetQuota( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2338,7 +2338,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderQuota, std::to_string(setQuotaOptions.ShareQuota.GetValue())); } - return SetQuotaParseResponse(context, pipeline.Send(context, request)); + return SetQuotaParseResult(context, pipeline.Send(context, request)); } struct SetMetadataOptions @@ -2354,7 +2354,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2374,7 +2374,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader(Details::c_HeaderMetadata + ("-" + pair.first), pair.second); } request.AddHeader(Details::c_HeaderVersion, setMetadataOptions.ApiVersionParameter); - return SetMetadataParseResponse(context, pipeline.Send(context, request)); + return SetMetadataParseResult(context, pipeline.Send(context, request)); } struct GetAccessPolicyOptions @@ -2388,7 +2388,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response GetAccessPolicy( + static Azure::Core::Response GetAccessPolicy( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2403,7 +2403,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(getAccessPolicyOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, getAccessPolicyOptions.ApiVersionParameter); - return GetAccessPolicyParseResponse(context, pipeline.Send(context, request)); + return GetAccessPolicyParseResult(context, pipeline.Send(context, request)); } struct SetAccessPolicyOptions @@ -2418,7 +2418,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response SetAccessPolicy( + static Azure::Core::Response SetAccessPolicy( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2444,7 +2444,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(setAccessPolicyOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, setAccessPolicyOptions.ApiVersionParameter); - return SetAccessPolicyParseResponse(context, pipeline.Send(context, request)); + return SetAccessPolicyParseResult(context, pipeline.Send(context, request)); } struct GetStatisticsOptions @@ -2458,7 +2458,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response GetStatistics( + static Azure::Core::Response GetStatistics( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2473,7 +2473,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(getStatisticsOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, getStatisticsOptions.ApiVersionParameter); - return GetStatisticsParseResponse(context, pipeline.Send(context, request)); + return GetStatisticsParseResult(context, pipeline.Send(context, request)); } struct RestoreOptions @@ -2495,7 +2495,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { DeletedShareVersion; // Specifies the version of the preivously-deleted share. }; - static Azure::Core::Response Restore( + static Azure::Core::Response Restore( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2525,11 +2525,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderDeletedShareVersion, restoreOptions.DeletedShareVersion.GetValue()); } - return RestoreParseResponse(context, pipeline.Send(context, request)); + return RestoreParseResult(context, pipeline.Send(context, request)); } private: - static Azure::Core::Response CreateParseResponse( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2537,10 +2537,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share created. - ShareCreateResponse result; + ShareCreateResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2549,7 +2549,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResponse( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2557,7 +2557,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - ShareGetPropertiesResponse result; + ShareGetPropertiesResult result; for (auto i = response.GetHeaders().lower_bound(Details::c_HeaderMetadata); i != response.GetHeaders().end() @@ -2593,7 +2593,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.NextAllowedQuotaDowngradeTime = response.GetHeaders().at(Details::c_HeaderNextAllowedQuotaDowngradeTime); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2602,7 +2602,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResponse( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2610,8 +2610,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Accepted - ShareDeleteResponse result; - return Azure::Core::Response( + ShareDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2620,7 +2620,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response CreateSnapshotParseResponse( + static Azure::Core::Response CreateSnapshotParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2628,11 +2628,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share snapshot created. - ShareCreateSnapshotResponse result; + ShareCreateSnapshotResult result; result.Snapshot = response.GetHeaders().at(Details::c_HeaderSnapshot); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2641,7 +2641,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response CreatePermissionParseResponse( + static Azure::Core::Response CreatePermissionParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2649,9 +2649,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share level permission created. - ShareCreatePermissionResponse result; + ShareCreatePermissionResult result; result.FilePermissionKey = response.GetHeaders().at(Details::c_HeaderFilePermissionKey); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2665,7 +2665,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { node["permission"] = object.Permission; } - static Azure::Core::Response GetPermissionParseResponse( + static Azure::Core::Response GetPermissionParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2674,11 +2674,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success const auto& bodyBuffer = response.GetBody(); - ShareGetPermissionResponse result = bodyBuffer.empty() - ? ShareGetPermissionResponse() - : ShareGetPermissionResponseFromSharePermission( + ShareGetPermissionResult result = bodyBuffer.empty() + ? ShareGetPermissionResult() + : ShareGetPermissionResultFromSharePermission( SharePermissionFromJson(nlohmann::json::parse(bodyBuffer))); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2694,15 +2694,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareGetPermissionResponse ShareGetPermissionResponseFromSharePermission( + static ShareGetPermissionResult ShareGetPermissionResultFromSharePermission( SharePermission object) { - ShareGetPermissionResponse result; + ShareGetPermissionResult result; result.Permission = std::move(object.Permission); return result; } - static Azure::Core::Response SetQuotaParseResponse( + static Azure::Core::Response SetQuotaParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2710,10 +2710,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - ShareSetQuotaResponse result; + ShareSetQuotaResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2722,7 +2722,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResponse( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2730,10 +2730,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - ShareSetMetadataResponse result; + ShareSetMetadataResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2742,7 +2742,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetAccessPolicyParseResponse( + static Azure::Core::Response GetAccessPolicyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2753,12 +2753,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ShareGetAccessPolicyResponse result = bodyBuffer.empty() - ? ShareGetAccessPolicyResponse() - : ShareGetAccessPolicyResponseFromSignedIdentifiers(SignedIdentifiersFromXml(reader)); + ShareGetAccessPolicyResult result = bodyBuffer.empty() + ? ShareGetAccessPolicyResult() + : ShareGetAccessPolicyResultFromSignedIdentifiers(SignedIdentifiersFromXml(reader)); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2957,15 +2957,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareGetAccessPolicyResponse ShareGetAccessPolicyResponseFromSignedIdentifiers( + static ShareGetAccessPolicyResult ShareGetAccessPolicyResultFromSignedIdentifiers( std::vector object) { - ShareGetAccessPolicyResponse result; + ShareGetAccessPolicyResult result; result.SignedIdentifiers = std::move(object); return result; } - static Azure::Core::Response SetAccessPolicyParseResponse( + static Azure::Core::Response SetAccessPolicyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2973,10 +2973,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - ShareSetAccessPolicyResponse result; + ShareSetAccessPolicyResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3021,7 +3021,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } writer.Write(XmlNode{XmlNodeType::EndTag}); }; - static Azure::Core::Response GetStatisticsParseResponse( + static Azure::Core::Response GetStatisticsParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3032,12 +3032,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ShareGetStatisticsResponse result = bodyBuffer.empty() - ? ShareGetStatisticsResponse() - : ShareGetStatisticsResponseFromShareStats(ShareStatsFromXml(reader)); + ShareGetStatisticsResult result = bodyBuffer.empty() + ? ShareGetStatisticsResult() + : ShareGetStatisticsResultFromShareStats(ShareStatsFromXml(reader)); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3103,14 +3103,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareGetStatisticsResponse ShareGetStatisticsResponseFromShareStats(ShareStats object) + static ShareGetStatisticsResult ShareGetStatisticsResultFromShareStats(ShareStats object) { - ShareGetStatisticsResponse result; + ShareGetStatisticsResult result; result.ShareUsageBytes = object.ShareUsageBytes; return result; } - static Azure::Core::Response RestoreParseResponse( + static Azure::Core::Response RestoreParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3118,10 +3118,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Created - ShareRestoreResponse result; + ShareRestoreResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3163,7 +3163,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { FileLastWriteTime; // Last write time for the file/directory. Default value: Now. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3195,7 +3195,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader(Details::c_HeaderFileAttributes, createOptions.FileAttributes); request.AddHeader(Details::c_HeaderFileCreationTime, createOptions.FileCreationTime); request.AddHeader(Details::c_HeaderFileLastWriteTime, createOptions.FileLastWriteTime); - return CreateParseResponse(context, pipeline.Send(context, request)); + return CreateParseResult(context, pipeline.Send(context, request)); } struct GetPropertiesOptions @@ -3212,7 +3212,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3231,7 +3231,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(getPropertiesOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, getPropertiesOptions.ApiVersionParameter); - return GetPropertiesParseResponse(context, pipeline.Send(context, request)); + return GetPropertiesParseResult(context, pipeline.Send(context, request)); } struct DeleteOptions @@ -3245,7 +3245,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3259,7 +3259,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryTimeout, std::to_string(deleteOptions.Timeout.GetValue())); } request.AddHeader(Details::c_HeaderVersion, deleteOptions.ApiVersionParameter); - return DeleteParseResponse(context, pipeline.Send(context, request)); + return DeleteParseResult(context, pipeline.Send(context, request)); } struct SetPropertiesOptions @@ -3290,7 +3290,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { FileLastWriteTime; // Last write time for the file/directory. Default value: Now. }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3321,7 +3321,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader(Details::c_HeaderFileCreationTime, setPropertiesOptions.FileCreationTime); request.AddHeader( Details::c_HeaderFileLastWriteTime, setPropertiesOptions.FileLastWriteTime); - return SetPropertiesParseResponse(context, pipeline.Send(context, request)); + return SetPropertiesParseResult(context, pipeline.Send(context, request)); } struct SetMetadataOptions @@ -3337,7 +3337,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3357,7 +3357,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader(Details::c_HeaderMetadata + ("-" + pair.first), pair.second); } request.AddHeader(Details::c_HeaderVersion, setMetadataOptions.ApiVersionParameter); - return SetMetadataParseResponse(context, pipeline.Send(context, request)); + return SetMetadataParseResult(context, pipeline.Send(context, request)); } struct ListFilesAndDirectoriesSegmentOptions @@ -3386,7 +3386,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response + static Azure::Core::Response ListFilesAndDirectoriesSegment( std::string url, Azure::Core::Http::HttpPipeline& pipeline, @@ -3426,8 +3426,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } request.AddHeader( Details::c_HeaderVersion, listFilesAndDirectoriesSegmentOptions.ApiVersionParameter); - return ListFilesAndDirectoriesSegmentParseResponse( - context, pipeline.Send(context, request)); + return ListFilesAndDirectoriesSegmentParseResult(context, pipeline.Send(context, request)); } struct ListHandlesOptions @@ -3457,7 +3456,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response ListHandles( + static Azure::Core::Response ListHandles( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3491,7 +3490,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { (listHandlesOptions.Recursive.GetValue() ? "true" : "false")); } request.AddHeader(Details::c_HeaderVersion, listHandlesOptions.ApiVersionParameter); - return ListHandlesParseResponse(context, pipeline.Send(context, request)); + return ListHandlesParseResult(context, pipeline.Send(context, request)); } struct ForceCloseHandlesOptions @@ -3519,7 +3518,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response ForceCloseHandles( + static Azure::Core::Response ForceCloseHandles( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3551,11 +3550,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { (forceCloseHandlesOptions.Recursive.GetValue() ? "true" : "false")); } request.AddHeader(Details::c_HeaderVersion, forceCloseHandlesOptions.ApiVersionParameter); - return ForceCloseHandlesParseResponse(context, pipeline.Send(context, request)); + return ForceCloseHandlesParseResult(context, pipeline.Send(context, request)); } private: - static Azure::Core::Response CreateParseResponse( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3563,7 +3562,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Directory created. - DirectoryCreateResponse result; + DirectoryCreateResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -3575,7 +3574,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3584,7 +3583,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResponse( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3592,7 +3591,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - DirectoryGetPropertiesResponse result; + DirectoryGetPropertiesResult result; for (auto i = response.GetHeaders().lower_bound(Details::c_HeaderMetadata); i != response.GetHeaders().end() @@ -3612,7 +3611,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FilePermissionKey = response.GetHeaders().at(Details::c_HeaderFilePermissionKey); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3621,7 +3620,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResponse( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3629,8 +3628,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted). - DirectoryDeleteResponse result; - return Azure::Core::Response( + DirectoryDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3639,7 +3638,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetPropertiesParseResponse( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3647,7 +3646,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - DirectorySetPropertiesResponse result; + DirectorySetPropertiesResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -3659,7 +3658,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3668,7 +3667,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResponse( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3676,11 +3675,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success (OK). - DirectorySetMetadataResponse result; + DirectorySetMetadataResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3689,8 +3688,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response - ListFilesAndDirectoriesSegmentParseResponse( + static Azure::Core::Response + ListFilesAndDirectoriesSegmentParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3701,12 +3700,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - DirectoryListFilesAndDirectoriesSegmentResponse result = bodyBuffer.empty() - ? DirectoryListFilesAndDirectoriesSegmentResponse() - : DirectoryListFilesAndDirectoriesSegmentResponseFromListFilesAndDirectoriesSegmentResponse( + DirectoryListFilesAndDirectoriesSegmentResult result = bodyBuffer.empty() + ? DirectoryListFilesAndDirectoriesSegmentResult() + : DirectoryListFilesAndDirectoriesSegmentResultFromListFilesAndDirectoriesSegmentResponse( ListFilesAndDirectoriesSegmentResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::c_HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4056,11 +4055,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static DirectoryListFilesAndDirectoriesSegmentResponse - DirectoryListFilesAndDirectoriesSegmentResponseFromListFilesAndDirectoriesSegmentResponse( + static DirectoryListFilesAndDirectoriesSegmentResult + DirectoryListFilesAndDirectoriesSegmentResultFromListFilesAndDirectoriesSegmentResponse( ListFilesAndDirectoriesSegmentResponse object) { - DirectoryListFilesAndDirectoriesSegmentResponse result; + DirectoryListFilesAndDirectoriesSegmentResult result; result.ServiceEndpoint = std::move(object.ServiceEndpoint); result.ShareName = std::move(object.ShareName); result.ShareSnapshot = std::move(object.ShareSnapshot); @@ -4073,7 +4072,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Azure::Core::Response ListHandlesParseResponse( + static Azure::Core::Response ListHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4084,12 +4083,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - DirectoryListHandlesResponse result = bodyBuffer.empty() - ? DirectoryListHandlesResponse() - : DirectoryListHandlesResponseFromListHandlesResponse( + DirectoryListHandlesResult result = bodyBuffer.empty() + ? DirectoryListHandlesResult() + : DirectoryListHandlesResultFromListHandlesResponse( ListHandlesResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::c_HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4285,17 +4284,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static DirectoryListHandlesResponse DirectoryListHandlesResponseFromListHandlesResponse( + static DirectoryListHandlesResult DirectoryListHandlesResultFromListHandlesResponse( ListHandlesResponse object) { - DirectoryListHandlesResponse result; + DirectoryListHandlesResult result; result.HandleList = std::move(object.HandleList); result.NextMarker = std::move(object.NextMarker); return result; } - static Azure::Core::Response - ForceCloseHandlesParseResponse( + static Azure::Core::Response ForceCloseHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4303,13 +4301,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - DirectoryForceCloseHandlesResponse result; + DirectoryForceCloseHandlesResult result; result.marker = response.GetHeaders().at(Details::c_HeaderMarker); result.numberOfHandlesClosed = std::stoi(response.GetHeaders().at(Details::c_HeaderNumberOfHandlesClosed)); result.numberOfHandlesFailedToClose = std::stoi(response.GetHeaders().at(Details::c_HeaderNumberOfHandlesFailedToClose)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4368,7 +4366,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4437,7 +4435,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { request.AddHeader(Details::c_HeaderLeaseId, createOptions.LeaseIdOptional.GetValue()); } - return CreateParseResponse(context, pipeline.Send(context, request)); + return CreateParseResult(context, pipeline.Send(context, request)); } struct DownloadOptions @@ -4460,7 +4458,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response Download( + static Azure::Core::Response Download( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4487,7 +4485,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { request.AddHeader(Details::c_HeaderLeaseId, downloadOptions.LeaseIdOptional.GetValue()); } - return DownloadParseResponse(context, pipeline.Send(context, request)); + return DownloadParseResult(context, pipeline.Send(context, request)); } struct GetPropertiesOptions @@ -4507,7 +4505,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4530,7 +4528,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderLeaseId, getPropertiesOptions.LeaseIdOptional.GetValue()); } - return GetPropertiesParseResponse(context, pipeline.Send(context, request)); + return GetPropertiesParseResult(context, pipeline.Send(context, request)); } struct DeleteOptions @@ -4547,7 +4545,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4564,7 +4562,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { request.AddHeader(Details::c_HeaderLeaseId, deleteOptions.LeaseIdOptional.GetValue()); } - return DeleteParseResponse(context, pipeline.Send(context, request)); + return DeleteParseResult(context, pipeline.Send(context, request)); } struct SetHTTPHeadersOptions @@ -4615,7 +4613,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response SetHTTPHeaders( + static Azure::Core::Response SetHTTPHeaders( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4690,7 +4688,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderLeaseId, setHTTPHeadersOptions.LeaseIdOptional.GetValue()); } - return SetHTTPHeadersParseResponse(context, pipeline.Send(context, request)); + return SetHTTPHeadersParseResult(context, pipeline.Send(context, request)); } struct SetMetadataOptions @@ -4709,7 +4707,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4733,7 +4731,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderLeaseId, setMetadataOptions.LeaseIdOptional.GetValue()); } - return SetMetadataParseResponse(context, pipeline.Send(context, request)); + return SetMetadataParseResult(context, pipeline.Send(context, request)); } struct AcquireLeaseOptions @@ -4762,7 +4760,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // logging is enabled. }; - static Azure::Core::Response AcquireLease( + static Azure::Core::Response AcquireLease( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4796,7 +4794,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderRequestId, acquireLeaseOptions.ClientRequestId.GetValue()); } - return AcquireLeaseParseResponse(context, pipeline.Send(context, request)); + return AcquireLeaseParseResult(context, pipeline.Send(context, request)); } struct ReleaseLeaseOptions @@ -4815,7 +4813,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // logging is enabled. }; - static Azure::Core::Response ReleaseLease( + static Azure::Core::Response ReleaseLease( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4837,7 +4835,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderRequestId, releaseLeaseOptions.ClientRequestId.GetValue()); } - return ReleaseLeaseParseResponse(context, pipeline.Send(context, request)); + return ReleaseLeaseParseResult(context, pipeline.Send(context, request)); } struct ChangeLeaseOptions @@ -4861,7 +4859,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // logging is enabled. }; - static Azure::Core::Response ChangeLease( + static Azure::Core::Response ChangeLease( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4889,7 +4887,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderRequestId, changeLeaseOptions.ClientRequestId.GetValue()); } - return ChangeLeaseParseResponse(context, pipeline.Send(context, request)); + return ChangeLeaseParseResult(context, pipeline.Send(context, request)); } struct BreakLeaseOptions @@ -4910,7 +4908,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // logging is enabled. }; - static Azure::Core::Response BreakLease( + static Azure::Core::Response BreakLease( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4935,7 +4933,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderRequestId, breakLeaseOptions.ClientRequestId.GetValue()); } - return BreakLeaseParseResponse(context, pipeline.Send(context, request)); + return BreakLeaseParseResult(context, pipeline.Send(context, request)); } struct UploadRangeOptions @@ -4975,7 +4973,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response UploadRange( + static Azure::Core::Response UploadRange( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5005,7 +5003,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderLeaseId, uploadRangeOptions.LeaseIdOptional.GetValue()); } - return UploadRangeParseResponse(context, pipeline.Send(context, request)); + return UploadRangeParseResult(context, pipeline.Send(context, request)); } struct UploadRangeFromURLOptions @@ -5050,7 +5048,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response UploadRangeFromURL( + static Azure::Core::Response UploadRangeFromURL( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5102,7 +5100,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderLeaseId, uploadRangeFromURLOptions.LeaseIdOptional.GetValue()); } - return UploadRangeFromURLParseResponse(context, pipeline.Send(context, request)); + return UploadRangeFromURLParseResult(context, pipeline.Send(context, request)); } struct GetRangeListOptions @@ -5124,7 +5122,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response GetRangeList( + static Azure::Core::Response GetRangeList( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5152,7 +5150,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { request.AddHeader( Details::c_HeaderLeaseId, getRangeListOptions.LeaseIdOptional.GetValue()); } - return GetRangeListParseResponse(context, pipeline.Send(context, request)); + return GetRangeListParseResult(context, pipeline.Send(context, request)); } struct StartCopyOptions @@ -5218,7 +5216,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response StartCopy( + static Azure::Core::Response StartCopy( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5287,7 +5285,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { request.AddHeader(Details::c_HeaderLeaseId, startCopyOptions.LeaseIdOptional.GetValue()); } - return StartCopyParseResponse(context, pipeline.Send(context, request)); + return StartCopyParseResult(context, pipeline.Send(context, request)); } struct AbortCopyOptions @@ -5306,7 +5304,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // active and matches this ID. }; - static Azure::Core::Response AbortCopy( + static Azure::Core::Response AbortCopy( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5327,7 +5325,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { request.AddHeader(Details::c_HeaderLeaseId, abortCopyOptions.LeaseIdOptional.GetValue()); } - return AbortCopyParseResponse(context, pipeline.Send(context, request)); + return AbortCopyParseResult(context, pipeline.Send(context, request)); } struct ListHandlesOptions @@ -5354,7 +5352,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response ListHandles( + static Azure::Core::Response ListHandles( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5382,7 +5380,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::c_QueryShareSnapshot, listHandlesOptions.ShareSnapshot.GetValue()); } request.AddHeader(Details::c_HeaderVersion, listHandlesOptions.ApiVersionParameter); - return ListHandlesParseResponse(context, pipeline.Send(context, request)); + return ListHandlesParseResult(context, pipeline.Send(context, request)); } struct ForceCloseHandlesOptions @@ -5407,7 +5405,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // for this request. }; - static Azure::Core::Response ForceCloseHandles( + static Azure::Core::Response ForceCloseHandles( std::string url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5433,11 +5431,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } request.AddHeader(Details::c_HeaderHandleId, forceCloseHandlesOptions.HandleId); request.AddHeader(Details::c_HeaderVersion, forceCloseHandlesOptions.ApiVersionParameter); - return ForceCloseHandlesParseResponse(context, pipeline.Send(context, request)); + return ForceCloseHandlesParseResult(context, pipeline.Send(context, request)); } private: - static Azure::Core::Response CreateParseResponse( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5445,7 +5443,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, File created. - FileCreateResponse result; + FileCreateResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -5457,8 +5455,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else { @@ -5466,7 +5463,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DownloadParseResponse( + static Azure::Core::Response DownloadParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5474,7 +5471,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Succeeded to read the entire file. - FileDownloadResponse result; + FileDownloadResult result; result.BodyStream = response.GetBodyStream(); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); @@ -5527,13 +5524,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { = LeaseStateTypeFromString(response.GetHeaders().at(Details::c_HeaderLeaseState)); result.LeaseStatus = LeaseStatusTypeFromString(response.GetHeaders().at(Details::c_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. - FileDownloadResponse result; + FileDownloadResult result; result.BodyStream = response.GetBodyStream(); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); @@ -5586,7 +5583,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { = LeaseStateTypeFromString(response.GetHeaders().at(Details::c_HeaderLeaseState)); result.LeaseStatus = LeaseStatusTypeFromString(response.GetHeaders().at(Details::c_HeaderLeaseStatus)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5595,7 +5592,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResponse( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5603,7 +5600,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - FileGetPropertiesResponse result; + FileGetPropertiesResult result; result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); for (auto i = response.GetHeaders().lower_bound(Details::c_HeaderMetadata); @@ -5653,7 +5650,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { = LeaseStateTypeFromString(response.GetHeaders().at(Details::c_HeaderLeaseState)); result.LeaseStatus = LeaseStatusTypeFromString(response.GetHeaders().at(Details::c_HeaderLeaseStatus)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5662,7 +5659,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResponse( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5670,9 +5667,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted). - FileDeleteResponse result; - return Azure::Core::Response( - std::move(result), std::move(responsePtr)); + FileDeleteResult result; + return Azure::Core::Response(std::move(result), std::move(responsePtr)); } else { @@ -5680,7 +5676,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetHTTPHeadersParseResponse( + static Azure::Core::Response SetHTTPHeadersParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5688,7 +5684,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - FileSetHTTPHeadersResponse result; + FileSetHTTPHeadersResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -5700,7 +5696,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5709,7 +5705,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResponse( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5717,11 +5713,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success (OK). - FileSetMetadataResponse result; + FileSetMetadataResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5730,7 +5726,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AcquireLeaseParseResponse( + static Azure::Core::Response AcquireLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5738,11 +5734,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The Acquire operation completed successfully. - FileAcquireLeaseResponse result; + FileAcquireLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5751,7 +5747,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ReleaseLeaseParseResponse( + static Azure::Core::Response ReleaseLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5759,10 +5755,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Release operation completed successfully. - FileReleaseLeaseResponse result; + FileReleaseLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5771,7 +5767,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ChangeLeaseParseResponse( + static Azure::Core::Response ChangeLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5779,11 +5775,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Change operation completed successfully. - FileChangeLeaseResponse result; + FileChangeLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5792,7 +5788,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response BreakLeaseParseResponse( + static Azure::Core::Response BreakLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5800,11 +5796,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The Break operation completed successfully. - FileBreakLeaseResponse result; + FileBreakLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5813,7 +5809,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response UploadRangeParseResponse( + static Azure::Core::Response UploadRangeParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5821,7 +5817,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success (Created). - FileUploadRangeResponse result; + FileUploadRangeResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderContentMD5) @@ -5831,7 +5827,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5840,7 +5836,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response UploadRangeFromURLParseResponse( + static Azure::Core::Response UploadRangeFromURLParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5848,13 +5844,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success (Created). - FileUploadRangeFromURLResponse result; + FileUploadRangeFromURLResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.XMsContentCrc64 = response.GetHeaders().at(Details::c_HeaderXMsContentCrc64); result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5863,7 +5859,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetRangeListParseResponse( + static Azure::Core::Response GetRangeListParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5874,14 +5870,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - FileGetRangeListResponse result = bodyBuffer.empty() - ? FileGetRangeListResponse() - : FileGetRangeListResponseFromRangeList(RangeListFromXml(reader)); + FileGetRangeListResult result = bodyBuffer.empty() + ? FileGetRangeListResult() + : FileGetRangeListResultFromRangeList(RangeListFromXml(reader)); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.FileContentLength = std::stoll(response.GetHeaders().at(Details::c_HeaderFileContentLength)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6009,15 +6005,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileGetRangeListResponse FileGetRangeListResponseFromRangeList( - std::vector object) + static FileGetRangeListResult FileGetRangeListResultFromRangeList(std::vector object) { - FileGetRangeListResponse result; + FileGetRangeListResult result; result.RangeList = std::move(object); return result; } - static Azure::Core::Response StartCopyParseResponse( + static Azure::Core::Response StartCopyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6025,13 +6020,13 @@ 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. - FileStartCopyResponse result; + FileStartCopyResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.CopyId = response.GetHeaders().at(Details::c_HeaderCopyId); result.CopyStatus = CopyStatusTypeFromString(response.GetHeaders().at(Details::c_HeaderCopyStatus)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6040,7 +6035,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AbortCopyParseResponse( + static Azure::Core::Response AbortCopyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6048,8 +6043,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. - FileAbortCopyResponse result; - return Azure::Core::Response( + FileAbortCopyResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6058,7 +6053,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ListHandlesParseResponse( + static Azure::Core::Response ListHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6069,11 +6064,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - FileListHandlesResponse result = bodyBuffer.empty() - ? FileListHandlesResponse() - : FileListHandlesResponseFromListHandlesResponse(ListHandlesResponseFromXml(reader)); + FileListHandlesResult result = bodyBuffer.empty() + ? FileListHandlesResult() + : FileListHandlesResultFromListHandlesResponse(ListHandlesResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::c_HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6269,16 +6264,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileListHandlesResponse FileListHandlesResponseFromListHandlesResponse( + static FileListHandlesResult FileListHandlesResultFromListHandlesResponse( ListHandlesResponse object) { - FileListHandlesResponse result; + FileListHandlesResult result; result.HandleList = std::move(object.HandleList); result.NextMarker = std::move(object.NextMarker); return result; } - static Azure::Core::Response ForceCloseHandlesParseResponse( + static Azure::Core::Response ForceCloseHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6286,13 +6281,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - FileForceCloseHandlesResponse result; + FileForceCloseHandlesResult result; result.marker = response.GetHeaders().at(Details::c_HeaderMarker); result.numberOfHandlesClosed = std::stoi(response.GetHeaders().at(Details::c_HeaderNumberOfHandlesClosed)); result.numberOfHandlesFailedToClose = std::stoi(response.GetHeaders().at(Details::c_HeaderNumberOfHandlesFailedToClose)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else diff --git a/sdk/storage/inc/shares/share_client.hpp b/sdk/storage/inc/shares/share_client.hpp index d4dc6979a..208f9d310 100644 --- a/sdk/storage/inc/shares/share_client.hpp +++ b/sdk/storage/inc/shares/share_client.hpp @@ -73,45 +73,47 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief Creates the file share. * @param options Optional parameters to create this file share. - * @return Azure::Core::Response The information containing the version and modified - * time of a share. + * @return Azure::Core::Response containing the information including the + * version and modified time of a share. */ - Azure::Core::Response Create( + Azure::Core::Response Create( const CreateShareOptions& options = CreateShareOptions()) const; /** * @brief Deletes the file share. * @param options Optional parameters to delete this file share. - * @return Azure::Core::Response Currently empty and reserved for future usage. + * @return Azure::Core::Response currently empty and reserved for future + * usage. */ - Azure::Core::Response Delete( + Azure::Core::Response Delete( const DeleteShareOptions& options = DeleteShareOptions()) const; /** * @brief Creates a snapshot for the share. * @param options Optional parameters to create the share snapshot. - * @return Azure::Core::Response Containing the information for ths snapshot. + * @return Azure::Core::Response containing the information for ths + * snapshot. */ - Azure::Core::Response CreateSnapshot( + Azure::Core::Response CreateSnapshot( const CreateShareSnapshotOptions& options = CreateShareSnapshotOptions()) const; /** * @brief Gets the properties of the share. * @param options Optional parameters to get the share properties. - * @return Azure::Core::Response Containing the information for ths share - * or one of its snapshot. + * @return Azure::Core::Response containing the properties for ths + * share or one of its snapshot. */ - Azure::Core::Response GetProperties( + Azure::Core::Response GetProperties( const GetSharePropertiesOptions& options = GetSharePropertiesOptions()) const; /** * @brief Sets the quota of the share. * @param quota Specifies the maximum size of the share, in gigabytes. * @param options Optional parameters to set the share quota. - * @return Azure::Core::Response The information containing the version - * and modified time of a share. + * @return Azure::Core::Response containing the information including the + * version and modified time of a share. */ - Azure::Core::Response SetQuota( + Azure::Core::Response SetQuota( int32_t quota, const SetShareQuotaOptions& options = SetShareQuotaOptions()) const; @@ -119,18 +121,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Sets the metadata to the share. * @param metadata A name-value pair to associate with a file storage 'Share' object.. * @param options Optional parameters to set the share metadata. - * @return Azure::Core::Response The information containing the version - * and modified time of a share. + * @return Azure::Core::Response containing the information including + * the version and modified time of a share. */ - Azure::Core::Response SetMetadata( + Azure::Core::Response SetMetadata( std::map metadata, const SetShareMetadataOptions& options = SetShareMetadataOptions()) const; /** * @brief Gets the access policy of the share. * @param options Optional parameters to get the share's access policy. - * @return Azure::Core::Response> The access policy of the - * share. + * @return Azure::Core::Response containing the access policy of + * the share. */ Azure::Core::Response GetAccessPolicy( const GetShareAccessPolicyOptions& options = GetShareAccessPolicyOptions()) const; @@ -139,30 +141,30 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Sets the access policy of the share. * @param accessPolicy Specifies the access policy to be set to the share. * @param options Optional parameters to Set the share's access policy. - * @return Azure::Core::Response The information containing the version - * and modified time of a share. + * @return Azure::Core::Response containing the information + * including the version and modified time of a share. */ - Azure::Core::Response SetAccessPolicy( + Azure::Core::Response SetAccessPolicy( const std::vector& accessPolicy, const SetShareAccessPolicyOptions& options = SetShareAccessPolicyOptions()) const; /** * @brief Gets the stats of the share. * @param options Optional parameters to get share's statistics. - * @return Azure::Core::Response The information containing the bytes used in - * by the share, the version and modified time of a share. + * @return Azure::Core::Response containing the information including + * the bytes used in by the share, the version and modified time of a share. */ - Azure::Core::Response GetStatistics( + Azure::Core::Response GetStatistics( const GetShareStatsOptions& options = GetShareStatsOptions()) const; /** * @brief Creates a permission on the share. * @param permission Specifies the permission to be created on the share. * @param options Optional parameters to create the share's permission. - * @return Azure::Core::Response The information containing the permission - * key of the permission. + * @return Azure::Core::Response containing the information + * including the permission key of the permission. */ - Azure::Core::Response CreatePermission( + Azure::Core::Response CreatePermission( const std::string& permission, const CreateSharePermissionOptions& options = CreateSharePermissionOptions()) const; @@ -170,9 +172,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Gets the permission of the share using the specific key. * @param permissionKey The permission key of a permission. * @param options Optional parameters to get share's permission. - * @return Azure::Core::Response The permission sting with specified key. + * @return Azure::Core::Response containing the permission string with + * specified key. */ - Azure::Core::Response GetPermission( + Azure::Core::Response GetPermission( const std::string& permissionKey, const GetSharePermissionOptions& options = GetSharePermissionOptions()) const; diff --git a/sdk/storage/inc/shares/share_options.hpp b/sdk/storage/inc/shares/share_options.hpp index fa00608e2..d2ded9358 100644 --- a/sdk/storage/inc/shares/share_options.hpp +++ b/sdk/storage/inc/shares/share_options.hpp @@ -32,7 +32,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::vector> PerRetryPolicies; }; - struct ListSharesOptions + struct ListSharesSegmentOptions { /** * @brief Context for cancelling long running operations. diff --git a/sdk/storage/inc/shares/share_responses.hpp b/sdk/storage/inc/shares/share_responses.hpp index 53902f9fa..002338f59 100644 --- a/sdk/storage/inc/shares/share_responses.hpp +++ b/sdk/storage/inc/shares/share_responses.hpp @@ -9,19 +9,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // ServiceClient models: - using ListSharesSegmentResult = ServiceListSharesSegmentResponse; - using SetServicePropertiesInfo = ServiceSetPropertiesResponse; + using ListSharesSegmentResult = ServiceListSharesSegmentResult; + using SetServicePropertiesResult = ServiceSetPropertiesResult; + using GetServicePropertiesResult = StorageServiceProperties; // ShareClient models: - using ShareInfo = ShareCreateResponse; - using ShareDeleteInfo = ShareDeleteResponse; - using ShareSnapshotInfo = ShareCreateSnapshotResponse; - using FileShareProperties = ShareGetPropertiesResponse; - using SetShareQuotaInfo = ShareSetQuotaResponse; - using SetShareMetadataInfo = ShareSetMetadataResponse; - using SetAccessPolicyInfo = ShareSetAccessPolicyResponse; - using ShareStatistics = ShareGetStatisticsResponse; - using SharePermissionInfo = ShareCreatePermissionResponse; - using GetShareAccessPolicyResult = ShareGetAccessPolicyResponse; + using CreateShareResult = ShareCreateResult; + using DeleteShareResult = ShareDeleteResult; + 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; }}}} // namespace Azure::Storage::Files::Shares diff --git a/sdk/storage/inc/shares/share_service_client.hpp b/sdk/storage/inc/shares/share_service_client.hpp index 606cf6a5a..7cf5b4f12 100644 --- a/sdk/storage/inc/shares/share_service_client.hpp +++ b/sdk/storage/inc/shares/share_service_client.hpp @@ -83,24 +83,26 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * returned and information used for future list operation on valid result not yet returned. */ Azure::Core::Response ListSharesSegment( - const ListSharesOptions& options = ListSharesOptions()) const; + const ListSharesSegmentOptions& options = ListSharesSegmentOptions()) const; /** * @brief Set the service's properties. * @param properties The properties of the service that is to be set. * @param options Optional parameters to set the properties of the service. - * @return Azure::Core::Response The service's properties. + * @return Azure::Core::Response The infromation returned when + * setting the service properties. */ - Azure::Core::Response SetProperties( + Azure::Core::Response SetProperties( StorageServiceProperties properties, const SetServicePropertiesOptions& options = SetServicePropertiesOptions()) const; /** * @brief Get the service's properties. * @param options Optional parameters to get the properties of the service. - * @return Azure::Core::Response The service's properties. + * @return Azure::Core::Response The result containing service's + * properties. */ - Azure::Core::Response GetProperties( + Azure::Core::Response GetProperties( const GetServicePropertiesOptions& options = GetServicePropertiesOptions()) const; private: diff --git a/sdk/storage/sample/datalake_getting_started.cpp b/sdk/storage/sample/datalake_getting_started.cpp index 2954d5ab9..5afc71c89 100644 --- a/sdk/storage/sample/datalake_getting_started.cpp +++ b/sdk/storage/sample/datalake_getting_started.cpp @@ -89,7 +89,7 @@ void DataLakeGettingStarted() std::vector fileSystems; do { - auto response = serviceClient.ListFileSystems(); + auto response = serviceClient.ListFileSystemsSegement(); if (response->Continuation.HasValue()) { continuation = response->Continuation.GetValue(); diff --git a/sdk/storage/src/datalake/datalake_directory_client.cpp b/sdk/storage/src/datalake/datalake_directory_client.cpp index 64f5acd95..1f483f272 100644 --- a/sdk/storage/src/datalake/datalake_directory_client.cpp +++ b/sdk/storage/src/datalake/datalake_directory_client.cpp @@ -128,9 +128,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return FileClient(std::move(builder), std::move(blobClient), m_pipeline); } - Azure::Core::Response DirectoryClient::Rename( + Azure::Core::Response DirectoryClient::Rename( const std::string& destinationPath, - const DirectoryRenameOptions& options) const + const RenameDirectoryOptions& options) const { Azure::Core::Nullable destinationFileSystem = options.DestinationFileSystem; if (!destinationFileSystem.HasValue() || destinationFileSystem.GetValue().empty()) @@ -159,16 +159,17 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = DataLakeRestClient::Path::Create( destinationDfsUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); // At this point, there is not more exception thrown, meaning the rename is successful. - auto ret = DirectoryRenameInfo(); + auto ret = RenameDirectoryResult(); ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.Continuation = std::move(result->Continuation); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response DirectoryClient::Delete( + Azure::Core::Response DirectoryClient::Delete( bool Recursive, - const DirectoryDeleteOptions& options) const + const DeleteDirectoryOptions& options) const { DataLakeRestClient::Path::DeleteOptions protocolLayerOptions; protocolLayerOptions.Continuation = options.Continuation; diff --git a/sdk/storage/src/datalake/datalake_file_client.cpp b/sdk/storage/src/datalake/datalake_file_client.cpp index dc02be0ad..92445b112 100644 --- a/sdk/storage/src/datalake/datalake_file_client.cpp +++ b/sdk/storage/src/datalake/datalake_file_client.cpp @@ -196,10 +196,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_pipeline = std::make_shared(policies); } - Azure::Core::Response FileClient::AppendData( + Azure::Core::Response FileClient::AppendData( Azure::Core::Http::BodyStream* content, int64_t offset, - const PathAppendDataOptions& options) const + const AppendFileDataOptions& options) const { DataLakeRestClient::Path::AppendDataOptions protocolLayerOptions; protocolLayerOptions.Position = offset; @@ -210,9 +210,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri.ToString(), *content, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::FlushData( + Azure::Core::Response FileClient::FlushData( int64_t endingOffset, - const PathFlushDataOptions& options) const + const FlushFileDataOptions& options) const { DataLakeRestClient::Path::FlushDataOptions protocolLayerOptions; protocolLayerOptions.Position = endingOffset; @@ -234,9 +234,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::Rename( + Azure::Core::Response FileClient::Rename( const std::string& destinationPath, - const FileRenameOptions& options) const + const RenameFileOptions& options) const { Azure::Core::Nullable destinationFileSystem = options.DestinationFileSystem; if (!destinationFileSystem.HasValue() || destinationFileSystem.GetValue().empty()) @@ -264,13 +264,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = DataLakeRestClient::Path::Create( destinationDfsUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); // At this point, there is not more exception thrown, meaning the rename is successful. - auto ret = FileRenameInfo(); + auto ret = RenameFileResult(); ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::Delete(const FileDeleteOptions& options) const + Azure::Core::Response FileClient::Delete(const FileDeleteOptions& options) const { DataLakeRestClient::Path::DeleteOptions protocolLayerOptions; protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId; @@ -280,11 +280,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; auto result = DataLakeRestClient::Path::Delete( m_dfsUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); - auto ret = FileDeleteInfo(); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + auto ret = DeleteFileResult(); + return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::Read(const FileReadOptions& options) const + Azure::Core::Response FileClient::Read(const ReadFileOptions& options) const { Blobs::DownloadBlobOptions blobOptions; blobOptions.Context = options.Context; @@ -296,7 +296,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.AccessConditions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; blobOptions.AccessConditions.LeaseId = options.AccessConditions.LeaseId; auto result = m_blobClient.Download(blobOptions); - FileReadInfo ret; + ReadFileResult ret; ret.Body = std::move(result->BodyStream); ret.HttpHeaders = FromBlobHttpHeaders(std::move(result->HttpHeaders)); Azure::Core::Nullable RangeOffset; @@ -320,12 +320,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ? FromBlobLeaseStatus(result->LeaseStatus.GetValue()) : ret.LeaseStatus; ret.Metadata = std::move(result->Metadata); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::UploadFromFile( + Azure::Core::Response FileClient::UploadFrom( const std::string& file, - const UploadFileOptions& options) const + const UploadFileFromOptions& options) const { Blobs::UploadBlockBlobFromOptions blobOptions; blobOptions.Context = options.Context; @@ -336,10 +336,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return m_blockBlobClient.UploadFrom(file, blobOptions); } - Azure::Core::Response FileClient::UploadFromBuffer( + Azure::Core::Response FileClient::UploadFrom( const uint8_t* buffer, std::size_t bufferSize, - const UploadFileOptions& options) const + const UploadFileFromOptions& options) const { Blobs::UploadBlockBlobFromOptions blobOptions; blobOptions.Context = options.Context; @@ -350,13 +350,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return m_blockBlobClient.UploadFrom(buffer, bufferSize, blobOptions); } - Azure::Core::Response FileClient::DownloadToBuffer( + Azure::Core::Response FileClient::DownloadTo( uint8_t* buffer, std::size_t bufferSize, - const DownloadFileOptions& options) const + const DownloadFileToOptions& options) const { auto result = m_blockBlobClient.DownloadTo(buffer, bufferSize, options); - FileDownloadInfo ret; + DownloadFileToResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.ContentLength = result->ContentLength; @@ -364,15 +364,15 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.Metadata = std::move(result->Metadata); ret.ServerEncrypted = std::move(result->ServerEncrypted); ret.EncryptionKeySha256 = std::move(result->EncryptionKeySha256); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::DownloadToFile( + Azure::Core::Response FileClient::DownloadTo( const std::string& file, - const DownloadFileOptions& options) const + const DownloadFileToOptions& options) const { auto result = m_blockBlobClient.DownloadTo(file, options); - FileDownloadInfo ret; + DownloadFileToResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.ContentLength = result->ContentLength; @@ -380,7 +380,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.Metadata = std::move(result->Metadata); ret.ServerEncrypted = std::move(result->ServerEncrypted); ret.EncryptionKeySha256 = std::move(result->EncryptionKeySha256); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); } }}}} // namespace Azure::Storage::Files::DataLake diff --git a/sdk/storage/src/datalake/datalake_file_system_client.cpp b/sdk/storage/src/datalake/datalake_file_system_client.cpp index b695bffea..1a15759fa 100644 --- a/sdk/storage/src/datalake/datalake_file_system_client.cpp +++ b/sdk/storage/src/datalake/datalake_file_system_client.cpp @@ -167,21 +167,22 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return DirectoryClient(builder, m_blobContainerClient.GetBlobClient(path), m_pipeline); } - Azure::Core::Response FileSystemClient::Create( - const FileSystemCreateOptions& options) const + Azure::Core::Response FileSystemClient::Create( + const CreateFileSystemOptions& options) const { Blobs::CreateContainerOptions blobOptions; blobOptions.Context = options.Context; blobOptions.Metadata = options.Metadata; auto result = m_blobContainerClient.Create(blobOptions); - FileSystemInfo ret; + CreateFileSystemResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileSystemClient::Delete( - const FileSystemDeleteOptions& options) const + Azure::Core::Response FileSystemClient::Delete( + const DeleteFileSystemOptions& options) const { Blobs::DeleteContainerOptions blobOptions; blobOptions.Context = options.Context; @@ -189,41 +190,43 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.AccessConditions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; blobOptions.AccessConditions.LeaseId = options.AccessConditions.LeaseId; auto result = m_blobContainerClient.Delete(blobOptions); - FileSystemDeleteResponse ret; - return Azure::Core::Response( + FileSystemDeleteResult ret; + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileSystemClient::GetProperties( - const FileSystemGetPropertiesOptions& options) const + Azure::Core::Response FileSystemClient::GetProperties( + const GetFileSystemPropertiesOptions& options) const { Blobs::GetContainerPropertiesOptions blobOptions; blobOptions.Context = options.Context; blobOptions.AccessConditions.LeaseId = options.AccessConditions.LeaseId; auto result = m_blobContainerClient.GetProperties(blobOptions); - FileSystemProperties ret; + GetFileSystemPropertiesResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.Metadata = std::move(result->Metadata); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileSystemClient::SetMetadata( + Azure::Core::Response FileSystemClient::SetMetadata( const std::map& metadata, - const FileSystemSetMetadataOptions& options) const + const SetFileSystemMetadataOptions& options) const { Blobs::SetContainerMetadataOptions blobOptions; blobOptions.Context = options.Context; blobOptions.AccessConditions.IfModifiedSince = options.AccessConditions.IfModifiedSince; blobOptions.AccessConditions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; auto result = m_blobContainerClient.SetMetadata(metadata, blobOptions); - FileSystemInfo ret; + SetFileSystemMetadataResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileSystemClient::ListPaths( + Azure::Core::Response FileSystemClient::ListPaths( bool recursive, const ListPathsOptions& options) const { diff --git a/sdk/storage/src/datalake/datalake_path_client.cpp b/sdk/storage/src/datalake/datalake_path_client.cpp index 57ff7d9f3..9a14ed378 100644 --- a/sdk/storage/src/datalake/datalake_path_client.cpp +++ b/sdk/storage/src/datalake/datalake_path_client.cpp @@ -178,9 +178,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_pipeline = std::make_shared(policies); } - Azure::Core::Response PathClient::SetAccessControl( + Azure::Core::Response PathClient::SetAccessControl( std::vector acls, - const SetAccessControlOptions& options) const + const SetPathAccessControlOptions& options) const { DataLakeRestClient::Path::SetAccessControlOptions protocolLayerOptions; protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId; @@ -196,7 +196,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response PathClient::SetHttpHeaders( + Azure::Core::Response PathClient::SetHttpHeaders( DataLakeHttpHeaders httpHeaders, const SetPathHttpHeadersOptions& options) const { @@ -214,16 +214,16 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.AccessConditions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; blobOptions.AccessConditions.LeaseId = options.AccessConditions.LeaseId; auto result = m_blobClient.SetHttpHeaders(blobHttpHeaders, blobOptions); - SetPathHttpHeadersInfo ret; + SetPathHttpHeadersResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response PathClient::Create( + Azure::Core::Response PathClient::Create( PathResourceType type, - const PathCreateOptions& options) const + const CreatePathOptions& options) const { DataLakeRestClient::Path::CreateOptions protocolLayerOptions; protocolLayerOptions.Resource = type; @@ -242,15 +242,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { protocolLayerOptions.Permissions = options.Permissions; auto result = DataLakeRestClient::Path::Create( m_dfsUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); - auto ret = PathInfo(); + auto ret = CreatePathResult(); ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.ContentLength = std::move(result->ContentLength); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response PathClient::Delete( - const PathDeleteOptions& options) const + Azure::Core::Response PathClient::Delete(const DeletePathOptions& options) const { DataLakeRestClient::Path::DeleteOptions protocolLayerOptions; protocolLayerOptions.Continuation = options.Continuation; @@ -264,8 +263,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response PathClient::GetProperties( - const PathGetPropertiesOptions& options) const + Azure::Core::Response PathClient::GetProperties( + const GetPathPropertiesOptions& options) const { Blobs::GetBlobPropertiesOptions blobOptions; blobOptions.Context = options.Context; @@ -275,7 +274,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.AccessConditions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; blobOptions.AccessConditions.LeaseId = options.AccessConditions.LeaseId; auto result = m_blobClient.GetProperties(blobOptions); - PathProperties ret; + GetPathPropertiesResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.CreationTime = std::move(result->CreationTime); @@ -301,11 +300,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.CopyStatus = std::move(result->CopyStatus); ret.CopyProgress = std::move(result->CopyProgress); ret.CopyCompletionTime = std::move(result->CopyCompletionTime); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response PathClient::GetAccessControls( - const PathAccessControlOptions& options) const + Azure::Core::Response PathClient::GetAccessControls( + const GetPathAccessControlOptions& options) const { DataLakeRestClient::Path::GetPropertiesOptions protocolLayerOptions; protocolLayerOptions.Action = PathGetPropertiesAction::GetAccessControl; @@ -321,7 +321,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { acl = Acl::DeserializeAcls(result->ACL.GetValue()); } - auto ret = PathAccessControl{}; + auto ret = GetPathAccessControlResult{}; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); if (!acl.HasValue()) @@ -329,10 +329,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { throw std::runtime_error("Got null value returned when getting access control."); } ret.Acls = std::move(acl.GetValue()); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response PathClient::SetMetadata( + Azure::Core::Response PathClient::SetMetadata( const std::map& metadata, const SetPathMetadataOptions& options) const { @@ -344,9 +345,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.AccessConditions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; blobOptions.AccessConditions.LeaseId = options.AccessConditions.LeaseId; auto result = m_blobClient.SetMetadata(metadata, blobOptions); - SetPathMetadataInfo ret; + SetPathMetadataResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } }}}} // namespace Azure::Storage::Files::DataLake diff --git a/sdk/storage/src/datalake/datalake_service_client.cpp b/sdk/storage/src/datalake/datalake_service_client.cpp index 4bc6929f6..a73675edf 100644 --- a/sdk/storage/src/datalake/datalake_service_client.cpp +++ b/sdk/storage/src/datalake/datalake_service_client.cpp @@ -156,8 +156,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { builder, m_blobServiceClient.GetBlobContainerClient(fileSystemName), m_pipeline); } - Azure::Core::Response ServiceClient::ListFileSystems( - const ListFileSystemsOptions& options) const + Azure::Core::Response ServiceClient::ListFileSystemsSegement( + const ListFileSystemsSegmentOptions& options) const { Blobs::ListContainersSegmentOptions blobOptions; blobOptions.Context = options.Context; @@ -165,10 +165,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.Marker = options.Continuation; blobOptions.MaxResults = options.MaxResults; auto result = m_blobServiceClient.ListBlobContainersSegment(blobOptions); - auto response = ListFileSystemsResult(); + auto response = ListFileSystemsSegmentResult(); response.Continuation = result->NextMarker.empty() ? response.Continuation : result->NextMarker; response.Filesystems = FileSystemsFromContainerItems(result->Items); - return Azure::Core::Response( + return Azure::Core::Response( std::move(response), result.ExtractRawResponse()); } diff --git a/sdk/storage/src/shares/share_client.cpp b/sdk/storage/src/shares/share_client.cpp index 6e88cbb47..53c218ef0 100644 --- a/sdk/storage/src/shares/share_client.cpp +++ b/sdk/storage/src/shares/share_client.cpp @@ -110,7 +110,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_pipeline = std::make_shared(policies); } - Azure::Core::Response ShareClient::Create(const CreateShareOptions& options) const + Azure::Core::Response ShareClient::Create( + const CreateShareOptions& options) const { auto protocolLayerOptions = ShareRestClient::Share::CreateOptions(); protocolLayerOptions.Metadata = options.Metadata; @@ -119,7 +120,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::Delete( + Azure::Core::Response ShareClient::Delete( const DeleteShareOptions& options) const { auto protocolLayerOptions = ShareRestClient::Share::DeleteOptions(); @@ -132,7 +133,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::CreateSnapshot( + Azure::Core::Response ShareClient::CreateSnapshot( const CreateShareSnapshotOptions& options) const { auto protocolLayerOptions = ShareRestClient::Share::CreateSnapshotOptions(); @@ -141,7 +142,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::GetProperties( + Azure::Core::Response ShareClient::GetProperties( const GetSharePropertiesOptions& options) const { auto protocolLayerOptions = ShareRestClient::Share::GetPropertiesOptions(); @@ -150,7 +151,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::SetQuota( + Azure::Core::Response ShareClient::SetQuota( int32_t quota, const SetShareQuotaOptions& options) const { @@ -160,7 +161,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::SetMetadata( + Azure::Core::Response ShareClient::SetMetadata( std::map metadata, const SetShareMetadataOptions& options) const { @@ -178,7 +179,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::SetAccessPolicy( + Azure::Core::Response ShareClient::SetAccessPolicy( const std::vector& accessPolicy, const SetShareAccessPolicyOptions& options) const { @@ -188,7 +189,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::GetStatistics( + Azure::Core::Response ShareClient::GetStatistics( const GetShareStatsOptions& options) const { auto protocolLayerOptions = ShareRestClient::Share::GetStatisticsOptions(); @@ -196,7 +197,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::CreatePermission( + Azure::Core::Response ShareClient::CreatePermission( const std::string& permission, const CreateSharePermissionOptions& options) const { @@ -206,16 +207,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::GetPermission( + Azure::Core::Response ShareClient::GetPermission( const std::string& permissionKey, const GetSharePermissionOptions& options) const { auto protocolLayerOptions = ShareRestClient::Share::GetPermissionOptions(); protocolLayerOptions.FilePermissionKeyRequired = permissionKey; - auto result = ShareRestClient::Share::GetPermission( + return ShareRestClient::Share::GetPermission( m_shareUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); - return Azure::Core::Response( - std::move(result->Permission), result.ExtractRawResponse()); } }}}} // namespace Azure::Storage::Files::Shares diff --git a/sdk/storage/src/shares/share_service_client.cpp b/sdk/storage/src/shares/share_service_client.cpp index 5db91aeda..788e8e928 100644 --- a/sdk/storage/src/shares/share_service_client.cpp +++ b/sdk/storage/src/shares/share_service_client.cpp @@ -115,7 +115,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } Azure::Core::Response ServiceClient::ListSharesSegment( - const ListSharesOptions& options) const + const ListSharesSegmentOptions& options) const { auto protocolLayerOptions = ShareRestClient::Service::ListSharesSegmentOptions(); protocolLayerOptions.ListSharesInclude = options.ListSharesInclude; @@ -126,7 +126,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_serviceUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ServiceClient::SetProperties( + Azure::Core::Response ServiceClient::SetProperties( StorageServiceProperties properties, const SetServicePropertiesOptions& options) const { @@ -136,7 +136,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_serviceUri.ToString(), *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ServiceClient::GetProperties( + Azure::Core::Response ServiceClient::GetProperties( const GetServicePropertiesOptions& options) const { auto protocolLayerOptions = ShareRestClient::Service::GetPropertiesOptions(); diff --git a/sdk/storage/test/datalake/datalake_directory_client_test.cpp b/sdk/storage/test/datalake/datalake_directory_client_test.cpp index ce46ee2ea..d01997554 100644 --- a/sdk/storage/test/datalake/datalake_directory_client_test.cpp +++ b/sdk/storage/test/datalake/datalake_directory_client_test.cpp @@ -53,10 +53,10 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& client : directoryClient) { auto response = client.GetProperties(); - Files::DataLake::DirectoryDeleteOptions options1; + Files::DataLake::DeleteDirectoryOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; EXPECT_THROW(client.Delete(false, options1), StorageError); - Files::DataLake::DirectoryDeleteOptions options2; + Files::DataLake::DeleteDirectoryOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(client.Delete(false, options2)); } @@ -73,10 +73,10 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& client : directoryClient) { auto response = client.GetProperties(); - Files::DataLake::DirectoryDeleteOptions options1; + Files::DataLake::DeleteDirectoryOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; EXPECT_THROW(client.Delete(false, options1), StorageError); - Files::DataLake::DirectoryDeleteOptions options2; + Files::DataLake::DeleteDirectoryOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(client.Delete(false, options2)); } @@ -139,10 +139,10 @@ namespace Azure { namespace Storage { namespace Test { for (auto& client : directoryClient) { auto response = client.GetProperties(); - Files::DataLake::DirectoryRenameOptions options1; + Files::DataLake::RenameDirectoryOptions options1; options1.SourceAccessConditions.IfModifiedSince = response->LastModified; EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); - Files::DataLake::DirectoryRenameOptions options2; + Files::DataLake::RenameDirectoryOptions options2; options2.SourceAccessConditions.IfUnmodifiedSince = response->LastModified; auto newPath = LowercaseRandomString(); EXPECT_NO_THROW(client.Rename(newPath, options2)); @@ -161,10 +161,10 @@ namespace Azure { namespace Storage { namespace Test { for (auto& client : directoryClient) { auto response = client.GetProperties(); - Files::DataLake::DirectoryRenameOptions options1; + Files::DataLake::RenameDirectoryOptions options1; options1.SourceAccessConditions.IfNoneMatch = response->ETag; EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); - Files::DataLake::DirectoryRenameOptions options2; + Files::DataLake::RenameDirectoryOptions options2; options2.SourceAccessConditions.IfMatch = response->ETag; auto newPath = LowercaseRandomString(); EXPECT_NO_THROW(client.Rename(newPath, options2)); @@ -182,7 +182,7 @@ namespace Azure { namespace Storage { namespace Test { } { // Rename to a non-existing file system will fail and source is not changed. - Files::DataLake::DirectoryRenameOptions options; + Files::DataLake::RenameDirectoryOptions options; options.DestinationFileSystem = LowercaseRandomString(); for (auto& client : directoryClient) { @@ -197,7 +197,7 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::FileSystemClient::CreateFromConnectionString( AdlsGen2ConnectionString(), newfileSystemName)); newfileSystemClient->Create(); - Files::DataLake::DirectoryRenameOptions options; + Files::DataLake::RenameDirectoryOptions options; options.DestinationFileSystem = newfileSystemName; for (auto& client : directoryClient) { @@ -227,8 +227,8 @@ namespace Azure { namespace Storage { namespace Test { // Create path with metadata works auto client1 = m_fileSystemClient->GetDirectoryClient(LowercaseRandomString()); auto client2 = m_fileSystemClient->GetDirectoryClient(LowercaseRandomString()); - Files::DataLake::PathCreateOptions options1; - Files::DataLake::PathCreateOptions options2; + Files::DataLake::CreatePathOptions options1; + Files::DataLake::CreatePathOptions options2; options1.Metadata = metadata1; options2.Metadata = metadata2; @@ -278,7 +278,7 @@ namespace Azure { namespace Storage { namespace Test { for (int32_t i = 0; i < 2; ++i) { auto client = m_fileSystemClient->GetDirectoryClient(LowercaseRandomString()); - Files::DataLake::PathCreateOptions options; + Files::DataLake::CreatePathOptions options; options.HttpHeaders = httpHeader; EXPECT_NO_THROW(client.Create(options)); directoryClient.emplace_back(std::move(client)); diff --git a/sdk/storage/test/datalake/datalake_file_client_test.cpp b/sdk/storage/test/datalake/datalake_file_client_test.cpp index 312ca67a6..8739c2ae3 100644 --- a/sdk/storage/test/datalake/datalake_file_client_test.cpp +++ b/sdk/storage/test/datalake/datalake_file_client_test.cpp @@ -122,10 +122,10 @@ namespace Azure { namespace Storage { namespace Test { for (auto& client : fileClient) { auto response = client.GetProperties(); - Files::DataLake::FileRenameOptions options1; + Files::DataLake::RenameFileOptions options1; options1.SourceAccessConditions.IfModifiedSince = response->LastModified; EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); - Files::DataLake::FileRenameOptions options2; + Files::DataLake::RenameFileOptions options2; options2.SourceAccessConditions.IfUnmodifiedSince = response->LastModified; auto newPath = LowercaseRandomString(); EXPECT_NO_THROW(client.Rename(newPath, options2)); @@ -144,10 +144,10 @@ namespace Azure { namespace Storage { namespace Test { for (auto& client : fileClient) { auto response = client.GetProperties(); - Files::DataLake::FileRenameOptions options1; + Files::DataLake::RenameFileOptions options1; options1.SourceAccessConditions.IfNoneMatch = response->ETag; EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); - Files::DataLake::FileRenameOptions options2; + Files::DataLake::RenameFileOptions options2; options2.SourceAccessConditions.IfMatch = response->ETag; auto newPath = LowercaseRandomString(); EXPECT_NO_THROW(client.Rename(newPath, options2)); @@ -165,7 +165,7 @@ namespace Azure { namespace Storage { namespace Test { } { // Rename to a non-existing file system will fail but will not change URI. - Files::DataLake::FileRenameOptions options; + Files::DataLake::RenameFileOptions options; options.DestinationFileSystem = LowercaseRandomString(); for (auto& client : fileClient) { @@ -180,7 +180,7 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::FileSystemClient::CreateFromConnectionString( AdlsGen2ConnectionString(), newfileSystemName)); newfileSystemClient->Create(); - Files::DataLake::FileRenameOptions options; + Files::DataLake::RenameFileOptions options; options.DestinationFileSystem = newfileSystemName; for (auto& client : fileClient) { @@ -210,8 +210,8 @@ namespace Azure { namespace Storage { namespace Test { // Create path with metadata works auto client1 = m_fileSystemClient->GetFileClient(LowercaseRandomString()); auto client2 = m_fileSystemClient->GetFileClient(LowercaseRandomString()); - Files::DataLake::FileCreateOptions options1; - Files::DataLake::FileCreateOptions options2; + Files::DataLake::CreateFileOptions options1; + Files::DataLake::CreateFileOptions options2; options1.Metadata = metadata1; options2.Metadata = metadata2; @@ -259,7 +259,7 @@ namespace Azure { namespace Storage { namespace Test { for (int32_t i = 0; i < 2; ++i) { auto client = m_fileSystemClient->GetFileClient(LowercaseRandomString()); - Files::DataLake::FileCreateOptions options; + Files::DataLake::CreateFileOptions options; options.HttpHeaders = httpHeader; EXPECT_NO_THROW(client.Create(options)); fileClient.emplace_back(std::move(client)); @@ -336,7 +336,7 @@ namespace Azure { namespace Storage { namespace Test { // Read Range { auto firstHalf = std::vector(buffer.begin(), buffer.begin() + (bufferSize / 2)); - Files::DataLake::FileReadOptions options; + Files::DataLake::ReadFileOptions options; options.Offset = 0; options.Length = bufferSize / 2; result = newFileClient->Read(options); @@ -346,7 +346,7 @@ namespace Azure { namespace Storage { namespace Test { } { auto secondHalf = std::vector(buffer.begin() + bufferSize / 2, buffer.end()); - Files::DataLake::FileReadOptions options; + Files::DataLake::ReadFileOptions options; options.Offset = bufferSize / 2; options.Length = bufferSize / 2; result = newFileClient->Read(options); @@ -356,10 +356,10 @@ namespace Azure { namespace Storage { namespace Test { { // Read with last modified access condition. auto response = newFileClient->GetProperties(); - Files::DataLake::FileReadOptions options1; + Files::DataLake::ReadFileOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; EXPECT_THROW(newFileClient->Read(options1), StorageError); - Files::DataLake::FileReadOptions options2; + Files::DataLake::ReadFileOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(result = newFileClient->Read(options2)); downloaded = ReadBodyStream(result->Body); @@ -368,10 +368,10 @@ namespace Azure { namespace Storage { namespace Test { { // Read with if match access condition. auto response = newFileClient->GetProperties(); - Files::DataLake::FileReadOptions options1; + Files::DataLake::ReadFileOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; EXPECT_THROW(newFileClient->Read(options1), StorageError); - Files::DataLake::FileReadOptions options2; + Files::DataLake::ReadFileOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(result = newFileClient->Read(options2)); downloaded = ReadBodyStream(result->Body); diff --git a/sdk/storage/test/datalake/datalake_file_system_client_test.cpp b/sdk/storage/test/datalake/datalake_file_system_client_test.cpp index 83a449b46..2ca8c9e13 100644 --- a/sdk/storage/test/datalake/datalake_file_system_client_test.cpp +++ b/sdk/storage/test/datalake/datalake_file_system_client_test.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: MIT #include "datalake_file_system_client_test.hpp" +#include "datalake/datalake_options.hpp" #include @@ -117,10 +118,10 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& client : fileSystemClient) { auto response = client.GetProperties(); - Files::DataLake::FileSystemDeleteOptions options1; + Files::DataLake::DeleteFileSystemOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; EXPECT_THROW(client.Delete(options1), StorageError); - Files::DataLake::FileSystemDeleteOptions options2; + Files::DataLake::DeleteFileSystemOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(client.Delete(options2)); } @@ -147,8 +148,8 @@ namespace Azure { namespace Storage { namespace Test { AdlsGen2ConnectionString(), LowercaseRandomString()); auto client2 = Files::DataLake::FileSystemClient::CreateFromConnectionString( AdlsGen2ConnectionString(), LowercaseRandomString()); - Files::DataLake::FileSystemCreateOptions options1; - Files::DataLake::FileSystemCreateOptions options2; + Files::DataLake::CreateFileSystemOptions options1; + Files::DataLake::CreateFileSystemOptions options2; options1.Metadata = metadata1; options2.Metadata = metadata2; @@ -161,7 +162,7 @@ namespace Azure { namespace Storage { namespace Test { } } - TEST_F(DataLakeFileSystemClientTest, FileSystemProperties) + TEST_F(DataLakeFileSystemClientTest, GetFileSystemPropertiesResult) { auto metadata1 = RandomMetadata(); auto metadata2 = RandomMetadata(); diff --git a/sdk/storage/test/datalake/datalake_path_client_test.cpp b/sdk/storage/test/datalake/datalake_path_client_test.cpp index bfd718089..921d51c4d 100644 --- a/sdk/storage/test/datalake/datalake_path_client_test.cpp +++ b/sdk/storage/test/datalake/datalake_path_client_test.cpp @@ -72,8 +72,8 @@ namespace Azure { namespace Storage { namespace Test { // Create path with metadata works auto client1 = m_fileSystemClient->GetFileClient(LowercaseRandomString()); auto client2 = m_fileSystemClient->GetFileClient(LowercaseRandomString()); - Files::DataLake::PathCreateOptions options1; - Files::DataLake::PathCreateOptions options2; + Files::DataLake::CreatePathOptions options1; + Files::DataLake::CreatePathOptions options2; options1.Metadata = metadata1; options2.Metadata = metadata2; @@ -86,7 +86,7 @@ namespace Azure { namespace Storage { namespace Test { } } - TEST_F(DataLakePathClientTest, PathProperties) + TEST_F(DataLakePathClientTest, GetPathPropertiesResult) { auto metadata1 = RandomMetadata(); auto metadata2 = RandomMetadata(); @@ -124,7 +124,7 @@ namespace Azure { namespace Storage { namespace Test { for (int32_t i = 0; i < 2; ++i) { auto client = m_fileSystemClient->GetFileClient(LowercaseRandomString()); - Files::DataLake::PathCreateOptions options; + Files::DataLake::CreatePathOptions options; options.HttpHeaders = httpHeader; EXPECT_NO_THROW(client.Create(options)); pathClient.emplace_back(std::move(client)); @@ -211,10 +211,10 @@ namespace Azure { namespace Storage { namespace Test { std::vector acls = GetValidAcls(); auto response = m_pathClient->GetProperties(); - Files::DataLake::SetAccessControlOptions options1; + Files::DataLake::SetPathAccessControlOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; EXPECT_THROW(m_pathClient->SetAccessControl(acls, options1), StorageError); - Files::DataLake::SetAccessControlOptions options2; + Files::DataLake::SetPathAccessControlOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(m_pathClient->SetAccessControl(acls, options2)); } @@ -223,10 +223,10 @@ namespace Azure { namespace Storage { namespace Test { // Set/Get Acls works with if match access condition. std::vector acls = GetValidAcls(); auto response = m_pathClient->GetProperties(); - Files::DataLake::SetAccessControlOptions options1; + Files::DataLake::SetPathAccessControlOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; EXPECT_THROW(m_pathClient->SetAccessControl(acls, options1), StorageError); - Files::DataLake::SetAccessControlOptions options2; + Files::DataLake::SetPathAccessControlOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(m_pathClient->SetAccessControl(acls, options2)); } diff --git a/sdk/storage/test/datalake/datalake_service_client_test.cpp b/sdk/storage/test/datalake/datalake_service_client_test.cpp index 2c3fc404c..e2152605b 100644 --- a/sdk/storage/test/datalake/datalake_service_client_test.cpp +++ b/sdk/storage/test/datalake/datalake_service_client_test.cpp @@ -54,14 +54,14 @@ namespace Azure { namespace Storage { namespace Test { { std::vector result; std::string continuation; - Files::DataLake::ListFileSystemsOptions options; + Files::DataLake::ListFileSystemsSegmentOptions options; if (!prefix.empty()) { options.Prefix = prefix; } do { - auto response = m_dataLakeServiceClient->ListFileSystems(options); + auto response = m_dataLakeServiceClient->ListFileSystemsSegement(options); result.insert(result.end(), response->Filesystems.begin(), response->Filesystems.end()); if (response->Continuation.HasValue()) { @@ -72,7 +72,7 @@ namespace Azure { namespace Storage { namespace Test { return result; } - TEST_F(DataLakeServiceClientTest, ListFileSystems) + TEST_F(DataLakeServiceClientTest, ListFileSystemsSegement) { { // Normal list without prefix. @@ -119,9 +119,9 @@ namespace Azure { namespace Storage { namespace Test { } { // List max result - Files::DataLake::ListFileSystemsOptions options; + Files::DataLake::ListFileSystemsSegmentOptions options; options.MaxResults = 2; - auto response = m_dataLakeServiceClient->ListFileSystems(options); + auto response = m_dataLakeServiceClient->ListFileSystemsSegement(options); EXPECT_LE(2U, response->Filesystems.size()); } } diff --git a/sdk/storage/test/shares/share_client_test.cpp b/sdk/storage/test/shares/share_client_test.cpp index d3dec0cbe..cfb18ad96 100644 --- a/sdk/storage/test/shares/share_client_test.cpp +++ b/sdk/storage/test/shares/share_client_test.cpp @@ -174,10 +174,12 @@ namespace Azure { namespace Storage { namespace Test { "2127521184-1604012920-1887927527-513D:AI(A;;FA;;;SY)(A;;FA;;;BA)(A;;" "0x1200a9;;;S-1-5-21-397955417-626881126-188441444-3053964)"; + std::string expectedPermission = permission + "S:NO_ACCESS_CONTROL"; + auto ret = m_shareClient->CreatePermission(permission); EXPECT_FALSE(ret->FilePermissionKey.empty()); - auto ret2 = m_shareClient->GetPermission(ret->FilePermissionKey).ExtractValue(); - EXPECT_EQ(ret2, permission); + auto ret2 = m_shareClient->GetPermission(ret->FilePermissionKey); + EXPECT_EQ(expectedPermission, ret2->Permission); } }}} // namespace Azure::Storage::Test diff --git a/sdk/storage/test/shares/share_service_client_test.cpp b/sdk/storage/test/shares/share_service_client_test.cpp index b082170b5..9aef6e7c7 100644 --- a/sdk/storage/test/shares/share_service_client_test.cpp +++ b/sdk/storage/test/shares/share_service_client_test.cpp @@ -56,7 +56,7 @@ namespace Azure { namespace Storage { namespace Test { { std::vector result; std::string continuation; - Files::Shares::ListSharesOptions options; + Files::Shares::ListSharesSegmentOptions options; if (!prefix.empty()) { options.Prefix = prefix; @@ -118,7 +118,7 @@ namespace Azure { namespace Storage { namespace Test { } { // List max result - Files::Shares::ListSharesOptions options; + Files::Shares::ListSharesSegmentOptions options; options.MaxResults = 2; auto response = m_fileShareServiceClient->ListSharesSegment(options); EXPECT_LE(2U, response->ShareItems.size());