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

Refined protocol layer. (#1443)

Browse Source 
* Refined protocol layer.

* Resolves review comments.

* Move more un-used things into details.
This commit is contained in:
Kan Tang 2021-01-23 07:10:41 -08:00 committed by GitHub
parent 1aaf1f22df
commit 46d4af45b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 824 additions and 847 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/storage/azure-storage-files-datalake/CHANGELOG.md
View File

@ -7,6 +7,9 @@
- Added `Owner`, `Permissions`, and `Group` to `GetDataLakePathAccessControlResult`.
- `ReadDataLakeFileResult` now has a new field `FileSize`.
- Added support for `GetAccessPolicy` and `SetAccessPolicy` in `DataLakeFileSystemClient`.
- Moved all protocol layer generated result types to `Details` namespace.
- Renamed `FileSystem` type returned from `ListDataLakeFileSystems` to be `FileSystemItem`. Member object name `FileSystems` is renamed to `Items`.
- Renamed `Path` type returned from `ListDataLakePaths` to be `PathItem`. Member object name `Paths` is renamed to `Items`.
### Breaking Changes

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

@ -17,11 +17,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
using GetUserDelegationKeyResult = Blobs::Models::GetUserDelegationKeyResult;
using UserDelegationKey = Blobs::Models::UserDelegationKey;
using ListFileSystemsSinglePageResult = ServiceListFileSystemsResult;
using ListFileSystemsSinglePageResult = Details::ServiceListFileSystemsResult;
// FileSystemClient models:
using ListPathsSinglePageResult = FileSystemListPathsResult;
using ListPathsSinglePageResult = Details::FileSystemListPathsResult;
using DataLakeSignedIdentifier = Blobs::Models::BlobSignedIdentifier;
struct GetDataLakeFileSystemAccessPolicyResult
@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
bool Deleted = true;
};
using SetDataLakeFileSystemMetadataResult = FileSystemCreateResult;
using SetDataLakeFileSystemMetadataResult = Details::FileSystemCreateResult;
// PathClient models:
@ -159,14 +159,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
Azure::Core::Nullable<int64_t> FileSize;
};
using SetDataLakePathAccessControlListResult = PathSetAccessControlResult;
using SetDataLakePathPermissionsResult = PathSetAccessControlResult;
using SetDataLakePathAccessControlListResult = Details::PathSetAccessControlResult;
using SetDataLakePathPermissionsResult = Details::PathSetAccessControlResult;
// FileClient models:
using UploadDataLakeFileFromResult = Blobs::Models::UploadBlockBlobResult;
using AppendDataLakeFileResult = PathAppendDataResult;
using FlushDataLakeFileResult = PathFlushDataResult;
using AppendDataLakeFileResult = Details::PathAppendDataResult;
using FlushDataLakeFileResult = Details::PathFlushDataResult;
using ScheduleDataLakeFileDeletionResult = Blobs::Models::SetBlobExpiryResult;
struct ReadDataLakeFileResult
@ -216,7 +216,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
Azure::Core::Nullable<std::string> ContinuationToken;
};
using SetDataLakeDirectoryAccessControlRecursiveResult = PathSetAccessControlRecursiveResult;
using SetDataLakeDirectoryAccessControlRecursiveResult
= Details::PathSetAccessControlRecursiveResult;
using CreateDataLakeDirectoryResult = CreateDataLakePathResult;
using DeleteDataLakeDirectoryResult = DeleteDataLakePathResult;

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

@ -4,6 +4,8 @@
#pragma once
#include "azure/storage/files/datalake/dll_import_export.hpp"
#include <functional>
#include <iostream>
#include <map>
@ -15,88 +17,15 @@
#include <azure/core/datetime.hpp>
#include <azure/core/http/http.hpp>
#include <azure/core/http/pipeline.hpp>
#include <azure/core/internal/json.hpp>
#include <azure/core/nullable.hpp>
#include <azure/core/response.hpp>
#include <azure/storage/common/crypt.hpp>
#include <azure/storage/common/storage_common.hpp>
#include <azure/storage/common/storage_exception.hpp>
#include <azure/storage/files/datalake/dll_import_export.hpp>
#include <azure/core/internal/json.hpp>
namespace Azure { namespace Storage { namespace Files { namespace DataLake {
namespace Details {
constexpr static const char* DefaultServiceApiVersion = "2020-02-10";
constexpr static const char* PathDnsSuffixDefault = "dfs.core.windows.net";
constexpr static const char* QueryFileSystemResource = "resource";
constexpr static const char* QueryTimeout = "timeout";
constexpr static const char* QueryRecursive = "recursive";
constexpr static const char* QueryContinuationToken = "continuation";
constexpr static const char* QueryPathSetAccessControlRecursiveMode = "mode";
constexpr static const char* QueryForceFlag = "forceflag";
constexpr static const char* QueryPath = "directory";
constexpr static const char* QueryPrefix = "prefix";
constexpr static const char* QueryPageSizeHint = "maxresults";
constexpr static const char* QueryUpn = "upn";
constexpr static const char* QueryPosition = "position";
constexpr static const char* QueryRetainUncommittedData = "retainuncommitteddata";
constexpr static const char* QueryClose = "close";
constexpr static const char* QueryResource = "resource";
constexpr static const char* QueryPathResourceType = "resource";
constexpr static const char* QueryPathRenameMode = "mode";
constexpr static const char* QueryPathGetPropertiesAction = "action";
constexpr static const char* QueryAction = "action";
constexpr static const char* QueryMaxRecords = "maxrecords";
constexpr static const char* QueryComp = "comp";
constexpr static const char* HeaderVersion = "x-ms-version";
constexpr static const char* HeaderRequestId = "x-ms-client-request-id";
constexpr static const char* HeaderIfMatch = "if-match";
constexpr static const char* HeaderIfModifiedSince = "if-modified-since";
constexpr static const char* HeaderIfNoneMatch = "if-none-match";
constexpr static const char* HeaderIfUnmodifiedSince = "if-unmodified-since";
constexpr static const char* HeaderLeaseId = "x-ms-lease-id";
constexpr static const char* HeaderProposedLeaseId = "x-ms-proposed-lease-id";
constexpr static const char* HeaderProperties = "x-ms-properties";
constexpr static const char* HeaderSourceIfMatch = "x-ms-source-if-match";
constexpr static const char* HeaderSourceIfModifiedSince = "x-ms-source-if-modified-since";
constexpr static const char* HeaderSourceIfNoneMatch = "x-ms-source-if-none-match";
constexpr static const char* HeaderSourceIfUnmodifiedSince = "x-ms-source-if-unmodified-since";
constexpr static const char* HeaderSourceLeaseId = "x-ms-source-lease-id";
constexpr static const char* HeaderCacheControl = "x-ms-cache-control";
constexpr static const char* HeaderContentDisposition = "x-ms-content-disposition";
constexpr static const char* HeaderContentEncoding = "x-ms-content-encoding";
constexpr static const char* HeaderContentLanguage = "x-ms-content-language";
constexpr static const char* HeaderContentType = "x-ms-content-type";
constexpr static const char* HeaderTransactionalContentHashMd5 = "content-md5";
constexpr static const char* HeaderContentHashMd5 = "x-ms-content-md5";
constexpr static const char* HeaderTransactionalContentHashCrc64 = "x-ms-content-crc64";
constexpr static const char* HeaderUmask = "x-ms-umask";
constexpr static const char* HeaderPermissions = "x-ms-permissions";
constexpr static const char* HeaderRenameSource = "x-ms-rename-source";
constexpr static const char* HeaderOwner = "x-ms-owner";
constexpr static const char* HeaderGroup = "x-ms-group";
constexpr static const char* HeaderAcl = "x-ms-acl";
constexpr static const char* HeaderContentLength = "content-length";
constexpr static const char* HeaderExpiryOptions = "x-ms-expiry-option";
constexpr static const char* HeaderExpiresOn = "x-ms-expiry-time";
constexpr static const char* HeaderDate = "date";
constexpr static const char* HeaderClientRequestId = "x-ms-client-request-id";
constexpr static const char* HeaderContinuationToken = "x-ms-continuation";
constexpr static const char* HeaderErrorCode = "x-ms-error-code";
constexpr static const char* HeaderETag = "etag";
constexpr static const char* HeaderLastModified = "last-modified";
constexpr static const char* HeaderNamespaceEnabled = "x-ms-namespace-enabled";
constexpr static const char* HeaderPathLeaseAction = "x-ms-lease-action";
constexpr static const char* HeaderXMsLeaseDuration = "x-ms-lease-duration";
constexpr static const char* HeaderXMsLeaseBreakPeriod = "x-ms-lease-break-period";
constexpr static const char* HeaderLeaseTime = "x-ms-lease-time";
constexpr static const char* HeaderAcceptRanges = "accept-ranges";
constexpr static const char* HeaderResourceType = "x-ms-resource-type";
constexpr static const char* HeaderLeaseState = "x-ms-lease-state";
constexpr static const char* HeaderLeaseStatus = "x-ms-lease-status";
constexpr static const char* HeaderRequestIsServerEncrypted = "x-ms-request-server-encrypted";
} // namespace Details
namespace Models {
struct PathHttpHeaders
{
@ -177,15 +106,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string ErrorMessage;
};
struct SetAccessControlRecursiveResponse
{
int32_t DirectoriesSuccessful = int32_t();
int32_t FilesSuccessful = int32_t();
int32_t FailureCount = int32_t();
std::vector<Models::AclFailedEntry> FailedEntries;
};
struct Path
struct PathItem
{
std::string Name;
bool IsDirectory = bool();
@ -197,23 +118,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string Permissions;
};
struct PathList
{
std::vector<Models::Path> Paths;
};
struct FileSystem
struct FileSystemItem
{
std::string Name;
Core::DateTime LastModified;
std::string ETag;
};
struct FileSystemList
{
std::vector<Models::FileSystem> Filesystems;
};
class PublicAccessType {
public:
PublicAccessType() = default;
@ -222,9 +133,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
bool operator!=(const PublicAccessType& other) const { return !(*this == other); }
const std::string& Get() const { return m_value; }
const static PublicAccessType FileSystem;
const static PublicAccessType Path;
const static PublicAccessType None;
AZ_STORAGE_FILES_DATALAKE_DLLEXPORT const static PublicAccessType FileSystem;
AZ_STORAGE_FILES_DATALAKE_DLLEXPORT const static PublicAccessType Path;
AZ_STORAGE_FILES_DATALAKE_DLLEXPORT const static PublicAccessType None;
private:
std::string m_value;
@ -363,9 +274,100 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string m_value;
}; // extensible enum LeaseStatusType
} // namespace Models
namespace Details {
using namespace Models;
constexpr static const char* DefaultServiceApiVersion = "2020-02-10";
constexpr static const char* PathDnsSuffixDefault = "dfs.core.windows.net";
constexpr static const char* QueryFileSystemResource = "resource";
constexpr static const char* QueryTimeout = "timeout";
constexpr static const char* QueryRecursive = "recursive";
constexpr static const char* QueryContinuationToken = "continuation";
constexpr static const char* QueryPathSetAccessControlRecursiveMode = "mode";
constexpr static const char* QueryForceFlag = "forceflag";
constexpr static const char* QueryPath = "directory";
constexpr static const char* QueryPrefix = "prefix";
constexpr static const char* QueryPageSizeHint = "maxresults";
constexpr static const char* QueryUpn = "upn";
constexpr static const char* QueryPosition = "position";
constexpr static const char* QueryRetainUncommittedData = "retainuncommitteddata";
constexpr static const char* QueryClose = "close";
constexpr static const char* QueryResource = "resource";
constexpr static const char* QueryPathResourceType = "resource";
constexpr static const char* QueryPathRenameMode = "mode";
constexpr static const char* QueryPathGetPropertiesAction = "action";
constexpr static const char* QueryAction = "action";
constexpr static const char* QueryMaxRecords = "maxrecords";
constexpr static const char* QueryComp = "comp";
constexpr static const char* HeaderVersion = "x-ms-version";
constexpr static const char* HeaderRequestId = "x-ms-client-request-id";
constexpr static const char* HeaderIfMatch = "if-match";
constexpr static const char* HeaderIfModifiedSince = "if-modified-since";
constexpr static const char* HeaderIfNoneMatch = "if-none-match";
constexpr static const char* HeaderIfUnmodifiedSince = "if-unmodified-since";
constexpr static const char* HeaderLeaseId = "x-ms-lease-id";
constexpr static const char* HeaderProposedLeaseId = "x-ms-proposed-lease-id";
constexpr static const char* HeaderProperties = "x-ms-properties";
constexpr static const char* HeaderSourceIfMatch = "x-ms-source-if-match";
constexpr static const char* HeaderSourceIfModifiedSince = "x-ms-source-if-modified-since";
constexpr static const char* HeaderSourceIfNoneMatch = "x-ms-source-if-none-match";
constexpr static const char* HeaderSourceIfUnmodifiedSince = "x-ms-source-if-unmodified-since";
constexpr static const char* HeaderSourceLeaseId = "x-ms-source-lease-id";
constexpr static const char* HeaderCacheControl = "x-ms-cache-control";
constexpr static const char* HeaderContentDisposition = "x-ms-content-disposition";
constexpr static const char* HeaderContentEncoding = "x-ms-content-encoding";
constexpr static const char* HeaderContentLanguage = "x-ms-content-language";
constexpr static const char* HeaderContentType = "x-ms-content-type";
constexpr static const char* HeaderTransactionalContentHashMd5 = "content-md5";
constexpr static const char* HeaderContentHashMd5 = "x-ms-content-md5";
constexpr static const char* HeaderTransactionalContentHashCrc64 = "x-ms-content-crc64";
constexpr static const char* HeaderUmask = "x-ms-umask";
constexpr static const char* HeaderPermissions = "x-ms-permissions";
constexpr static const char* HeaderRenameSource = "x-ms-rename-source";
constexpr static const char* HeaderOwner = "x-ms-owner";
constexpr static const char* HeaderGroup = "x-ms-group";
constexpr static const char* HeaderAcl = "x-ms-acl";
constexpr static const char* HeaderContentLength = "content-length";
constexpr static const char* HeaderExpiryOptions = "x-ms-expiry-option";
constexpr static const char* HeaderExpiresOn = "x-ms-expiry-time";
constexpr static const char* HeaderDate = "date";
constexpr static const char* HeaderClientRequestId = "x-ms-client-request-id";
constexpr static const char* HeaderContinuationToken = "x-ms-continuation";
constexpr static const char* HeaderErrorCode = "x-ms-error-code";
constexpr static const char* HeaderETag = "etag";
constexpr static const char* HeaderLastModified = "last-modified";
constexpr static const char* HeaderNamespaceEnabled = "x-ms-namespace-enabled";
constexpr static const char* HeaderPathLeaseAction = "x-ms-lease-action";
constexpr static const char* HeaderXMsLeaseDuration = "x-ms-lease-duration";
constexpr static const char* HeaderXMsLeaseBreakPeriod = "x-ms-lease-break-period";
constexpr static const char* HeaderLeaseTime = "x-ms-lease-time";
constexpr static const char* HeaderAcceptRanges = "accept-ranges";
constexpr static const char* HeaderResourceType = "x-ms-resource-type";
constexpr static const char* HeaderLeaseState = "x-ms-lease-state";
constexpr static const char* HeaderLeaseStatus = "x-ms-lease-status";
constexpr static const char* HeaderRequestIsServerEncrypted = "x-ms-request-server-encrypted";
struct SetAccessControlRecursiveResponse
{
int32_t DirectoriesSuccessful = int32_t();
int32_t FilesSuccessful = int32_t();
int32_t FailureCount = int32_t();
std::vector<AclFailedEntry> FailedEntries;
};
struct PathList
{
std::vector<PathItem> Items;
};
struct FileSystemList
{
std::vector<FileSystemItem> Items;
};
struct ServiceListFileSystemsResult
{
std::vector<Models::FileSystem> Filesystems;
std::vector<FileSystemItem> Items;
Azure::Core::Nullable<std::string> ContinuationToken;
};
@ -396,7 +398,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
struct FileSystemListPathsResult
{
std::vector<Models::Path> Paths;
std::vector<PathItem> Items;
Azure::Core::Nullable<std::string> ContinuationToken;
};
@ -449,7 +451,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
int32_t DirectoriesSuccessful = int32_t();
int32_t FilesSuccessful = int32_t();
int32_t FailureCount = int32_t();
std::vector<Models::AclFailedEntry> FailedEntries;
std::vector<AclFailedEntry> FailedEntries;
Azure::Core::Nullable<std::string> ContinuationToken;
};
@ -472,9 +474,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Core::DateTime LastModified;
};
} // namespace Models
namespace Details {
class DataLakeRestClient {
public:
class Service {
@ -489,7 +488,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
};
static Azure::Core::Response<Models::ServiceListFileSystemsResult> ListFileSystems(
static Azure::Core::Response<ServiceListFileSystemsResult> ListFileSystems(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -535,8 +534,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
private:
static Azure::Core::Response<Models::ServiceListFileSystemsResult>
ListFileSystemsParseResult(
static Azure::Core::Response<ServiceListFileSystemsResult> ListFileSystemsParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -545,8 +543,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
// OK
const auto& bodyBuffer = response.GetBody();
Models::ServiceListFileSystemsResult result = bodyBuffer.empty()
? Models::ServiceListFileSystemsResult()
ServiceListFileSystemsResult result = bodyBuffer.empty()
? ServiceListFileSystemsResult()
: ServiceListFileSystemsResultFromFileSystemList(
FileSystemListFromJson(Azure::Core::Internal::Json::json::parse(bodyBuffer)));
if (response.GetHeaders().find(Details::HeaderContinuationToken)
@ -554,7 +552,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken);
}
return Azure::Core::Response<Models::ServiceListFileSystemsResult>(
return Azure::Core::Response<ServiceListFileSystemsResult>(
std::move(result), std::move(responsePtr));
}
else
@ -564,9 +562,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Models::FileSystem FileSystemFromJson(const Azure::Core::Internal::Json::json& node)
static FileSystemItem FileSystemItemFromJson(const Azure::Core::Internal::Json::json& node)
{
Models::FileSystem result;
FileSystemItem result;
result.Name = node["name"].get<std::string>();
result.LastModified = Core::DateTime::Parse(
node["lastModified"].get<std::string>(), Core::DateTime::DateFormat::Rfc1123);
@ -574,22 +572,21 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
return result;
}
static Models::FileSystemList FileSystemListFromJson(
const Azure::Core::Internal::Json::json& node)
static FileSystemList FileSystemListFromJson(const Azure::Core::Internal::Json::json& node)
{
Models::FileSystemList result;
FileSystemList result;
for (const auto& element : node["filesystems"])
{
result.Filesystems.emplace_back(FileSystemFromJson(element));
result.Items.emplace_back(FileSystemItemFromJson(element));
}
return result;
}
static Models::ServiceListFileSystemsResult ServiceListFileSystemsResultFromFileSystemList(
Models::FileSystemList object)
static ServiceListFileSystemsResult ServiceListFileSystemsResultFromFileSystemList(
FileSystemList object)
{
Models::ServiceListFileSystemsResult result;
result.Filesystems = std::move(object.Filesystems);
ServiceListFileSystemsResult result;
result.Items = std::move(object.Items);
return result;
}
@ -599,14 +596,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
public:
struct CreateOptions
{
Models::FileSystemResourceType Resource;
FileSystemResourceType Resource;
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
Azure::Core::Nullable<std::string> Properties;
};
static Azure::Core::Response<Models::FileSystemCreateResult> Create(
static Azure::Core::Response<FileSystemCreateResult> Create(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -638,7 +635,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
struct SetPropertiesOptions
{
Models::FileSystemResourceType Resource;
FileSystemResourceType Resource;
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
@ -647,7 +644,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<Core::DateTime> IfUnmodifiedSince;
};
static Azure::Core::Response<Models::FileSystemSetPropertiesResult> SetProperties(
static Azure::Core::Response<FileSystemSetPropertiesResult> SetProperties(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -694,13 +691,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
struct GetPropertiesOptions
{
Models::FileSystemResourceType Resource;
FileSystemResourceType Resource;
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
};
static Azure::Core::Response<Models::FileSystemGetPropertiesResult> GetProperties(
static Azure::Core::Response<FileSystemGetPropertiesResult> GetProperties(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -728,7 +725,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
struct DeleteOptions
{
Models::FileSystemResourceType Resource;
FileSystemResourceType Resource;
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
@ -736,7 +733,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<Core::DateTime> IfUnmodifiedSince;
};
static Azure::Core::Response<Models::FileSystemDeleteResult> Delete(
static Azure::Core::Response<FileSystemDeleteResult> Delete(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -777,7 +774,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
struct ListPathsOptions
{
Models::FileSystemResourceType Resource;
FileSystemResourceType Resource;
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
@ -788,7 +785,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<bool> Upn;
};
static Azure::Core::Response<Models::FileSystemListPathsResult> ListPaths(
static Azure::Core::Response<FileSystemListPathsResult> ListPaths(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -846,7 +843,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
private:
static Azure::Core::Response<Models::FileSystemCreateResult> CreateParseResult(
static Azure::Core::Response<FileSystemCreateResult> CreateParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -854,13 +851,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created)
{
// Created
Models::FileSystemCreateResult result;
FileSystemCreateResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
Core::DateTime::DateFormat::Rfc1123);
result.NamespaceEnabled = response.GetHeaders().at(Details::HeaderNamespaceEnabled);
return Azure::Core::Response<Models::FileSystemCreateResult>(
return Azure::Core::Response<FileSystemCreateResult>(
std::move(result), std::move(responsePtr));
}
else
@ -870,8 +867,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::FileSystemSetPropertiesResult>
SetPropertiesParseResult(
static Azure::Core::Response<FileSystemSetPropertiesResult> SetPropertiesParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -879,12 +875,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// Ok
Models::FileSystemSetPropertiesResult result;
FileSystemSetPropertiesResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
Core::DateTime::DateFormat::Rfc1123);
return Azure::Core::Response<Models::FileSystemSetPropertiesResult>(
return Azure::Core::Response<FileSystemSetPropertiesResult>(
std::move(result), std::move(responsePtr));
}
else
@ -894,8 +890,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::FileSystemGetPropertiesResult>
GetPropertiesParseResult(
static Azure::Core::Response<FileSystemGetPropertiesResult> GetPropertiesParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -903,14 +898,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// Ok
Models::FileSystemGetPropertiesResult result;
FileSystemGetPropertiesResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
Core::DateTime::DateFormat::Rfc1123);
result.Properties = response.GetHeaders().at(Details::HeaderProperties);
result.NamespaceEnabled = response.GetHeaders().at(Details::HeaderNamespaceEnabled);
return Azure::Core::Response<Models::FileSystemGetPropertiesResult>(
return Azure::Core::Response<FileSystemGetPropertiesResult>(
std::move(result), std::move(responsePtr));
}
else
@ -920,7 +915,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::FileSystemDeleteResult> DeleteParseResult(
static Azure::Core::Response<FileSystemDeleteResult> DeleteParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -928,8 +923,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted)
{
// Accepted
Models::FileSystemDeleteResult result;
return Azure::Core::Response<Models::FileSystemDeleteResult>(
FileSystemDeleteResult result;
return Azure::Core::Response<FileSystemDeleteResult>(
std::move(result), std::move(responsePtr));
}
else
@ -939,7 +934,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::FileSystemListPathsResult> ListPathsParseResult(
static Azure::Core::Response<FileSystemListPathsResult> ListPathsParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -948,8 +943,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
// Ok
const auto& bodyBuffer = response.GetBody();
Models::FileSystemListPathsResult result = bodyBuffer.empty()
? Models::FileSystemListPathsResult()
FileSystemListPathsResult result = bodyBuffer.empty()
? FileSystemListPathsResult()
: FileSystemListPathsResultFromPathList(
PathListFromJson(Azure::Core::Internal::Json::json::parse(bodyBuffer)));
if (response.GetHeaders().find(Details::HeaderContinuationToken)
@ -957,7 +952,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken);
}
return Azure::Core::Response<Models::FileSystemListPathsResult>(
return Azure::Core::Response<FileSystemListPathsResult>(
std::move(result), std::move(responsePtr));
}
else
@ -967,9 +962,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Models::Path PathFromJson(const Azure::Core::Internal::Json::json& node)
static PathItem PathItemFromJson(const Azure::Core::Internal::Json::json& node)
{
Models::Path result;
PathItem result;
result.Name = node["name"].get<std::string>();
if (node.contains("isDirectory"))
{
@ -988,21 +983,20 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
return result;
}
static Models::PathList PathListFromJson(const Azure::Core::Internal::Json::json& node)
static PathList PathListFromJson(const Azure::Core::Internal::Json::json& node)
{
Models::PathList result;
PathList result;
for (const auto& element : node["paths"])
{
result.Paths.emplace_back(PathFromJson(element));
result.Items.emplace_back(PathItemFromJson(element));
}
return result;
}
static Models::FileSystemListPathsResult FileSystemListPathsResultFromPathList(
Models::PathList object)
static FileSystemListPathsResult FileSystemListPathsResultFromPathList(PathList object)
{
Models::FileSystemListPathsResult result;
result.Paths = std::move(object.Paths);
FileSystemListPathsResult result;
result.Items = std::move(object.Items);
return result;
}
@ -1015,9 +1009,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
Azure::Core::Nullable<Models::PathResourceType> Resource;
Azure::Core::Nullable<PathResourceType> Resource;
Azure::Core::Nullable<std::string> ContinuationToken;
Azure::Core::Nullable<Models::PathRenameMode> Mode;
Azure::Core::Nullable<PathRenameMode> Mode;
Azure::Core::Nullable<std::string> CacheControl;
Azure::Core::Nullable<std::string> ContentEncoding;
Azure::Core::Nullable<std::string> ContentLanguage;
@ -1039,7 +1033,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<Core::DateTime> SourceIfUnmodifiedSince;
};
static Azure::Core::Response<Models::PathCreateResult> Create(
static Azure::Core::Response<PathCreateResult> Create(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1179,7 +1173,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
Models::PathLeaseAction XMsLeaseAction;
PathLeaseAction XMsLeaseAction;
Azure::Core::Nullable<int32_t> XMsLeaseDuration;
Azure::Core::Nullable<int32_t> XMsLeaseBreakPeriod;
Azure::Core::Nullable<std::string> LeaseIdOptional;
@ -1190,7 +1184,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<Core::DateTime> IfUnmodifiedSince;
};
static Azure::Core::Response<Models::PathLeaseResult> Lease(
static Azure::Core::Response<PathLeaseResult> Lease(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1262,7 +1256,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<std::string> ClientRequestId;
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
Azure::Core::Nullable<Models::PathGetPropertiesAction> Action;
Azure::Core::Nullable<PathGetPropertiesAction> Action;
Azure::Core::Nullable<bool> Upn;
Azure::Core::Nullable<std::string> LeaseIdOptional;
Azure::Core::Nullable<std::string> IfMatch;
@ -1271,7 +1265,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<Core::DateTime> IfUnmodifiedSince;
};
static Azure::Core::Response<Models::PathGetPropertiesResult> GetProperties(
static Azure::Core::Response<PathGetPropertiesResult> GetProperties(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1350,7 +1344,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<Core::DateTime> IfUnmodifiedSince;
};
static Azure::Core::Response<Models::PathDeleteResult> Delete(
static Azure::Core::Response<PathDeleteResult> Delete(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1428,7 +1422,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
};
static Azure::Core::Response<Models::PathSetAccessControlResult> SetAccessControl(
static Azure::Core::Response<PathSetAccessControlResult> SetAccessControl(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1501,7 +1495,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
Azure::Core::Nullable<int32_t> Timeout;
Azure::Core::Nullable<std::string> ContinuationToken;
Models::PathSetAccessControlRecursiveMode Mode;
PathSetAccessControlRecursiveMode Mode;
Azure::Core::Nullable<bool> ForceFlag;
Azure::Core::Nullable<int32_t> MaxRecords;
Azure::Core::Nullable<std::string> Acl;
@ -1509,8 +1503,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
};
static Azure::Core::Response<Models::PathSetAccessControlRecursiveResult>
SetAccessControlRecursive(
static Azure::Core::Response<PathSetAccessControlRecursiveResult> SetAccessControlRecursive(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1587,7 +1580,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
};
static Azure::Core::Response<Models::PathFlushDataResult> FlushData(
static Azure::Core::Response<PathFlushDataResult> FlushData(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1706,7 +1699,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
};
static Azure::Core::Response<Models::PathAppendDataResult> AppendData(
static Azure::Core::Response<PathAppendDataResult> AppendData(
const Azure::Core::Http::Url& url,
Azure::Core::Http::BodyStream& bodyStream,
Azure::Core::Http::HttpPipeline& pipeline,
@ -1768,11 +1761,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Azure::Core::Nullable<int32_t> Timeout;
std::string ApiVersionParameter = Details::DefaultServiceApiVersion;
Azure::Core::Nullable<std::string> ClientRequestId;
Models::PathExpiryOptions XMsExpiryOption;
PathExpiryOptions XMsExpiryOption;
Azure::Core::Nullable<std::string> PathExpiryTime;
};
static Azure::Core::Response<Models::PathSetExpiryResult> SetExpiry(
static Azure::Core::Response<PathSetExpiryResult> SetExpiry(
const Azure::Core::Http::Url& url,
Azure::Core::Http::HttpPipeline& pipeline,
Azure::Core::Context context,
@ -1803,7 +1796,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
private:
static Azure::Core::Response<Models::PathCreateResult> CreateParseResult(
static Azure::Core::Response<PathCreateResult> CreateParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -1811,7 +1804,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created)
{
// The file or directory was created.
Models::PathCreateResult result;
PathCreateResult result;
if (response.GetHeaders().find(Details::HeaderETag) != response.GetHeaders().end())
{
result.ETag = response.GetHeaders().at(Details::HeaderETag);
@ -1834,7 +1827,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
result.ContentLength
= std::stoll(response.GetHeaders().at(Details::HeaderContentLength));
}
return Azure::Core::Response<Models::PathCreateResult>(
return Azure::Core::Response<PathCreateResult>(
std::move(result), std::move(responsePtr));
}
else
@ -1844,7 +1837,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::PathLeaseResult> LeaseParseResult(
static Azure::Core::Response<PathLeaseResult> LeaseParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -1852,7 +1845,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// The "renew", "change" or "release" action was successful.
Models::PathLeaseResult result;
PathLeaseResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
@ -1861,13 +1854,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId);
}
return Azure::Core::Response<Models::PathLeaseResult>(
return Azure::Core::Response<PathLeaseResult>(
std::move(result), std::move(responsePtr));
}
else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created)
{
// A new lease has been created. The "acquire" action was successful.
Models::PathLeaseResult result;
PathLeaseResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
@ -1876,19 +1869,19 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
result.LeaseId = response.GetHeaders().at(Details::HeaderLeaseId);
}
return Azure::Core::Response<Models::PathLeaseResult>(
return Azure::Core::Response<PathLeaseResult>(
std::move(result), std::move(responsePtr));
}
else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted)
{
// The "break" lease action was successful.
Models::PathLeaseResult result;
PathLeaseResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
Core::DateTime::DateFormat::Rfc1123);
result.LeaseTime = std::stoi(response.GetHeaders().at(Details::HeaderLeaseTime));
return Azure::Core::Response<Models::PathLeaseResult>(
return Azure::Core::Response<PathLeaseResult>(
std::move(result), std::move(responsePtr));
}
else
@ -1898,7 +1891,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::PathGetPropertiesResult> GetPropertiesParseResult(
static Azure::Core::Response<PathGetPropertiesResult> GetPropertiesParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -1906,7 +1899,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// Returns all properties for the file or directory.
Models::PathGetPropertiesResult result;
PathGetPropertiesResult result;
if (response.GetHeaders().find(Details::HeaderAcceptRanges)
!= response.GetHeaders().end())
{
@ -1979,15 +1972,15 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
!= response.GetHeaders().end())
{
result.LeaseState
= Models::LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState));
= LeaseStateType(response.GetHeaders().at(Details::HeaderLeaseState));
}
if (response.GetHeaders().find(Details::HeaderLeaseStatus)
!= response.GetHeaders().end())
{
result.LeaseStatus
= Models::LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus));
= LeaseStatusType(response.GetHeaders().at(Details::HeaderLeaseStatus));
}
return Azure::Core::Response<Models::PathGetPropertiesResult>(
return Azure::Core::Response<PathGetPropertiesResult>(
std::move(result), std::move(responsePtr));
}
else
@ -1997,7 +1990,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::PathDeleteResult> DeleteParseResult(
static Azure::Core::Response<PathDeleteResult> DeleteParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -2005,13 +1998,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// The file was deleted.
Models::PathDeleteResult result;
PathDeleteResult result;
if (response.GetHeaders().find(Details::HeaderContinuationToken)
!= response.GetHeaders().end())
{
result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken);
}
return Azure::Core::Response<Models::PathDeleteResult>(
return Azure::Core::Response<PathDeleteResult>(
std::move(result), std::move(responsePtr));
}
else
@ -2021,8 +2014,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::PathSetAccessControlResult>
SetAccessControlParseResult(
static Azure::Core::Response<PathSetAccessControlResult> SetAccessControlParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -2030,12 +2022,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// Set directory access control response.
Models::PathSetAccessControlResult result;
PathSetAccessControlResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
Core::DateTime::DateFormat::Rfc1123);
return Azure::Core::Response<Models::PathSetAccessControlResult>(
return Azure::Core::Response<PathSetAccessControlResult>(
std::move(result), std::move(responsePtr));
}
else
@ -2045,7 +2037,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::PathSetAccessControlRecursiveResult>
static Azure::Core::Response<PathSetAccessControlRecursiveResult>
SetAccessControlRecursiveParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
@ -2055,8 +2047,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
// Set directory access control recursive response.
const auto& bodyBuffer = response.GetBody();
Models::PathSetAccessControlRecursiveResult result = bodyBuffer.empty()
? Models::PathSetAccessControlRecursiveResult()
PathSetAccessControlRecursiveResult result = bodyBuffer.empty()
? PathSetAccessControlRecursiveResult()
: PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse(
SetAccessControlRecursiveResponseFromJson(
Azure::Core::Internal::Json::json::parse(bodyBuffer)));
@ -2065,7 +2057,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
result.ContinuationToken = response.GetHeaders().at(Details::HeaderContinuationToken);
}
return Azure::Core::Response<Models::PathSetAccessControlRecursiveResult>(
return Azure::Core::Response<PathSetAccessControlRecursiveResult>(
std::move(result), std::move(responsePtr));
}
else
@ -2075,20 +2067,19 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Models::AclFailedEntry AclFailedEntryFromJson(
const Azure::Core::Internal::Json::json& node)
static AclFailedEntry AclFailedEntryFromJson(const Azure::Core::Internal::Json::json& node)
{
Models::AclFailedEntry result;
AclFailedEntry result;
result.Name = node["name"].get<std::string>();
result.Type = node["type"].get<std::string>();
result.ErrorMessage = node["errorMessage"].get<std::string>();
return result;
}
static Models::SetAccessControlRecursiveResponse SetAccessControlRecursiveResponseFromJson(
static SetAccessControlRecursiveResponse SetAccessControlRecursiveResponseFromJson(
const Azure::Core::Internal::Json::json& node)
{
Models::SetAccessControlRecursiveResponse result;
SetAccessControlRecursiveResponse result;
result.DirectoriesSuccessful = node["directoriesSuccessful"].get<int32_t>();
result.FilesSuccessful = node["filesSuccessful"].get<int32_t>();
result.FailureCount = node["failureCount"].get<int32_t>();
@ -2099,11 +2090,11 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
return result;
}
static Models::PathSetAccessControlRecursiveResult
static PathSetAccessControlRecursiveResult
PathSetAccessControlRecursiveResultFromSetAccessControlRecursiveResponse(
Models::SetAccessControlRecursiveResponse object)
SetAccessControlRecursiveResponse object)
{
Models::PathSetAccessControlRecursiveResult result;
PathSetAccessControlRecursiveResult result;
result.DirectoriesSuccessful = object.DirectoriesSuccessful;
result.FilesSuccessful = object.FilesSuccessful;
result.FailureCount = object.FailureCount;
@ -2111,7 +2102,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
return result;
}
static Azure::Core::Response<Models::PathFlushDataResult> FlushDataParseResult(
static Azure::Core::Response<PathFlushDataResult> FlushDataParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -2119,7 +2110,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// The data was flushed (written) to the file successfully.
Models::PathFlushDataResult result;
PathFlushDataResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
@ -2130,7 +2121,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
result.ContentLength
= std::stoll(response.GetHeaders().at(Details::HeaderContentLength));
}
return Azure::Core::Response<Models::PathFlushDataResult>(
return Azure::Core::Response<PathFlushDataResult>(
std::move(result), std::move(responsePtr));
}
else
@ -2140,7 +2131,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::PathAppendDataResult> AppendDataParseResult(
static Azure::Core::Response<PathAppendDataResult> AppendDataParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -2148,7 +2139,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted)
{
// Append data to file control response.
Models::PathAppendDataResult result;
PathAppendDataResult result;
if (response.GetHeaders().find(Details::HeaderContentHashMd5)
!= response.GetHeaders().end())
{
@ -2164,7 +2155,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
result.IsServerEncrypted
= response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true";
return Azure::Core::Response<Models::PathAppendDataResult>(
return Azure::Core::Response<PathAppendDataResult>(
std::move(result), std::move(responsePtr));
}
else
@ -2174,7 +2165,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
}
}
static Azure::Core::Response<Models::PathSetExpiryResult> SetExpiryParseResult(
static Azure::Core::Response<PathSetExpiryResult> SetExpiryParseResult(
Azure::Core::Context context,
std::unique_ptr<Azure::Core::Http::RawResponse> responsePtr)
{
@ -2182,12 +2173,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok)
{
// The blob expiry was set successfully.
Models::PathSetExpiryResult result;
PathSetExpiryResult result;
result.ETag = response.GetHeaders().at(Details::HeaderETag);
result.LastModified = Core::DateTime::Parse(
response.GetHeaders().at(Details::HeaderLastModified),
Core::DateTime::DateFormat::Rfc1123);
return Azure::Core::Response<Models::PathSetExpiryResult>(
return Azure::Core::Response<PathSetExpiryResult>(
std::move(result), std::move(responsePtr));
}
else

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

@ -88,7 +88,7 @@ void DataLakeGettingStarted()
// List all file systems.
std::string continuation;
std::vector<Models::FileSystem> fileSystems;
std::vector<Models::FileSystemItem> fileSystems;
do
{
auto response = serviceClient.ListFileSystemsSinglePage();
@ -96,8 +96,7 @@ void DataLakeGettingStarted()
{
continuation = response->ContinuationToken.GetValue();
}
fileSystems.insert(
fileSystems.end(), response->Filesystems.begin(), response->Filesystems.end());
fileSystems.insert(fileSystems.end(), response->Items.begin(), response->Items.end());
} while (!continuation.empty());
// Delete file system.

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

@ -35,13 +35,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
return blobOptions;
}
std::vector<Models::FileSystem> FileSystemsFromContainerItems(
std::vector<Models::FileSystemItem> FileSystemsFromContainerItems(
const std::vector<Blobs::Models::BlobContainerItem>& items)
{
std::vector<Models::FileSystem> fileSystems;
std::vector<Models::FileSystemItem> fileSystems;
for (const auto& item : items)
{
Models::FileSystem fileSystem;
Models::FileSystemItem fileSystem;
fileSystem.ETag = item.ETag;
fileSystem.Name = item.Name;
fileSystem.LastModified = item.LastModified;
@ -184,7 +184,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
auto result = m_blobServiceClient.ListBlobContainersSinglePage(blobOptions);
auto response = Models::ListFileSystemsSinglePageResult();
response.ContinuationToken = std::move(result->ContinuationToken);
response.Filesystems = FileSystemsFromContainerItems(result->Items);
response.Items = FileSystemsFromContainerItems(result->Items);
return Azure::Core::Response<Models::ListFileSystemsSinglePageResult>(
std::move(response), result.ExtractRawResponse());
}

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

@ -50,11 +50,11 @@ namespace Azure { namespace Storage { namespace Test {
void DataLakeFileSystemClientTest::TearDownTestSuite() { m_fileSystemClient->Delete(); }
std::vector<Files::DataLake::Models::Path> DataLakeFileSystemClientTest::ListAllPaths(
std::vector<Files::DataLake::Models::PathItem> DataLakeFileSystemClientTest::ListAllPaths(
bool recursive,
const std::string& directory)
{
std::vector<Files::DataLake::Models::Path> result;
std::vector<Files::DataLake::Models::PathItem> result;
std::string continuation;
Files::DataLake::ListPathsSinglePageOptions options;
if (!directory.empty())
@ -64,7 +64,7 @@ namespace Azure { namespace Storage { namespace Test {
do
{
auto response = m_fileSystemClient->ListPathsSinglePage(recursive, options);
result.insert(result.end(), response->Paths.begin(), response->Paths.end());
result.insert(result.end(), response->Items.begin(), response->Items.end());
if (response->ContinuationToken.HasValue())
{
continuation = response->ContinuationToken.GetValue();
@ -239,7 +239,7 @@ namespace Azure { namespace Storage { namespace Test {
for (const auto& name : m_pathNameSetA)
{
auto iter = std::find_if(
result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) {
result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) {
return path.Name == name;
});
EXPECT_NE(result.end(), iter);
@ -249,7 +249,7 @@ namespace Azure { namespace Storage { namespace Test {
for (const auto& name : m_pathNameSetB)
{
auto iter = std::find_if(
result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) {
result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) {
return path.Name == name;
});
EXPECT_NE(result.end(), iter);
@ -263,7 +263,7 @@ namespace Azure { namespace Storage { namespace Test {
for (const auto& name : m_pathNameSetA)
{
auto iter = std::find_if(
result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) {
result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) {
return path.Name == name;
});
EXPECT_NE(result.end(), iter);
@ -273,7 +273,7 @@ namespace Azure { namespace Storage { namespace Test {
for (const auto& name : m_pathNameSetB)
{
auto iter = std::find_if(
result.begin(), result.end(), [&name](const Files::DataLake::Models::Path& path) {
result.begin(), result.end(), [&name](const Files::DataLake::Models::PathItem& path) {
return path.Name == name;
});
EXPECT_EQ(result.end(), iter);
@ -284,7 +284,7 @@ namespace Azure { namespace Storage { namespace Test {
Files::DataLake::ListPathsSinglePageOptions options;
options.PageSizeHint = 2;
auto response = m_fileSystemClient->ListPathsSinglePage(true, options);
EXPECT_LE(2U, response->Paths.size());
EXPECT_LE(2U, response->Items.size());
}
}

2
sdk/storage/azure-storage-files-datalake/test/datalake_file_system_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::Models::Path> ListAllPaths(
static std::vector<Files::DataLake::Models::PathItem> ListAllPaths(
bool recursive,
const std::string& directory = std::string());

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

@ -53,10 +53,10 @@ namespace Azure { namespace Storage { namespace Test {
}
}
std::vector<Files::DataLake::Models::FileSystem> DataLakeServiceClientTest::ListAllFileSystems(
const std::string& prefix)
std::vector<Files::DataLake::Models::FileSystemItem>
DataLakeServiceClientTest::ListAllFileSystems(const std::string& prefix)
{
std::vector<Files::DataLake::Models::FileSystem> result;
std::vector<Files::DataLake::Models::FileSystemItem> result;
std::string continuation;
Files::DataLake::ListFileSystemsSinglePageOptions options;
if (!prefix.empty())
@ -66,7 +66,7 @@ namespace Azure { namespace Storage { namespace Test {
do
{
auto response = m_dataLakeServiceClient->ListFileSystemsSinglePage(options);
result.insert(result.end(), response->Filesystems.begin(), response->Filesystems.end());
result.insert(result.end(), response->Items.begin(), response->Items.end());
if (response->ContinuationToken.HasValue())
{
continuation = response->ContinuationToken.GetValue();
@ -86,7 +86,7 @@ namespace Azure { namespace Storage { namespace Test {
auto iter = std::find_if(
result.begin(),
result.end(),
[&name](const Files::DataLake::Models::FileSystem& fileSystem) {
[&name](const Files::DataLake::Models::FileSystemItem& fileSystem) {
return fileSystem.Name == name;
});
EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixA.size()), m_fileSystemPrefixA);
@ -97,7 +97,7 @@ namespace Azure { namespace Storage { namespace Test {
auto iter = std::find_if(
result.begin(),
result.end(),
[&name](const Files::DataLake::Models::FileSystem& fileSystem) {
[&name](const Files::DataLake::Models::FileSystemItem& fileSystem) {
return fileSystem.Name == name;
});
EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixB.size()), m_fileSystemPrefixB);
@ -112,7 +112,7 @@ namespace Azure { namespace Storage { namespace Test {
auto iter = std::find_if(
result.begin(),
result.end(),
[&name](const Files::DataLake::Models::FileSystem& fileSystem) {
[&name](const Files::DataLake::Models::FileSystemItem& fileSystem) {
return fileSystem.Name == name;
});
EXPECT_EQ(iter->Name.substr(0U, m_fileSystemPrefixA.size()), m_fileSystemPrefixA);
@ -123,7 +123,7 @@ namespace Azure { namespace Storage { namespace Test {
auto iter = std::find_if(
result.begin(),
result.end(),
[&name](const Files::DataLake::Models::FileSystem& fileSystem) {
[&name](const Files::DataLake::Models::FileSystemItem& fileSystem) {
return fileSystem.Name == name;
});
EXPECT_EQ(result.end(), iter);
@ -134,7 +134,7 @@ namespace Azure { namespace Storage { namespace Test {
Files::DataLake::ListFileSystemsSinglePageOptions options;
options.PageSizeHint = 2;
auto response = m_dataLakeServiceClient->ListFileSystemsSinglePage(options);
EXPECT_LE(2U, response->Filesystems.size());
EXPECT_LE(2U, response->Items.size());
}
}

2
sdk/storage/azure-storage-files-datalake/test/datalake_service_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::Models::FileSystem> ListAllFileSystems(
static std::vector<Files::DataLake::Models::FileSystemItem> ListAllFileSystems(
const std::string& prefix = std::string());
static std::shared_ptr<Files::DataLake::DataLakeServiceClient> m_dataLakeServiceClient;

3
sdk/storage/azure-storage-files-shares/CHANGELOG.md
View File

@ -8,6 +8,9 @@
- `ContentRange` in `FileDownloadResult` is now `Azure::Core::Http::Range`.
- `ContentLength` in `FileDownloadResult` is renamed to `FileSize`.
- Renamed `GetUri` to `GetUrl`.
- Moved all protocol layer generated result types to `Details` namespace.
- Renamed `ShareItems` in `ListSharesResponse` to `Items`.
- Renamed `ShareItems` in `ServiceListSharesSinglePageResult` to `Items`.
## 12.0.0-beta.6 (2020-01-14)

1100
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp
View File

File diff suppressed because it is too large Load Diff

72
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
View File

@ -11,8 +11,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names
// ServiceClient models:
using ListSharesSinglePageResult = ServiceListSharesSinglePageResult;
using SetServicePropertiesResult = ServiceSetPropertiesResult;
using ListSharesSinglePageResult = Details::ServiceListSharesSinglePageResult;
using SetServicePropertiesResult = Details::ServiceSetPropertiesResult;
using GetServicePropertiesResult = StorageServiceProperties;
// ShareClient models:
@ -27,20 +27,20 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names
{
bool Deleted = true;
};
using CreateShareSnapshotResult = ShareCreateSnapshotResult;
using GetSharePropertiesResult = ShareGetPropertiesResult;
using SetShareQuotaResult = ShareSetQuotaResult;
using SetShareMetadataResult = ShareSetMetadataResult;
using SetShareAccessPolicyResult = ShareSetAccessPolicyResult;
using GetShareStatisticsResult = ShareGetStatisticsResult;
using CreateSharePermissionResult = ShareCreatePermissionResult;
using GetShareAccessPolicyResult = ShareGetAccessPolicyResult;
using GetSharePermissionResult = ShareGetPermissionResult;
using AcquireShareLeaseResult = ShareAcquireLeaseResult;
using RenewShareLeaseResult = ShareRenewLeaseResult;
using ReleaseShareLeaseResult = ShareReleaseLeaseResult;
using BreakShareLeaseResult = ShareBreakLeaseResult;
using ChangeShareLeaseResult = ShareChangeLeaseResult;
using CreateShareSnapshotResult = Details::ShareCreateSnapshotResult;
using GetSharePropertiesResult = Details::ShareGetPropertiesResult;
using SetShareQuotaResult = Details::ShareSetQuotaResult;
using SetShareMetadataResult = Details::ShareSetMetadataResult;
using SetShareAccessPolicyResult = Details::ShareSetAccessPolicyResult;
using GetShareStatisticsResult = Details::ShareGetStatisticsResult;
using CreateSharePermissionResult = Details::ShareCreatePermissionResult;
using GetShareAccessPolicyResult = Details::ShareGetAccessPolicyResult;
using GetSharePermissionResult = Details::ShareGetPermissionResult;
using AcquireShareLeaseResult = Details::ShareAcquireLeaseResult;
using RenewShareLeaseResult = Details::ShareRenewLeaseResult;
using ReleaseShareLeaseResult = Details::ShareReleaseLeaseResult;
using BreakShareLeaseResult = Details::ShareBreakLeaseResult;
using ChangeShareLeaseResult = Details::ShareChangeLeaseResult;
// DirectoryClient models:
struct CreateShareDirectoryResult
@ -63,10 +63,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names
bool Deleted = true;
};
using GetShareDirectoryPropertiesResult = DirectoryGetPropertiesResult;
using SetShareDirectoryPropertiesResult = DirectorySetPropertiesResult;
using SetShareDirectoryMetadataResult = DirectorySetMetadataResult;
using ForceCloseAllShareDirectoryHandlesResult = DirectoryForceCloseHandlesResult;
using GetShareDirectoryPropertiesResult = Details::DirectoryGetPropertiesResult;
using SetShareDirectoryPropertiesResult = Details::DirectorySetPropertiesResult;
using SetShareDirectoryMetadataResult = Details::DirectorySetMetadataResult;
using ForceCloseAllShareDirectoryHandlesResult = Details::DirectoryForceCloseHandlesResult;
struct ForceCloseShareDirectoryHandleResult
{
@ -138,23 +138,23 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names
Azure::Core::Nullable<Core::DateTime> LastWrittenOn;
};
using DownloadShareFileResult = FileDownloadResult;
using StartCopyShareFileResult = FileStartCopyResult;
using AbortCopyShareFileResult = FileAbortCopyResult;
using GetShareFilePropertiesResult = FileGetPropertiesResult;
using SetShareFilePropertiesResult = FileSetHttpHeadersResult;
using ResizeFileResult = FileSetHttpHeadersResult;
using SetShareFileMetadataResult = FileSetMetadataResult;
using UploadShareFileRangeResult = FileUploadRangeResult;
using ClearShareFileRangeResult = FileUploadRangeResult;
using UploadFileRangeFromUrlResult = FileUploadRangeFromUrlResult;
using GetShareFileRangeListResult = FileGetRangeListResult;
using DownloadShareFileResult = Details::FileDownloadResult;
using StartCopyShareFileResult = Details::FileStartCopyResult;
using AbortCopyShareFileResult = Details::FileAbortCopyResult;
using GetShareFilePropertiesResult = Details::FileGetPropertiesResult;
using SetShareFilePropertiesResult = Details::FileSetHttpHeadersResult;
using ResizeFileResult = Details::FileSetHttpHeadersResult;
using SetShareFileMetadataResult = Details::FileSetMetadataResult;
using UploadShareFileRangeResult = Details::FileUploadRangeResult;
using ClearShareFileRangeResult = Details::FileUploadRangeResult;
using UploadFileRangeFromUrlResult = Details::FileUploadRangeFromUrlResult;
using GetShareFileRangeListResult = Details::FileGetRangeListResult;
using ListShareFileHandlesSinglePageResult = ListShareDirectoryHandlesSinglePageResult;
using ForceCloseAllShareFileHandlesResult = FileForceCloseHandlesResult;
using AcquireShareFileLeaseResult = FileAcquireLeaseResult;
using ReleaseShareFileLeaseResult = FileReleaseLeaseResult;
using BreakShareFileLeaseResult = FileBreakLeaseResult;
using ChangeShareFileLeaseResult = FileChangeLeaseResult;
using ForceCloseAllShareFileHandlesResult = Details::FileForceCloseHandlesResult;
using AcquireShareFileLeaseResult = Details::FileAcquireLeaseResult;
using ReleaseShareFileLeaseResult = Details::FileReleaseLeaseResult;
using BreakShareFileLeaseResult = Details::FileBreakLeaseResult;
using ChangeShareFileLeaseResult = Details::FileChangeLeaseResult;
struct DownloadShareFileToResult
{

4
sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp
View File

@ -76,7 +76,7 @@ namespace Azure { namespace Storage { namespace Test {
do
{
auto response = m_fileShareServiceClient->ListSharesSinglePage(options);
result.insert(result.end(), response->ShareItems.begin(), response->ShareItems.end());
result.insert(result.end(), response->Items.begin(), response->Items.end());
continuation = response->ContinuationToken;
options.ContinuationToken = continuation;
} while (!continuation.empty());
@ -133,7 +133,7 @@ namespace Azure { namespace Storage { namespace Test {
Files::Shares::ListSharesSinglePageOptions options;
options.PageSizeHint = 2;
auto response = m_fileShareServiceClient->ListSharesSinglePage(options);
EXPECT_LE(2U, response->ShareItems.size());
EXPECT_LE(2U, response->Items.size());
}
}