github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moved model types in datalake service into Models namespace. (#966)

Browse Source
This commit is contained in:
Kan Tang 2020-11-13 10:51:43 +08:00 committed by GitHub
parent 941d33fe90
commit 216c88483a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 712 additions and 684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp
View File

@ -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<CreateDirectoryResult> containing the information of the
* created directory
* @return Azure::Core::Response<Models::CreateDirectoryResult> containing the information of
* the created directory
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<CreateDirectoryResult> Create(
Azure::Core::Response<Models::CreateDirectoryResult> 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<RenameDirectoryResult> containing the information returned when
* renaming the directory.
* @return Azure::Core::Response<Models::RenameDirectoryResult> 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<RenameDirectoryResult> Rename(
Azure::Core::Response<Models::RenameDirectoryResult> 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<DeleteDirectoryResult> containing the information returned when
* deleting the directory.
* @return Azure::Core::Response<Models::DeleteDirectoryResult> containing the information
* returned when deleting the directory.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<DeleteDirectoryResult> Delete(
Azure::Core::Response<Models::DeleteDirectoryResult> 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<SetDirectoryAccessControlRecursiveResult>
* @return Azure::Core::Response<Models::SetDirectoryAccessControlRecursiveResult>
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<SetDirectoryAccessControlRecursiveResult> SetAccessControlRecursive(
PathSetAccessControlRecursiveMode mode,
std::vector<Acl> acls,
Azure::Core::Response<Models::SetDirectoryAccessControlRecursiveResult>
SetAccessControlRecursive(
Models::PathSetAccessControlRecursiveMode mode,
std::vector<Models::Acl> acls,
const SetDirectoryAccessControlRecursiveOptions& options
= SetDirectoryAccessControlRecursiveOptions()) const;

62
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp
View File

@ -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<AppendFileDataResult> containing the information returned when
* appending some data to the path.
* @return Azure::Core::Response<Models::AppendFileDataResult> containing the information
* returned when appending some data to the path.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<AppendFileDataResult> AppendData(
Azure::Core::Response<Models::AppendFileDataResult> 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<FlushFileDataResult> containing the information returned when
* flushing the data appended to the path.
* @return Azure::Core::Response<Models::FlushFileDataResult> containing the information
* returned when flushing the data appended to the path.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<FlushFileDataResult> FlushData(
Azure::Core::Response<Models::FlushFileDataResult> 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<CreateFileResult> containing the information returned when
* creating the file.
* @return Azure::Core::Response<Models::CreateFileResult> containing the information returned
* when creating the file.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<CreateFileResult> Create(
Azure::Core::Response<Models::CreateFileResult> 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<RenameFileResult> containing the information returned when
* renaming the file.
* @return Azure::Core::Response<Models::RenameFileResult> 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<RenameFileResult> Rename(
Azure::Core::Response<Models::RenameFileResult> 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<DeleteFileResult>
* @return Azure::Core::Response<Models::DeleteFileResult>
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<DeleteFileResult> Delete(
Azure::Core::Response<Models::DeleteFileResult> 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<ReadFileResult> containing the information and content returned
* when reading from a file.
* @return Azure::Core::Response<Models::ReadFileResult> containing the information and content
* returned when reading from a file.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<ReadFileResult> Read(
Azure::Core::Response<Models::ReadFileResult> 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<UploadFileFromResult> UploadFrom(
Azure::Core::Response<Models::UploadFileFromResult> 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<UploadFileFromResult> containing the information returned when
* uploading a file from a local file.
* @return Azure::Core::Response<Models::UploadFileFromResult> containing the information
* returned when uploading a file from a local file.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<UploadFileFromResult> UploadFrom(
Azure::Core::Response<Models::UploadFileFromResult> 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<DownloadFileToResult> containing the information returned when
* downloading a file to a local buffer.
* @return Azure::Core::Response<Models::DownloadFileToResult> containing the information
* returned when downloading a file to a local buffer.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<DownloadFileToResult> DownloadTo(
Azure::Core::Response<Models::DownloadFileToResult> 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<DownloadFileToResult> containing the information returned when
* downloading a file to a local file.
* @return Azure::Core::Response<Models::DownloadFileToResult> containing the information
* returned when downloading a file to a local file.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<DownloadFileToResult> DownloadTo(
Azure::Core::Response<Models::DownloadFileToResult> 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<ScheduleFileDeletionResult> containing the information and
* content returned when schedule the file for deletion.
* @return Azure::Core::Response<Models::ScheduleFileDeletionResult> containing the information
* and content returned when schedule the file for deletion.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<ScheduleFileDeletionResult> ScheduleDeletion(
Azure::Core::Response<Models::ScheduleFileDeletionResult> ScheduleDeletion(
ScheduleFileExpiryOriginType expiryOrigin,
const ScheduleFileDeletionOptions& options = ScheduleFileDeletionOptions()) const;

26
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp
View File

@ -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<CreateFileSystemResult> containing the information of create a
* file system.
* @return Azure::Core::Response<Models::CreateFileSystemResult> containing the information of
* create a file system.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<CreateFileSystemResult> Create(
Azure::Core::Response<Models::CreateFileSystemResult> Create(
const CreateFileSystemOptions& options = CreateFileSystemOptions()) const;
/**
* @brief Deletes the file system.
* @param options Optional parameters to delete this file system.
* @return Azure::Core::Response<DeleteFileSystemResult> containing the information returned
* when deleting file systems.
* @return Azure::Core::Response<Models::DeleteFileSystemResult> containing the information
* returned when deleting file systems.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<DeleteFileSystemResult> Delete(
Azure::Core::Response<Models::DeleteFileSystemResult> 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<SetFileSystemMetadataResult> containing the information
* @return Azure::Core::Response<Models::SetFileSystemMetadataResult> containing the information
* returned when setting the metadata onto the file system.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<SetFileSystemMetadataResult> SetMetadata(
Azure::Core::Response<Models::SetFileSystemMetadataResult> SetMetadata(
const std::map<std::string, std::string>& 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<GetFileSystemPropertiesResult> containing the information when
* getting the file system's properties.
* @return Azure::Core::Response<Models::GetFileSystemPropertiesResult> containing the
* information when getting the file system's properties.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<GetFileSystemPropertiesResult> GetProperties(
Azure::Core::Response<Models::GetFileSystemPropertiesResult> 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<ListPathsResult> containing the results when listing
* @return Azure::Core::Response<Models::ListPathsResult> containing the results when listing
* the paths under a file system.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<ListPathsResult> ListPaths(
Azure::Core::Response<Models::ListPathsResult> ListPaths(
bool recursive,
const ListPathsOptions& options = ListPathsOptions()) const;

10
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp
View File

@ -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.

63
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp
View File

@ -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<CreatePathResult> containing the information returned when
* creating a path.
* @return Azure::Core::Response<Models::CreatePathResult> containing the information returned
* when creating a path.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<CreatePathResult> Create(
PathResourceType type,
Azure::Core::Response<Models::CreatePathResult> 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<DeletePathResult> which is current empty but preserved for
* future usage.
* @return Azure::Core::Response<Models::DeletePathResult> which is current empty but preserved
* for future usage.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<DeletePathResult> Delete(
Azure::Core::Response<Models::DeletePathResult> 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<SetPathAccessControlResult> containing the information returned
* when setting path's access control.
* @return Azure::Core::Response<Models::SetPathAccessControlResult> containing the information
* returned when setting path's access control.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<SetPathAccessControlResult> SetAccessControl(
std::vector<Acl> acls,
Azure::Core::Response<Models::SetPathAccessControlResult> SetAccessControl(
std::vector<Models::Acl> 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<SetPathHttpHeadersResult> SetHttpHeaders(
DataLakeHttpHeaders httpHeaders,
Azure::Core::Response<Models::SetPathHttpHeadersResult> 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<GetPathPropertiesResult> containing the properties of the path.
* @return Azure::Core::Response<Models::GetPathPropertiesResult> containing the properties of
* the path.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<GetPathPropertiesResult> GetProperties(
Azure::Core::Response<Models::GetPathPropertiesResult> 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<GetPathAccessControlResult> containing the access control list
* of the path.
* @return Azure::Core::Response<Models::GetPathAccessControlResult> containing the access
* control list of the path.
* @remark This request is sent to dfs endpoint.
*/
Azure::Core::Response<GetPathAccessControlResult> GetAccessControls(
Azure::Core::Response<Models::GetPathAccessControlResult> 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<SetPathMetadataResult> containing the information returned when
* setting the metadata.
* @return Azure::Core::Response<Models::SetPathMetadataResult> containing the information
* returned when setting the metadata.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<SetPathMetadataResult> SetMetadata(
Azure::Core::Response<Models::SetPathMetadataResult> SetMetadata(
const std::map<std::string, std::string>& 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<Models::AcquirePathLeaseResult> describing the lease.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<AcquirePathLeaseResult> AcquireLease(
Azure::Core::Response<Models::AcquirePathLeaseResult> 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<Models::RenewPathLeaseResult> describing the lease.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<RenewPathLeaseResult> RenewLease(
Azure::Core::Response<Models::RenewPathLeaseResult> 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<Models::ReleasePathLeaseResult> describing the updated path.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<ReleasePathLeaseResult> ReleaseLease(
Azure::Core::Response<Models::ReleasePathLeaseResult> 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<Models::ChangePathLeaseResult> describing the lease.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<ChangePathLeaseResult> ChangeLease(
Azure::Core::Response<Models::ChangePathLeaseResult> 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<Models::BreakPathLeaseResult> describing the broken lease.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<BreakPathLeaseResult> BreakLease(
Azure::Core::Response<Models::BreakPathLeaseResult> BreakLease(
const BreakPathLeaseOptions& options = BreakPathLeaseOptions()) const
{
return m_blobClient.BreakLease(options);

4
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
View File

@ -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

2
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp
View File

@ -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:

12
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp
View File

@ -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<ListFileSystemsSegmentResult> containing the listed result of
* file systems and continuation token for unfinished list result.
* @return Azure::Core::Response<Models::ListFileSystemsSegmentResult> 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<ListFileSystemsSegmentResult> ListFileSystemsSegement(
Azure::Core::Response<Models::ListFileSystemsSegmentResult> 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<GetUserDelegationKeyResult> containing the user delegation key
* related information.
* @return Azure::Core::Response<Models::GetUserDelegationKeyResult> containing the user
* delegation key related information.
* @remark This request is sent to blob endpoint.
*/
Azure::Core::Response<GetUserDelegationKeyResult> GetUserDelegationKey(
Azure::Core::Response<Models::GetUserDelegationKeyResult> GetUserDelegationKey(
const std::string& startsOn,
const std::string& expiresOn,
const GetUserDelegationKeyOptions& options = GetUserDelegationKeyOptions()) const

882
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp
View File

File diff suppressed because it is too large Load Diff

2
sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp
View File

@ -87,7 +87,7 @@ void DataLakeGettingStarted()
// List all file systems.
std::string continuation;
std::vector<FileSystem> fileSystems;
std::vector<Models::FileSystem> fileSystems;
do
{
auto response = serviceClient.ListFileSystemsSegement();

16
sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp
View File

@ -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<RenameDirectoryResult> DirectoryClient::Rename(
Azure::Core::Response<Models::RenameDirectoryResult> 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<RenameDirectoryResult>(
return Azure::Core::Response<Models::RenameDirectoryResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<DeleteDirectoryResult> DirectoryClient::Delete(
Azure::Core::Response<Models::DeleteDirectoryResult> 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<SetDirectoryAccessControlRecursiveResult>
Azure::Core::Response<Models::SetDirectoryAccessControlRecursiveResult>
DirectoryClient::SetAccessControlRecursive(
PathSetAccessControlRecursiveMode mode,
std::vector<Acl> acls,
Models::PathSetAccessControlRecursiveMode mode,
std::vector<Models::Acl> 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);
}

75
sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp
View File

@ -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<Azure::Core::Http::HttpPipeline>(policies);
}
Azure::Core::Response<AppendFileDataResult> FileClient::AppendData(
Azure::Core::Response<Models::AppendFileDataResult> 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<FlushFileDataResult> FileClient::FlushData(
Azure::Core::Response<Models::FlushFileDataResult> 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<RenameFileResult> FileClient::Rename(
Azure::Core::Response<Models::RenameFileResult> 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<RenameFileResult>(std::move(ret), result.ExtractRawResponse());
auto ret = Models::RenameFileResult();
return Azure::Core::Response<Models::RenameFileResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<DeleteFileResult> FileClient::Delete(const FileDeleteOptions& options) const
Azure::Core::Response<Models::DeleteFileResult> 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<DeleteFileResult>(std::move(ret), result.ExtractRawResponse());
auto ret = Models::DeleteFileResult();
return Azure::Core::Response<Models::DeleteFileResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<ReadFileResult> FileClient::Read(const ReadFileOptions& options) const
Azure::Core::Response<Models::ReadFileResult> 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<int64_t> 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<ReadFileResult>(std::move(ret), result.ExtractRawResponse());
return Azure::Core::Response<Models::ReadFileResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<UploadFileFromResult> FileClient::UploadFrom(
Azure::Core::Response<Models::UploadFileFromResult> 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<UploadFileFromResult> FileClient::UploadFrom(
Azure::Core::Response<Models::UploadFileFromResult> 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<DownloadFileToResult> FileClient::DownloadTo(
Azure::Core::Response<Models::DownloadFileToResult> 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<DownloadFileToResult>(std::move(ret), result.ExtractRawResponse());
return Azure::Core::Response<Models::DownloadFileToResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<DownloadFileToResult> FileClient::DownloadTo(
Azure::Core::Response<Models::DownloadFileToResult> 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<DownloadFileToResult>(std::move(ret), result.ExtractRawResponse());
return Azure::Core::Response<Models::DownloadFileToResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<ScheduleFileDeletionResult> FileClient::ScheduleDeletion(
Azure::Core::Response<Models::ScheduleFileDeletionResult> FileClient::ScheduleDeletion(
ScheduleFileExpiryOriginType expiryOrigin,
const ScheduleFileDeletionOptions& options) const
{

26
sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
View File

@ -185,21 +185,21 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
return DirectoryClient(builder, m_blobContainerClient.GetBlobClient(path), m_pipeline);
}
Azure::Core::Response<CreateFileSystemResult> FileSystemClient::Create(
Azure::Core::Response<Models::CreateFileSystemResult> 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<CreateFileSystemResult>(
return Azure::Core::Response<Models::CreateFileSystemResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<FileSystemDeleteResult> FileSystemClient::Delete(
Azure::Core::Response<Models::FileSystemDeleteResult> 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<FileSystemDeleteResult>(
Models::FileSystemDeleteResult ret;
return Azure::Core::Response<Models::FileSystemDeleteResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<GetFileSystemPropertiesResult> FileSystemClient::GetProperties(
Azure::Core::Response<Models::GetFileSystemPropertiesResult> 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<GetFileSystemPropertiesResult>(
return Azure::Core::Response<Models::GetFileSystemPropertiesResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<SetFileSystemMetadataResult> FileSystemClient::SetMetadata(
Azure::Core::Response<Models::SetFileSystemMetadataResult> FileSystemClient::SetMetadata(
const std::map<std::string, std::string>& 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<SetFileSystemMetadataResult>(
return Azure::Core::Response<Models::SetFileSystemMetadataResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<ListPathsResult> FileSystemClient::ListPaths(
Azure::Core::Response<Models::ListPathsResult> FileSystemClient::ListPaths(
bool recursive,
const ListPathsOptions& options) const
{

76
sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
View File

@ -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<Azure::Core::Http::HttpPipeline>(policies);
}
Azure::Core::Response<SetPathAccessControlResult> PathClient::SetAccessControl(
std::vector<Acl> acls,
Azure::Core::Response<Models::SetPathAccessControlResult> PathClient::SetAccessControl(
std::vector<Models::Acl> 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<SetPathHttpHeadersResult> PathClient::SetHttpHeaders(
DataLakeHttpHeaders httpHeaders,
Azure::Core::Response<Models::SetPathHttpHeadersResult> 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<SetPathHttpHeadersResult>(
return Azure::Core::Response<Models::SetPathHttpHeadersResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<CreatePathResult> PathClient::Create(
PathResourceType type,
Azure::Core::Response<Models::CreatePathResult> 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<CreatePathResult>(std::move(ret), result.ExtractRawResponse());
return Azure::Core::Response<Models::CreatePathResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<DeletePathResult> PathClient::Delete(const DeletePathOptions& options) const
Azure::Core::Response<Models::DeletePathResult> 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<GetPathPropertiesResult> PathClient::GetProperties(
Azure::Core::Response<Models::GetPathPropertiesResult> 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<GetPathPropertiesResult>(
return Azure::Core::Response<Models::GetPathPropertiesResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<GetPathAccessControlResult> PathClient::GetAccessControls(
Azure::Core::Response<Models::GetPathAccessControlResult> 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<std::vector<Acl>> acl;
Azure::Core::Nullable<std::vector<Models::Acl>> 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<GetPathAccessControlResult>(
return Azure::Core::Response<Models::GetPathAccessControlResult>(
std::move(ret), result.ExtractRawResponse());
}
Azure::Core::Response<SetPathMetadataResult> PathClient::SetMetadata(
Azure::Core::Response<Models::SetPathMetadataResult> PathClient::SetMetadata(
const std::map<std::string, std::string>& 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<SetPathMetadataResult>(
return Azure::Core::Response<Models::SetPathMetadataResult>(
std::move(ret), result.ExtractRawResponse());
}
}}}} // namespace Azure::Storage::Files::DataLake

4
sdk/storage/azure-storage-files-datalake/src/datalake_responses.cpp
View File

@ -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

2
sdk/storage/azure-storage-files-datalake/src/datalake_sas_builder.cpp
View File

@ -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;

12
sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
View File

@ -36,13 +36,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
return blobOptions;
}
std::vector<FileSystem> FileSystemsFromContainerItems(
std::vector<Models::FileSystem> FileSystemsFromContainerItems(
const std::vector<Blobs::Models::BlobContainerItem>& items)
{
std::vector<FileSystem> fileSystems;
std::vector<Models::FileSystem> 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<ListFileSystemsSegmentResult>
Azure::Core::Response<Models::ListFileSystemsSegmentResult>
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<ListFileSystemsSegmentResult>(
return Azure::Core::Response<Models::ListFileSystemsSegmentResult>(
std::move(response), result.ExtractRawResponse());
}

12
sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp
View File

@ -312,18 +312,20 @@ namespace Azure { namespace Storage { namespace Test {
{
// Set/Get Acls recursive works.
std::vector<Files::DataLake::Acl> acls = GetValidAcls();
std::vector<Files::DataLake::Models::Acl> acls = GetValidAcls();
EXPECT_NO_THROW(directoryClient1.SetAccessControl(acls));
EXPECT_NO_THROW(rootDirectoryClient.SetAccessControlRecursive(
Files::DataLake::PathSetAccessControlRecursiveMode::Modify, acls));
std::vector<Files::DataLake::Acl> resultAcls1;
std::vector<Files::DataLake::Acl> resultAcls2;
Files::DataLake::Models::PathSetAccessControlRecursiveMode::Modify, acls));
std::vector<Files::DataLake::Models::Acl> resultAcls1;
std::vector<Files::DataLake::Models::Acl> 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);
});

21
sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp
View File

@ -49,11 +49,11 @@ namespace Azure { namespace Storage { namespace Test {
void DataLakeFileSystemClientTest::TearDownTestSuite() { m_fileSystemClient->Delete(); }
std::vector<Files::DataLake::Path> DataLakeFileSystemClientTest::ListAllPaths(
std::vector<Files::DataLake::Models::Path> DataLakeFileSystemClientTest::ListAllPaths(
bool recursive,
const std::string& directory)
{
std::vector<Files::DataLake::Path> result;
std::vector<Files::DataLake::Models::Path> 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));

4
sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp
View File

@ -11,11 +11,11 @@ namespace Azure { namespace Storage { namespace Test {
static void SetUpTestSuite();
static void TearDownTestSuite();
static std::vector<Files::DataLake::Path> ListAllPaths(
static std::vector<Files::DataLake::Models::Path> ListAllPaths(
bool recursive,
const std::string& directory = std::string());
static Files::DataLake::DataLakeHttpHeaders GetInterestingHttpHeaders();
static Files::DataLake::Models::DataLakeHttpHeaders GetInterestingHttpHeaders();
static std::shared_ptr<Files::DataLake::FileSystemClient> m_fileSystemClient;
static std::string m_fileSystemName;

30
sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp
View File

@ -25,23 +25,23 @@ namespace Azure { namespace Storage { namespace Test {
DataLakeFileSystemClientTest::TearDownTestSuite();
}
std::vector<Files::DataLake::Acl> DataLakePathClientTest::GetValidAcls()
std::vector<Files::DataLake::Models::Acl> DataLakePathClientTest::GetValidAcls()
{
static std::vector<Files::DataLake::Acl> result = []() {
std::vector<Files::DataLake::Acl> ret;
Files::DataLake::Acl acl1;
static std::vector<Files::DataLake::Models::Acl> result = []() {
std::vector<Files::DataLake::Models::Acl> 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<Files::DataLake::Acl> acls = GetValidAcls();
std::vector<Files::DataLake::Models::Acl> acls = GetValidAcls();
EXPECT_NO_THROW(m_pathClient->SetAccessControl(acls));
std::vector<Files::DataLake::Acl> resultAcls;
std::vector<Files::DataLake::Models::Acl> 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<Files::DataLake::Acl> acls = GetValidAcls();
std::vector<Files::DataLake::Models::Acl> 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<Files::DataLake::Acl> acls = GetValidAcls();
std::vector<Files::DataLake::Models::Acl> 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);

2
sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp
View File

@ -12,7 +12,7 @@ namespace Azure { namespace Storage { namespace Test {
static void SetUpTestSuite();
static void TearDownTestSuite();
static std::vector<Files::DataLake::Acl> GetValidAcls();
static std::vector<Files::DataLake::Models::Acl> GetValidAcls();
static std::shared_ptr<Files::DataLake::PathClient> m_pathClient;
static std::string m_pathName;

2
sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp
View File

@ -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";

20
sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.cpp
View File

@ -52,10 +52,10 @@ namespace Azure { namespace Storage { namespace Test {
}
}
std::vector<Files::DataLake::FileSystem> DataLakeServiceClientTest::ListAllFileSystems(
std::vector<Files::DataLake::Models::FileSystem> DataLakeServiceClientTest::ListAllFileSystems(
const std::string& prefix)
{
std::vector<Files::DataLake::FileSystem> result;
std::vector<Files::DataLake::Models::FileSystem> 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);

2
sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp
View File

@ -11,7 +11,7 @@ namespace Azure { namespace Storage { namespace Test {
static void SetUpTestSuite();
static void TearDownTestSuite();
static std::vector<Files::DataLake::FileSystem> ListAllFileSystems(
static std::vector<Files::DataLake::Models::FileSystem> ListAllFileSystems(
const std::string& prefix = std::string());
static std::shared_ptr<Files::DataLake::DataLakeServiceClient> m_dataLakeServiceClient;