diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp index de8ba2713..1040be4de 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp @@ -98,14 +98,14 @@ 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 containing the information of the - * created directory + * @return Azure::Core::Response containing the information of + * the created directory * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Create( + Azure::Core::Response Create( const CreateDirectoryOptions& options = CreateDirectoryOptions()) const { - return PathClient::Create(PathResourceType::Directory, options); + return PathClient::Create(Models::PathResourceType::Directory, options); } /** @@ -114,13 +114,13 @@ 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 containing the information returned when - * renaming the directory. + * @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 RenameDirectoryOptions& options = RenameDirectoryOptions()) const; @@ -129,11 +129,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @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 containing the information returned when - * deleting the directory. + * @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 DeleteDirectoryOptions& options = DeleteDirectoryOptions()) const; @@ -149,12 +149,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * entry (ACE) consists of a scope, a type, a user or group identifier, and permissions. * @param options Optional parameters to set an access control recursively to the resource the * directory points to. - * @return Azure::Core::Response + * @return Azure::Core::Response * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response SetAccessControlRecursive( - PathSetAccessControlRecursiveMode mode, - std::vector acls, + Azure::Core::Response + SetAccessControlRecursive( + Models::PathSetAccessControlRecursiveMode mode, + std::vector acls, const SetDirectoryAccessControlRecursiveOptions& options = SetDirectoryAccessControlRecursiveOptions()) const; diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp index f363be623..2c2bb6a7c 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp @@ -93,11 +93,11 @@ 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 containing the information returned when - * appending some data to the path. + * @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 AppendFileDataOptions& options = AppendFileDataOptions()) const; @@ -113,11 +113,11 @@ 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 containing the information returned when - * flushing the data appended to the path. + * @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 FlushFileDataOptions& options = FlushFileDataOptions()) const; @@ -125,14 +125,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @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 containing the information returned when - * creating the file. + * @return Azure::Core::Response containing the information returned + * when creating the file. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Create( + Azure::Core::Response Create( const CreateFileOptions& options = CreateFileOptions()) const { - return PathClient::Create(PathResourceType::File, options); + return PathClient::Create(Models::PathResourceType::File, options); } /** @@ -141,33 +141,33 @@ 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 containing the information returned when - * renaming the file. + * @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 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 containing the information and content returned - * when reading from a file. + * @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( + Azure::Core::Response Read( const ReadFileOptions& options = ReadFileOptions()) const; /** @@ -180,7 +180,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * uploading a file from a buffer. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response UploadFrom( + Azure::Core::Response UploadFrom( const uint8_t* buffer, std::size_t bufferSize, const UploadFileFromOptions& options = UploadFileFromOptions()) const; @@ -190,11 +190,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * an existing file overwrites any existing metadata on the file. * @param fileName A file containing the content to upload. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response containing the information returned when - * uploading a file from a local file. + * @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 UploadFrom( + Azure::Core::Response UploadFrom( const std::string& fileName, const UploadFileFromOptions& options = UploadFileFromOptions()) const; @@ -205,11 +205,11 @@ 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 containing the information returned when - * downloading a file to a local buffer. + * @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 DownloadTo( + Azure::Core::Response DownloadTo( uint8_t* buffer, std::size_t bufferSize, const DownloadFileToOptions& options = DownloadFileToOptions()) const; @@ -219,11 +219,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * requests. * @param fileName A file path to write the downloaded content to. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response containing the information returned when - * downloading a file to a local file. + * @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 DownloadTo( + Azure::Core::Response DownloadTo( const std::string& fileName, const DownloadFileToOptions& options = DownloadFileToOptions()) const; @@ -231,11 +231,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @brief Schedules the file for deletion. * @param expiryOrigin Specify the origin of expiry. * @param options Optional parameters to schedule the file for deletion. - * @return Azure::Core::Response containing the information and - * content returned when schedule the file for deletion. + * @return Azure::Core::Response containing the information + * and content returned when schedule the file for deletion. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response ScheduleDeletion( + Azure::Core::Response ScheduleDeletion( ScheduleFileExpiryOriginType expiryOrigin, const ScheduleFileDeletionOptions& options = ScheduleFileDeletionOptions()) const; diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp index 0e679d1ad..954204b04 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp @@ -107,21 +107,21 @@ 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 containing the information of create a - * file system. + * @return Azure::Core::Response containing the information of + * create a file system. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response Create( + 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 containing the information returned - * when deleting file systems. + * @return Azure::Core::Response containing the information + * returned when deleting file systems. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response Delete( + Azure::Core::Response Delete( const DeleteFileSystemOptions& options = DeleteFileSystemOptions()) const; /** @@ -129,22 +129,22 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @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 containing the information + * @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 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 containing the information when - * getting the file system's properties. + * @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( + Azure::Core::Response GetProperties( const GetFileSystemPropertiesOptions& options = GetFileSystemPropertiesOptions()) const; /** @@ -153,11 +153,11 @@ 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 containing the results when listing + * @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( + Azure::Core::Response ListPaths( bool recursive, const ListPathsOptions& options = ListPathsOptions()) const; diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp index 588d1e8d1..72760cab6 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp @@ -316,7 +316,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Specify the http headers for this path. */ - DataLakeHttpHeaders HttpHeaders; + Models::DataLakeHttpHeaders HttpHeaders; /** * @brief Specify the access condition for the path. @@ -407,7 +407,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Specify the http headers for this path. */ - DataLakeHttpHeaders HttpHeaders; + Models::DataLakeHttpHeaders HttpHeaders; /** * @brief User-defined metadata to be stored with the path. Note that the string may only @@ -570,7 +570,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * PathRenameMode::Legacy or PathRenameMode::Posix, and the default value will be * PathRenameMode::Posix. */ - PathRenameMode Mode = PathRenameMode::Posix; + Models::PathRenameMode Mode = Models::PathRenameMode::Posix; /** * @brief If not specified, the source's file system is used. Otherwise, rename to destination @@ -632,7 +632,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * PathRenameMode::Legacy or PathRenameMode::Posix, and the default value will be * PathRenameMode::Posix. */ - PathRenameMode Mode = PathRenameMode::Posix; + Models::PathRenameMode Mode = Models::PathRenameMode::Posix; /** * @brief If not specified, the source's file system is used. Otherwise, rename to destination @@ -729,7 +729,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief The standard HTTP header system properties to set. */ - DataLakeHttpHeaders HttpHeaders; + Models::DataLakeHttpHeaders HttpHeaders; /** * @brief Name-value pairs associated with the blob as metadata. diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp index ea8214a00..76703423d 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp @@ -85,22 +85,22 @@ 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 containing the information returned when - * creating a path. + * @return Azure::Core::Response containing the information returned + * when creating a path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response Create( - PathResourceType type, + Azure::Core::Response Create( + Models::PathResourceType type, 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 which is current empty but preserved for - * future usage. + * @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( + Azure::Core::Response Delete( const DeletePathOptions& options = DeletePathOptions()) const; /** @@ -114,12 +114,12 @@ 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 containing the information returned - * when setting path's access control. + * @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( - std::vector acls, + Azure::Core::Response SetAccessControl( + std::vector acls, const SetPathAccessControlOptions& options = SetPathAccessControlOptions()) const; /** @@ -130,8 +130,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * when setting the path's Http headers. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response SetHttpHeaders( - DataLakeHttpHeaders httpHeaders, + Azure::Core::Response SetHttpHeaders( + Models::DataLakeHttpHeaders httpHeaders, const SetPathHttpHeadersOptions& options = SetPathHttpHeadersOptions()) const; /** @@ -140,20 +140,21 @@ 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 containing the properties of the path. + * @return Azure::Core::Response containing the properties of + * the path. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response GetProperties( + 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 containing the access control list - * of the path. + * @return Azure::Core::Response containing the access + * control list of the path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response GetAccessControls( + Azure::Core::Response GetAccessControls( const GetPathAccessControlOptions& options = GetPathAccessControlOptions()) const; /** @@ -161,11 +162,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @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 the resource the path points to. - * @return Azure::Core::Response containing the information returned when - * setting the metadata. + * @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; @@ -176,10 +177,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * Azure::Storage::c_InfiniteLeaseDuration for a lease that never expires. A non-infinite lease * can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. * @param options Optional parameters to execute this function. - * @return A AcquirePathLeaseResult describing the lease. + * @return Azure::Core::Response describing the lease. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response AcquireLease( + Azure::Core::Response AcquireLease( const std::string& proposedLeaseId, int32_t duration, const AcquirePathLeaseOptions& options = AcquirePathLeaseOptions()) const @@ -191,10 +192,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @brief Renews the path's previously-acquired lease. * @param leaseId ID of the previously-acquired lease. * @param options Optional parameters to execute this function. - * @return A RenewPathLeaseResult describing the lease. + * @return Azure::Core::Response describing the lease. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response RenewLease( + Azure::Core::Response RenewLease( const std::string& leaseId, const RenewPathLeaseOptions& options = RenewPathLeaseOptions()) const { @@ -205,10 +206,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @brief Releases the path's previously-acquired lease. * @param leaseId ID of the previously-acquired lease. * @param options Optional parameters to execute this function. - * @return A ReleasePathLeaseResult describing the updated path. + * @return Azure::Core::Response describing the updated path. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response ReleaseLease( + Azure::Core::Response ReleaseLease( const std::string& leaseId, const ReleasePathLeaseOptions& options = ReleasePathLeaseOptions()) const { @@ -220,10 +221,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @param leaseId ID of the previously-acquired lease. * @param proposedLeaseId Proposed lease ID, in a GUID string format. * @param options Optional parameters to execute this function. - * @return A ChangePathLeaseResult describing the lease. + * @return Azure::Core::Response describing the lease. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response ChangeLease( + Azure::Core::Response ChangeLease( const std::string& leaseId, const std::string& proposedLeaseId, const ChangePathLeaseOptions& options = ChangePathLeaseOptions()) const @@ -234,10 +235,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Breaks the previously-acquired lease. * @param options Optional parameters to execute this function. - * @return A BreakPathLeaseResult describing the broken lease. + * @return Azure::Core::Response describing the broken lease. * @remark This request is sent to blob endpoint. */ - Azure::Core::Response BreakLease( + Azure::Core::Response BreakLease( const BreakPathLeaseOptions& options = BreakPathLeaseOptions()) const { return m_blobClient.BreakLease(options); diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp index 7d0365e9c..dde4bb63e 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp @@ -6,7 +6,7 @@ #include "azure/storage/blobs/blob_responses.hpp" #include "azure/storage/files/datalake/protocol/datalake_rest_client.hpp" -namespace Azure { namespace Storage { namespace Files { namespace DataLake { +namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace Models { // ServiceClient models: @@ -183,4 +183,4 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { using CreateDirectoryResult = CreatePathResult; using DeleteDirectoryResult = PathDeleteResult; -}}}} // namespace Azure::Storage::Files::DataLake +}}}}} // namespace Azure::Storage::Files::DataLake::Models diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp index 118a2f71d..4c2fc53a9 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp @@ -327,7 +327,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * @return The SAS query parameters used for authenticating requests. */ std::string GenerateSasToken( - const UserDelegationKey& userDelegationKey, + const Models::UserDelegationKey& userDelegationKey, const std::string& accountName); private: diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp index a3cfbdb86..3bae5d24d 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp @@ -88,11 +88,11 @@ 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 containing the listed result of - * file systems and continuation token for unfinished list result. + * @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 ListFileSystemsSegement( + Azure::Core::Response ListFileSystemsSegement( const ListFileSystemsSegmentOptions& options = ListFileSystemsSegmentOptions()) const; /** @@ -105,11 +105,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { * specified in UTC. * @param options Optional parameters to execute * this function. - * @return Azure::Core::Response containing the user delegation key - * related information. + * @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/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp index 641dac1b9..8084a2db6 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp @@ -112,554 +112,546 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { constexpr static const char* c_HeaderXMsRequestServerEncrypted = "x-ms-request-server-encrypted"; } // namespace Details - struct DataLakeHttpHeaders - { - std::string CacheControl; - std::string ContentDisposition; - std::string ContentEncoding; - std::string ContentLanguage; - std::string ContentType; - }; - // Mode "set" sets POSIX access control rights on files and directories, "modify" modifies one or - // more POSIX access control rights that pre-exist on files and directories, "remove" removes one - // or more POSIX access control rights that were present earlier on files and directories - enum class PathSetAccessControlRecursiveMode - { - Set, - Modify, - Remove, - Unknown - }; - - // Required. Indicates mode of the expiry time - enum class PathExpiryOptions - { - NeverExpire, - RelativeToCreation, - RelativeToNow, - Absolute, - Unknown - }; - - struct AclFailedEntry - { - std::string Name; - std::string Type; - std::string ErrorMessage; - }; - - struct SetAccessControlRecursiveResponse - { - int32_t DirectoriesSuccessful = int32_t(); - int32_t FilesSuccessful = int32_t(); - int32_t FailureCount = int32_t(); - std::vector FailedEntries; - }; - - struct Path - { - std::string Name; - bool IsDirectory = bool(); - std::string LastModified; - std::string ETag; - int64_t ContentLength = int64_t(); - std::string Owner; - std::string Group; - std::string Permissions; - }; - - struct PathList - { - std::vector Paths; - }; - - struct FileSystem - { - std::string Name; - std::string LastModified; - std::string ETag; - }; - - struct FileSystemList - { - std::vector Filesystems; - }; - - struct StorageError - { - - // The service error response object. - struct Error + namespace Models { + struct DataLakeHttpHeaders { - std::string Code; // The service error code. - std::string Message; // The service error message. + std::string CacheControl; + std::string ContentDisposition; + std::string ContentEncoding; + std::string ContentLanguage; + std::string ContentType; + }; + // Mode "set" sets POSIX access control rights on files and directories, "modify" modifies one + // or more POSIX access control rights that pre-exist on files and directories, "remove" + // removes one or more POSIX access control rights that were present earlier on files and + // directories + enum class PathSetAccessControlRecursiveMode + { + Set, + Modify, + Remove, + Unknown }; - Error Error; // The service error response object. - }; + // Required. Indicates mode of the expiry time + enum class PathExpiryOptions + { + NeverExpire, + RelativeToCreation, + RelativeToNow, + Absolute, + Unknown + }; - // Required only for Create File and Create Directory. The value must be "file" or "directory". - enum class PathResourceType - { - Directory, - File, - Unknown - }; + struct AclFailedEntry + { + std::string Name; + std::string Type; + std::string ErrorMessage; + }; - // Optional. Valid only when namespace is enabled. This parameter determines the behavior of the - // rename operation. The value must be "legacy" or "posix", and the default value will be "posix". - enum class PathRenameMode - { - Legacy, - Posix, - Unknown - }; + struct SetAccessControlRecursiveResponse + { + int32_t DirectoriesSuccessful = int32_t(); + int32_t FilesSuccessful = int32_t(); + int32_t FailureCount = int32_t(); + std::vector FailedEntries; + }; - // There are five lease actions: "acquire", "break", "change", "renew", and "release". Use - // "acquire" and specify the "x-ms-proposed-lease-id" and "x-ms-lease-duration" to acquire a new - // lease. Use "break" to break an existing lease. When a lease is broken, the lease break period - // is allowed to elapse, during which time no lease operation except break and release can be - // performed on the file. When a lease is successfully broken, the response indicates the interval - // in seconds until a new lease can be acquired. Use "change" and specify the current lease ID in - // "x-ms-lease-id" and the new lease ID in "x-ms-proposed-lease-id" to change the lease ID of an - // active lease. Use "renew" and specify the "x-ms-lease-id" to renew an existing lease. Use - // "release" and specify the "x-ms-lease-id" to release a lease. - enum class PathLeaseAction - { - Acquire, - Break, - Change, - Renew, - Release, - Unknown - }; + struct Path + { + std::string Name; + bool IsDirectory = bool(); + std::string LastModified; + std::string ETag; + int64_t ContentLength = int64_t(); + std::string Owner; + std::string Group; + std::string Permissions; + }; - // Lease state of the resource. - enum class LeaseStateType - { - Available, - Leased, - Expired, - Breaking, - Broken, - Unknown - }; + struct PathList + { + std::vector Paths; + }; - // The lease status of the resource. - enum class LeaseStatusType - { - Locked, - Unlocked, - Unknown - }; + struct FileSystem + { + std::string Name; + std::string LastModified; + std::string ETag; + }; - // Optional. If the value is "getStatus" only the system defined properties for the path are - // returned. If the value is "getAccessControl" the access control list is returned in the - // response headers (Hierarchical Namespace must be enabled for the account), otherwise the - // properties are returned. - enum class PathGetPropertiesAction - { - GetAccessControl, - GetStatus, - Unknown - }; + struct FileSystemList + { + std::vector Filesystems; + }; - struct ServiceListFileSystemsResult - { - Azure::Core::Nullable ContinuationToken; - std::vector Filesystems; - }; + // Required only for Create File and Create Directory. The value must be "file" or "directory". + enum class PathResourceType + { + Directory, + File, + Unknown + }; - struct FileSystemCreateResult - { - std::string ETag; - std::string LastModified; - std::string NamespaceEnabled; - }; + // Optional. Valid only when namespace is enabled. This parameter determines the behavior of the + // rename operation. The value must be "legacy" or "posix", and the default value will be + // "posix". + enum class PathRenameMode + { + Legacy, + Posix, + Unknown + }; - struct FileSystemSetPropertiesResult - { - std::string ETag; - std::string LastModified; - }; + // There are five lease actions: "acquire", "break", "change", "renew", and "release". Use + // "acquire" and specify the "x-ms-proposed-lease-id" and "x-ms-lease-duration" to acquire a new + // lease. Use "break" to break an existing lease. When a lease is broken, the lease break period + // is allowed to elapse, during which time no lease operation except break and release can be + // performed on the file. When a lease is successfully broken, the response indicates the + // interval in seconds until a new lease can be acquired. Use "change" and specify the current + // lease ID in "x-ms-lease-id" and the new lease ID in "x-ms-proposed-lease-id" to change the + // lease ID of an active lease. Use "renew" and specify the "x-ms-lease-id" to renew an existing + // lease. Use "release" and specify the "x-ms-lease-id" to release a lease. + enum class PathLeaseAction + { + Acquire, + Break, + Change, + Renew, + Release, + Unknown + }; - struct FileSystemGetPropertiesResult - { - std::string ETag; - std::string LastModified; - std::string Properties; - std::string NamespaceEnabled; - }; + // Lease state of the resource. + enum class LeaseStateType + { + Available, + Leased, + Expired, + Breaking, + Broken, + Unknown + }; - struct FileSystemDeleteResult - { - }; + // The lease status of the resource. + enum class LeaseStatusType + { + Locked, + Unlocked, + Unknown + }; - struct FileSystemListPathsResult - { - Azure::Core::Nullable ContinuationToken; - std::vector Paths; - }; + // Optional. If the value is "getStatus" only the system defined properties for the path are + // returned. If the value is "getAccessControl" the access control list is returned in the + // response headers (Hierarchical Namespace must be enabled for the account), otherwise the + // properties are returned. + enum class PathGetPropertiesAction + { + GetAccessControl, + GetStatus, + Unknown + }; - struct PathCreateResult - { - Azure::Core::Nullable ETag; - Azure::Core::Nullable LastModified; - Azure::Core::Nullable ContinuationToken; - Azure::Core::Nullable ContentLength; - }; + struct ServiceListFileSystemsResult + { + Azure::Core::Nullable ContinuationToken; + std::vector Filesystems; + }; - struct PathLeaseResult - { - std::string ETag; - std::string LastModified; - std::string LeaseId; - std::string LeaseTime; - }; + struct FileSystemCreateResult + { + std::string ETag; + std::string LastModified; + std::string NamespaceEnabled; + }; - struct PathReadResult - { - std::unique_ptr BodyStream; - std::string AcceptRanges; - DataLakeHttpHeaders HttpHeaders; - int64_t ContentLength = int64_t(); - Azure::Core::Nullable ContentRange; - Azure::Core::Nullable TransactionalMd5; - std::string ETag; - std::string LastModified; - std::string ResourceType; - Azure::Core::Nullable Properties; - Azure::Core::Nullable LeaseDuration; - LeaseStateType LeaseState = LeaseStateType::Unknown; - LeaseStatusType LeaseStatus = LeaseStatusType::Unknown; - Azure::Core::Nullable ContentMd5; - }; + struct FileSystemSetPropertiesResult + { + std::string ETag; + std::string LastModified; + }; - struct PathGetPropertiesResult - { - Azure::Core::Nullable AcceptRanges; - DataLakeHttpHeaders HttpHeaders; - int64_t ContentLength = int64_t(); - Azure::Core::Nullable ContentRange; - Azure::Core::Nullable ContentMd5; - std::string ETag; - std::string LastModified; - Azure::Core::Nullable ResourceType; - Azure::Core::Nullable Properties; - Azure::Core::Nullable Owner; - Azure::Core::Nullable Group; - Azure::Core::Nullable Permissions; - Azure::Core::Nullable Acl; - Azure::Core::Nullable LeaseDuration; - Azure::Core::Nullable LeaseState; - Azure::Core::Nullable LeaseStatus; - }; + struct FileSystemGetPropertiesResult + { + std::string ETag; + std::string LastModified; + std::string Properties; + std::string NamespaceEnabled; + }; - struct PathDeleteResult - { - Azure::Core::Nullable ContinuationToken; - }; + struct FileSystemDeleteResult + { + }; - struct PathSetAccessControlResult - { - std::string ETag; - std::string LastModified; - }; + struct FileSystemListPathsResult + { + Azure::Core::Nullable ContinuationToken; + std::vector Paths; + }; - struct PathSetAccessControlRecursiveResult - { - Azure::Core::Nullable ContinuationToken; - int32_t DirectoriesSuccessful = int32_t(); - int32_t FilesSuccessful = int32_t(); - int32_t FailureCount = int32_t(); - std::vector FailedEntries; - }; + struct PathCreateResult + { + Azure::Core::Nullable ETag; + Azure::Core::Nullable LastModified; + Azure::Core::Nullable ContinuationToken; + Azure::Core::Nullable ContentLength; + }; - struct PathFlushDataResult - { - std::string ETag; - std::string LastModified; - int64_t ContentLength = int64_t(); - }; + struct PathLeaseResult + { + std::string ETag; + std::string LastModified; + std::string LeaseId; + std::string LeaseTime; + }; - struct PathAppendDataResult - { - Azure::Core::Nullable ContentMD5; - Azure::Core::Nullable ContentCrc64; - bool IsServerEncrypted = bool(); - }; + struct PathReadResult + { + std::unique_ptr BodyStream; + std::string AcceptRanges; + DataLakeHttpHeaders HttpHeaders; + int64_t ContentLength = int64_t(); + Azure::Core::Nullable ContentRange; + Azure::Core::Nullable TransactionalMd5; + std::string ETag; + std::string LastModified; + std::string ResourceType; + Azure::Core::Nullable Properties; + Azure::Core::Nullable LeaseDuration; + Models::LeaseStateType LeaseState = Models::LeaseStateType::Unknown; + Models::LeaseStatusType LeaseStatus = Models::LeaseStatusType::Unknown; + Azure::Core::Nullable ContentMd5; + }; - struct PathSetExpiryResult - { - std::string ETag; - std::string LastModified; - }; + struct PathGetPropertiesResult + { + Azure::Core::Nullable AcceptRanges; + DataLakeHttpHeaders HttpHeaders; + int64_t ContentLength = int64_t(); + Azure::Core::Nullable ContentRange; + Azure::Core::Nullable ContentMd5; + std::string ETag; + std::string LastModified; + Azure::Core::Nullable ResourceType; + Azure::Core::Nullable Properties; + Azure::Core::Nullable Owner; + Azure::Core::Nullable Group; + Azure::Core::Nullable Permissions; + Azure::Core::Nullable Acl; + Azure::Core::Nullable LeaseDuration; + Azure::Core::Nullable LeaseState; + Azure::Core::Nullable LeaseStatus; + }; + struct PathDeleteResult + { + Azure::Core::Nullable ContinuationToken; + }; + + struct PathSetAccessControlResult + { + std::string ETag; + std::string LastModified; + }; + + struct PathSetAccessControlRecursiveResult + { + Azure::Core::Nullable ContinuationToken; + int32_t DirectoriesSuccessful = int32_t(); + int32_t FilesSuccessful = int32_t(); + int32_t FailureCount = int32_t(); + std::vector FailedEntries; + }; + + struct PathFlushDataResult + { + std::string ETag; + std::string LastModified; + int64_t ContentLength = int64_t(); + }; + + struct PathAppendDataResult + { + Azure::Core::Nullable ContentMD5; + Azure::Core::Nullable ContentCrc64; + bool IsServerEncrypted = bool(); + }; + + struct PathSetExpiryResult + { + std::string ETag; + std::string LastModified; + }; + + } // namespace Models namespace Details { inline std::string PathSetAccessControlRecursiveModeToString( - const PathSetAccessControlRecursiveMode& pathSetAccessControlRecursiveMode) + const Models::PathSetAccessControlRecursiveMode& pathSetAccessControlRecursiveMode) { switch (pathSetAccessControlRecursiveMode) { - case PathSetAccessControlRecursiveMode::Set: + case Models::PathSetAccessControlRecursiveMode::Set: return "set"; - case PathSetAccessControlRecursiveMode::Modify: + case Models::PathSetAccessControlRecursiveMode::Modify: return "modify"; - case PathSetAccessControlRecursiveMode::Remove: + case Models::PathSetAccessControlRecursiveMode::Remove: return "remove"; default: return std::string(); } } - inline PathSetAccessControlRecursiveMode PathSetAccessControlRecursiveModeFromString( + inline Models::PathSetAccessControlRecursiveMode PathSetAccessControlRecursiveModeFromString( const std::string& pathSetAccessControlRecursiveMode) { if (pathSetAccessControlRecursiveMode == "set") { - return PathSetAccessControlRecursiveMode::Set; + return Models::PathSetAccessControlRecursiveMode::Set; } if (pathSetAccessControlRecursiveMode == "modify") { - return PathSetAccessControlRecursiveMode::Modify; + return Models::PathSetAccessControlRecursiveMode::Modify; } if (pathSetAccessControlRecursiveMode == "remove") { - return PathSetAccessControlRecursiveMode::Remove; + return Models::PathSetAccessControlRecursiveMode::Remove; } throw std::runtime_error( "Cannot convert " + pathSetAccessControlRecursiveMode + " to PathSetAccessControlRecursiveMode"); } - inline std::string PathExpiryOptionsToString(const PathExpiryOptions& pathExpiryOptions) + inline std::string PathExpiryOptionsToString(const Models::PathExpiryOptions& pathExpiryOptions) { switch (pathExpiryOptions) { - case PathExpiryOptions::NeverExpire: + case Models::PathExpiryOptions::NeverExpire: return "NeverExpire"; - case PathExpiryOptions::RelativeToCreation: + case Models::PathExpiryOptions::RelativeToCreation: return "RelativeToCreation"; - case PathExpiryOptions::RelativeToNow: + case Models::PathExpiryOptions::RelativeToNow: return "RelativeToNow"; - case PathExpiryOptions::Absolute: + case Models::PathExpiryOptions::Absolute: return "Absolute"; default: return std::string(); } } - inline PathExpiryOptions PathExpiryOptionsFromString(const std::string& pathExpiryOptions) + inline Models::PathExpiryOptions PathExpiryOptionsFromString( + const std::string& pathExpiryOptions) { if (pathExpiryOptions == "NeverExpire") { - return PathExpiryOptions::NeverExpire; + return Models::PathExpiryOptions::NeverExpire; } if (pathExpiryOptions == "RelativeToCreation") { - return PathExpiryOptions::RelativeToCreation; + return Models::PathExpiryOptions::RelativeToCreation; } if (pathExpiryOptions == "RelativeToNow") { - return PathExpiryOptions::RelativeToNow; + return Models::PathExpiryOptions::RelativeToNow; } if (pathExpiryOptions == "Absolute") { - return PathExpiryOptions::Absolute; + return Models::PathExpiryOptions::Absolute; } throw std::runtime_error("Cannot convert " + pathExpiryOptions + " to PathExpiryOptions"); } - inline std::string PathResourceTypeToString(const PathResourceType& pathResourceType) + inline std::string PathResourceTypeToString(const Models::PathResourceType& pathResourceType) { switch (pathResourceType) { - case PathResourceType::Directory: + case Models::PathResourceType::Directory: return "directory"; - case PathResourceType::File: + case Models::PathResourceType::File: return "file"; default: return std::string(); } } - inline PathResourceType PathResourceTypeFromString(const std::string& pathResourceType) + inline Models::PathResourceType PathResourceTypeFromString(const std::string& pathResourceType) { if (pathResourceType == "directory") { - return PathResourceType::Directory; + return Models::PathResourceType::Directory; } if (pathResourceType == "file") { - return PathResourceType::File; + return Models::PathResourceType::File; } throw std::runtime_error("Cannot convert " + pathResourceType + " to PathResourceType"); } - inline std::string PathRenameModeToString(const PathRenameMode& pathRenameMode) + inline std::string PathRenameModeToString(const Models::PathRenameMode& pathRenameMode) { switch (pathRenameMode) { - case PathRenameMode::Legacy: + case Models::PathRenameMode::Legacy: return "legacy"; - case PathRenameMode::Posix: + case Models::PathRenameMode::Posix: return "posix"; default: return std::string(); } } - inline PathRenameMode PathRenameModeFromString(const std::string& pathRenameMode) + inline Models::PathRenameMode PathRenameModeFromString(const std::string& pathRenameMode) { if (pathRenameMode == "legacy") { - return PathRenameMode::Legacy; + return Models::PathRenameMode::Legacy; } if (pathRenameMode == "posix") { - return PathRenameMode::Posix; + return Models::PathRenameMode::Posix; } throw std::runtime_error("Cannot convert " + pathRenameMode + " to PathRenameMode"); } - inline std::string PathLeaseActionToString(const PathLeaseAction& pathLeaseAction) + inline std::string PathLeaseActionToString(const Models::PathLeaseAction& pathLeaseAction) { switch (pathLeaseAction) { - case PathLeaseAction::Acquire: + case Models::PathLeaseAction::Acquire: return "acquire"; - case PathLeaseAction::Break: + case Models::PathLeaseAction::Break: return "break"; - case PathLeaseAction::Change: + case Models::PathLeaseAction::Change: return "change"; - case PathLeaseAction::Renew: + case Models::PathLeaseAction::Renew: return "renew"; - case PathLeaseAction::Release: + case Models::PathLeaseAction::Release: return "release"; default: return std::string(); } } - inline PathLeaseAction PathLeaseActionFromString(const std::string& pathLeaseAction) + inline Models::PathLeaseAction PathLeaseActionFromString(const std::string& pathLeaseAction) { if (pathLeaseAction == "acquire") { - return PathLeaseAction::Acquire; + return Models::PathLeaseAction::Acquire; } if (pathLeaseAction == "break") { - return PathLeaseAction::Break; + return Models::PathLeaseAction::Break; } if (pathLeaseAction == "change") { - return PathLeaseAction::Change; + return Models::PathLeaseAction::Change; } if (pathLeaseAction == "renew") { - return PathLeaseAction::Renew; + return Models::PathLeaseAction::Renew; } if (pathLeaseAction == "release") { - return PathLeaseAction::Release; + return Models::PathLeaseAction::Release; } throw std::runtime_error("Cannot convert " + pathLeaseAction + " to PathLeaseAction"); } - inline std::string LeaseStateTypeToString(const LeaseStateType& leaseStateType) + inline std::string LeaseStateTypeToString(const Models::LeaseStateType& leaseStateType) { switch (leaseStateType) { - case LeaseStateType::Available: + case Models::LeaseStateType::Available: return "available"; - case LeaseStateType::Leased: + case Models::LeaseStateType::Leased: return "leased"; - case LeaseStateType::Expired: + case Models::LeaseStateType::Expired: return "expired"; - case LeaseStateType::Breaking: + case Models::LeaseStateType::Breaking: return "breaking"; - case LeaseStateType::Broken: + case Models::LeaseStateType::Broken: return "broken"; default: return std::string(); } } - inline LeaseStateType LeaseStateTypeFromString(const std::string& leaseStateType) + inline Models::LeaseStateType LeaseStateTypeFromString(const std::string& leaseStateType) { if (leaseStateType == "available") { - return LeaseStateType::Available; + return Models::LeaseStateType::Available; } if (leaseStateType == "leased") { - return LeaseStateType::Leased; + return Models::LeaseStateType::Leased; } if (leaseStateType == "expired") { - return LeaseStateType::Expired; + return Models::LeaseStateType::Expired; } if (leaseStateType == "breaking") { - return LeaseStateType::Breaking; + return Models::LeaseStateType::Breaking; } if (leaseStateType == "broken") { - return LeaseStateType::Broken; + return Models::LeaseStateType::Broken; } throw std::runtime_error("Cannot convert " + leaseStateType + " to LeaseStateType"); } - inline std::string LeaseStatusTypeToString(const LeaseStatusType& leaseStatusType) + inline std::string LeaseStatusTypeToString(const Models::LeaseStatusType& leaseStatusType) { switch (leaseStatusType) { - case LeaseStatusType::Locked: + case Models::LeaseStatusType::Locked: return "locked"; - case LeaseStatusType::Unlocked: + case Models::LeaseStatusType::Unlocked: return "unlocked"; default: return std::string(); } } - inline LeaseStatusType LeaseStatusTypeFromString(const std::string& leaseStatusType) + inline Models::LeaseStatusType LeaseStatusTypeFromString(const std::string& leaseStatusType) { if (leaseStatusType == "locked") { - return LeaseStatusType::Locked; + return Models::LeaseStatusType::Locked; } if (leaseStatusType == "unlocked") { - return LeaseStatusType::Unlocked; + return Models::LeaseStatusType::Unlocked; } throw std::runtime_error("Cannot convert " + leaseStatusType + " to LeaseStatusType"); } inline std::string PathGetPropertiesActionToString( - const PathGetPropertiesAction& pathGetPropertiesAction) + const Models::PathGetPropertiesAction& pathGetPropertiesAction) { switch (pathGetPropertiesAction) { - case PathGetPropertiesAction::GetAccessControl: + case Models::PathGetPropertiesAction::GetAccessControl: return "getAccessControl"; - case PathGetPropertiesAction::GetStatus: + case Models::PathGetPropertiesAction::GetStatus: return "getStatus"; default: return std::string(); } } - inline PathGetPropertiesAction PathGetPropertiesActionFromString( + inline Models::PathGetPropertiesAction PathGetPropertiesActionFromString( const std::string& pathGetPropertiesAction) { if (pathGetPropertiesAction == "getAccessControl") { - return PathGetPropertiesAction::GetAccessControl; + return Models::PathGetPropertiesAction::GetAccessControl; } if (pathGetPropertiesAction == "getStatus") { - return PathGetPropertiesAction::GetStatus; + return Models::PathGetPropertiesAction::GetStatus; } throw std::runtime_error( "Cannot convert " + pathGetPropertiesAction + " to PathGetPropertiesAction"); @@ -699,7 +691,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // use for this request. }; - static Azure::Core::Response ListFileSystems( + static Azure::Core::Response ListFileSystems( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -747,7 +739,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } private: - static Azure::Core::Response ListFileSystemsParseResult( + static Azure::Core::Response + ListFileSystemsParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -756,8 +749,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // OK const auto& bodyBuffer = response.GetBody(); - ServiceListFileSystemsResult result = bodyBuffer.empty() - ? ServiceListFileSystemsResult() + Models::ServiceListFileSystemsResult result = bodyBuffer.empty() + ? Models::ServiceListFileSystemsResult() : ServiceListFileSystemsResultFromFileSystemList( FileSystemListFromJson(nlohmann::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) @@ -765,7 +758,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.ContinuationToken = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -775,19 +768,20 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Storage::Files::DataLake::FileSystem FileSystemFromJson(const nlohmann::json& node) + static Storage::Files::DataLake::Models::FileSystem FileSystemFromJson( + const nlohmann::json& node) { - Storage::Files::DataLake::FileSystem result; + Storage::Files::DataLake::Models::FileSystem result; result.Name = node["name"].get(); result.LastModified = node["lastModified"].get(); result.ETag = node["etag"].get(); return result; } - static Storage::Files::DataLake::FileSystemList FileSystemListFromJson( + static Storage::Files::DataLake::Models::FileSystemList FileSystemListFromJson( const nlohmann::json& node) { - Storage::Files::DataLake::FileSystemList result; + Storage::Files::DataLake::Models::FileSystemList result; for (const auto& element : node["filesystems"]) { result.Filesystems.emplace_back(FileSystemFromJson(element)); @@ -795,10 +789,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static ServiceListFileSystemsResult ServiceListFileSystemsResultFromFileSystemList( - FileSystemList object) + static Models::ServiceListFileSystemsResult ServiceListFileSystemsResultFromFileSystemList( + Models::FileSystemList object) { - ServiceListFileSystemsResult result; + Models::ServiceListFileSystemsResult result; result.Filesystems = std::move(object.Filesystems); return result; @@ -833,7 +827,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // and include values for all properties. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -897,7 +891,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // not been modified since the specified date/time. }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -956,7 +950,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // use for this request. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -1005,7 +999,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // not been modified since the specified date/time. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -1082,7 +1076,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // unique friendly names. }; - static Azure::Core::Response ListPaths( + static Azure::Core::Response ListPaths( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -1141,7 +1135,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -1149,12 +1143,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Created - FileSystemCreateResult result; + Models::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 @@ -1164,7 +1158,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response SetPropertiesParseResult( + static Azure::Core::Response + SetPropertiesParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -1172,10 +1167,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - FileSystemSetPropertiesResult result; + Models::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 @@ -1185,7 +1180,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response + GetPropertiesParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -1193,13 +1189,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - FileSystemGetPropertiesResult result; + Models::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 @@ -1209,7 +1205,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -1217,8 +1213,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Accepted - FileSystemDeleteResult result; - return Azure::Core::Response( + Models::FileSystemDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1228,7 +1224,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response ListPathsParseResult( + static Azure::Core::Response ListPathsParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -1237,8 +1233,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // Ok const auto& bodyBuffer = response.GetBody(); - FileSystemListPathsResult result = bodyBuffer.empty() - ? FileSystemListPathsResult() + Models::FileSystemListPathsResult result = bodyBuffer.empty() + ? Models::FileSystemListPathsResult() : FileSystemListPathsResultFromPathList( PathListFromJson(nlohmann::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) @@ -1246,7 +1242,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.ContinuationToken = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1256,9 +1252,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Storage::Files::DataLake::Path PathFromJson(const nlohmann::json& node) + static Storage::Files::DataLake::Models::Path PathFromJson(const nlohmann::json& node) { - Storage::Files::DataLake::Path result; + Storage::Files::DataLake::Models::Path result; result.Name = node["name"].get(); if (node.contains("isDirectory")) { @@ -1276,9 +1272,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static Storage::Files::DataLake::PathList PathListFromJson(const nlohmann::json& node) + static Storage::Files::DataLake::Models::PathList PathListFromJson( + const nlohmann::json& node) { - Storage::Files::DataLake::PathList result; + Storage::Files::DataLake::Models::PathList result; for (const auto& element : node["paths"]) { result.Paths.emplace_back(PathFromJson(element)); @@ -1286,9 +1283,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static FileSystemListPathsResult FileSystemListPathsResultFromPathList(PathList object) + static Models::FileSystemListPathsResult FileSystemListPathsResultFromPathList( + Models::PathList object) { - FileSystemListPathsResult result; + Models::FileSystemListPathsResult result; result.Paths = std::move(object.Paths); return result; @@ -1311,7 +1309,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::c_DefaultServiceApiVersion; // Specifies the version of the operation to // use for this request. - Azure::Core::Nullable + Azure::Core::Nullable Resource; // Required only for Create File and Create Directory. The value must be // "file" or "directory". Azure::Core::Nullable @@ -1322,7 +1320,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // returned in the response, it must be specified in a subsequent // invocation of the delete operation to continue deleting the // directory. - Azure::Core::Nullable + Azure::Core::Nullable Mode; // Optional. Valid only when namespace is enabled. This parameter determines the // behavior of the rename operation. The value must be "legacy" or "posix", and // the default value will be "posix". @@ -1401,7 +1399,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( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -1550,20 +1548,19 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::c_DefaultServiceApiVersion; // Specifies the version of the operation to // use for this request. - PathLeaseAction - XMsLeaseAction; // There are five lease actions: "acquire", "break", "change", - // "renew", and "release". Use "acquire" and specify the - // "x-ms-proposed-lease-id" and "x-ms-lease-duration" to acquire a new - // lease. Use "break" to break an existing lease. When a lease is - // broken, the lease break period is allowed to elapse, during which - // time no lease operation except break and release can be performed - // on the file. When a lease is successfully broken, the response - // indicates the interval in seconds until a new lease can be - // acquired. Use "change" and specify the current lease ID in - // "x-ms-lease-id" and the new lease ID in "x-ms-proposed-lease-id" to - // change the lease ID of an active lease. Use "renew" and specify the - // "x-ms-lease-id" to renew an existing lease. Use "release" and - // specify the "x-ms-lease-id" to release a lease. + Models::PathLeaseAction XMsLeaseAction = Models::PathLeaseAction:: + Unknown; // There are five lease actions: "acquire", "break", "change", "renew", and + // "release". Use "acquire" and specify the "x-ms-proposed-lease-id" and + // "x-ms-lease-duration" to acquire a new lease. Use "break" to break an + // existing lease. When a lease is broken, the lease break period is allowed + // to elapse, during which time no lease operation except break and release + // can be performed on the file. When a lease is successfully broken, the + // response indicates the interval in seconds until a new lease can be + // acquired. Use "change" and specify the current lease ID in "x-ms-lease-id" + // and the new lease ID in "x-ms-proposed-lease-id" to change the lease ID of + // an active lease. Use "renew" and specify the "x-ms-lease-id" to renew an + // existing lease. Use "release" and specify the "x-ms-lease-id" to release a + // lease. Azure::Core::Nullable XMsLeaseDuration; // The lease duration is required to acquire a lease, and specifies // the duration of the lease in seconds. The lease duration must be @@ -1593,7 +1590,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // not been modified since the specified date/time. }; - static Azure::Core::Response Lease( + static Azure::Core::Response Lease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -1702,7 +1699,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // not been modified since the specified date/time. }; - static Azure::Core::Response Read( + static Azure::Core::Response Read( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -1772,7 +1769,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::string ApiVersionParameter = Details::c_DefaultServiceApiVersion; // Specifies the version of the operation to // use for this request. - Azure::Core::Nullable + Azure::Core::Nullable Action; // Optional. If the value is "getStatus" only the system defined properties // for the path are returned. If the value is "getAccessControl" the access // control list is returned in the response headers (Hierarchical Namespace @@ -1800,7 +1797,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // not been modified since the specified date/time. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -1901,7 +1898,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // not been modified since the specified date/time. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -2005,7 +2002,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // use for this request. }; - static Azure::Core::Response SetAccessControl( + static Azure::Core::Response SetAccessControl( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -2090,11 +2087,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // returned in the response, it must be specified in a subsequent // invocation of the delete operation to continue deleting the // directory. - PathSetAccessControlRecursiveMode - Mode; // Mode "set" sets POSIX access control rights on files and directories, - // "modify" modifies one or more POSIX access control rights that pre-exist on - // files and directories, "remove" removes one or more POSIX access control - // rights that were present earlier on files and directories + Models::PathSetAccessControlRecursiveMode Mode + = Models::PathSetAccessControlRecursiveMode:: + Unknown; // Mode "set" sets POSIX access control rights on files and directories, + // "modify" modifies one or more POSIX access control rights that + // pre-exist on files and directories, "remove" removes one or more POSIX + // access control rights that were present earlier on files and + // directories Azure::Core::Nullable ForceFlag; // Optional. Valid for "SetAccessControlRecursive" operation. If set to // false, the operation will terminate quickly on encountering user errors @@ -2120,7 +2119,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // use for this request. }; - static Azure::Core::Response SetAccessControlRecursive( + static Azure::Core::Response + SetAccessControlRecursive( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -2258,7 +2258,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // use for this request. }; - static Azure::Core::Response FlushData( + static Azure::Core::Response FlushData( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -2403,7 +2403,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { // use for this request. }; - static Azure::Core::Response AppendData( + static Azure::Core::Response AppendData( const Azure::Core::Http::Url& url, Azure::Core::Http::BodyStream& bodyStream, Azure::Core::Http::HttpPipeline& pipeline, @@ -2473,11 +2473,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ClientRequestId; // Provides a client-generated, opaque value with a 1 KB character // limit that is recorded in the analytics logs when storage // analytics logging is enabled. - PathExpiryOptions XMsExpiryOption; // Required. Indicates mode of the expiry time + Models::PathExpiryOptions XMsExpiryOption + = Models::PathExpiryOptions::Unknown; // Required. Indicates mode of the expiry time Azure::Core::Nullable PathExpiryTime; // The time to set the blob to expiry }; - static Azure::Core::Response SetExpiry( + static Azure::Core::Response SetExpiry( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, const Azure::Core::Context& context, @@ -2512,7 +2513,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2520,7 +2521,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The file or directory was created. - PathCreateResult result; + Models::PathCreateResult result; if (response.GetHeaders().find(Details::c_HeaderETag) != response.GetHeaders().end()) { result.ETag = response.GetHeaders().at(Details::c_HeaderETag); @@ -2541,7 +2542,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 @@ -2551,7 +2552,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response LeaseParseResult( + static Azure::Core::Response LeaseParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2559,7 +2560,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. - PathLeaseResult result; + Models::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) @@ -2567,13 +2568,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.LeaseId = response.GetHeaders().at(Details::c_HeaderXMsLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // A new lease has been created. The "acquire" action was successful. - PathLeaseResult result; + Models::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) @@ -2581,17 +2582,17 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.LeaseId = response.GetHeaders().at(Details::c_HeaderXMsLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The "break" lease action was successful. - PathLeaseResult result; + Models::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( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2601,7 +2602,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response ReadParseResult( + static Azure::Core::Response ReadParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2609,7 +2610,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Ok - PathReadResult result; + Models::PathReadResult result; result.BodyStream = response.GetBodyStream(); result.AcceptRanges = response.GetHeaders().at(Details::c_HeaderAcceptRanges); if (response.GetHeaders().find("cache-control") != response.GetHeaders().end()) @@ -2666,12 +2667,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { 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 - PathReadResult result; + Models::PathReadResult result; result.BodyStream = response.GetBodyStream(); result.AcceptRanges = response.GetHeaders().at(Details::c_HeaderAcceptRanges); if (response.GetHeaders().find("cache-control") != response.GetHeaders().end()) @@ -2733,7 +2735,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { 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 { @@ -2742,7 +2745,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2750,7 +2753,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. - PathGetPropertiesResult result; + Models::PathGetPropertiesResult result; if (response.GetHeaders().find(Details::c_HeaderAcceptRanges) != response.GetHeaders().end()) { @@ -2841,7 +2844,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 @@ -2851,7 +2854,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2859,13 +2862,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The file was deleted. - PathDeleteResult result; + Models::PathDeleteResult result; if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) != response.GetHeaders().end()) { result.ContinuationToken = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2875,7 +2878,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response SetAccessControlParseResult( + static Azure::Core::Response + SetAccessControlParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2883,10 +2887,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Set directory access control response. - PathSetAccessControlResult result; + Models::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 @@ -2896,7 +2900,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response + static Azure::Core::Response SetAccessControlRecursiveParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) @@ -2906,8 +2910,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // Set directory access control recursive response. const auto& bodyBuffer = response.GetBody(); - PathSetAccessControlRecursiveResult result = bodyBuffer.empty() - ? PathSetAccessControlRecursiveResult() + Models::PathSetAccessControlRecursiveResult result = bodyBuffer.empty() + ? Models::PathSetAccessControlRecursiveResult() : PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse( SetAccessControlRecursiveResponseFromJson(nlohmann::json::parse(bodyBuffer))); if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) @@ -2915,7 +2919,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { result.ContinuationToken = response.GetHeaders().at(Details::c_HeaderXMsContinuation); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2925,20 +2929,20 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Storage::Files::DataLake::AclFailedEntry AclFailedEntryFromJson( + static Storage::Files::DataLake::Models::AclFailedEntry AclFailedEntryFromJson( const nlohmann::json& node) { - Storage::Files::DataLake::AclFailedEntry result; + Storage::Files::DataLake::Models::AclFailedEntry result; result.Name = node["name"].get(); result.Type = node["type"].get(); result.ErrorMessage = node["errorMessage"].get(); return result; } - static Storage::Files::DataLake::SetAccessControlRecursiveResponse + static Storage::Files::DataLake::Models::SetAccessControlRecursiveResponse SetAccessControlRecursiveResponseFromJson(const nlohmann::json& node) { - Storage::Files::DataLake::SetAccessControlRecursiveResponse result; + Storage::Files::DataLake::Models::SetAccessControlRecursiveResponse result; result.DirectoriesSuccessful = node["directoriesSuccessful"].get(); result.FilesSuccessful = node["filesSuccessful"].get(); result.FailureCount = node["failureCount"].get(); @@ -2949,11 +2953,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static PathSetAccessControlRecursiveResult + static Models::PathSetAccessControlRecursiveResult PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse( - SetAccessControlRecursiveResponse object) + Models::SetAccessControlRecursiveResponse object) { - PathSetAccessControlRecursiveResult result; + Models::PathSetAccessControlRecursiveResult result; result.DirectoriesSuccessful = object.DirectoriesSuccessful; result.FilesSuccessful = object.FilesSuccessful; result.FailureCount = object.FailureCount; @@ -2961,7 +2965,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static Azure::Core::Response FlushDataParseResult( + static Azure::Core::Response FlushDataParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2969,7 +2973,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. - PathFlushDataResult result; + Models::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) @@ -2978,7 +2982,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 @@ -2988,7 +2992,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response AppendDataParseResult( + static Azure::Core::Response AppendDataParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -2996,7 +3000,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Append data to file control response. - PathAppendDataResult result; + Models::PathAppendDataResult result; if (response.GetHeaders().find(Details::c_HeaderContentMD5) != response.GetHeaders().end()) { @@ -3009,7 +3013,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderXMsRequestServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3019,7 +3023,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } } - static Azure::Core::Response SetExpiryParseResult( + static Azure::Core::Response SetExpiryParseResult( const Azure::Core::Context& context, std::unique_ptr responsePtr) { @@ -3027,10 +3031,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The blob expiry was set successfully. - PathSetExpiryResult result; + Models::PathSetExpiryResult 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 diff --git a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp index 1a92ee8e5..d57ec9722 100644 --- a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp +++ b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp @@ -87,7 +87,7 @@ void DataLakeGettingStarted() // List all file systems. std::string continuation; - std::vector fileSystems; + std::vector fileSystems; do { auto response = serviceClient.ListFileSystemsSegement(); diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp index 860ab01aa..41860b8d5 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp @@ -149,7 +149,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return DirectoryClient(std::move(builder), std::move(blobClient), m_pipeline); } - Azure::Core::Response DirectoryClient::Rename( + Azure::Core::Response DirectoryClient::Rename( const std::string& destinationPath, const RenameDirectoryOptions& options) const { @@ -180,13 +180,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = Details::DataLakeRestClient::Path::Create( destinationDfsUri, *m_pipeline, options.Context, protocolLayerOptions); // At this point, there is not more exception thrown, meaning the rename is successful. - auto ret = RenameDirectoryResult(); + auto ret = Models::RenameDirectoryResult(); ret.ContinuationToken = std::move(result->ContinuationToken); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response DirectoryClient::Delete( + Azure::Core::Response DirectoryClient::Delete( bool recursive, const DeleteDirectoryOptions& options) const { @@ -202,10 +202,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response + Azure::Core::Response DirectoryClient::SetAccessControlRecursive( - PathSetAccessControlRecursiveMode mode, - std::vector acls, + Models::PathSetAccessControlRecursiveMode mode, + std::vector acls, const SetDirectoryAccessControlRecursiveOptions& options) const { Details::DataLakeRestClient::Path::SetAccessControlRecursiveOptions protocolLayerOptions; @@ -213,7 +213,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { protocolLayerOptions.ContinuationToken = options.ContinuationToken; protocolLayerOptions.MaxRecords = options.MaxRecords; protocolLayerOptions.ForceFlag = options.ForceFlag; - protocolLayerOptions.Acl = Acl::SerializeAcls(acls); + protocolLayerOptions.Acl = Models::Acl::SerializeAcls(acls); return Details::DataLakeRestClient::Path::SetAccessControlRecursive( m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); } diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp index f6181a161..ec7e4980f 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp @@ -43,9 +43,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return std::make_pair(offset, length); } - DataLakeHttpHeaders FromBlobHttpHeaders(Blobs::Models::BlobHttpHeaders headers) + Models::DataLakeHttpHeaders FromBlobHttpHeaders(Blobs::Models::BlobHttpHeaders headers) { - DataLakeHttpHeaders ret; + Models::DataLakeHttpHeaders ret; ret.CacheControl = std::move(headers.CacheControl); ret.ContentDisposition = std::move(headers.ContentDisposition); ret.ContentEncoding = std::move(headers.ContentEncoding); @@ -54,7 +54,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return ret; } - Blobs::Models::BlobHttpHeaders FromDataLakeHttpHeaders(DataLakeHttpHeaders headers) + Blobs::Models::BlobHttpHeaders FromDataLakeHttpHeaders(Models::DataLakeHttpHeaders headers) { Blobs::Models::BlobHttpHeaders ret; ret.CacheControl = std::move(headers.CacheControl); @@ -65,35 +65,35 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return ret; } - LeaseStateType FromBlobLeaseState(Blobs::Models::BlobLeaseState state) + Models::LeaseStateType FromBlobLeaseState(Blobs::Models::BlobLeaseState state) { switch (state) { case Blobs::Models::BlobLeaseState::Available: - return LeaseStateType::Available; + return Models::LeaseStateType::Available; case Blobs::Models::BlobLeaseState::Breaking: - return LeaseStateType::Breaking; + return Models::LeaseStateType::Breaking; case Blobs::Models::BlobLeaseState::Broken: - return LeaseStateType::Broken; + return Models::LeaseStateType::Broken; case Blobs::Models::BlobLeaseState::Expired: - return LeaseStateType::Expired; + return Models::LeaseStateType::Expired; case Blobs::Models::BlobLeaseState::Leased: - return LeaseStateType::Leased; + return Models::LeaseStateType::Leased; default: - return LeaseStateType::Unknown; + return Models::LeaseStateType::Unknown; } } - LeaseStatusType FromBlobLeaseStatus(Blobs::Models::BlobLeaseStatus status) + Models::LeaseStatusType FromBlobLeaseStatus(Blobs::Models::BlobLeaseStatus status) { switch (status) { case Blobs::Models::BlobLeaseStatus::Locked: - return LeaseStatusType::Locked; + return Models::LeaseStatusType::Locked; case Blobs::Models::BlobLeaseStatus::Unlocked: - return LeaseStatusType::Unlocked; + return Models::LeaseStatusType::Unlocked; default: - return LeaseStatusType::Unknown; + return Models::LeaseStatusType::Unknown; } } } // namespace @@ -208,7 +208,7 @@ 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 AppendFileDataOptions& options) const @@ -222,7 +222,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri, *content, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::FlushData( + Azure::Core::Response FileClient::FlushData( int64_t endingOffset, const FlushFileDataOptions& options) const { @@ -246,7 +246,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::Rename( + Azure::Core::Response FileClient::Rename( const std::string& destinationPath, const RenameFileOptions& options) const { @@ -276,11 +276,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = Details::DataLakeRestClient::Path::Create( destinationDfsUri, *m_pipeline, options.Context, protocolLayerOptions); // At this point, there is not more exception thrown, meaning the rename is successful. - auto ret = RenameFileResult(); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + auto ret = Models::RenameFileResult(); + 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 { Details::DataLakeRestClient::Path::DeleteOptions protocolLayerOptions; protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId; @@ -290,11 +292,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; auto result = Details::DataLakeRestClient::Path::Delete( m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); - auto ret = DeleteFileResult(); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + auto ret = Models::DeleteFileResult(); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::Read(const ReadFileOptions& options) const + Azure::Core::Response FileClient::Read( + const ReadFileOptions& options) const { Blobs::DownloadBlobOptions blobOptions; blobOptions.Context = options.Context; @@ -306,7 +310,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); - ReadFileResult ret; + Models::ReadFileResult ret; ret.Body = std::move(result->BodyStream); ret.HttpHeaders = FromBlobHttpHeaders(std::move(result->HttpHeaders)); Azure::Core::Nullable RangeOffset; @@ -333,10 +337,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.CreationTime = std::move(result->CreationTime); ret.ExpiryTime = std::move(result->ExpiryTime); ret.LastAccessTime = std::move(result->LastAccessTime); - return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); + return Azure::Core::Response( + std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::UploadFrom( + Azure::Core::Response FileClient::UploadFrom( const std::string& fileName, const UploadFileFromOptions& options) const { @@ -349,7 +354,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return m_blockBlobClient.UploadFrom(fileName, blobOptions); } - Azure::Core::Response FileClient::UploadFrom( + Azure::Core::Response FileClient::UploadFrom( const uint8_t* buffer, std::size_t bufferSize, const UploadFileFromOptions& options) const @@ -363,13 +368,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return m_blockBlobClient.UploadFrom(buffer, bufferSize, blobOptions); } - Azure::Core::Response FileClient::DownloadTo( + Azure::Core::Response FileClient::DownloadTo( uint8_t* buffer, std::size_t bufferSize, const DownloadFileToOptions& options) const { auto result = m_blockBlobClient.DownloadTo(buffer, bufferSize, options); - DownloadFileToResult ret; + Models::DownloadFileToResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.ContentLength = result->ContentLength; @@ -377,15 +382,16 @@ 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::DownloadTo( + Azure::Core::Response FileClient::DownloadTo( const std::string& fileName, const DownloadFileToOptions& options) const { auto result = m_blockBlobClient.DownloadTo(fileName, options); - DownloadFileToResult ret; + Models::DownloadFileToResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.ContentLength = result->ContentLength; @@ -393,10 +399,11 @@ 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::ScheduleDeletion( + Azure::Core::Response FileClient::ScheduleDeletion( ScheduleFileExpiryOriginType expiryOrigin, const ScheduleFileDeletionOptions& options) const { diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp index ad2a5c2cb..09324d4bd 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp @@ -185,21 +185,21 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return DirectoryClient(builder, m_blobContainerClient.GetBlobClient(path), m_pipeline); } - Azure::Core::Response FileSystemClient::Create( + 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); - CreateFileSystemResult ret; + Models::CreateFileSystemResult 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 FileSystemClient::Delete( + Azure::Core::Response FileSystemClient::Delete( const DeleteFileSystemOptions& options) const { Blobs::DeleteContainerOptions blobOptions; @@ -208,27 +208,27 @@ 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); - FileSystemDeleteResult ret; - return Azure::Core::Response( + Models::FileSystemDeleteResult ret; + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileSystemClient::GetProperties( + 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); - GetFileSystemPropertiesResult ret; + Models::GetFileSystemPropertiesResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.Metadata = std::move(result->Metadata); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileSystemClient::SetMetadata( + Azure::Core::Response FileSystemClient::SetMetadata( const std::map& metadata, const SetFileSystemMetadataOptions& options) const { @@ -237,14 +237,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.AccessConditions.IfModifiedSince = options.AccessConditions.IfModifiedSince; blobOptions.AccessConditions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; auto result = m_blobContainerClient.SetMetadata(metadata, blobOptions); - SetFileSystemMetadataResult ret; + Models::SetFileSystemMetadataResult 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 FileSystemClient::ListPaths( + Azure::Core::Response FileSystemClient::ListPaths( bool recursive, const ListPathsOptions& options) const { diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp index df285c37b..55f592a9a 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp @@ -36,46 +36,46 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return blobOptions; } - LeaseStateType FromBlobLeaseState(Blobs::Models::BlobLeaseState state) + Models::LeaseStateType FromBlobLeaseState(Blobs::Models::BlobLeaseState state) { - auto ret = LeaseStateType::Unknown; + auto ret = Models::LeaseStateType::Unknown; switch (state) { case Blobs::Models::BlobLeaseState::Available: - ret = LeaseStateType::Available; + ret = Models::LeaseStateType::Available; break; case Blobs::Models::BlobLeaseState::Breaking: - ret = LeaseStateType::Breaking; + ret = Models::LeaseStateType::Breaking; break; case Blobs::Models::BlobLeaseState::Broken: - ret = LeaseStateType::Broken; + ret = Models::LeaseStateType::Broken; break; case Blobs::Models::BlobLeaseState::Expired: - ret = LeaseStateType::Expired; + ret = Models::LeaseStateType::Expired; break; case Blobs::Models::BlobLeaseState::Leased: - ret = LeaseStateType::Leased; + ret = Models::LeaseStateType::Leased; break; default: - ret = LeaseStateType::Unknown; + ret = Models::LeaseStateType::Unknown; break; } return ret; } - LeaseStatusType FromBlobLeaseStatus(Blobs::Models::BlobLeaseStatus status) + Models::LeaseStatusType FromBlobLeaseStatus(Blobs::Models::BlobLeaseStatus status) { - auto ret = LeaseStatusType::Unknown; + auto ret = Models::LeaseStatusType::Unknown; switch (status) { case Blobs::Models::BlobLeaseStatus::Locked: - ret = LeaseStatusType::Locked; + ret = Models::LeaseStatusType::Locked; break; case Blobs::Models::BlobLeaseStatus::Unlocked: - ret = LeaseStatusType::Unlocked; + ret = Models::LeaseStatusType::Unlocked; break; default: - ret = LeaseStatusType::Unknown; + ret = Models::LeaseStatusType::Unknown; break; } return ret; @@ -194,8 +194,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_pipeline = std::make_shared(policies); } - Azure::Core::Response PathClient::SetAccessControl( - std::vector acls, + Azure::Core::Response PathClient::SetAccessControl( + std::vector acls, const SetPathAccessControlOptions& options) const { Details::DataLakeRestClient::Path::SetAccessControlOptions protocolLayerOptions; @@ -203,7 +203,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { protocolLayerOptions.Owner = options.Owner; protocolLayerOptions.Group = options.Group; protocolLayerOptions.Permissions = options.Permissions; - protocolLayerOptions.Acl = Acl::SerializeAcls(acls); + protocolLayerOptions.Acl = Models::Acl::SerializeAcls(acls); protocolLayerOptions.IfMatch = options.AccessConditions.IfMatch; protocolLayerOptions.IfNoneMatch = options.AccessConditions.IfNoneMatch; protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince; @@ -212,8 +212,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response PathClient::SetHttpHeaders( - DataLakeHttpHeaders httpHeaders, + Azure::Core::Response PathClient::SetHttpHeaders( + Models::DataLakeHttpHeaders httpHeaders, const SetPathHttpHeadersOptions& options) const { Blobs::SetBlobHttpHeadersOptions blobOptions; @@ -230,15 +230,15 @@ 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); - SetPathHttpHeadersResult ret; + Models::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( - PathResourceType type, + Azure::Core::Response PathClient::Create( + Models::PathResourceType type, const CreatePathOptions& options) const { Details::DataLakeRestClient::Path::CreateOptions protocolLayerOptions; @@ -258,14 +258,16 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { protocolLayerOptions.Permissions = options.Permissions; auto result = Details::DataLakeRestClient::Path::Create( m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); - auto ret = CreatePathResult(); + auto ret = Models::CreatePathResult(); ret.ETag = std::move(result->ETag.GetValue()); ret.LastModified = std::move(result->LastModified.GetValue()); 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 DeletePathOptions& options) const + Azure::Core::Response PathClient::Delete( + const DeletePathOptions& options) const { Details::DataLakeRestClient::Path::DeleteOptions protocolLayerOptions; protocolLayerOptions.ContinuationToken = options.ContinuationToken; @@ -279,7 +281,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response PathClient::GetProperties( + Azure::Core::Response PathClient::GetProperties( const GetPathPropertiesOptions& options) const { Blobs::GetBlobPropertiesOptions blobOptions; @@ -290,7 +292,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); - GetPathPropertiesResult ret; + Models::GetPathPropertiesResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.CreationTime = std::move(result->CreationTime); @@ -318,15 +320,15 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.CopyCompletionTime = std::move(result->CopyCompletionTime); ret.ExpiryTime = std::move(result->ExpiryTime); ret.LastAccessTime = std::move(result->LastAccessTime); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response PathClient::GetAccessControls( + Azure::Core::Response PathClient::GetAccessControls( const GetPathAccessControlOptions& options) const { Details::DataLakeRestClient::Path::GetPropertiesOptions protocolLayerOptions; - protocolLayerOptions.Action = PathGetPropertiesAction::GetAccessControl; + protocolLayerOptions.Action = Models::PathGetPropertiesAction::GetAccessControl; protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId; protocolLayerOptions.IfMatch = options.AccessConditions.IfMatch; protocolLayerOptions.IfNoneMatch = options.AccessConditions.IfNoneMatch; @@ -334,12 +336,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince; auto result = Details::DataLakeRestClient::Path::GetProperties( m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); - Azure::Core::Nullable> acl; + Azure::Core::Nullable> acl; if (result->Acl.HasValue()) { - acl = Acl::DeserializeAcls(result->Acl.GetValue()); + acl = Models::Acl::DeserializeAcls(result->Acl.GetValue()); } - auto ret = GetPathAccessControlResult{}; + auto ret = Models::GetPathAccessControlResult{}; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); if (!acl.HasValue()) @@ -347,11 +349,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( + 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 { @@ -363,10 +365,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); - SetPathMetadataResult ret; + Models::SetPathMetadataResult 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()); } }}}} // namespace Azure::Storage::Files::DataLake diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp index 3909b21fa..b500c2dc0 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp @@ -5,7 +5,7 @@ #include "azure/storage/files/datalake/datalake_utilities.hpp" -namespace Azure { namespace Storage { namespace Files { namespace DataLake { +namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace Models { Acl Acl::FromString(const std::string& aclString) { @@ -77,4 +77,4 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } -}}}} // namespace Azure::Storage::Files::DataLake +}}}}} // namespace Azure::Storage::Files::DataLake::Models diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_sas_builder.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_sas_builder.cpp index 0ba25e363..03d9161a5 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_sas_builder.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_sas_builder.cpp @@ -189,7 +189,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } std::string DataLakeSasBuilder::GenerateSasToken( - const UserDelegationKey& userDelegationKey, + const Models::UserDelegationKey& userDelegationKey, const std::string& accountName) { std::string canonicalName = "/blob/" + accountName + "/" + FileSystemName; diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp index ac657e66d..6e220f1ee 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp @@ -36,13 +36,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return blobOptions; } - std::vector FileSystemsFromContainerItems( + std::vector FileSystemsFromContainerItems( const std::vector& items) { - std::vector fileSystems; + std::vector fileSystems; for (const auto& item : items) { - FileSystem fileSystem; + Models::FileSystem fileSystem; fileSystem.ETag = item.ETag; fileSystem.Name = item.Name; fileSystem.LastModified = item.LastModified; @@ -173,7 +173,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { builder, m_blobServiceClient.GetBlobContainerClient(fileSystemName), m_pipeline); } - Azure::Core::Response + Azure::Core::Response DataLakeServiceClient::ListFileSystemsSegement(const ListFileSystemsSegmentOptions& options) const { Blobs::ListContainersSegmentOptions blobOptions; @@ -182,11 +182,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.ContinuationToken = options.ContinuationToken; blobOptions.MaxResults = options.MaxResults; auto result = m_blobServiceClient.ListBlobContainersSegment(blobOptions); - auto response = ListFileSystemsSegmentResult(); + auto response = Models::ListFileSystemsSegmentResult(); response.ContinuationToken = result->ContinuationToken.empty() ? response.ContinuationToken : result->ContinuationToken; response.Filesystems = FileSystemsFromContainerItems(result->Items); - return Azure::Core::Response( + return Azure::Core::Response( std::move(response), result.ExtractRawResponse()); } diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp index a2e495151..41bd1ce02 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp @@ -312,18 +312,20 @@ namespace Azure { namespace Storage { namespace Test { { // Set/Get Acls recursive works. - std::vector acls = GetValidAcls(); + std::vector acls = GetValidAcls(); EXPECT_NO_THROW(directoryClient1.SetAccessControl(acls)); EXPECT_NO_THROW(rootDirectoryClient.SetAccessControlRecursive( - Files::DataLake::PathSetAccessControlRecursiveMode::Modify, acls)); - std::vector resultAcls1; - std::vector resultAcls2; + Files::DataLake::Models::PathSetAccessControlRecursiveMode::Modify, acls)); + std::vector resultAcls1; + std::vector resultAcls2; EXPECT_NO_THROW(resultAcls1 = directoryClient1.GetAccessControls()->Acls); EXPECT_NO_THROW(resultAcls2 = directoryClient2.GetAccessControls()->Acls); for (const auto& acl : resultAcls2) { auto iter = std::find_if( - resultAcls1.begin(), resultAcls1.end(), [&acl](const Files::DataLake::Acl& targetAcl) { + resultAcls1.begin(), + resultAcls1.end(), + [&acl](const Files::DataLake::Models::Acl& targetAcl) { return (targetAcl.Type == acl.Type) && (targetAcl.Id == acl.Id) && (targetAcl.Scope == acl.Scope); }); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp index 3bbf57cce..b701df924 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp @@ -49,11 +49,11 @@ namespace Azure { namespace Storage { namespace Test { void DataLakeFileSystemClientTest::TearDownTestSuite() { m_fileSystemClient->Delete(); } - std::vector DataLakeFileSystemClientTest::ListAllPaths( + std::vector DataLakeFileSystemClientTest::ListAllPaths( bool recursive, const std::string& directory) { - std::vector result; + std::vector result; std::string continuation; Files::DataLake::ListPathsOptions options; if (!directory.empty()) @@ -77,10 +77,11 @@ namespace Azure { namespace Storage { namespace Test { return result; } - Files::DataLake::DataLakeHttpHeaders DataLakeFileSystemClientTest::GetInterestingHttpHeaders() + Files::DataLake::Models::DataLakeHttpHeaders + DataLakeFileSystemClientTest::GetInterestingHttpHeaders() { - static Files::DataLake::DataLakeHttpHeaders result = []() { - Files::DataLake::DataLakeHttpHeaders ret; + static Files::DataLake::Models::DataLakeHttpHeaders result = []() { + Files::DataLake::Models::DataLakeHttpHeaders ret; ret.CacheControl = std::string("no-cache"); ret.ContentDisposition = std::string("attachment"); ret.ContentEncoding = std::string("deflate"); @@ -202,7 +203,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { return path.Name == name; }); EXPECT_NE(result.end(), iter); @@ -212,7 +213,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { return path.Name == name; }); EXPECT_NE(result.end(), iter); @@ -226,7 +227,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { return path.Name == name; }); EXPECT_NE(result.end(), iter); @@ -236,7 +237,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_pathNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::Path& path) { + result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) { return path.Name == name; }); EXPECT_EQ(result.end(), iter); @@ -259,7 +260,7 @@ namespace Azure { namespace Storage { namespace Test { { std::string pathName = baseName + RandomString(); auto pathClient = m_fileSystemClient->GetPathClient(pathName); - EXPECT_NO_THROW(pathClient.Create(Files::DataLake::PathResourceType::File)); + EXPECT_NO_THROW(pathClient.Create(Files::DataLake::Models::PathResourceType::File)); auto pathUrl = pathClient.GetUri(); EXPECT_EQ( pathUrl, m_fileSystemClient->GetUri() + "/" + Storage::Details::UrlEncodePath(pathName)); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp index 1b18fdfbb..78311940d 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp @@ -11,11 +11,11 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static std::vector ListAllPaths( + static std::vector ListAllPaths( bool recursive, const std::string& directory = std::string()); - static Files::DataLake::DataLakeHttpHeaders GetInterestingHttpHeaders(); + static Files::DataLake::Models::DataLakeHttpHeaders GetInterestingHttpHeaders(); static std::shared_ptr m_fileSystemClient; static std::string m_fileSystemName; diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp index c01b01b75..266408b98 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp @@ -25,23 +25,23 @@ namespace Azure { namespace Storage { namespace Test { DataLakeFileSystemClientTest::TearDownTestSuite(); } - std::vector DataLakePathClientTest::GetValidAcls() + std::vector DataLakePathClientTest::GetValidAcls() { - static std::vector result = []() { - std::vector ret; - Files::DataLake::Acl acl1; + static std::vector result = []() { + std::vector ret; + Files::DataLake::Models::Acl acl1; acl1.Type = "user"; acl1.Id = "72a3f86f-271f-439e-b031-25678907d381"; acl1.Permissions = "rwx"; - Files::DataLake::Acl acl2; + Files::DataLake::Models::Acl acl2; acl2.Type = "user"; acl2.Id = ""; acl2.Permissions = "rwx"; - Files::DataLake::Acl acl3; + Files::DataLake::Models::Acl acl3; acl3.Type = "group"; acl3.Id = ""; acl3.Permissions = "r--"; - Files::DataLake::Acl acl4; + Files::DataLake::Models::Acl acl4; acl4.Type = "other"; acl4.Id = ""; acl4.Permissions = "---"; @@ -189,15 +189,17 @@ namespace Azure { namespace Storage { namespace Test { { { // Set/Get Acls works. - std::vector acls = GetValidAcls(); + std::vector acls = GetValidAcls(); EXPECT_NO_THROW(m_pathClient->SetAccessControl(acls)); - std::vector resultAcls; + std::vector resultAcls; EXPECT_NO_THROW(resultAcls = m_pathClient->GetAccessControls()->Acls); EXPECT_EQ(resultAcls.size(), acls.size() + 1); // Always append mask::rwx for (const auto& acl : acls) { auto iter = std::find_if( - resultAcls.begin(), resultAcls.end(), [&acl](const Files::DataLake::Acl& targetAcl) { + resultAcls.begin(), + resultAcls.end(), + [&acl](const Files::DataLake::Models::Acl& targetAcl) { return (targetAcl.Type == acl.Type) && (targetAcl.Id == acl.Id) && (targetAcl.Scope == acl.Scope); }); @@ -208,7 +210,7 @@ namespace Azure { namespace Storage { namespace Test { { // Set/Get Acls works with last modified access condition. - std::vector acls = GetValidAcls(); + std::vector acls = GetValidAcls(); auto response = m_pathClient->GetProperties(); Files::DataLake::SetPathAccessControlOptions options1; @@ -221,7 +223,7 @@ namespace Azure { namespace Storage { namespace Test { { // Set/Get Acls works with if match access condition. - std::vector acls = GetValidAcls(); + std::vector acls = GetValidAcls(); auto response = m_pathClient->GetProperties(); Files::DataLake::SetPathAccessControlOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; @@ -246,8 +248,8 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(aLease.LeaseId, leaseId1); auto properties = *m_pathClient->GetProperties(); - EXPECT_EQ(properties.LeaseState.GetValue(), Files::DataLake::LeaseStateType::Leased); - EXPECT_EQ(properties.LeaseStatus.GetValue(), Files::DataLake::LeaseStatusType::Locked); + EXPECT_EQ(properties.LeaseState.GetValue(), Files::DataLake::Models::LeaseStateType::Leased); + EXPECT_EQ(properties.LeaseStatus.GetValue(), Files::DataLake::Models::LeaseStatusType::Locked); EXPECT_FALSE(properties.LeaseDuration.GetValue().empty()); auto rLease = *m_pathClient->RenewLease(leaseId1); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp index 834644497..ce27a13c1 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp @@ -12,7 +12,7 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static std::vector GetValidAcls(); + static std::vector GetValidAcls(); static std::shared_ptr m_pathClient; static std::string m_pathName; diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp index fab5b23cb..495f1ceed 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp @@ -407,7 +407,7 @@ namespace Azure { namespace Storage { namespace Test { // response headers override { - Files::DataLake::DataLakeHttpHeaders headers; + Files::DataLake::Models::DataLakeHttpHeaders headers; headers.ContentType = "application/x-binary"; headers.ContentLanguage = "en-US"; headers.ContentDisposition = "attachment"; diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp index 1907ccba3..a2a94ee3c 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp @@ -52,10 +52,10 @@ namespace Azure { namespace Storage { namespace Test { } } - std::vector DataLakeServiceClientTest::ListAllFileSystems( + std::vector DataLakeServiceClientTest::ListAllFileSystems( const std::string& prefix) { - std::vector result; + std::vector result; std::string continuation; Files::DataLake::ListFileSystemsSegmentOptions options; if (!prefix.empty()) @@ -83,7 +83,9 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_fileSystemNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::FileSystem& fileSystem) { + result.begin(), + result.end(), + [&name](const Files::DataLake::Models::FileSystem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixA.size()), m_fileSystemPrefixA); @@ -92,7 +94,9 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_fileSystemNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::FileSystem& fileSystem) { + result.begin(), + result.end(), + [&name](const Files::DataLake::Models::FileSystem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixB.size()), m_fileSystemPrefixB); @@ -105,7 +109,9 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_fileSystemNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::FileSystem& fileSystem) { + result.begin(), + result.end(), + [&name](const Files::DataLake::Models::FileSystem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixA.size()), m_fileSystemPrefixA); @@ -114,7 +120,9 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_fileSystemNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::DataLake::FileSystem& fileSystem) { + result.begin(), + result.end(), + [&name](const Files::DataLake::Models::FileSystem& fileSystem) { return fileSystem.Name == name; }); EXPECT_EQ(result.end(), iter); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp index 6c63d7454..296224559 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp @@ -11,7 +11,7 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static std::vector ListAllFileSystems( + static std::vector ListAllFileSystems( const std::string& prefix = std::string()); static std::shared_ptr m_dataLakeServiceClient;