diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp index d0a9bfc90..66c375c1f 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp @@ -122,1059 +122,1065 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { constexpr static const char* c_HeaderFileRangeWriteTypeDefault = "update"; constexpr static const char* c_HeaderXMsContentCrc64 = "x-ms-content-crc64"; } // namespace Details - - enum class ListSharesIncludeType - { - None = 0, - Snapshots = 1, - Metadata = 2, - Deleted = 4, - - }; - - inline ListSharesIncludeType operator|(ListSharesIncludeType lhs, ListSharesIncludeType rhs) - { - using type = std::underlying_type_t; - return static_cast(static_cast(lhs) | static_cast(rhs)); - } - - inline ListSharesIncludeType& operator|=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) - { - lhs = lhs | rhs; - return lhs; - } - - inline ListSharesIncludeType operator&(ListSharesIncludeType lhs, ListSharesIncludeType rhs) - { - using type = std::underlying_type_t; - return static_cast(static_cast(lhs) & static_cast(rhs)); - } - - inline ListSharesIncludeType& operator&=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) - { - lhs = lhs & rhs; - return lhs; - } - inline std::string ListSharesIncludeTypeToString(const ListSharesIncludeType& val) - { - ListSharesIncludeType value_list[] = { - ListSharesIncludeType::Snapshots, - ListSharesIncludeType::Metadata, - ListSharesIncludeType::Deleted, - }; - const char* string_list[] = { - "snapshots", - "metadata", - "deleted", - }; - std::string result; - for (std::size_t i = 0; i < sizeof(value_list) / sizeof(ListSharesIncludeType); ++i) + namespace Models { + struct FileShareHttpHeaders { - if ((val & value_list[i]) == value_list[i]) - { - if (!result.empty()) - { - result += ","; - } - result += string_list[i]; - } + std::string CacheControl; + std::string ContentDisposition; + std::string ContentEncoding; + std::string ContentLanguage; + std::string ContentType; + std::string ContentMd5; + }; + // Specifies the option to copy file security descriptor from source file or to set it using the + // value which is defined by the header value of x-ms-file-permission or + // x-ms-file-permission-key. + enum class PermissionCopyModeType + { + Source, + Override, + Unknown + }; + + // Specifies the option include to delete the base share and all of its snapshots. + enum class DeleteSnapshotsOptionType + { + Include, + Unknown + }; + + // Only update is supported: - Update: Writes the bytes downloaded from the source url into the + // specified range. + enum class FileRangeWriteFromUrlType + { + Update, + Unknown + }; + + // An Access policy. + struct AccessPolicy + { + std::string Start; // The date-time the policy is active. + std::string Expiry; // The date-time the policy expires. + std::string Permission; // The permissions for the ACL policy. + }; + + // CORS is an HTTP feature that enables a web application running under one domain to access + // resources in another domain. Web browsers implement a security restriction known as + // same-origin policy that prevents a web page from calling APIs in a different domain; CORS + // provides a secure way to allow one domain (the origin domain) to call APIs in another domain. + struct CorsRule + { + std::string AllowedOrigins; // The origin domains that are permitted to make a request against + // the storage service via CORS. The origin domain is the domain + // from which the request originates. Note that the origin must be + // an exact case-sensitive match with the origin that the user age + // sends to the service. You can also use the wildcard character + // '*' to allow all origin domains to make requests via CORS. + std::string AllowedMethods; // The methods (HTTP request verbs) that the origin domain may use + // for a CORS request. (comma separated) + std::string AllowedHeaders; // The request headers that the origin domain may specify on the + // CORS request. + std::string ExposedHeaders; // The response headers that may be sent in the response to the + // CORS request and exposed by the browser to the request issuer. + int32_t MaxAgeInSeconds = int32_t(); // The maximum amount time that a browser should cache + // the preflight OPTIONS request. + }; + + // A listed directory item. + struct DirectoryItem + { + std::string Name; + }; + + // File properties. + struct FileProperty + { + int64_t ContentLength + = int64_t(); // Content length of the file. This value may not be up-to-date since an SMB + // client may have modified the file locally. The value of Content-Length may + // not reflect that fact until the handle is closed or the op-lock is broken. + // To retrieve current property values, call Get File Properties. + }; + + // A listed file item. + struct FileItem + { + std::string Name; + Models::FileProperty Properties; + }; + + // Abstract for entries that can be listed from Directory. + struct FilesAndDirectoriesListSegment + { + std::vector DirectoryItems; + std::vector FileItems; + }; + + // A listed Azure Storage handle item. + struct HandleItem + { + std::string HandleId; // XSMB service handle ID + std::string Path; // File or directory name including full path starting from share root + std::string FileId; // FileId uniquely identifies the file or directory. + std::string ParentId; // ParentId uniquely identifies the parent directory of the object. + std::string SessionId; // SMB session ID in context of which the file handle was opened + std::string ClientIp; // Client IP that opened the handle + std::string OpenTime; // Time when the session that previously opened the handle has last been + // reconnected. (UTC) + std::string LastReconnectTime; // Time handle was last connected to (UTC) + }; + + // When a file or share is leased, specifies whether the lease is of infinite or fixed duration. + enum class LeaseDurationType + { + Infinite, + Fixed, + Unknown + }; + + // Lease state of the file or share. + enum class LeaseStateType + { + Available, + Leased, + Expired, + Breaking, + Broken, + Unknown + }; + + // The current lease status of the file or share. + enum class LeaseStatusType + { + Locked, + Unlocked, + Unknown + }; + + // An enumeration of directories and files. + struct ListFilesAndDirectoriesSegmentResponse + { + std::string ServiceEndpoint; + std::string ShareName; + std::string ShareSnapshot; + std::string DirectoryPath; + std::string Prefix; + std::string PreviousContinuationToken; + int32_t MaxResults = int32_t(); + Models::FilesAndDirectoriesListSegment Segment; + std::string ContinuationToken; + }; + + // An enumeration of handles. + struct ListHandlesResponse + { + std::vector HandleList; + std::string ContinuationToken; + }; + + // Properties of a share. + struct ShareProperties + { + std::string LastModified; + std::string Etag; + int64_t Quota = int64_t(); + Azure::Core::Nullable ProvisionedIops; + Azure::Core::Nullable ProvisionedIngressMBps; + Azure::Core::Nullable ProvisionedEgressMBps; + Azure::Core::Nullable NextAllowedQuotaDowngradeTime; + std::string DeletedTime; + int32_t RemainingRetentionDays = int32_t(); + Models::LeaseStatusType LeaseStatus; + Models::LeaseStateType LeaseState; + Models::LeaseDurationType LeaseDuration; + }; + + typedef std::map Metadata; + + // A listed Azure Storage share item. + struct ShareItem + { + std::string Name; + std::string Snapshot; + bool Deleted = bool(); + std::string Version; + Models::ShareProperties Properties; + Models::Metadata ShareMetadata; + }; + + // An enumeration of shares. + struct ListSharesResponse + { + std::string ServiceEndpoint; + std::string Prefix; + std::string PreviousContinuationToken; + int32_t MaxResults = int32_t(); + std::vector ShareItems; + std::string ContinuationToken; + }; + + // The retention policy. + struct ShareRetentionPolicy + { + bool Enabled + = bool(); // Indicates whether a retention policy is enabled for the File service. If + // false, metrics data is retained, and the user is responsible for deleting it. + Azure::Core::Nullable + Days; // Indicates the number of days that metrics data should be retained. All data older + // than this value will be deleted. Metrics data is deleted on a best-effort basis + // after the retention period expires. + }; + + // Storage Analytics metrics for file service. + struct Metrics + { + std::string Version; // The version of Storage Analytics to configure. + bool Enabled = bool(); // Indicates whether metrics are enabled for the File service. + Azure::Core::Nullable IncludeApis; // Indicates whether metrics should generate summary + // statistics for called API operations. + Models::ShareRetentionPolicy RetentionPolicy; + }; + + // Settings for SMB multichannel + struct SmbMultichannel + { + bool Enabled = bool(); // If SMB multichannel is enabled. + }; + + // An Azure Storage file range. + struct FileRange + { + int64_t Start = int64_t(); // Start of the range. + int64_t End = int64_t(); // End of the range. + }; + + // An Azure Storage file clear range. + struct ClearRange + { + int64_t Start = int64_t(); // Start of the range. + int64_t End = int64_t(); // End of the range. + }; + + // Settings for SMB protocol. + struct SmbSettings + { + Models::SmbMultichannel Multichannel; // Settings for SMB Multichannel. + }; + + // Protocol settings + struct ShareProtocolSettings + { + Models::SmbSettings Settings; // Settings for SMB protocol. + }; + + // The list of file ranges + struct ShareFileRangeList + { + std::vector Ranges; + std::vector ClearRanges; + }; + + // Stats for the share. + struct ShareStats + { + int64_t ShareUsageBytes + = int64_t(); // The approximate size of the data stored in bytes. Note that this value may + // not include all recently created or recently resized files. + }; + + // Signed identifier. + struct SignedIdentifier + { + std::string Id; // A unique id. + Models::AccessPolicy Policy; // The access policy. + }; + + // Storage service properties. + struct StorageServiceProperties + { + Models::Metrics HourMetrics; // A summary of request statistics grouped by API in hourly + // aggregates for files. + Models::Metrics MinuteMetrics; // A summary of request statistics grouped by API in minute + // aggregates for files. + std::vector Cors; // The set of CORS rules. + Azure::Core::Nullable Protocol; // Protocol settings + }; + + // A permission (a security descriptor) at the share level. + struct SharePermission + { + std::string + Permission; // The permission in the Security Descriptor Definition Language (SDDL). + }; + + // Describes what lease action to take. + enum class LeaseAction + { + Acquire, + Release, + Change, + Renew, + Break, + Unknown + }; + + // State of the copy operation identified by 'x-ms-copy-id'. + enum class CopyStatusType + { + Pending, + Success, + Aborted, + Failed, + Unknown + }; + + // Specify one of the following options: - Update: Writes the bytes specified by the request + // body into the specified range. The Range and Content-Length headers must match to perform the + // update. - Clear: Clears the specified range and releases the space used in storage for that + // range. To clear a range, set the Content-Length header to zero, and set the Range header to a + // value that indicates the range to clear, up to maximum file size. + enum class FileRangeWriteType + { + Update, + Clear, + Unknown + }; + + struct ServiceSetPropertiesResult + { + }; + + struct ServiceGetPropertiesResult + { + Models::Metrics HourMetrics; + Models::Metrics MinuteMetrics; + std::vector Cors; + Azure::Core::Nullable Protocol; + }; + + struct ServiceListSharesSegmentResult + { + std::string ServiceEndpoint; + std::string Prefix; + std::string PreviousContinuationToken; + int32_t MaxResults = int32_t(); + std::vector ShareItems; + std::string ContinuationToken; + }; + + struct ShareCreateResult + { + std::string ETag; + std::string LastModified; + }; + + struct ShareGetPropertiesResult + { + std::map Metadata; + std::string ETag; + std::string LastModified; + int64_t Quota = int64_t(); + Azure::Core::Nullable ProvisionedIops; + Azure::Core::Nullable ProvisionedIngressMBps; + Azure::Core::Nullable ProvisionedEgressMBps; + Azure::Core::Nullable NextAllowedQuotaDowngradeTime; + Azure::Core::Nullable LeaseDuration; + Azure::Core::Nullable LeaseState; + Azure::Core::Nullable LeaseStatus; + }; + + struct ShareDeleteResult + { + }; + + struct ShareAcquireLeaseResult + { + std::string ETag; + std::string LastModified; + Azure::Core::Nullable LeaseTime; + std::string LeaseId; + }; + + struct ShareReleaseLeaseResult + { + std::string ETag; + std::string LastModified; + Azure::Core::Nullable LeaseTime; + }; + + struct ShareChangeLeaseResult + { + std::string ETag; + std::string LastModified; + Azure::Core::Nullable LeaseTime; + std::string LeaseId; + }; + + struct ShareRenewLeaseResult + { + std::string ETag; + std::string LastModified; + Azure::Core::Nullable LeaseTime; + std::string LeaseId; + }; + + struct ShareBreakLeaseResult + { + std::string ETag; + std::string LastModified; + int32_t LeaseTime = int32_t(); + Azure::Core::Nullable LeaseId; + }; + + struct ShareCreateSnapshotResult + { + std::string Snapshot; + std::string ETag; + std::string LastModified; + }; + + struct ShareCreatePermissionResult + { + std::string FilePermissionKey; + }; + + struct ShareGetPermissionResult + { + std::string Permission; + }; + + struct ShareSetQuotaResult + { + std::string ETag; + std::string LastModified; + }; + + struct ShareSetMetadataResult + { + std::string ETag; + std::string LastModified; + }; + + struct ShareGetAccessPolicyResult + { + std::vector SignedIdentifiers; + std::string ETag; + std::string LastModified; + }; + + struct ShareSetAccessPolicyResult + { + std::string ETag; + std::string LastModified; + }; + + struct ShareGetStatisticsResult + { + int64_t ShareUsageBytes = int64_t(); + std::string ETag; + std::string LastModified; + }; + + struct ShareRestoreResult + { + std::string ETag; + std::string LastModified; + }; + + struct DirectoryCreateResult + { + std::string ETag; + std::string LastModified; + bool IsServerEncrypted = bool(); + std::string FilePermissionKey; + std::string FileAttributes; + std::string FileCreationTime; + std::string FileLastWriteTime; + std::string FileChangeTime; + std::string FileId; + std::string FileParentId; + }; + + struct DirectoryGetPropertiesResult + { + std::map Metadata; + std::string ETag; + std::string LastModified; + bool IsServerEncrypted = bool(); + std::string FileAttributes; + std::string FileCreationTime; + std::string FileLastWriteTime; + std::string FileChangeTime; + std::string FilePermissionKey; + std::string FileId; + std::string FileParentId; + }; + + struct DirectoryDeleteResult + { + }; + + struct DirectorySetPropertiesResult + { + std::string ETag; + std::string LastModified; + bool IsServerEncrypted = bool(); + std::string FilePermissionKey; + std::string FileAttributes; + std::string FileCreationTime; + std::string FileLastWriteTime; + std::string FileChangeTime; + std::string FileId; + std::string FileParentId; + }; + + struct DirectorySetMetadataResult + { + std::string ETag; + bool IsServerEncrypted = bool(); + }; + + struct DirectoryListFilesAndDirectoriesSegmentResult + { + std::string ServiceEndpoint; + std::string ShareName; + std::string ShareSnapshot; + std::string DirectoryPath; + std::string Prefix; + std::string PreviousContinuationToken; + int32_t MaxResults = int32_t(); + Models::FilesAndDirectoriesListSegment Segment; + std::string ContinuationToken; + FileShareHttpHeaders HttpHeaders; + }; + + struct DirectoryListHandlesResult + { + std::vector HandleList; + std::string ContinuationToken; + FileShareHttpHeaders HttpHeaders; + }; + + struct DirectoryForceCloseHandlesResult + { + Azure::Core::Nullable ContinuationToken; + int32_t numberOfHandlesClosed = int32_t(); + int32_t numberOfHandlesFailedToClose = int32_t(); + }; + + struct FileCreateResult + { + std::string ETag; + std::string LastModified; + bool IsServerEncrypted = bool(); + std::string FilePermissionKey; + std::string FileAttributes; + std::string FileCreationTime; + std::string FileLastWriteTime; + std::string FileChangeTime; + std::string FileId; + std::string FileParentId; + }; + + struct FileDownloadResult + { + std::unique_ptr BodyStream; + std::string LastModified; + std::map Metadata; + int64_t ContentLength = int64_t(); + FileShareHttpHeaders HttpHeaders; + Azure::Core::Nullable ContentRange; + std::string ETag; + Azure::Core::Nullable TransactionalContentMd5; + std::string AcceptRanges; + Azure::Core::Nullable CopyCompletionTime; + Azure::Core::Nullable CopyStatusDescription; + Azure::Core::Nullable CopyId; + Azure::Core::Nullable CopyProgress; + Azure::Core::Nullable CopySource; + Azure::Core::Nullable CopyStatus; + Azure::Core::Nullable IsServerEncrypted; + std::string FileAttributes; + std::string FileCreationTime; + std::string FileLastWriteTime; + std::string FileChangeTime; + std::string FilePermissionKey; + std::string FileId; + std::string FileParentId; + Azure::Core::Nullable LeaseDuration; + Azure::Core::Nullable LeaseState; + Azure::Core::Nullable LeaseStatus; + }; + + struct FileGetPropertiesResult + { + std::string LastModified; + std::map Metadata; + std::string FileType; + int64_t ContentLength = int64_t(); + FileShareHttpHeaders HttpHeaders; + std::string ETag; + Azure::Core::Nullable CopyCompletionTime; + Azure::Core::Nullable CopyStatusDescription; + Azure::Core::Nullable CopyId; + Azure::Core::Nullable CopyProgress; + Azure::Core::Nullable CopySource; + Azure::Core::Nullable CopyStatus; + Azure::Core::Nullable IsServerEncrypted; + std::string FileAttributes; + std::string FileCreationTime; + std::string FileLastWriteTime; + std::string FileChangeTime; + std::string FilePermissionKey; + std::string FileId; + std::string FileParentId; + Azure::Core::Nullable LeaseDuration; + Azure::Core::Nullable LeaseState; + Azure::Core::Nullable LeaseStatus; + }; + + struct FileDeleteResult + { + }; + + struct FileSetHttpHeadersResult + { + std::string ETag; + std::string LastModified; + bool IsServerEncrypted = bool(); + std::string FilePermissionKey; + std::string FileAttributes; + std::string FileCreationTime; + std::string FileLastWriteTime; + std::string FileChangeTime; + std::string FileId; + std::string FileParentId; + }; + + struct FileSetMetadataResult + { + std::string ETag; + bool IsServerEncrypted = bool(); + }; + + struct FileAcquireLeaseResult + { + std::string ETag; + std::string LastModified; + std::string LeaseId; + }; + + struct FileReleaseLeaseResult + { + std::string ETag; + std::string LastModified; + }; + + struct FileChangeLeaseResult + { + std::string ETag; + std::string LastModified; + std::string LeaseId; + }; + + struct FileBreakLeaseResult + { + std::string ETag; + std::string LastModified; + Azure::Core::Nullable LeaseId; + }; + + struct FileUploadRangeResult + { + std::string ETag; + std::string LastModified; + std::string TransactionalContentMd5; + bool IsServerEncrypted = bool(); + }; + + struct FileUploadRangeFromUrlResult + { + std::string ETag; + std::string LastModified; + std::string XMsContentCrc64; + bool IsServerEncrypted = bool(); + }; + + struct FileGetRangeListResult + { + std::vector Ranges; + std::vector ClearRanges; + std::string LastModified; + std::string ETag; + int64_t FileContentLength = int64_t(); + }; + + struct FileStartCopyResult + { + std::string ETag; + std::string LastModified; + std::string CopyId; + CopyStatusType CopyStatus = CopyStatusType::Unknown; + }; + + struct FileAbortCopyResult + { + }; + + struct FileListHandlesResult + { + std::vector HandleList; + std::string ContinuationToken; + FileShareHttpHeaders HttpHeaders; + }; + + struct FileForceCloseHandlesResult + { + Azure::Core::Nullable ContinuationToken; + int32_t numberOfHandlesClosed = int32_t(); + int32_t numberOfHandlesFailedToClose = int32_t(); + }; + + enum class ListSharesIncludeType + { + None = 0, + Snapshots = 1, + Metadata = 2, + Deleted = 4, + + }; + + inline ListSharesIncludeType operator|(ListSharesIncludeType lhs, ListSharesIncludeType rhs) + { + using type = std::underlying_type_t; + return static_cast(static_cast(lhs) | static_cast(rhs)); } - return result; - } - - struct FileShareHttpHeaders - { - std::string CacheControl; - std::string ContentDisposition; - std::string ContentEncoding; - std::string ContentLanguage; - std::string ContentType; - std::string ContentMd5; - }; - // Specifies the option to copy file security descriptor from source file or to set it using the - // value which is defined by the header value of x-ms-file-permission or x-ms-file-permission-key. - enum class PermissionCopyModeType - { - Source, - Override, - Unknown - }; - - // Specifies the option include to delete the base share and all of its snapshots. - enum class DeleteSnapshotsOptionType - { - Include, - Unknown - }; - - // Only update is supported: - Update: Writes the bytes downloaded from the source url into the - // specified range. - enum class FileRangeWriteFromUrlType - { - Update, - Unknown - }; - - // An Access policy. - struct AccessPolicy - { - std::string Start; // The date-time the policy is active. - std::string Expiry; // The date-time the policy expires. - std::string Permission; // The permissions for the ACL policy. - }; - - // CORS is an HTTP feature that enables a web application running under one domain to access - // resources in another domain. Web browsers implement a security restriction known as same-origin - // policy that prevents a web page from calling APIs in a different domain; CORS provides a secure - // way to allow one domain (the origin domain) to call APIs in another domain. - struct CorsRule - { - std::string AllowedOrigins; // The origin domains that are permitted to make a request against - // the storage service via CORS. The origin domain is the domain - // from which the request originates. Note that the origin must be - // an exact case-sensitive match with the origin that the user age - // sends to the service. You can also use the wildcard character '*' - // to allow all origin domains to make requests via CORS. - std::string AllowedMethods; // The methods (HTTP request verbs) that the origin domain may use - // for a CORS request. (comma separated) - std::string AllowedHeaders; // The request headers that the origin domain may specify on the - // CORS request. - std::string ExposedHeaders; // The response headers that may be sent in the response to the CORS - // request and exposed by the browser to the request issuer. - int32_t MaxAgeInSeconds = int32_t(); // The maximum amount time that a browser should cache the - // preflight OPTIONS request. - }; - - // A listed directory item. - struct DirectoryItem - { - std::string Name; - }; - - // File properties. - struct FileProperty - { - int64_t ContentLength - = int64_t(); // Content length of the file. This value may not be up-to-date since an SMB - // client may have modified the file locally. The value of Content-Length may - // not reflect that fact until the handle is closed or the op-lock is broken. - // To retrieve current property values, call Get File Properties. - }; - - // A listed file item. - struct FileItem - { - std::string Name; - FileProperty Properties; - }; - - // Abstract for entries that can be listed from Directory. - struct FilesAndDirectoriesListSegment - { - std::vector DirectoryItems; - std::vector FileItems; - }; - - // A listed Azure Storage handle item. - struct HandleItem - { - std::string HandleId; // XSMB service handle ID - std::string Path; // File or directory name including full path starting from share root - std::string FileId; // FileId uniquely identifies the file or directory. - std::string ParentId; // ParentId uniquely identifies the parent directory of the object. - std::string SessionId; // SMB session ID in context of which the file handle was opened - std::string ClientIp; // Client IP that opened the handle - std::string OpenTime; // Time when the session that previously opened the handle has last been - // reconnected. (UTC) - std::string LastReconnectTime; // Time handle was last connected to (UTC) - }; - - // When a file or share is leased, specifies whether the lease is of infinite or fixed duration. - enum class LeaseDurationType - { - Infinite, - Fixed, - Unknown - }; - - // Lease state of the file or share. - enum class LeaseStateType - { - Available, - Leased, - Expired, - Breaking, - Broken, - Unknown - }; - - // The current lease status of the file or share. - enum class LeaseStatusType - { - Locked, - Unlocked, - Unknown - }; - - // An enumeration of directories and files. - struct ListFilesAndDirectoriesSegmentResponse - { - std::string ServiceEndpoint; - std::string ShareName; - std::string ShareSnapshot; - std::string DirectoryPath; - std::string Prefix; - std::string PreviousContinuationToken; - int32_t MaxResults = int32_t(); - FilesAndDirectoriesListSegment Segment; - std::string ContinuationToken; - }; - - // An enumeration of handles. - struct ListHandlesResponse - { - std::vector HandleList; - std::string ContinuationToken; - }; - - // Properties of a share. - struct ShareProperties - { - std::string LastModified; - std::string Etag; - int64_t Quota = int64_t(); - Azure::Core::Nullable ProvisionedIops; - Azure::Core::Nullable ProvisionedIngressMBps; - Azure::Core::Nullable ProvisionedEgressMBps; - Azure::Core::Nullable NextAllowedQuotaDowngradeTime; - std::string DeletedTime; - int32_t RemainingRetentionDays = int32_t(); - LeaseStatusType LeaseStatus; - LeaseStateType LeaseState; - LeaseDurationType LeaseDuration; - }; - - typedef std::map Metadata; - - // A listed Azure Storage share item. - struct ShareItem - { - std::string Name; - std::string Snapshot; - bool Deleted = bool(); - std::string Version; - ShareProperties Properties; - Metadata ShareMetadata; - }; - - // An enumeration of shares. - struct ListSharesResponse - { - std::string ServiceEndpoint; - std::string Prefix; - std::string PreviousContinuationToken; - int32_t MaxResults = int32_t(); - std::vector ShareItems; - std::string ContinuationToken; - }; - - // The retention policy. - struct ShareRetentionPolicy - { - bool Enabled - = bool(); // Indicates whether a retention policy is enabled for the File service. If false, - // metrics data is retained, and the user is responsible for deleting it. - Azure::Core::Nullable - Days; // Indicates the number of days that metrics data should be retained. All data older - // than this value will be deleted. Metrics data is deleted on a best-effort basis - // after the retention period expires. - }; - - // Storage Analytics metrics for file service. - struct Metrics - { - std::string Version; // The version of Storage Analytics to configure. - bool Enabled = bool(); // Indicates whether metrics are enabled for the File service. - Azure::Core::Nullable IncludeApis; // Indicates whether metrics should generate summary - // statistics for called API operations. - ShareRetentionPolicy RetentionPolicy; - }; - - // Settings for SMB multichannel - struct SmbMultichannel - { - bool Enabled = bool(); // If SMB multichannel is enabled. - }; - - // An Azure Storage file range. - struct FileRange - { - int64_t Start = int64_t(); // Start of the range. - int64_t End = int64_t(); // End of the range. - }; - - // An Azure Storage file clear range. - struct ClearRange - { - int64_t Start = int64_t(); // Start of the range. - int64_t End = int64_t(); // End of the range. - }; - - // Settings for SMB protocol. - struct SmbSettings - { - SmbMultichannel Multichannel; // Settings for SMB Multichannel. - }; - - // Protocol settings - struct ShareProtocolSettings - { - SmbSettings Settings; // Settings for SMB protocol. - }; - - // The list of file ranges - struct ShareFileRangeList - { - std::vector Ranges; - std::vector ClearRanges; - }; - - // Stats for the share. - struct ShareStats - { - int64_t ShareUsageBytes - = int64_t(); // The approximate size of the data stored in bytes. Note that this value may - // not include all recently created or recently resized files. - }; - - // Signed identifier. - struct SignedIdentifier - { - std::string Id; // A unique id. - AccessPolicy Policy; // The access policy. - }; - - // Storage service properties. - struct StorageServiceProperties - { - Metrics HourMetrics; // A summary of request statistics grouped by API in hourly aggregates for - // files. - Metrics MinuteMetrics; // A summary of request statistics grouped by API in minute aggregates - // for files. - std::vector Cors; // The set of CORS rules. - Azure::Core::Nullable Protocol; // Protocol settings - }; - - // A permission (a security descriptor) at the share level. - struct SharePermission - { - std::string Permission; // The permission in the Security Descriptor Definition Language (SDDL). - }; - - // Describes what lease action to take. - enum class LeaseAction - { - Acquire, - Release, - Change, - Renew, - Break, - Unknown - }; - - // State of the copy operation identified by 'x-ms-copy-id'. - enum class CopyStatusType - { - Pending, - Success, - Aborted, - Failed, - Unknown - }; - - // Specify one of the following options: - Update: Writes the bytes specified by the request body - // into the specified range. The Range and Content-Length headers must match to perform the - // update. - Clear: Clears the specified range and releases the space used in storage for that - // range. To clear a range, set the Content-Length header to zero, and set the Range header to a - // value that indicates the range to clear, up to maximum file size. - enum class FileRangeWriteType - { - Update, - Clear, - Unknown - }; - - struct ServiceSetPropertiesResult - { - }; - - struct ServiceGetPropertiesResult - { - Metrics HourMetrics; - Metrics MinuteMetrics; - std::vector Cors; - Azure::Core::Nullable Protocol; - }; - - struct ServiceListSharesSegmentResult - { - std::string ServiceEndpoint; - std::string Prefix; - std::string PreviousContinuationToken; - int32_t MaxResults = int32_t(); - std::vector ShareItems; - std::string ContinuationToken; - }; - - struct ShareCreateResult - { - std::string ETag; - std::string LastModified; - }; - - struct ShareGetPropertiesResult - { - std::map Metadata; - std::string ETag; - std::string LastModified; - int64_t Quota = int64_t(); - Azure::Core::Nullable ProvisionedIops; - Azure::Core::Nullable ProvisionedIngressMBps; - Azure::Core::Nullable ProvisionedEgressMBps; - Azure::Core::Nullable NextAllowedQuotaDowngradeTime; - Azure::Core::Nullable LeaseDuration; - Azure::Core::Nullable LeaseState; - Azure::Core::Nullable LeaseStatus; - }; - - struct ShareDeleteResult - { - }; - - struct ShareAcquireLeaseResult - { - std::string ETag; - std::string LastModified; - Azure::Core::Nullable LeaseTime; - std::string LeaseId; - }; - - struct ShareReleaseLeaseResult - { - std::string ETag; - std::string LastModified; - Azure::Core::Nullable LeaseTime; - }; - - struct ShareChangeLeaseResult - { - std::string ETag; - std::string LastModified; - Azure::Core::Nullable LeaseTime; - std::string LeaseId; - }; - - struct ShareRenewLeaseResult - { - std::string ETag; - std::string LastModified; - Azure::Core::Nullable LeaseTime; - std::string LeaseId; - }; - - struct ShareBreakLeaseResult - { - std::string ETag; - std::string LastModified; - int32_t LeaseTime = int32_t(); - Azure::Core::Nullable LeaseId; - }; - - struct ShareCreateSnapshotResult - { - std::string Snapshot; - std::string ETag; - std::string LastModified; - }; - - struct ShareCreatePermissionResult - { - std::string FilePermissionKey; - }; - - struct ShareGetPermissionResult - { - std::string Permission; - }; - - struct ShareSetQuotaResult - { - std::string ETag; - std::string LastModified; - }; - - struct ShareSetMetadataResult - { - std::string ETag; - std::string LastModified; - }; - - struct ShareGetAccessPolicyResult - { - std::vector SignedIdentifiers; - std::string ETag; - std::string LastModified; - }; - - struct ShareSetAccessPolicyResult - { - std::string ETag; - std::string LastModified; - }; - - struct ShareGetStatisticsResult - { - int64_t ShareUsageBytes = int64_t(); - std::string ETag; - std::string LastModified; - }; - - struct ShareRestoreResult - { - std::string ETag; - std::string LastModified; - }; - - struct DirectoryCreateResult - { - std::string ETag; - std::string LastModified; - bool IsServerEncrypted = bool(); - std::string FilePermissionKey; - std::string FileAttributes; - std::string FileCreationTime; - std::string FileLastWriteTime; - std::string FileChangeTime; - std::string FileId; - std::string FileParentId; - }; - - struct DirectoryGetPropertiesResult - { - std::map Metadata; - std::string ETag; - std::string LastModified; - bool IsServerEncrypted = bool(); - std::string FileAttributes; - std::string FileCreationTime; - std::string FileLastWriteTime; - std::string FileChangeTime; - std::string FilePermissionKey; - std::string FileId; - std::string FileParentId; - }; - - struct DirectoryDeleteResult - { - }; - - struct DirectorySetPropertiesResult - { - std::string ETag; - std::string LastModified; - bool IsServerEncrypted = bool(); - std::string FilePermissionKey; - std::string FileAttributes; - std::string FileCreationTime; - std::string FileLastWriteTime; - std::string FileChangeTime; - std::string FileId; - std::string FileParentId; - }; - - struct DirectorySetMetadataResult - { - std::string ETag; - bool IsServerEncrypted = bool(); - }; - - struct DirectoryListFilesAndDirectoriesSegmentResult - { - std::string ServiceEndpoint; - std::string ShareName; - std::string ShareSnapshot; - std::string DirectoryPath; - std::string Prefix; - std::string PreviousContinuationToken; - int32_t MaxResults = int32_t(); - FilesAndDirectoriesListSegment Segment; - std::string ContinuationToken; - FileShareHttpHeaders HttpHeaders; - }; - - struct DirectoryListHandlesResult - { - std::vector HandleList; - std::string ContinuationToken; - FileShareHttpHeaders HttpHeaders; - }; - - struct DirectoryForceCloseHandlesResult - { - Azure::Core::Nullable ContinuationToken; - int32_t numberOfHandlesClosed = int32_t(); - int32_t numberOfHandlesFailedToClose = int32_t(); - }; - - struct FileCreateResult - { - std::string ETag; - std::string LastModified; - bool IsServerEncrypted = bool(); - std::string FilePermissionKey; - std::string FileAttributes; - std::string FileCreationTime; - std::string FileLastWriteTime; - std::string FileChangeTime; - std::string FileId; - std::string FileParentId; - }; - - struct FileDownloadResult - { - std::unique_ptr BodyStream; - std::string LastModified; - std::map Metadata; - int64_t ContentLength = int64_t(); - FileShareHttpHeaders HttpHeaders; - Azure::Core::Nullable ContentRange; - std::string ETag; - Azure::Core::Nullable TransactionalContentMd5; - std::string AcceptRanges; - Azure::Core::Nullable CopyCompletionTime; - Azure::Core::Nullable CopyStatusDescription; - Azure::Core::Nullable CopyId; - Azure::Core::Nullable CopyProgress; - Azure::Core::Nullable CopySource; - Azure::Core::Nullable CopyStatus; - Azure::Core::Nullable IsServerEncrypted; - std::string FileAttributes; - std::string FileCreationTime; - std::string FileLastWriteTime; - std::string FileChangeTime; - std::string FilePermissionKey; - std::string FileId; - std::string FileParentId; - Azure::Core::Nullable LeaseDuration; - Azure::Core::Nullable LeaseState; - Azure::Core::Nullable LeaseStatus; - }; - - struct FileGetPropertiesResult - { - std::string LastModified; - std::map Metadata; - std::string FileType; - int64_t ContentLength = int64_t(); - FileShareHttpHeaders HttpHeaders; - std::string ETag; - Azure::Core::Nullable CopyCompletionTime; - Azure::Core::Nullable CopyStatusDescription; - Azure::Core::Nullable CopyId; - Azure::Core::Nullable CopyProgress; - Azure::Core::Nullable CopySource; - Azure::Core::Nullable CopyStatus; - Azure::Core::Nullable IsServerEncrypted; - std::string FileAttributes; - std::string FileCreationTime; - std::string FileLastWriteTime; - std::string FileChangeTime; - std::string FilePermissionKey; - std::string FileId; - std::string FileParentId; - Azure::Core::Nullable LeaseDuration; - Azure::Core::Nullable LeaseState; - Azure::Core::Nullable LeaseStatus; - }; - - struct FileDeleteResult - { - }; - - struct FileSetHttpHeadersResult - { - std::string ETag; - std::string LastModified; - bool IsServerEncrypted = bool(); - std::string FilePermissionKey; - std::string FileAttributes; - std::string FileCreationTime; - std::string FileLastWriteTime; - std::string FileChangeTime; - std::string FileId; - std::string FileParentId; - }; - - struct FileSetMetadataResult - { - std::string ETag; - bool IsServerEncrypted = bool(); - }; - - struct FileAcquireLeaseResult - { - std::string ETag; - std::string LastModified; - std::string LeaseId; - }; - - struct FileReleaseLeaseResult - { - std::string ETag; - std::string LastModified; - }; - - struct FileChangeLeaseResult - { - std::string ETag; - std::string LastModified; - std::string LeaseId; - }; - - struct FileBreakLeaseResult - { - std::string ETag; - std::string LastModified; - Azure::Core::Nullable LeaseId; - }; - - struct FileUploadRangeResult - { - std::string ETag; - std::string LastModified; - std::string TransactionalContentMd5; - bool IsServerEncrypted = bool(); - }; - - struct FileUploadRangeFromUrlResult - { - std::string ETag; - std::string LastModified; - std::string XMsContentCrc64; - bool IsServerEncrypted = bool(); - }; - - struct FileGetRangeListResult - { - std::vector Ranges; - std::vector ClearRanges; - std::string LastModified; - std::string ETag; - int64_t FileContentLength = int64_t(); - }; - - struct FileStartCopyResult - { - std::string ETag; - std::string LastModified; - std::string CopyId; - CopyStatusType CopyStatus = CopyStatusType::Unknown; - }; - - struct FileAbortCopyResult - { - }; - - struct FileListHandlesResult - { - std::vector HandleList; - std::string ContinuationToken; - FileShareHttpHeaders HttpHeaders; - }; - - struct FileForceCloseHandlesResult - { - Azure::Core::Nullable ContinuationToken; - int32_t numberOfHandlesClosed = int32_t(); - int32_t numberOfHandlesFailedToClose = int32_t(); - }; + inline ListSharesIncludeType& operator|=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) + { + lhs = lhs | rhs; + return lhs; + } + + inline ListSharesIncludeType operator&(ListSharesIncludeType lhs, ListSharesIncludeType rhs) + { + using type = std::underlying_type_t; + return static_cast(static_cast(lhs) & static_cast(rhs)); + } + + inline ListSharesIncludeType& operator&=(ListSharesIncludeType& lhs, ListSharesIncludeType rhs) + { + lhs = lhs & rhs; + return lhs; + } + inline std::string ListSharesIncludeTypeToString(const Models::ListSharesIncludeType& val) + { + Models::ListSharesIncludeType value_list[] = { + ListSharesIncludeType::Snapshots, + ListSharesIncludeType::Metadata, + ListSharesIncludeType::Deleted, + }; + const char* string_list[] = { + "snapshots", + "metadata", + "deleted", + }; + std::string result; + for (std::size_t i = 0; i < sizeof(value_list) / sizeof(Models::ListSharesIncludeType); ++i) + { + if ((val & value_list[i]) == value_list[i]) + { + if (!result.empty()) + { + result += ","; + } + result += string_list[i]; + } + } + return result; + } + + } // namespace Models namespace Details { inline std::string PermissionCopyModeTypeToString( - const PermissionCopyModeType& permissionCopyModeType) + const Models::PermissionCopyModeType& permissionCopyModeType) { switch (permissionCopyModeType) { - case PermissionCopyModeType::Source: + case Models::PermissionCopyModeType::Source: return "source"; - case PermissionCopyModeType::Override: + case Models::PermissionCopyModeType::Override: return "override"; default: return std::string(); } } - inline PermissionCopyModeType PermissionCopyModeTypeFromString( + inline Models::PermissionCopyModeType PermissionCopyModeTypeFromString( const std::string& permissionCopyModeType) { if (permissionCopyModeType == "source") { - return PermissionCopyModeType::Source; + return Models::PermissionCopyModeType::Source; } if (permissionCopyModeType == "override") { - return PermissionCopyModeType::Override; + return Models::PermissionCopyModeType::Override; } throw std::runtime_error( "Cannot convert " + permissionCopyModeType + " to PermissionCopyModeType"); } inline std::string DeleteSnapshotsOptionTypeToString( - const DeleteSnapshotsOptionType& deleteSnapshotsOptionType) + const Models::DeleteSnapshotsOptionType& deleteSnapshotsOptionType) { switch (deleteSnapshotsOptionType) { - case DeleteSnapshotsOptionType::Include: + case Models::DeleteSnapshotsOptionType::Include: return "include"; default: return std::string(); } } - inline DeleteSnapshotsOptionType DeleteSnapshotsOptionTypeFromString( + inline Models::DeleteSnapshotsOptionType DeleteSnapshotsOptionTypeFromString( const std::string& deleteSnapshotsOptionType) { if (deleteSnapshotsOptionType == "include") { - return DeleteSnapshotsOptionType::Include; + return Models::DeleteSnapshotsOptionType::Include; } throw std::runtime_error( "Cannot convert " + deleteSnapshotsOptionType + " to DeleteSnapshotsOptionType"); } inline std::string FileRangeWriteFromUrlTypeToString( - const FileRangeWriteFromUrlType& fileRangeWriteFromUrlType) + const Models::FileRangeWriteFromUrlType& fileRangeWriteFromUrlType) { switch (fileRangeWriteFromUrlType) { - case FileRangeWriteFromUrlType::Update: + case Models::FileRangeWriteFromUrlType::Update: return "update"; default: return std::string(); } } - inline FileRangeWriteFromUrlType FileRangeWriteFromUrlTypeFromString( + inline Models::FileRangeWriteFromUrlType FileRangeWriteFromUrlTypeFromString( const std::string& fileRangeWriteFromUrlType) { if (fileRangeWriteFromUrlType == "update") { - return FileRangeWriteFromUrlType::Update; + return Models::FileRangeWriteFromUrlType::Update; } throw std::runtime_error( "Cannot convert " + fileRangeWriteFromUrlType + " to FileRangeWriteFromUrlType"); } - inline std::string LeaseDurationTypeToString(const LeaseDurationType& leaseDurationType) + inline std::string LeaseDurationTypeToString(const Models::LeaseDurationType& leaseDurationType) { switch (leaseDurationType) { - case LeaseDurationType::Infinite: + case Models::LeaseDurationType::Infinite: return "infinite"; - case LeaseDurationType::Fixed: + case Models::LeaseDurationType::Fixed: return "fixed"; default: return std::string(); } } - inline LeaseDurationType LeaseDurationTypeFromString(const std::string& leaseDurationType) + inline Models::LeaseDurationType LeaseDurationTypeFromString( + const std::string& leaseDurationType) { if (leaseDurationType == "infinite") { - return LeaseDurationType::Infinite; + return Models::LeaseDurationType::Infinite; } if (leaseDurationType == "fixed") { - return LeaseDurationType::Fixed; + return Models::LeaseDurationType::Fixed; } throw std::runtime_error("Cannot convert " + leaseDurationType + " to LeaseDurationType"); } - inline std::string LeaseStateTypeToString(const LeaseStateType& leaseStateType) + inline std::string LeaseStateTypeToString(const Models::LeaseStateType& leaseStateType) { switch (leaseStateType) { - case LeaseStateType::Available: + case Models::LeaseStateType::Available: return "available"; - case LeaseStateType::Leased: + case Models::LeaseStateType::Leased: return "leased"; - case LeaseStateType::Expired: + case Models::LeaseStateType::Expired: return "expired"; - case LeaseStateType::Breaking: + case Models::LeaseStateType::Breaking: return "breaking"; - case LeaseStateType::Broken: + case Models::LeaseStateType::Broken: return "broken"; default: return std::string(); } } - inline LeaseStateType LeaseStateTypeFromString(const std::string& leaseStateType) + inline Models::LeaseStateType LeaseStateTypeFromString(const std::string& leaseStateType) { if (leaseStateType == "available") { - return LeaseStateType::Available; + return Models::LeaseStateType::Available; } if (leaseStateType == "leased") { - return LeaseStateType::Leased; + return Models::LeaseStateType::Leased; } if (leaseStateType == "expired") { - return LeaseStateType::Expired; + return Models::LeaseStateType::Expired; } if (leaseStateType == "breaking") { - return LeaseStateType::Breaking; + return Models::LeaseStateType::Breaking; } if (leaseStateType == "broken") { - return LeaseStateType::Broken; + return Models::LeaseStateType::Broken; } throw std::runtime_error("Cannot convert " + leaseStateType + " to LeaseStateType"); } - inline std::string LeaseStatusTypeToString(const LeaseStatusType& leaseStatusType) + inline std::string LeaseStatusTypeToString(const Models::LeaseStatusType& leaseStatusType) { switch (leaseStatusType) { - case LeaseStatusType::Locked: + case Models::LeaseStatusType::Locked: return "locked"; - case LeaseStatusType::Unlocked: + case Models::LeaseStatusType::Unlocked: return "unlocked"; default: return std::string(); } } - inline LeaseStatusType LeaseStatusTypeFromString(const std::string& leaseStatusType) + inline Models::LeaseStatusType LeaseStatusTypeFromString(const std::string& leaseStatusType) { if (leaseStatusType == "locked") { - return LeaseStatusType::Locked; + return Models::LeaseStatusType::Locked; } if (leaseStatusType == "unlocked") { - return LeaseStatusType::Unlocked; + return Models::LeaseStatusType::Unlocked; } throw std::runtime_error("Cannot convert " + leaseStatusType + " to LeaseStatusType"); } - inline std::string LeaseActionToString(const LeaseAction& leaseAction) + inline std::string LeaseActionToString(const Models::LeaseAction& leaseAction) { switch (leaseAction) { - case LeaseAction::Acquire: + case Models::LeaseAction::Acquire: return "acquire"; - case LeaseAction::Release: + case Models::LeaseAction::Release: return "release"; - case LeaseAction::Change: + case Models::LeaseAction::Change: return "change"; - case LeaseAction::Renew: + case Models::LeaseAction::Renew: return "renew"; - case LeaseAction::Break: + case Models::LeaseAction::Break: return "break"; default: return std::string(); } } - inline LeaseAction LeaseActionFromString(const std::string& leaseAction) + inline Models::LeaseAction LeaseActionFromString(const std::string& leaseAction) { if (leaseAction == "acquire") { - return LeaseAction::Acquire; + return Models::LeaseAction::Acquire; } if (leaseAction == "release") { - return LeaseAction::Release; + return Models::LeaseAction::Release; } if (leaseAction == "change") { - return LeaseAction::Change; + return Models::LeaseAction::Change; } if (leaseAction == "renew") { - return LeaseAction::Renew; + return Models::LeaseAction::Renew; } if (leaseAction == "break") { - return LeaseAction::Break; + return Models::LeaseAction::Break; } throw std::runtime_error("Cannot convert " + leaseAction + " to LeaseAction"); } - inline std::string CopyStatusTypeToString(const CopyStatusType& copyStatusType) + inline std::string CopyStatusTypeToString(const Models::CopyStatusType& copyStatusType) { switch (copyStatusType) { - case CopyStatusType::Pending: + case Models::CopyStatusType::Pending: return "pending"; - case CopyStatusType::Success: + case Models::CopyStatusType::Success: return "success"; - case CopyStatusType::Aborted: + case Models::CopyStatusType::Aborted: return "aborted"; - case CopyStatusType::Failed: + case Models::CopyStatusType::Failed: return "failed"; default: return std::string(); } } - inline CopyStatusType CopyStatusTypeFromString(const std::string& copyStatusType) + inline Models::CopyStatusType CopyStatusTypeFromString(const std::string& copyStatusType) { if (copyStatusType == "pending") { - return CopyStatusType::Pending; + return Models::CopyStatusType::Pending; } if (copyStatusType == "success") { - return CopyStatusType::Success; + return Models::CopyStatusType::Success; } if (copyStatusType == "aborted") { - return CopyStatusType::Aborted; + return Models::CopyStatusType::Aborted; } if (copyStatusType == "failed") { - return CopyStatusType::Failed; + return Models::CopyStatusType::Failed; } throw std::runtime_error("Cannot convert " + copyStatusType + " to CopyStatusType"); } - inline std::string FileRangeWriteTypeToString(const FileRangeWriteType& fileRangeWriteType) + inline std::string FileRangeWriteTypeToString( + const Models::FileRangeWriteType& fileRangeWriteType) { switch (fileRangeWriteType) { - case FileRangeWriteType::Update: + case Models::FileRangeWriteType::Update: return "update"; - case FileRangeWriteType::Clear: + case Models::FileRangeWriteType::Clear: return "clear"; default: return std::string(); } } - inline FileRangeWriteType FileRangeWriteTypeFromString(const std::string& fileRangeWriteType) + inline Models::FileRangeWriteType FileRangeWriteTypeFromString( + const std::string& fileRangeWriteType) { if (fileRangeWriteType == "update") { - return FileRangeWriteType::Update; + return Models::FileRangeWriteType::Update; } if (fileRangeWriteType == "clear") { - return FileRangeWriteType::Clear; + return Models::FileRangeWriteType::Clear; } throw std::runtime_error("Cannot convert " + fileRangeWriteType + " to FileRangeWriteType"); } @@ -1185,7 +1191,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { public: struct SetPropertiesOptions { - StorageServiceProperties ServiceProperties; // The StorageService properties. + Models::StorageServiceProperties ServiceProperties; // The StorageService properties. Azure::Core::Nullable Timeout; // The timeout parameter is expressed in seconds. // For more information, see SetProperties( + static Azure::Core::Response SetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1239,7 +1245,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1274,7 +1280,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { MaxResults; // Specifies the maximum number of entries to return. If the request does // not specify maxresults, or specifies a value greater than 5,000, the // server will return up to 5,000 items. - Azure::Core::Nullable + Azure::Core::Nullable ListSharesInclude; // Include this parameter to specify one or more datasets to // include in the response. Azure::Core::Nullable @@ -1287,7 +1293,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response ListSharesSegment( + static Azure::Core::Response ListSharesSegment( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -1320,7 +1326,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { request.GetUrl().AppendQueryParameter( Details::c_QueryListSharesInclude, - Storage::Details::UrlEncodeQueryParameter(ListSharesIncludeTypeToString( + Storage::Details::UrlEncodeQueryParameter(Models::ListSharesIncludeTypeToString( listSharesSegmentOptions.ListSharesInclude.GetValue()))); } if (listSharesSegmentOptions.Timeout.HasValue()) @@ -1335,7 +1341,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response SetPropertiesParseResult( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1343,8 +1349,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted) - ServiceSetPropertiesResult result; - return Azure::Core::Response( + Models::ServiceSetPropertiesResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1356,7 +1362,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void ShareRetentionPolicyToXml( Storage::Details::XmlWriter& writer, - const ShareRetentionPolicy& object) + const Models::ShareRetentionPolicy& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); @@ -1375,7 +1381,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static void MetricsToXml(Storage::Details::XmlWriter& writer, const Metrics& object) + static void MetricsToXml(Storage::Details::XmlWriter& writer, const Models::Metrics& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Version"}); @@ -1403,7 +1409,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void CorsRuleToXml(Storage::Details::XmlWriter& writer, const CorsRule& object) + static void CorsRuleToXml( + Storage::Details::XmlWriter& writer, + const Models::CorsRule& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "CorsRule"}); @@ -1439,7 +1447,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void SmbMultichannelToXml( Storage::Details::XmlWriter& writer, - const SmbMultichannel& object) + const Models::SmbMultichannel& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Multichannel"}); @@ -1451,7 +1459,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void SmbSettingsToXml(Storage::Details::XmlWriter& writer, const SmbSettings& object) + static void SmbSettingsToXml( + Storage::Details::XmlWriter& writer, + const Models::SmbSettings& object) { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "SMB"}); SmbMultichannelToXml(writer, object.Multichannel); @@ -1460,7 +1470,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void ShareProtocolSettingsToXml( Storage::Details::XmlWriter& writer, - const ShareProtocolSettings& object) + const Models::ShareProtocolSettings& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "ProtocolSettings"}); @@ -1470,7 +1480,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void StorageServicePropertiesToXml( Storage::Details::XmlWriter& writer, - const StorageServiceProperties& object) + const Models::StorageServiceProperties& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "StorageServiceProperties"}); @@ -1498,7 +1508,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -1509,11 +1519,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ServiceGetPropertiesResult result = bodyBuffer.empty() - ? ServiceGetPropertiesResult() + Models::ServiceGetPropertiesResult result = bodyBuffer.empty() + ? Models::ServiceGetPropertiesResult() : ServiceGetPropertiesResultFromStorageServiceProperties( StorageServicePropertiesFromXml(reader)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -1523,9 +1533,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static ShareRetentionPolicy ShareRetentionPolicyFromXml(Storage::Details::XmlReader& reader) + static Models::ShareRetentionPolicy ShareRetentionPolicyFromXml( + Storage::Details::XmlReader& reader) { - auto result = ShareRetentionPolicy(); + auto result = Models::ShareRetentionPolicy(); enum class XmlTagName { c_Days, @@ -1583,9 +1594,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Metrics MetricsFromXml(Storage::Details::XmlReader& reader) + static Models::Metrics MetricsFromXml(Storage::Details::XmlReader& reader) { - auto result = Metrics(); + auto result = Models::Metrics(); enum class XmlTagName { c_Enabled, @@ -1663,9 +1674,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static CorsRule CorsRuleFromXml(Storage::Details::XmlReader& reader) + static Models::CorsRule CorsRuleFromXml(Storage::Details::XmlReader& reader) { - auto result = CorsRule(); + auto result = Models::CorsRule(); enum class XmlTagName { c_AllowedHeaders, @@ -1750,9 +1761,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static SmbMultichannel SmbMultichannelFromXml(Storage::Details::XmlReader& reader) + static Models::SmbMultichannel SmbMultichannelFromXml(Storage::Details::XmlReader& reader) { - auto result = SmbMultichannel(); + auto result = Models::SmbMultichannel(); enum class XmlTagName { c_Enabled, @@ -1801,9 +1812,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static SmbSettings SmbSettingsFromXml(Storage::Details::XmlReader& reader) + static Models::SmbSettings SmbSettingsFromXml(Storage::Details::XmlReader& reader) { - auto result = SmbSettings(); + auto result = Models::SmbSettings(); enum class XmlTagName { c_Multichannel, @@ -1854,10 +1865,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareProtocolSettings ShareProtocolSettingsFromXml( + static Models::ShareProtocolSettings ShareProtocolSettingsFromXml( Storage::Details::XmlReader& reader) { - auto result = ShareProtocolSettings(); + auto result = Models::ShareProtocolSettings(); enum class XmlTagName { c_SMB, @@ -1908,10 +1919,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static StorageServiceProperties StorageServicePropertiesFromXml( + static Models::StorageServiceProperties StorageServicePropertiesFromXml( Storage::Details::XmlReader& reader) { - auto result = StorageServiceProperties(); + auto result = Models::StorageServiceProperties(); enum class XmlTagName { c_Cors, @@ -2009,10 +2020,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ServiceGetPropertiesResult ServiceGetPropertiesResultFromStorageServiceProperties( - StorageServiceProperties object) + static Models::ServiceGetPropertiesResult + ServiceGetPropertiesResultFromStorageServiceProperties( + Models::StorageServiceProperties object) { - ServiceGetPropertiesResult result; + Models::ServiceGetPropertiesResult result; result.HourMetrics = std::move(object.HourMetrics); result.MinuteMetrics = std::move(object.MinuteMetrics); result.Cors = std::move(object.Cors); @@ -2020,7 +2032,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Azure::Core::Response ListSharesSegmentParseResult( + static Azure::Core::Response + ListSharesSegmentParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -2031,11 +2044,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ServiceListSharesSegmentResult result = bodyBuffer.empty() - ? ServiceListSharesSegmentResult() + Models::ServiceListSharesSegmentResult result = bodyBuffer.empty() + ? Models::ServiceListSharesSegmentResult() : ServiceListSharesSegmentResultFromListSharesResponse( ListSharesResponseFromXml(reader)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -2045,9 +2058,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static LeaseStatusType LeaseStatusTypeFromXml(Storage::Details::XmlReader& reader) + static Models::LeaseStatusType LeaseStatusTypeFromXml(Storage::Details::XmlReader& reader) { - auto result = LeaseStatusType::Unknown; + auto result = Models::LeaseStatusType::Unknown; enum class XmlTagName { c_LeaseStatus, @@ -2096,9 +2109,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static LeaseStateType LeaseStateTypeFromXml(Storage::Details::XmlReader& reader) + static Models::LeaseStateType LeaseStateTypeFromXml(Storage::Details::XmlReader& reader) { - auto result = LeaseStateType::Unknown; + auto result = Models::LeaseStateType::Unknown; enum class XmlTagName { c_LeaseState, @@ -2147,9 +2160,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static LeaseDurationType LeaseDurationTypeFromXml(Storage::Details::XmlReader& reader) + static Models::LeaseDurationType LeaseDurationTypeFromXml( + Storage::Details::XmlReader& reader) { - auto result = LeaseDurationType::Unknown; + auto result = Models::LeaseDurationType::Unknown; enum class XmlTagName { c_LeaseDuration, @@ -2198,9 +2212,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareProperties SharePropertiesFromXml(Storage::Details::XmlReader& reader) + static Models::ShareProperties SharePropertiesFromXml(Storage::Details::XmlReader& reader) { - auto result = ShareProperties(); + auto result = Models::ShareProperties(); enum class XmlTagName { c_DeletedTime, @@ -2387,9 +2401,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareItem ShareItemFromXml(Storage::Details::XmlReader& reader) + static Models::ShareItem ShareItemFromXml(Storage::Details::XmlReader& reader) { - auto result = ShareItem(); + auto result = Models::ShareItem(); enum class XmlTagName { c_Deleted, @@ -2486,9 +2500,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ListSharesResponse ListSharesResponseFromXml(Storage::Details::XmlReader& reader) + static Models::ListSharesResponse ListSharesResponseFromXml( + Storage::Details::XmlReader& reader) { - auto result = ListSharesResponse(); + auto result = Models::ListSharesResponse(); enum class XmlTagName { c_EnumerationResults, @@ -2600,10 +2615,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ServiceListSharesSegmentResult ServiceListSharesSegmentResultFromListSharesResponse( - ListSharesResponse object) + static Models::ServiceListSharesSegmentResult + ServiceListSharesSegmentResultFromListSharesResponse(Models::ListSharesResponse object) { - ServiceListSharesSegmentResult result; + Models::ServiceListSharesSegmentResult result; result.ServiceEndpoint = std::move(object.ServiceEndpoint); result.Prefix = std::move(object.Prefix); result.PreviousContinuationToken = std::move(object.PreviousContinuationToken); @@ -2633,7 +2648,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2690,7 +2705,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2734,7 +2749,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::c_DefaultServiceApiVersion; // Specifies the version of the operation to // use for this request. - Azure::Core::Nullable + Azure::Core::Nullable XMsDeleteSnapshots; // Specifies the option include to delete the base share and all // of its snapshots. Azure::Core::Nullable @@ -2742,7 +2757,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2807,7 +2822,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response AcquireLease( + static Azure::Core::Response AcquireLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2869,7 +2884,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response ReleaseLease( + static Azure::Core::Response ReleaseLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2930,7 +2945,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response ChangeLease( + static Azure::Core::Response ChangeLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -2991,7 +3006,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response RenewLease( + static Azure::Core::Response RenewLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3058,7 +3073,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // present, specifies the share snapshot to query. }; - static Azure::Core::Response BreakLease( + static Azure::Core::Response BreakLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3117,7 +3132,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response CreateSnapshot( + static Azure::Core::Response CreateSnapshot( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3162,10 +3177,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ApiVersionParameter = Details::c_DefaultServiceApiVersion; // Specifies the version of the operation to // use for this request. - SharePermission Permission; // A permission (a security descriptor) at the share level. + Models::SharePermission + Permission; // A permission (a security descriptor) at the share level. }; - static Azure::Core::Response CreatePermission( + static Azure::Core::Response CreatePermission( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3209,7 +3225,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response GetPermission( + static Azure::Core::Response GetPermission( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3248,7 +3264,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response SetQuota( + static Azure::Core::Response SetQuota( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3295,7 +3311,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3350,7 +3366,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response GetAccessPolicy( + static Azure::Core::Response GetAccessPolicy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3377,7 +3393,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct SetAccessPolicyOptions { - std::vector ShareAcl; // The ACL for the share. + std::vector ShareAcl; // The ACL for the share. Azure::Core::Nullable Timeout; // The timeout parameter is expressed in seconds. // For more information, see SetAccessPolicy( + static Azure::Core::Response SetAccessPolicy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3442,7 +3458,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response GetStatistics( + static Azure::Core::Response GetStatistics( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3487,7 +3503,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { DeletedShareVersion; // Specifies the version of the preivously-deleted share. }; - static Azure::Core::Response Restore( + static Azure::Core::Response Restore( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -3525,7 +3541,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3533,10 +3549,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share created. - ShareCreateResult result; + Models::ShareCreateResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3546,7 +3562,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3554,7 +3570,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - ShareGetPropertiesResult result; + Models::ShareGetPropertiesResult result; for (auto i = response.GetHeaders().lower_bound(Details::c_HeaderMetadata); i != response.GetHeaders().end() @@ -3608,7 +3624,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseStatus = LeaseStatusTypeFromString( response.GetHeaders().at(Details::c_HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3618,7 +3634,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3626,8 +3642,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Accepted - ShareDeleteResult result; - return Azure::Core::Response( + Models::ShareDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3637,7 +3653,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AcquireLeaseParseResult( + static Azure::Core::Response AcquireLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3645,7 +3661,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The Acquire operation completed successfully. - ShareAcquireLeaseResult result; + Models::ShareAcquireLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderLeaseTime) @@ -3654,7 +3670,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::c_HeaderLeaseTime)); } result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3664,7 +3680,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ReleaseLeaseParseResult( + static Azure::Core::Response ReleaseLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3672,7 +3688,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Release operation completed successfully. - ShareReleaseLeaseResult result; + Models::ShareReleaseLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderLeaseTime) @@ -3680,7 +3696,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::c_HeaderLeaseTime)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3690,7 +3706,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ChangeLeaseParseResult( + static Azure::Core::Response ChangeLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3698,7 +3714,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Change operation completed successfully. - ShareChangeLeaseResult result; + Models::ShareChangeLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderLeaseTime) @@ -3707,7 +3723,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::c_HeaderLeaseTime)); } result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3717,7 +3733,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response RenewLeaseParseResult( + static Azure::Core::Response RenewLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3725,7 +3741,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Renew operation completed successfully. - ShareRenewLeaseResult result; + Models::ShareRenewLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderLeaseTime) @@ -3734,7 +3750,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseTime = std::stoi(response.GetHeaders().at(Details::c_HeaderLeaseTime)); } result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3744,7 +3760,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response BreakLeaseParseResult( + static Azure::Core::Response BreakLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3752,7 +3768,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The Break operation completed successfully. - ShareBreakLeaseResult result; + Models::ShareBreakLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderLeaseTime) @@ -3764,7 +3780,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3774,7 +3790,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response CreateSnapshotParseResult( + static Azure::Core::Response CreateSnapshotParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3782,11 +3798,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share snapshot created. - ShareCreateSnapshotResult result; + Models::ShareCreateSnapshotResult result; result.Snapshot = response.GetHeaders().at(Details::c_HeaderSnapshot); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3796,7 +3812,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response CreatePermissionParseResult( + static Azure::Core::Response + CreatePermissionParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3804,9 +3821,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Share level permission created. - ShareCreatePermissionResult result; + Models::ShareCreatePermissionResult result; result.FilePermissionKey = response.GetHeaders().at(Details::c_HeaderFilePermissionKey); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3816,12 +3833,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static void SharePermissionToJson(nlohmann::json& node, const SharePermission& object) + static void SharePermissionToJson( + nlohmann::json& node, + const Models::SharePermission& object) { node["permission"] = object.Permission; } - static Azure::Core::Response GetPermissionParseResult( + static Azure::Core::Response GetPermissionParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3830,11 +3849,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success const auto& bodyBuffer = response.GetBody(); - ShareGetPermissionResult result = bodyBuffer.empty() - ? ShareGetPermissionResult() + Models::ShareGetPermissionResult result = bodyBuffer.empty() + ? Models::ShareGetPermissionResult() : ShareGetPermissionResultFromSharePermission( SharePermissionFromJson(nlohmann::json::parse(bodyBuffer))); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3844,22 +3863,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static SharePermission SharePermissionFromJson(const nlohmann::json& node) + static Models::SharePermission SharePermissionFromJson(const nlohmann::json& node) { - SharePermission result; + Models::SharePermission result; result.Permission = node["permission"].get(); return result; } - static ShareGetPermissionResult ShareGetPermissionResultFromSharePermission( - SharePermission object) + static Models::ShareGetPermissionResult ShareGetPermissionResultFromSharePermission( + Models::SharePermission object) { - ShareGetPermissionResult result; + Models::ShareGetPermissionResult result; result.Permission = std::move(object.Permission); return result; } - static Azure::Core::Response SetQuotaParseResult( + static Azure::Core::Response SetQuotaParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3867,10 +3886,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - ShareSetQuotaResult result; + Models::ShareSetQuotaResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3880,7 +3899,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResult( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3888,10 +3907,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - ShareSetMetadataResult result; + Models::ShareSetMetadataResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3901,7 +3920,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetAccessPolicyParseResult( + static Azure::Core::Response GetAccessPolicyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -3912,12 +3931,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ShareGetAccessPolicyResult result = bodyBuffer.empty() - ? ShareGetAccessPolicyResult() + Models::ShareGetAccessPolicyResult result = bodyBuffer.empty() + ? Models::ShareGetAccessPolicyResult() : ShareGetAccessPolicyResultFromSignedIdentifiers(SignedIdentifiersFromXml(reader)); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -3927,9 +3946,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static AccessPolicy AccessPolicyFromXml(Storage::Details::XmlReader& reader) + static Models::AccessPolicy AccessPolicyFromXml(Storage::Details::XmlReader& reader) { - auto result = AccessPolicy(); + auto result = Models::AccessPolicy(); enum class XmlTagName { c_Expiry, @@ -3996,9 +4015,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static SignedIdentifier SignedIdentifierFromXml(Storage::Details::XmlReader& reader) + static Models::SignedIdentifier SignedIdentifierFromXml(Storage::Details::XmlReader& reader) { - auto result = SignedIdentifier(); + auto result = Models::SignedIdentifier(); enum class XmlTagName { c_AccessPolicy, @@ -4058,10 +4077,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static std::vector SignedIdentifiersFromXml( + static std::vector SignedIdentifiersFromXml( Storage::Details::XmlReader& reader) { - auto result = std::vector(); + auto result = std::vector(); enum class XmlTagName { c_SignedIdentifier, @@ -4118,15 +4137,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareGetAccessPolicyResult ShareGetAccessPolicyResultFromSignedIdentifiers( - std::vector object) + static Models::ShareGetAccessPolicyResult ShareGetAccessPolicyResultFromSignedIdentifiers( + std::vector object) { - ShareGetAccessPolicyResult result; + Models::ShareGetAccessPolicyResult result; result.SignedIdentifiers = std::move(object); return result; } - static Azure::Core::Response SetAccessPolicyParseResult( + static Azure::Core::Response SetAccessPolicyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4134,10 +4153,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - ShareSetAccessPolicyResult result; + Models::ShareSetAccessPolicyResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4149,7 +4168,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void AccessPolicyToXml( Storage::Details::XmlWriter& writer, - const AccessPolicy& object) + const Models::AccessPolicy& object) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AccessPolicy"}); @@ -4172,7 +4191,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void SignedIdentifierToXml( Storage::Details::XmlWriter& writer, - const SignedIdentifier& object) + const Models::SignedIdentifier& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "SignedIdentifier"}); @@ -4186,7 +4205,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { static void SignedIdentifiersToXml( Storage::Details::XmlWriter& writer, - const std::vector& object) + const std::vector& object) { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::StartTag, "SignedIdentifiers"}); @@ -4196,7 +4215,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static Azure::Core::Response GetStatisticsParseResult( + static Azure::Core::Response GetStatisticsParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4207,12 +4226,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - ShareGetStatisticsResult result = bodyBuffer.empty() - ? ShareGetStatisticsResult() + Models::ShareGetStatisticsResult result = bodyBuffer.empty() + ? Models::ShareGetStatisticsResult() : ShareGetStatisticsResultFromShareStats(ShareStatsFromXml(reader)); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4222,9 +4241,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static ShareStats ShareStatsFromXml(Storage::Details::XmlReader& reader) + static Models::ShareStats ShareStatsFromXml(Storage::Details::XmlReader& reader) { - auto result = ShareStats(); + auto result = Models::ShareStats(); enum class XmlTagName { c_ShareStats, @@ -4279,14 +4298,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareGetStatisticsResult ShareGetStatisticsResultFromShareStats(ShareStats object) + static Models::ShareGetStatisticsResult ShareGetStatisticsResultFromShareStats( + Models::ShareStats object) { - ShareGetStatisticsResult result; + Models::ShareGetStatisticsResult result; result.ShareUsageBytes = object.ShareUsageBytes; return result; } - static Azure::Core::Response RestoreParseResult( + static Azure::Core::Response RestoreParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4294,10 +4314,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Created - ShareRestoreResult result; + Models::ShareRestoreResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4341,7 +4361,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { FileLastWriteTime; // Last write time for the file/directory. Default value: Now. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4403,7 +4423,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4441,7 +4461,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4489,7 +4509,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { FileLastWriteTime; // Last write time for the file/directory. Default value: Now. }; - static Azure::Core::Response SetProperties( + static Azure::Core::Response SetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4540,7 +4560,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4603,7 +4623,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response + static Azure::Core::Response ListFilesAndDirectoriesSegment( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, @@ -4683,7 +4703,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response ListHandles( + static Azure::Core::Response ListHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4756,7 +4776,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response ForceCloseHandles( + static Azure::Core::Response ForceCloseHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -4798,7 +4818,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4806,7 +4826,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, Directory created. - DirectoryCreateResult result; + Models::DirectoryCreateResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -4818,7 +4838,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4828,7 +4848,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4836,7 +4856,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - DirectoryGetPropertiesResult result; + Models::DirectoryGetPropertiesResult result; for (auto i = response.GetHeaders().lower_bound(Details::c_HeaderMetadata); i != response.GetHeaders().end() @@ -4856,7 +4876,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FilePermissionKey = response.GetHeaders().at(Details::c_HeaderFilePermissionKey); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4866,7 +4886,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4874,8 +4894,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted). - DirectoryDeleteResult result; - return Azure::Core::Response( + Models::DirectoryDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4885,7 +4905,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetPropertiesParseResult( + static Azure::Core::Response SetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4893,7 +4913,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - DirectorySetPropertiesResult result; + Models::DirectorySetPropertiesResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -4905,7 +4925,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4915,7 +4935,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResult( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -4923,11 +4943,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success (OK). - DirectorySetMetadataResult result; + Models::DirectorySetMetadataResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderRequestIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4937,7 +4957,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response + static Azure::Core::Response ListFilesAndDirectoriesSegmentParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) @@ -4949,12 +4969,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - DirectoryListFilesAndDirectoriesSegmentResult result = bodyBuffer.empty() - ? DirectoryListFilesAndDirectoriesSegmentResult() + Models::DirectoryListFilesAndDirectoriesSegmentResult result = bodyBuffer.empty() + ? Models::DirectoryListFilesAndDirectoriesSegmentResult() : DirectoryListFilesAndDirectoriesSegmentResultFromListFilesAndDirectoriesSegmentResponse( ListFilesAndDirectoriesSegmentResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::c_HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -4964,9 +4984,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static DirectoryItem DirectoryItemFromXml(Storage::Details::XmlReader& reader) + static Models::DirectoryItem DirectoryItemFromXml(Storage::Details::XmlReader& reader) { - auto result = DirectoryItem(); + auto result = Models::DirectoryItem(); enum class XmlTagName { c_Name, @@ -5015,9 +5035,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileProperty FilePropertyFromXml(Storage::Details::XmlReader& reader) + static Models::FileProperty FilePropertyFromXml(Storage::Details::XmlReader& reader) { - auto result = FileProperty(); + auto result = Models::FileProperty(); enum class XmlTagName { c_ContentLength, @@ -5066,9 +5086,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileItem FileItemFromXml(Storage::Details::XmlReader& reader) + static Models::FileItem FileItemFromXml(Storage::Details::XmlReader& reader) { - auto result = FileItem(); + auto result = Models::FileItem(); enum class XmlTagName { c_Name, @@ -5128,10 +5148,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FilesAndDirectoriesListSegment FilesAndDirectoriesListSegmentFromXml( + static Models::FilesAndDirectoriesListSegment FilesAndDirectoriesListSegmentFromXml( Storage::Details::XmlReader& reader) { - auto result = FilesAndDirectoriesListSegment(); + auto result = Models::FilesAndDirectoriesListSegment(); enum class XmlTagName { c_Directory, @@ -5191,10 +5211,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ListFilesAndDirectoriesSegmentResponse ListFilesAndDirectoriesSegmentResponseFromXml( - Storage::Details::XmlReader& reader) + static Models::ListFilesAndDirectoriesSegmentResponse + ListFilesAndDirectoriesSegmentResponseFromXml(Storage::Details::XmlReader& reader) { - auto result = ListFilesAndDirectoriesSegmentResponse(); + auto result = Models::ListFilesAndDirectoriesSegmentResponse(); enum class XmlTagName { c_Entries, @@ -5320,11 +5340,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static DirectoryListFilesAndDirectoriesSegmentResult + static Models::DirectoryListFilesAndDirectoriesSegmentResult DirectoryListFilesAndDirectoriesSegmentResultFromListFilesAndDirectoriesSegmentResponse( - ListFilesAndDirectoriesSegmentResponse object) + Models::ListFilesAndDirectoriesSegmentResponse object) { - DirectoryListFilesAndDirectoriesSegmentResult result; + Models::DirectoryListFilesAndDirectoriesSegmentResult result; result.ServiceEndpoint = std::move(object.ServiceEndpoint); result.ShareName = std::move(object.ShareName); result.ShareSnapshot = std::move(object.ShareSnapshot); @@ -5337,7 +5357,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Azure::Core::Response ListHandlesParseResult( + static Azure::Core::Response ListHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5348,12 +5368,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - DirectoryListHandlesResult result = bodyBuffer.empty() - ? DirectoryListHandlesResult() + Models::DirectoryListHandlesResult result = bodyBuffer.empty() + ? Models::DirectoryListHandlesResult() : DirectoryListHandlesResultFromListHandlesResponse( ListHandlesResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::c_HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5363,9 +5383,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) + static Models::HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) { - auto result = HandleItem(); + auto result = Models::HandleItem(); enum class XmlTagName { c_ClientIp, @@ -5477,9 +5497,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ListHandlesResponse ListHandlesResponseFromXml(Storage::Details::XmlReader& reader) + static Models::ListHandlesResponse ListHandlesResponseFromXml( + Storage::Details::XmlReader& reader) { - auto result = ListHandlesResponse(); + auto result = Models::ListHandlesResponse(); enum class XmlTagName { c_Entries, @@ -5550,16 +5571,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static DirectoryListHandlesResult DirectoryListHandlesResultFromListHandlesResponse( - ListHandlesResponse object) + static Models::DirectoryListHandlesResult DirectoryListHandlesResultFromListHandlesResponse( + Models::ListHandlesResponse object) { - DirectoryListHandlesResult result; + Models::DirectoryListHandlesResult result; result.HandleList = std::move(object.HandleList); result.ContinuationToken = std::move(object.ContinuationToken); return result; } - static Azure::Core::Response ForceCloseHandlesParseResult( + static Azure::Core::Response + ForceCloseHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -5567,7 +5589,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - DirectoryForceCloseHandlesResult result; + Models::DirectoryForceCloseHandlesResult result; if (response.GetHeaders().find(Details::c_HeaderContinuationToken) != response.GetHeaders().end()) { @@ -5578,7 +5600,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { = std::stoi(response.GetHeaders().at(Details::c_HeaderNumberOfHandlesClosed)); result.numberOfHandlesFailedToClose = std::stoi( response.GetHeaders().at(Details::c_HeaderNumberOfHandlesFailedToClose)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -5640,7 +5662,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response Create( + static Azure::Core::Response Create( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5744,7 +5766,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response Download( + static Azure::Core::Response Download( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5794,7 +5816,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response GetProperties( + static Azure::Core::Response GetProperties( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5839,7 +5861,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response Delete( + static Azure::Core::Response Delete( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -5911,7 +5933,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response SetHttpHeaders( + static Azure::Core::Response SetHttpHeaders( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6009,7 +6031,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response SetMetadata( + static Azure::Core::Response SetMetadata( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6075,7 +6097,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response AcquireLease( + static Azure::Core::Response AcquireLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6126,7 +6148,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response ReleaseLease( + static Azure::Core::Response ReleaseLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6176,7 +6198,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response ChangeLease( + static Azure::Core::Response ChangeLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6228,7 +6250,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // analytics logging is enabled. }; - static Azure::Core::Response BreakLease( + static Azure::Core::Response BreakLease( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6273,7 +6295,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // the file's full size. The File service accepts only a single byte range // for the Range and 'x-ms-range' headers, and the byte range must be // specified in the following format: bytes=startByte-endByte. - FileRangeWriteType + Models::FileRangeWriteType XMsWrite; // Specify one of the following options: - Update: Writes the bytes // specified by the request body into the specified range. The Range and // Content-Length headers must match to perform the update. - Clear: Clears @@ -6299,7 +6321,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response UploadRange( + static Azure::Core::Response UploadRange( const Azure::Core::Http::Url& url, Azure::Core::Http::BodyStream& bodyStream, Azure::Core::Http::HttpPipeline& pipeline, @@ -6356,7 +6378,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // specified as a copy source. Azure::Core::Nullable SourceRange; // Bytes of source data in the specified range. - FileRangeWriteFromUrlType + Models::FileRangeWriteFromUrlType XMsWrite; // Only update is supported: - Update: Writes the bytes downloaded from the // source url into the specified range. int64_t ContentLength @@ -6380,7 +6402,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response UploadRangeFromUrl( + static Azure::Core::Response UploadRangeFromUrl( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6460,7 +6482,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response GetRangeList( + static Azure::Core::Response GetRangeList( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6535,7 +6557,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { FilePermissionKey; // Key of the permission to be set for the directory/file. Note: // Only one of the x-ms-file-permission or x-ms-file-permission-key // should be specified. - Azure::Core::Nullable + Azure::Core::Nullable XMsFilePermissionCopyMode; // Specifies the option to copy file security descriptor // from source file or to set it using the value which is // defined by the header value of x-ms-file-permission or @@ -6567,7 +6589,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response StartCopy( + static Azure::Core::Response StartCopy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6670,7 +6692,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // is active and matches this ID. }; - static Azure::Core::Response AbortCopy( + static Azure::Core::Response AbortCopy( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6725,7 +6747,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response ListHandles( + static Azure::Core::Response ListHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6789,7 +6811,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // use for this request. }; - static Azure::Core::Response ForceCloseHandles( + static Azure::Core::Response ForceCloseHandles( const Azure::Core::Http::Url& url, Azure::Core::Http::HttpPipeline& pipeline, Azure::Core::Context context, @@ -6825,7 +6847,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } private: - static Azure::Core::Response CreateParseResult( + static Azure::Core::Response CreateParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6833,7 +6855,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success, File created. - FileCreateResult result; + Models::FileCreateResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -6845,7 +6867,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -6855,7 +6877,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DownloadParseResult( + static Azure::Core::Response DownloadParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -6863,7 +6885,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Succeeded to read the entire file. - FileDownloadResult result; + Models::FileDownloadResult result; result.BodyStream = response.GetBodyStream(); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); @@ -6982,13 +7004,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseStatus = LeaseStatusTypeFromString( response.GetHeaders().at(Details::c_HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::PartialContent) { // Succeeded to read a specified range of the file. - FileDownloadResult result; + Models::FileDownloadResult result; result.BodyStream = response.GetBodyStream(); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); @@ -7107,7 +7129,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseStatus = LeaseStatusTypeFromString( response.GetHeaders().at(Details::c_HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7117,7 +7139,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetPropertiesParseResult( + static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7125,7 +7147,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - FileGetPropertiesResult result; + Models::FileGetPropertiesResult result; result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); for (auto i = response.GetHeaders().lower_bound(Details::c_HeaderMetadata); @@ -7238,7 +7260,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LeaseStatus = LeaseStatusTypeFromString( response.GetHeaders().at(Details::c_HeaderLeaseStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7248,7 +7270,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response DeleteParseResult( + static Azure::Core::Response DeleteParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7256,8 +7278,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // Success (Accepted). - FileDeleteResult result; - return Azure::Core::Response( + Models::FileDeleteResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7267,7 +7289,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetHttpHeadersParseResult( + static Azure::Core::Response SetHttpHeadersParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7275,7 +7297,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success - FileSetHttpHeadersResult result; + Models::FileSetHttpHeadersResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.IsServerEncrypted @@ -7287,7 +7309,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.FileChangeTime = response.GetHeaders().at(Details::c_HeaderFileChangeTime); result.FileId = response.GetHeaders().at(Details::c_HeaderFileId); result.FileParentId = response.GetHeaders().at(Details::c_HeaderFileParentId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7297,7 +7319,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response SetMetadataParseResult( + static Azure::Core::Response SetMetadataParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7305,11 +7327,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success (OK). - FileSetMetadataResult result; + Models::FileSetMetadataResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderRequestIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7319,7 +7341,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AcquireLeaseParseResult( + static Azure::Core::Response AcquireLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7327,11 +7349,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // The Acquire operation completed successfully. - FileAcquireLeaseResult result; + Models::FileAcquireLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7341,7 +7363,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ReleaseLeaseParseResult( + static Azure::Core::Response ReleaseLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7349,10 +7371,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Release operation completed successfully. - FileReleaseLeaseResult result; + Models::FileReleaseLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7362,7 +7384,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ChangeLeaseParseResult( + static Azure::Core::Response ChangeLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7370,11 +7392,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // The Change operation completed successfully. - FileChangeLeaseResult result; + Models::FileChangeLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7384,7 +7406,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response BreakLeaseParseResult( + static Azure::Core::Response BreakLeaseParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7392,14 +7414,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The Break operation completed successfully. - FileBreakLeaseResult result; + Models::FileBreakLeaseResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderLeaseId) != response.GetHeaders().end()) { result.LeaseId = response.GetHeaders().at(Details::c_HeaderLeaseId); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7409,7 +7431,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response UploadRangeParseResult( + static Azure::Core::Response UploadRangeParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7417,7 +7439,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success (Created). - FileUploadRangeResult result; + Models::FileUploadRangeResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderTransactionalContentMd5) @@ -7432,7 +7454,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderRequestIsServerEncrypted) == "true"; } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7442,7 +7464,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response UploadRangeFromUrlParseResult( + static Azure::Core::Response + UploadRangeFromUrlParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7450,13 +7473,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Created) { // Success (Created). - FileUploadRangeFromUrlResult result; + Models::FileUploadRangeFromUrlResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.XMsContentCrc64 = response.GetHeaders().at(Details::c_HeaderXMsContentCrc64); result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderRequestIsServerEncrypted) == "true"; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7466,7 +7489,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response GetRangeListParseResult( + static Azure::Core::Response GetRangeListParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7477,14 +7500,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - FileGetRangeListResult result = bodyBuffer.empty() - ? FileGetRangeListResult() + Models::FileGetRangeListResult result = bodyBuffer.empty() + ? Models::FileGetRangeListResult() : FileGetRangeListResultFromShareFileRangeList(ShareFileRangeListFromXml(reader)); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.FileContentLength = std::stoll(response.GetHeaders().at(Details::c_HeaderXMsContentLength)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7494,9 +7517,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static FileRange FileRangeFromXml(Storage::Details::XmlReader& reader) + static Models::FileRange FileRangeFromXml(Storage::Details::XmlReader& reader) { - auto result = FileRange(); + auto result = Models::FileRange(); enum class XmlTagName { c_End, @@ -7554,9 +7577,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ClearRange ClearRangeFromXml(Storage::Details::XmlReader& reader) + static Models::ClearRange ClearRangeFromXml(Storage::Details::XmlReader& reader) { - auto result = ClearRange(); + auto result = Models::ClearRange(); enum class XmlTagName { c_End, @@ -7614,9 +7637,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareFileRangeList ShareFileRangeListFromXml(Storage::Details::XmlReader& reader) + static Models::ShareFileRangeList ShareFileRangeListFromXml( + Storage::Details::XmlReader& reader) { - auto result = ShareFileRangeList(); + auto result = Models::ShareFileRangeList(); enum class XmlTagName { c_ClearRange, @@ -7684,16 +7708,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileGetRangeListResult FileGetRangeListResultFromShareFileRangeList( - ShareFileRangeList object) + static Models::FileGetRangeListResult FileGetRangeListResultFromShareFileRangeList( + Models::ShareFileRangeList object) { - FileGetRangeListResult result; + Models::FileGetRangeListResult result; result.Ranges = std::move(object.Ranges); result.ClearRanges = std::move(object.ClearRanges); return result; } - static Azure::Core::Response StartCopyParseResult( + static Azure::Core::Response StartCopyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7701,7 +7725,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Accepted) { // The copy file has been accepted with the specified copy status. - FileStartCopyResult result; + Models::FileStartCopyResult result; result.ETag = response.GetHeaders().at(Details::c_HeaderETag); result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); if (response.GetHeaders().find(Details::c_HeaderCopyId) != response.GetHeaders().end()) @@ -7714,7 +7738,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.CopyStatus = CopyStatusTypeFromString(response.GetHeaders().at(Details::c_HeaderCopyStatus)); } - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7724,7 +7748,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response AbortCopyParseResult( + static Azure::Core::Response AbortCopyParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7732,8 +7756,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::NoContent) { // The delete request was accepted and the file will be deleted. - FileAbortCopyResult result; - return Azure::Core::Response( + Models::FileAbortCopyResult result; + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7743,7 +7767,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static Azure::Core::Response ListHandlesParseResult( + static Azure::Core::Response ListHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7754,11 +7778,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const auto& bodyBuffer = response.GetBody(); auto reader = Storage::Details::XmlReader( reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); - FileListHandlesResult result = bodyBuffer.empty() - ? FileListHandlesResult() + Models::FileListHandlesResult result = bodyBuffer.empty() + ? Models::FileListHandlesResult() : FileListHandlesResultFromListHandlesResponse(ListHandlesResponseFromXml(reader)); result.HttpHeaders.ContentType = response.GetHeaders().at(Details::c_HeaderContentType); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else @@ -7768,9 +7792,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } } - static HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) + static Models::HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) { - auto result = HandleItem(); + auto result = Models::HandleItem(); enum class XmlTagName { c_ClientIp, @@ -7882,9 +7906,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ListHandlesResponse ListHandlesResponseFromXml(Storage::Details::XmlReader& reader) + static Models::ListHandlesResponse ListHandlesResponseFromXml( + Storage::Details::XmlReader& reader) { - auto result = ListHandlesResponse(); + auto result = Models::ListHandlesResponse(); enum class XmlTagName { c_Entries, @@ -7955,16 +7980,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileListHandlesResult FileListHandlesResultFromListHandlesResponse( - ListHandlesResponse object) + static Models::FileListHandlesResult FileListHandlesResultFromListHandlesResponse( + Models::ListHandlesResponse object) { - FileListHandlesResult result; + Models::FileListHandlesResult result; result.HandleList = std::move(object.HandleList); result.ContinuationToken = std::move(object.ContinuationToken); return result; } - static Azure::Core::Response ForceCloseHandlesParseResult( + static Azure::Core::Response + ForceCloseHandlesParseResult( Azure::Core::Context context, std::unique_ptr responsePtr) { @@ -7972,7 +7998,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (response.GetStatusCode() == Azure::Core::Http::HttpStatusCode::Ok) { // Success. - FileForceCloseHandlesResult result; + Models::FileForceCloseHandlesResult result; if (response.GetHeaders().find(Details::c_HeaderContinuationToken) != response.GetHeaders().end()) { @@ -7983,7 +8009,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { = std::stoi(response.GetHeaders().at(Details::c_HeaderNumberOfHandlesClosed)); result.numberOfHandlesFailedToClose = std::stoi( response.GetHeaders().at(Details::c_HeaderNumberOfHandlesFailedToClose)); - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::move(responsePtr)); } else diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp index 2754b7578..ef7a85bb7 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp @@ -102,47 +102,47 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief Creates the file share. * @param options Optional parameters to create this file share. - * @return Azure::Core::Response containing the information including the - * version and modified time of a share. + * @return Azure::Core::Response containing the information including + * the version and modified time of a share. */ - Azure::Core::Response Create( + Azure::Core::Response Create( const CreateShareOptions& options = CreateShareOptions()) const; /** * @brief Deletes the file share. * @param options Optional parameters to delete this file share. - * @return Azure::Core::Response currently empty and reserved for future - * usage. + * @return Azure::Core::Response currently empty and reserved for + * future usage. */ - Azure::Core::Response Delete( + Azure::Core::Response Delete( const DeleteShareOptions& options = DeleteShareOptions()) const; /** * @brief Creates a snapshot for the share. * @param options Optional parameters to create the share snapshot. - * @return Azure::Core::Response containing the information for ths - * snapshot. + * @return Azure::Core::Response containing the information + * for ths snapshot. */ - Azure::Core::Response CreateSnapshot( + Azure::Core::Response CreateSnapshot( const CreateShareSnapshotOptions& options = CreateShareSnapshotOptions()) const; /** * @brief Gets the properties of the share. * @param options Optional parameters to get the share properties. - * @return Azure::Core::Response containing the properties for ths - * share or one of its snapshot. + * @return Azure::Core::Response containing the properties for + * ths share or one of its snapshot. */ - Azure::Core::Response GetProperties( + Azure::Core::Response GetProperties( const GetSharePropertiesOptions& options = GetSharePropertiesOptions()) const; /** * @brief Sets the quota of the share. * @param quota Specifies the maximum size of the share, in gigabytes. * @param options Optional parameters to set the share quota. - * @return Azure::Core::Response containing the information including the - * version and modified time of a share. + * @return Azure::Core::Response containing the information + * including the version and modified time of a share. */ - Azure::Core::Response SetQuota( + Azure::Core::Response SetQuota( int32_t quotaInGiB, const SetShareQuotaOptions& options = SetShareQuotaOptions()) const; @@ -150,50 +150,50 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Sets the metadata to the share. * @param metadata A name-value pair to associate with a file storage 'Share' object.. * @param options Optional parameters to set the share metadata. - * @return Azure::Core::Response containing the information including - * the version and modified time of a share. + * @return Azure::Core::Response containing the information + * including the version and modified time of a share. */ - Azure::Core::Response SetMetadata( + Azure::Core::Response SetMetadata( std::map metadata, const SetShareMetadataOptions& options = SetShareMetadataOptions()) const; /** * @brief Gets the access policy of the share. * @param options Optional parameters to get the share's access policy. - * @return Azure::Core::Response containing the access policy of - * the share. + * @return Azure::Core::Response containing the access + * policy of the share. */ - Azure::Core::Response GetAccessPolicy( + Azure::Core::Response GetAccessPolicy( const GetShareAccessPolicyOptions& options = GetShareAccessPolicyOptions()) const; /** * @brief Sets the access policy of the share. * @param accessPolicy Specifies the access policy to be set to the share. * @param options Optional parameters to Set the share's access policy. - * @return Azure::Core::Response containing the information + * @return Azure::Core::Response containing the information * including the version and modified time of a share. */ - Azure::Core::Response SetAccessPolicy( - const std::vector& accessPolicy, + Azure::Core::Response SetAccessPolicy( + const std::vector& accessPolicy, const SetShareAccessPolicyOptions& options = SetShareAccessPolicyOptions()) const; /** * @brief Gets the stats of the share. * @param options Optional parameters to get share's statistics. - * @return Azure::Core::Response containing the information including - * the bytes used in by the share, the version and modified time of a share. + * @return Azure::Core::Response containing the information + * including the bytes used in by the share, the version and modified time of a share. */ - Azure::Core::Response GetStatistics( + Azure::Core::Response GetStatistics( const GetShareStatsOptions& options = GetShareStatsOptions()) const; /** * @brief Creates a permission on the share. * @param permission Specifies the permission to be created on the share. * @param options Optional parameters to create the share's permission. - * @return Azure::Core::Response containing the information + * @return Azure::Core::Response containing the information * including the permission key of the permission. */ - Azure::Core::Response CreatePermission( + Azure::Core::Response CreatePermission( const std::string& permission, const CreateSharePermissionOptions& options = CreateSharePermissionOptions()) const; @@ -201,20 +201,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Gets the permission of the share using the specific key. * @param permissionKey The permission key of a permission. * @param options Optional parameters to get share's permission. - * @return Azure::Core::Response containing the permission string with - * specified key. + * @return Azure::Core::Response containing the permission + * string with specified key. */ - Azure::Core::Response GetPermission( + Azure::Core::Response GetPermission( const std::string& permissionKey, const GetSharePermissionOptions& options = GetSharePermissionOptions()) const; /** * @brief List files and directories under the directory. * @param options Optional parameters to list the files and directories under this directory. - * @return Azure::Core::Response containing the + * @return Azure::Core::Response containing the * information of the operation, directory, share and the listed result. */ - Azure::Core::Response ListFilesAndDirectoriesSegment( + Azure::Core::Response + ListFilesAndDirectoriesSegment( const ListFilesAndDirectoriesSegmentOptions& options = ListFilesAndDirectoriesSegmentOptions()) const; @@ -226,9 +227,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * 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 Azure::Core::Response describing the lease. + * @return Azure::Core::Response describing the lease. */ - Azure::Core::Response AcquireLease( + Azure::Core::Response AcquireLease( const std::string& proposedLeaseId, int32_t duration, const AcquireShareLeaseOptions& options = AcquireShareLeaseOptions()) const; @@ -238,9 +239,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * * @param leaseId ID of the previously-acquired lease. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the updated lease status. + * @return Azure::Core::Response describing the updated lease + * status. */ - Azure::Core::Response ReleaseLease( + Azure::Core::Response ReleaseLease( const std::string& leaseId, const ReleaseShareLeaseOptions& options = ReleaseShareLeaseOptions()) const; @@ -250,9 +252,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @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 Azure::Core::Response describing the changed lease. + * @return Azure::Core::Response describing the changed lease. */ - Azure::Core::Response ChangeLease( + Azure::Core::Response ChangeLease( const std::string& leaseId, const std::string& proposedLeaseId, const ChangeShareLeaseOptions& options = ChangeShareLeaseOptions()) const; @@ -261,9 +263,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Breaks the previously-acquired lease. * * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the broken lease. + * @return Azure::Core::Response describing the broken lease. */ - Azure::Core::Response BreakLease( + Azure::Core::Response BreakLease( const BreakShareLeaseOptions& options = BreakShareLeaseOptions()) const; /** @@ -271,9 +273,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * * @param leaseId ID of the previously-acquired lease. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the renewed lease. + * @return Azure::Core::Response describing the renewed lease. */ - Azure::Core::Response RenewLease( + Azure::Core::Response RenewLease( const std::string& leaseId, const RenewShareLeaseOptions& options = RenewShareLeaseOptions()) const; diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp index 23ac446b9..d502158e7 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp @@ -105,39 +105,39 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief Creates the directory. * @param options Optional parameters to create this directory. - * @return Azure::Core::Response containing the information returned when - * creating the directory. + * @return Azure::Core::Response containing the information + * returned when creating the directory. */ - Azure::Core::Response Create( + Azure::Core::Response Create( const CreateDirectoryOptions& options = CreateDirectoryOptions()) const; /** * @brief Deletes the directory. * @param options Optional parameters to delete this directory. - * @return Azure::Core::Response containing the information returned when - * deleting the directory. Currently empty but preserved for future usage. + * @return Azure::Core::Response containing the information + * returned when deleting the directory. Currently empty but preserved for future usage. */ - Azure::Core::Response Delete( + Azure::Core::Response Delete( const DeleteDirectoryOptions& options = DeleteDirectoryOptions()) const; /** * @brief Gets the properties of the directory. * @param options Optional parameters to get this directory's properties. - * @return Azure::Core::Response containing the properties of the - * directory returned from the server. + * @return Azure::Core::Response containing the properties + * of the directory returned from the server. */ - Azure::Core::Response GetProperties( + Azure::Core::Response GetProperties( const GetDirectoryPropertiesOptions& options = GetDirectoryPropertiesOptions()) const; /** * @brief Sets the properties of the directory. * @param smbProperties The SMB properties to be set to the directory. * @param options Optional parameters to set this directory's properties. - * @return Azure::Core::Response containing the properties of the - * directory returned from the server. + * @return Azure::Core::Response containing the properties + * of the directory returned from the server. */ - Azure::Core::Response SetProperties( - FileShareSmbProperties smbProperties, + Azure::Core::Response SetProperties( + Models::FileShareSmbProperties smbProperties, const SetDirectoryPropertiesOptions& options = SetDirectoryPropertiesOptions()) const; /** @@ -145,30 +145,31 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @param metadata User-defined metadata to be stored with the directory. Note that the string * may only contain ASCII characters in the ISO-8859-1 character set. * @param options Optional parameters to set this directory's metadata. - * @return Azure::Core::Response containing the information of the - * directory returned from the server. + * @return Azure::Core::Response containing the information + * of the directory returned from the server. */ - Azure::Core::Response SetMetadata( + Azure::Core::Response SetMetadata( const std::map& metadata, const SetDirectoryMetadataOptions& options = SetDirectoryMetadataOptions()) const; /** * @brief List files and directories under the directory. * @param options Optional parameters to list the files and directories under this directory. - * @return Azure::Core::Response containing the + * @return Azure::Core::Response containing the * information of the operation, directory, share and the listed result. */ - Azure::Core::Response ListFilesAndDirectoriesSegment( + Azure::Core::Response + ListFilesAndDirectoriesSegment( const ListFilesAndDirectoriesSegmentOptions& options = ListFilesAndDirectoriesSegmentOptions()) const; /** * @brief List open handles on the directory. * @param options Optional parameters to list this directory's open handles. - * @return Azure::Core::Response containing the information - * of the operation and the open handles of this directory + * @return Azure::Core::Response containing the + * information of the operation and the open handles of this directory */ - Azure::Core::Response ListHandlesSegment( + Azure::Core::Response ListHandlesSegment( const ListDirectoryHandlesSegmentOptions& options = ListDirectoryHandlesSegmentOptions()) const; @@ -176,21 +177,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Closes a handle opened on a directory at the service. * @param handleId The ID of the handle to be closed. * @param options Optional parameters to close one of this directory's open handles. - * @return Azure::Core::Response containing the information - * of the closed handle. Current empty but preserved for future usage. + * @return Azure::Core::Response containing the + * information of the closed handle. Current empty but preserved for future usage. */ - Azure::Core::Response ForceCloseHandle( + Azure::Core::Response ForceCloseHandle( const std::string& handleId, const ForceCloseDirectoryHandleOptions& options = ForceCloseDirectoryHandleOptions()) const; /** * @brief Closes all handles opened on a directory at the service. * @param options Optional parameters to close all this directory's open handles. - * @return Azure::Core::Response containing the information - * of the closed handles + * @return Azure::Core::Response containing the + * information of the closed handles * @remark This operation may return a marker showing that the operation can be continued. */ - Azure::Core::Response ForceCloseAllHandles( + Azure::Core::Response ForceCloseAllHandles( const ForceCloseAllDirectoryHandlesOptions& options = ForceCloseAllDirectoryHandlesOptions()) const; diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_attribute.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_attribute.hpp index 6e42dccb5..d7ba6ff74 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_attribute.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_attribute.hpp @@ -5,207 +5,213 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { - enum class FileAttributes - { - /** - * @brief The File or Directory is read-only. - */ - ReadOnly = 1, - - /** - * @brief The File or Directory is hidden, and thus is not included in an ordinary directory - * listing. - */ - Hidden = 2, - - /** - * @brief The File or Directory is a systemfile. That is, the file is part of the operating - * system or is used exclusively by the operating system. - */ - System = 4, - - /** - * @brief The file or directory is a standard file that has no special attributes. This - * attribute is valid only if it is used alone. - */ - None = 8, - - /** - * @brief The file is a directory. - */ - Directory = 16, - - /** - * @brief The file is a candidate for backup or removal. - */ - Archive = 32, - - /** - * @brief The file or directory is temporary. A temporary file contains data that is needed - * while an application is executing but is not needed after the application is finished. File - * systems try to keep all the data in memory for quicker access rather than flushing the data - * back to mass storage. A temporary file should be deleted by the application as soon as it is - * no longer needed. - */ - Temporary = 64, - - /** - * @brief The file or directory is offline. The data of the file is not immediately available. - */ - Offline = 128, - - /** - * @brief The file or directory will not be indexed by the operating system's content indexing - * service. - */ - NotContentIndexed = 256, - - /** - * @brief The file or directory is excluded from the data integrity scan. When this value is - * applied to a directory, by default, all new files and subdirectories within that directory - * are excluded from data integrity. - */ - NoScrubData = 512 - }; - - inline FileAttributes operator|(FileAttributes lhs, FileAttributes rhs) - { - using type = std::underlying_type_t; - return static_cast(static_cast(lhs) | static_cast(rhs)); - } - - inline FileAttributes& operator|=(FileAttributes& lhs, FileAttributes rhs) - { - lhs = lhs | rhs; - return lhs; - } - - inline FileAttributes operator&(FileAttributes lhs, FileAttributes rhs) - { - using type = std::underlying_type_t; - return static_cast(static_cast(lhs) & static_cast(rhs)); - } - - inline FileAttributes& operator&=(FileAttributes& lhs, FileAttributes rhs) - { - lhs = lhs & rhs; - return lhs; - } - - inline FileAttributes FileAttributesFromString(const std::string& fileAttributesString) - { - FileAttributes result = static_cast(0); - - if (fileAttributesString == "ReadOnly") + namespace Models { + enum class FileAttributes { - result = FileAttributes::ReadOnly; - } - else if (fileAttributesString == "Hidden") - { - result = FileAttributes::Hidden; - } - else if (fileAttributesString == "System") - { - result = FileAttributes::System; - } - else if (fileAttributesString == "None") - { - result = FileAttributes::None; - } - else if (fileAttributesString == "Directory") - { - result = FileAttributes::Directory; - } - else if (fileAttributesString == "Archive") - { - result = FileAttributes::Archive; - } - else if (fileAttributesString == "Offline") - { - result = FileAttributes::Offline; - } - else if (fileAttributesString == "NotContentIndexed") - { - result = FileAttributes::NotContentIndexed; - } - else if (fileAttributesString == "NoScrubData") - { - result = FileAttributes::NoScrubData; - } + /** + * @brief The File or Directory is read-only. + */ + ReadOnly = 1, - return result; - } + /** + * @brief The File or Directory is hidden, and thus is not included in an ordinary directory + * listing. + */ + Hidden = 2, - inline std::string FileAttributesToString(const FileAttributes& val) - { - FileAttributes value_list[] = { - FileAttributes::ReadOnly, - FileAttributes::Hidden, - FileAttributes::System, - FileAttributes::None, - FileAttributes::Directory, - FileAttributes::Archive, - FileAttributes::Temporary, - FileAttributes::Offline, - FileAttributes::NotContentIndexed, - FileAttributes::NoScrubData, + /** + * @brief The File or Directory is a systemfile. That is, the file is part of the operating + * system or is used exclusively by the operating system. + */ + System = 4, + + /** + * @brief The file or directory is a standard file that has no special attributes. This + * attribute is valid only if it is used alone. + */ + None = 8, + + /** + * @brief The file is a directory. + */ + Directory = 16, + + /** + * @brief The file is a candidate for backup or removal. + */ + Archive = 32, + + /** + * @brief The file or directory is temporary. A temporary file contains data that is needed + * while an application is executing but is not needed after the application is finished. File + * systems try to keep all the data in memory for quicker access rather than flushing the data + * back to mass storage. A temporary file should be deleted by the application as soon as it + * is no longer needed. + */ + Temporary = 64, + + /** + * @brief The file or directory is offline. The data of the file is not immediately available. + */ + Offline = 128, + + /** + * @brief The file or directory will not be indexed by the operating system's content indexing + * service. + */ + NotContentIndexed = 256, + + /** + * @brief The file or directory is excluded from the data integrity scan. When this value is + * applied to a directory, by default, all new files and subdirectories within that directory + * are excluded from data integrity. + */ + NoScrubData = 512 }; - const char* string_list[] = { - "ReadOnly", - "Hidden", - "System", - "None", - "Directory", - "Archive", - "Temporary", - "Offline", - "NotContentIndexed", - "NoScrubData", - }; - std::string result; - for (std::size_t i = 0; i < sizeof(value_list) / sizeof(ListSharesIncludeType); ++i) + + inline FileAttributes operator|(FileAttributes lhs, FileAttributes rhs) { - if ((val & value_list[i]) == value_list[i]) + using type = std::underlying_type_t; + return static_cast(static_cast(lhs) | static_cast(rhs)); + } + + inline FileAttributes& operator|=(FileAttributes& lhs, FileAttributes rhs) + { + lhs = lhs | rhs; + return lhs; + } + + inline FileAttributes operator&(FileAttributes lhs, FileAttributes rhs) + { + using type = std::underlying_type_t; + return static_cast(static_cast(lhs) & static_cast(rhs)); + } + + inline FileAttributes& operator&=(FileAttributes& lhs, FileAttributes rhs) + { + lhs = lhs & rhs; + return lhs; + } + } // namespace Models + + namespace Details { + + inline Models::FileAttributes FileAttributesFromString(const std::string& fileAttributesString) + { + Models::FileAttributes result = static_cast(0); + + if (fileAttributesString == "ReadOnly") { - if (!result.empty()) + result = Models::FileAttributes::ReadOnly; + } + else if (fileAttributesString == "Hidden") + { + result = Models::FileAttributes::Hidden; + } + else if (fileAttributesString == "System") + { + result = Models::FileAttributes::System; + } + else if (fileAttributesString == "None") + { + result = Models::FileAttributes::None; + } + else if (fileAttributesString == "Directory") + { + result = Models::FileAttributes::Directory; + } + else if (fileAttributesString == "Archive") + { + result = Models::FileAttributes::Archive; + } + else if (fileAttributesString == "Offline") + { + result = Models::FileAttributes::Offline; + } + else if (fileAttributesString == "NotContentIndexed") + { + result = Models::FileAttributes::NotContentIndexed; + } + else if (fileAttributesString == "NoScrubData") + { + result = Models::FileAttributes::NoScrubData; + } + + return result; + } + + inline std::string FileAttributesToString(const Models::FileAttributes& val) + { + Models::FileAttributes value_list[] = { + Models::FileAttributes::ReadOnly, + Models::FileAttributes::Hidden, + Models::FileAttributes::System, + Models::FileAttributes::None, + Models::FileAttributes::Directory, + Models::FileAttributes::Archive, + Models::FileAttributes::Temporary, + Models::FileAttributes::Offline, + Models::FileAttributes::NotContentIndexed, + Models::FileAttributes::NoScrubData, + }; + const char* string_list[] = { + "ReadOnly", + "Hidden", + "System", + "None", + "Directory", + "Archive", + "Temporary", + "Offline", + "NotContentIndexed", + "NoScrubData", + }; + std::string result; + for (std::size_t i = 0; i < sizeof(value_list) / sizeof(Models::ListSharesIncludeType); ++i) + { + if ((val & value_list[i]) == value_list[i]) { - result += "|"; + if (!result.empty()) + { + result += "|"; + } + result += string_list[i]; } - result += string_list[i]; } + return result; } - return result; - } - inline FileAttributes FileAttributesListFromString(const std::string& fileAttributesString) - { - FileAttributes results = static_cast(0); - - std::string::const_iterator cur = fileAttributesString.begin(); - - auto getSubstrTillDelimiter - = [](char delimiter, const std::string& string, std::string::const_iterator& cur) { - auto begin = cur; - auto end = std::find(cur, string.end(), delimiter); - cur = end; - if (cur != string.end()) - { - ++cur; - } - return std::string(begin, end); - }; - - while (cur != fileAttributesString.end()) + inline Models::FileAttributes FileAttributesListFromString( + const std::string& fileAttributesString) { - std::string attribute = getSubstrTillDelimiter('|', fileAttributesString, cur); + Models::FileAttributes results = static_cast(0); - if (!attribute.empty()) + std::string::const_iterator cur = fileAttributesString.begin(); + + auto getSubstrTillDelimiter + = [](char delimiter, const std::string& string, std::string::const_iterator& cur) { + auto begin = cur; + auto end = std::find(cur, string.end(), delimiter); + cur = end; + if (cur != string.end()) + { + ++cur; + } + return std::string(begin, end); + }; + + while (cur != fileAttributesString.end()) { - results |= FileAttributesFromString(attribute); - } - } + std::string attribute = getSubstrTillDelimiter('|', fileAttributesString, cur); - return results; - } + if (!attribute.empty()) + { + results |= FileAttributesFromString(attribute); + } + } + + return results; + } + } // namespace Details }}}} // namespace Azure::Storage::Files::Shares \ No newline at end of file diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp index 312261a16..b891bf1ca 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp @@ -92,7 +92,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @return Azure::Core::Response containing the information returned when * creating the file. */ - Azure::Core::Response Create( + Azure::Core::Response Create( int64_t fileSize, const CreateFileOptions& options = CreateFileOptions()) const; @@ -102,17 +102,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @return Azure::Core::Response containing the information returned when * deleting the file. */ - Azure::Core::Response Delete( + Azure::Core::Response Delete( const DeleteFileOptions& options = DeleteFileOptions()) const; /** * @brief Open a stream for the file's content, or a range of the file's content that can be * used to download the server end data. * @param options Optional parameters to get the content of this file. - * @return Azure::Core::Response containing the range or full content and - * the information of the file. + * @return Azure::Core::Response containing the range or full + * content and the information of the file. */ - Azure::Core::Response Download( + Azure::Core::Response Download( const DownloadFileOptions& options = DownloadFileOptions()) const; /** @@ -123,10 +123,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @param bufferSize Size of the memory buffer. Size must be larger or equal to size of the file * or file range. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response containing the information of the + * @return Azure::Core::Response containing the information of the * downloaded file/file range. */ - Azure::Core::Response DownloadTo( + Azure::Core::Response DownloadTo( uint8_t* buffer, std::size_t bufferSize, const DownloadFileToOptions& options = DownloadFileToOptions()) const; @@ -137,10 +137,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * * @param fileName A file path to write the downloaded content to. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response containing the information of the + * @return Azure::Core::Response containing the information of the * downloaded file/file range. */ - Azure::Core::Response DownloadTo( + Azure::Core::Response DownloadTo( const std::string& fileName, const DownloadFileToOptions& options = DownloadFileToOptions()) const; @@ -151,9 +151,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @param buffer A memory buffer containing the content to upload. * @param bufferSize Size of the memory buffer. * @param options Optional parameters to execute this function. - * @return A UploadFilePagesResult describing the state of the updated file. + * @return Azure::Core::Response describing the state of the + * updated file. */ - Azure::Core::Response UploadFrom( + Azure::Core::Response UploadFrom( const uint8_t* buffer, std::size_t bufferSize, const UploadFileFromOptions& options = UploadFileFromOptions()) const; @@ -164,9 +165,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * * @param fileName A file containing the content to upload. * @param options Optional parameters to execute this function. - * @return A UploadFileFromResult describing the state of the updated file. + * @return Azure::Core::Response describing the state of the + * updated file. */ - Azure::Core::Response UploadFrom( + Azure::Core::Response UploadFrom( const std::string& fileName, const UploadFileFromOptions& options = UploadFileFromOptions()) const; @@ -180,9 +182,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * public file, no authentication is required to perform the copy operation. A file in a share * snapshot can also be specified as a copy source. * @param options Optional parameters to copy the content of this file. - * @return Azure::Core::Response containing the copy related information. + * @return Azure::Core::Response containing the copy related + * information. */ - Azure::Core::Response StartCopy( + Azure::Core::Response StartCopy( std::string copySource, const StartCopyFileOptions& options = StartCopyFileOptions()) const; @@ -191,19 +194,20 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @param copyId The copy identifier provided in the StartCopyFileResult of the original * StartCopy operation. * @param options Optional parameters to abort copying the content of this file. - * @return Azure::Core::Response containing the abort copy related + * @return Azure::Core::Response containing the abort copy related * information, current empty but preserved for future usage. */ - Azure::Core::Response AbortCopy( + Azure::Core::Response AbortCopy( std::string copyId, const AbortCopyFileOptions& options = AbortCopyFileOptions()) const; /** * @brief Gets the properties of a file. * @param options Optional parameters to get the properties of this file. - * @return Azure::Core::Response containing the file properties. + * @return Azure::Core::Response containing the file + * properties. */ - Azure::Core::Response GetProperties( + Azure::Core::Response GetProperties( const GetFilePropertiesOptions& options = GetFilePropertiesOptions()) const; /** @@ -211,12 +215,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @param httpHeaders The Http headers to be set to the file. * @param smbProperties The SMB properties to be set to the file. * @param options Optional parameters to set this file's properties. - * @return Azure::Core::Response containing the properties of the - * file returned from the server. + * @return Azure::Core::Response containing the properties of + * the file returned from the server. */ - Azure::Core::Response SetProperties( - FileShareHttpHeaders httpHeaders, - FileShareSmbProperties smbProperties, + Azure::Core::Response SetProperties( + Models::FileShareHttpHeaders httpHeaders, + Models::FileShareSmbProperties smbProperties, const SetFilePropertiesOptions& options = SetFilePropertiesOptions()) const; /** @@ -224,10 +228,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @param metadata User-defined metadata to be stored with the file. Note that the string * may only contain ASCII characters in the ISO-8859-1 character set. * @param options Optional parameters to set this file's metadata. - * @return Azure::Core::Response containing the information of the - * file returned from the server. + * @return Azure::Core::Response containing the information of + * the file returned from the server. */ - Azure::Core::Response SetMetadata( + Azure::Core::Response SetMetadata( const std::map& metadata, const SetFileMetadataOptions& options = SetFileMetadataOptions()) const; @@ -235,10 +239,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Uploads some data to a range of the file. * @param offset Specifies the starting offset for the content to be written as a range. * @param content A BodyStream containing the content of the range to upload. - * @return Azure::Core::Response containing the information of the uploaded - * range and the file returned from the server. + * @return Azure::Core::Response containing the information of the + * uploaded range and the file returned from the server. */ - Azure::Core::Response UploadRange( + Azure::Core::Response UploadRange( int64_t offset, Azure::Core::Http::BodyStream* content, const UploadFileRangeOptions& options = UploadFileRangeOptions()) const; @@ -247,50 +251,50 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Clears some range of data within the file. * @param offset Specifies the starting offset for the content to be cleared within the file. * @param length Specifies the length for the content to be cleared within the file. - * @return Azure::Core::Response containing the information of the cleared - * range returned from the server. + * @return Azure::Core::Response containing the information of the + * cleared range returned from the server. */ - Azure::Core::Response ClearRange( + Azure::Core::Response ClearRange( int64_t offset, int64_t length, const ClearFileRangeOptions& options = ClearFileRangeOptions()) const; /** * @brief Gets the list of valid range from the file within specified range. - * @return Azure::Core::Response containing the valid ranges within the - * file for the specified range. + * @return Azure::Core::Response containing the valid ranges + * within the file for the specified range. */ - Azure::Core::Response GetRangeList( + Azure::Core::Response GetRangeList( const GetFileRangeListOptions& options = GetFileRangeListOptions()) const; /** * @brief List open handles on the file. * @param options Optional parameters to list this file's open handles. - * @return Azure::Core::Response containing the information - * of the operation and the open handles of this file + * @return Azure::Core::Response containing the + * information of the operation and the open handles of this file */ - Azure::Core::Response ListHandlesSegment( + Azure::Core::Response ListHandlesSegment( const ListFileHandlesSegmentOptions& options = ListFileHandlesSegmentOptions()) const; /** * @brief Closes a handle opened on a file at the service. * @param handleId The ID of the handle to be closed. * @param options Optional parameters to close one of this file's open handles. - * @return Azure::Core::Response containing the information + * @return Azure::Core::Response containing the information * of the closed handle. Current empty but preserved for future usage. */ - Azure::Core::Response ForceCloseHandle( + Azure::Core::Response ForceCloseHandle( const std::string& handleId, const ForceCloseFileHandleOptions& options = ForceCloseFileHandleOptions()) const; /** * @brief Closes all handles opened on a file at the service. * @param options Optional parameters to close all this file's open handles. - * @return Azure::Core::Response containing the information - * of the closed handles + * @return Azure::Core::Response containing the + * information of the closed handles * @remark This operation may return a marker showing that the operation can be continued. */ - Azure::Core::Response ForceCloseAllHandles( + Azure::Core::Response ForceCloseAllHandles( const ForceCloseAllFileHandlesOptions& options = ForceCloseAllFileHandlesOptions()) const; /** @@ -298,9 +302,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * * @param proposedLeaseId Proposed lease ID, in a GUID string format. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the lease. + * @return Azure::Core::Response describing the lease. */ - Azure::Core::Response AcquireLease( + Azure::Core::Response AcquireLease( const std::string& proposedLeaseId, const AcquireFileLeaseOptions& options = AcquireFileLeaseOptions()) const; @@ -309,9 +313,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * * @param leaseId ID of the previously-acquired lease. * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the updated container. + * @return Azure::Core::Response describing the updated + * container. */ - Azure::Core::Response ReleaseLease( + Azure::Core::Response ReleaseLease( const std::string& leaseId, const ReleaseFileLeaseOptions& options = ReleaseFileLeaseOptions()) const; @@ -321,9 +326,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @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 Azure::Core::Response describing the changed lease. + * @return Azure::Core::Response describing the changed lease. */ - Azure::Core::Response ChangeLease( + Azure::Core::Response ChangeLease( const std::string& leaseId, const std::string& proposedLeaseId, const ChangeFileLeaseOptions& options = ChangeFileLeaseOptions()) const; @@ -332,9 +337,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Breaks the previously-acquired lease. * * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the broken lease. + * @return Azure::Core::Response describing the broken lease. */ - Azure::Core::Response BreakLease( + Azure::Core::Response BreakLease( const BreakFileLeaseOptions& options = BreakFileLeaseOptions()) const; private: diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp index 2e4a72693..00316e40f 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp @@ -123,7 +123,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief Include this parameter to specify one or more datasets to include in the response. */ - Azure::Core::Nullable ListSharesInclude; + Azure::Core::Nullable ListSharesInclude; }; struct SetServicePropertiesOptions @@ -335,7 +335,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief SMB properties to set for the directory. */ - FileShareSmbProperties SmbProperties; + Models::FileShareSmbProperties SmbProperties; }; struct DeleteDirectoryOptions @@ -482,12 +482,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief SMB properties to set for the file. */ - FileShareSmbProperties SmbProperties; + Models::FileShareSmbProperties SmbProperties; /** * @brief Specifies the HttpHeaders of the file. */ - FileShareHttpHeaders HttpHeaders; + Models::FileShareHttpHeaders HttpHeaders; /** * @brief A name-value pair to associate with a file storage object. @@ -565,13 +565,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief SMB properties to set for the destination file. */ - FileShareSmbProperties SmbProperties; + Models::FileShareSmbProperties SmbProperties; /** * @brief Specifies the option to copy file security descriptor from source file or to set it * using the value which is defined by the smb properties. */ - Azure::Core::Nullable PermissionCopyMode; + Azure::Core::Nullable PermissionCopyMode; /** * @brief Specifies the option to overwrite the target file if it already exists and has @@ -900,7 +900,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief The standard HTTP header system properties to set. */ - FileShareHttpHeaders HttpHeaders; + Models::FileShareHttpHeaders HttpHeaders; /** * @brief Name-value pairs associated with the file as metadata. @@ -915,7 +915,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief SMB properties to set for the destination file. */ - FileShareSmbProperties SmbProperties; + Models::FileShareSmbProperties SmbProperties; /** * @brief If specified the permission (security descriptor) shall be set for the directory. diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp index 913d4ea81..318011bbb 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp @@ -7,7 +7,7 @@ #include "azure/storage/files/shares/share_constants.hpp" #include "azure/storage/files/shares/share_file_attribute.hpp" -namespace Azure { namespace Storage { namespace Files { namespace Shares { +namespace Azure { namespace Storage { namespace Files { namespace Shares { namespace Models { // ServiceClient models: @@ -131,4 +131,4 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Nullable IsServerEncrypted; }; -}}}} // namespace Azure::Storage::Files::Shares +}}}}} // namespace Azure::Storage::Files::Shares::Models diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp index e884d1f3d..c1b4ea65b 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp @@ -80,30 +80,31 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { /** * @brief List the shares from the service. * @param options Optional parameters to list the shares. - * @return Azure::Core::Response The results containing the shares - * returned and information used for future list operation on valid result not yet returned. + * @return Azure::Core::Response The results containing the + * shares returned and information used for future list operation on valid result not yet + * returned. */ - Azure::Core::Response ListSharesSegment( + Azure::Core::Response ListSharesSegment( const ListSharesSegmentOptions& options = ListSharesSegmentOptions()) const; /** * @brief Set the service's properties. * @param properties The properties of the service that is to be set. * @param options Optional parameters to set the properties of the service. - * @return Azure::Core::Response The infromation returned when - * setting the service properties. + * @return Azure::Core::Response The infromation returned + * when setting the service properties. */ - Azure::Core::Response SetProperties( - StorageServiceProperties properties, + Azure::Core::Response SetProperties( + Models::StorageServiceProperties properties, const SetServicePropertiesOptions& options = SetServicePropertiesOptions()) const; /** * @brief Get the service's properties. * @param options Optional parameters to get the properties of the service. - * @return Azure::Core::Response The result containing service's - * properties. + * @return Azure::Core::Response The result containing + * service's properties. */ - Azure::Core::Response GetProperties( + Azure::Core::Response GetProperties( const GetServicePropertiesOptions& options = GetServicePropertiesOptions()) const; private: diff --git a/sdk/storage/azure-storage-files-shares/src/share_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_client.cpp index da10fc571..8027ad266 100644 --- a/sdk/storage/azure-storage-files-shares/src/share_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_client.cpp @@ -142,7 +142,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return newClient; } - Azure::Core::Response ShareClient::Create( + Azure::Core::Response ShareClient::Create( const CreateShareOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Share::CreateOptions(); @@ -152,19 +152,19 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::Delete( + Azure::Core::Response ShareClient::Delete( const DeleteShareOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Share::DeleteOptions(); if (options.IncludeSnapshots.HasValue() and options.IncludeSnapshots.GetValue()) { - protocolLayerOptions.XMsDeleteSnapshots = DeleteSnapshotsOptionType::Include; + protocolLayerOptions.XMsDeleteSnapshots = Models::DeleteSnapshotsOptionType::Include; } return Details::ShareRestClient::Share::Delete( m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::CreateSnapshot( + Azure::Core::Response ShareClient::CreateSnapshot( const CreateShareSnapshotOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Share::CreateSnapshotOptions(); @@ -173,7 +173,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::GetProperties( + Azure::Core::Response ShareClient::GetProperties( const GetSharePropertiesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Share::GetPropertiesOptions(); @@ -181,7 +181,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::SetQuota( + Azure::Core::Response ShareClient::SetQuota( int32_t quotaInGiB, const SetShareQuotaOptions& options) const { @@ -191,7 +191,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::SetMetadata( + Azure::Core::Response ShareClient::SetMetadata( std::map metadata, const SetShareMetadataOptions& options) const { @@ -201,7 +201,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::GetAccessPolicy( + Azure::Core::Response ShareClient::GetAccessPolicy( const GetShareAccessPolicyOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Share::GetAccessPolicyOptions(); @@ -209,8 +209,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::SetAccessPolicy( - const std::vector& accessPolicy, + Azure::Core::Response ShareClient::SetAccessPolicy( + const std::vector& accessPolicy, const SetShareAccessPolicyOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Share::SetAccessPolicyOptions(); @@ -219,7 +219,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::GetStatistics( + Azure::Core::Response ShareClient::GetStatistics( const GetShareStatsOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Share::GetStatisticsOptions(); @@ -227,7 +227,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::CreatePermission( + Azure::Core::Response ShareClient::CreatePermission( const std::string& permission, const CreateSharePermissionOptions& options) const { @@ -237,7 +237,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::GetPermission( + Azure::Core::Response ShareClient::GetPermission( const std::string& permissionKey, const GetSharePermissionOptions& options) const { @@ -247,7 +247,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response + Azure::Core::Response ShareClient::ListFilesAndDirectoriesSegment( const ListFilesAndDirectoriesSegmentOptions& options) const { @@ -258,7 +258,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions.MaxResults = options.MaxResults; auto result = Details::ShareRestClient::Directory::ListFilesAndDirectoriesSegment( m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); - ListFilesAndDirectoriesSegmentResult ret; + Models::ListFilesAndDirectoriesSegmentResult ret; ret.ServiceEndpoint = std::move(result->ServiceEndpoint); ret.ShareName = std::move(result->ShareName); ret.ShareSnapshot = std::move(result->ShareSnapshot); @@ -270,11 +270,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ret.DirectoryItems = std::move(result->Segment.DirectoryItems); ret.FileItems = std::move(result->Segment.FileItems); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response ShareClient::AcquireLease( + Azure::Core::Response ShareClient::AcquireLease( const std::string& proposedLeaseId, int32_t duration, const AcquireShareLeaseOptions& options) const @@ -286,7 +286,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::ChangeLease( + Azure::Core::Response ShareClient::ChangeLease( const std::string& leaseId, const std::string& proposedLeaseId, const ChangeShareLeaseOptions& options) const @@ -298,7 +298,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::ReleaseLease( + Azure::Core::Response ShareClient::ReleaseLease( const std::string& leaseId, const ReleaseShareLeaseOptions& options) const { @@ -308,7 +308,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::BreakLease( + Azure::Core::Response ShareClient::BreakLease( const BreakShareLeaseOptions& options) const { Details::ShareRestClient::Share::BreakLeaseOptions protocolLayerOptions; @@ -317,7 +317,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareClient::RenewLease( + Azure::Core::Response ShareClient::RenewLease( const std::string& leaseId, const RenewShareLeaseOptions& options) const { diff --git a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp index b4de38637..dc5a1bdb0 100644 --- a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp @@ -145,15 +145,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return newClient; } - Azure::Core::Response DirectoryClient::Create( + Azure::Core::Response DirectoryClient::Create( const CreateDirectoryOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Directory::CreateOptions(); protocolLayerOptions.Metadata = options.Metadata; - protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(options.SmbProperties.Attributes); if (protocolLayerOptions.FileAttributes.empty()) { - protocolLayerOptions.FileAttributes = FileAttributesToString(FileAttributes::Directory); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(Models::FileAttributes::Directory); } if (options.SmbProperties.CreationTime.HasValue()) { @@ -187,7 +189,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response DirectoryClient::Delete( + Azure::Core::Response DirectoryClient::Delete( const DeleteDirectoryOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Directory::DeleteOptions(); @@ -195,7 +197,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response DirectoryClient::GetProperties( + Azure::Core::Response DirectoryClient::GetProperties( const GetDirectoryPropertiesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Directory::GetPropertiesOptions(); @@ -203,12 +205,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response DirectoryClient::SetProperties( - FileShareSmbProperties smbProperties, + Azure::Core::Response DirectoryClient::SetProperties( + Models::FileShareSmbProperties smbProperties, const SetDirectoryPropertiesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Directory::SetPropertiesOptions(); - protocolLayerOptions.FileAttributes = FileAttributesToString(smbProperties.Attributes); + protocolLayerOptions.FileAttributes = Details::FileAttributesToString(smbProperties.Attributes); if (smbProperties.CreationTime.HasValue()) { protocolLayerOptions.FileCreationTime = smbProperties.CreationTime.GetValue(); @@ -241,7 +243,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response DirectoryClient::SetMetadata( + Azure::Core::Response DirectoryClient::SetMetadata( const std::map& metadata, const SetDirectoryMetadataOptions& options) const { @@ -251,7 +253,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response + Azure::Core::Response DirectoryClient::ListFilesAndDirectoriesSegment( const ListFilesAndDirectoriesSegmentOptions& options) const { @@ -262,7 +264,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions.MaxResults = options.MaxResults; auto result = Details::ShareRestClient::Directory::ListFilesAndDirectoriesSegment( m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); - ListFilesAndDirectoriesSegmentResult ret; + Models::ListFilesAndDirectoriesSegmentResult ret; ret.ServiceEndpoint = std::move(result->ServiceEndpoint); ret.ShareName = std::move(result->ShareName); ret.ShareSnapshot = std::move(result->ShareSnapshot); @@ -274,12 +276,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ret.DirectoryItems = std::move(result->Segment.DirectoryItems); ret.FileItems = std::move(result->Segment.FileItems); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response DirectoryClient::ListHandlesSegment( - const ListDirectoryHandlesSegmentOptions& options) const + Azure::Core::Response + DirectoryClient::ListHandlesSegment(const ListDirectoryHandlesSegmentOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Directory::ListHandlesOptions(); protocolLayerOptions.ContinuationToken = options.ContinuationToken; @@ -287,15 +289,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions.Recursive = options.Recursive; auto result = Details::ShareRestClient::Directory::ListHandles( m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); - ListDirectoryHandlesSegmentResult ret; + Models::ListDirectoryHandlesSegmentResult ret; ret.ContinuationToken = std::move(result->ContinuationToken); ret.HandleList = std::move(result->HandleList); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response DirectoryClient::ForceCloseHandle( + Azure::Core::Response DirectoryClient::ForceCloseHandle( const std::string& handleId, const ForceCloseDirectoryHandleOptions& options) const { @@ -303,12 +305,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions.HandleId = handleId; auto result = Details::ShareRestClient::File::ForceCloseHandles( m_shareDirectoryUri, *m_pipeline, options.Context, protocolLayerOptions); - return Azure::Core::Response( - ForceCloseDirectoryHandleResult(), result.ExtractRawResponse()); + return Azure::Core::Response( + Models::ForceCloseDirectoryHandleResult(), result.ExtractRawResponse()); } - Azure::Core::Response DirectoryClient::ForceCloseAllHandles( - const ForceCloseAllDirectoryHandlesOptions& options) const + Azure::Core::Response + DirectoryClient::ForceCloseAllHandles(const ForceCloseAllDirectoryHandlesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Directory::ForceCloseHandlesOptions(); protocolLayerOptions.HandleId = c_FileAllHandles; diff --git a/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp index 13b19c8f5..f86c1a492 100644 --- a/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp @@ -132,16 +132,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return newClient; } - Azure::Core::Response FileClient::Create( + Azure::Core::Response FileClient::Create( int64_t fileSize, const CreateFileOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::CreateOptions(); protocolLayerOptions.Metadata = options.Metadata; - protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(options.SmbProperties.Attributes); if (protocolLayerOptions.FileAttributes.empty()) { - protocolLayerOptions.FileAttributes = FileAttributesToString(FileAttributes::None); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(Models::FileAttributes::None); } if (options.SmbProperties.CreationTime.HasValue()) { @@ -201,7 +203,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::Delete(const DeleteFileOptions& options) const + Azure::Core::Response FileClient::Delete( + const DeleteFileOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::DeleteOptions(); protocolLayerOptions.LeaseIdOptional = options.AccessConditions.LeaseId; @@ -209,7 +212,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::Download( + Azure::Core::Response FileClient::Download( const DownloadFileOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::DownloadOptions(); @@ -268,7 +271,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return downloadResponse; } - Azure::Core::Response FileClient::StartCopy( + Azure::Core::Response FileClient::StartCopy( std::string copySource, const StartCopyFileOptions& options) const { @@ -276,7 +279,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions.Metadata = options.Metadata; protocolLayerOptions.CopySource = std::move(copySource); protocolLayerOptions.FileCopyFileAttributes - = FileAttributesToString(options.SmbProperties.Attributes); + = Details::FileAttributesToString(options.SmbProperties.Attributes); if (options.SmbProperties.CreationTime.HasValue()) { protocolLayerOptions.FileCopyFileCreationTime = options.SmbProperties.CreationTime.GetValue(); @@ -297,7 +300,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { if (options.PermissionCopyMode.HasValue()) { protocolLayerOptions.XMsFilePermissionCopyMode = options.PermissionCopyMode.GetValue(); - if (options.PermissionCopyMode.GetValue() == PermissionCopyModeType::Override) + if (options.PermissionCopyMode.GetValue() == Models::PermissionCopyModeType::Override) { if (options.Permission.HasValue()) { @@ -317,7 +320,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } else { - protocolLayerOptions.XMsFilePermissionCopyMode = PermissionCopyModeType::Source; + protocolLayerOptions.XMsFilePermissionCopyMode = Models::PermissionCopyModeType::Source; } protocolLayerOptions.FileCopyIgnoreReadOnly = options.IgnoreReadOnly; protocolLayerOptions.FileCopySetArchiveAttribute = options.SetArchiveAttribute; @@ -326,7 +329,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::AbortCopy( + Azure::Core::Response FileClient::AbortCopy( std::string copyId, const AbortCopyFileOptions& options) const { @@ -337,7 +340,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::GetProperties( + Azure::Core::Response FileClient::GetProperties( const GetFilePropertiesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::GetPropertiesOptions(); @@ -346,13 +349,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::SetProperties( - FileShareHttpHeaders httpHeaders, - FileShareSmbProperties smbProperties, + Azure::Core::Response FileClient::SetProperties( + Models::FileShareHttpHeaders httpHeaders, + Models::FileShareSmbProperties smbProperties, const SetFilePropertiesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::SetHttpHeadersOptions(); - protocolLayerOptions.FileAttributes = FileAttributesToString(smbProperties.Attributes); + protocolLayerOptions.FileAttributes = Details::FileAttributesToString(smbProperties.Attributes); if (smbProperties.CreationTime.HasValue()) { protocolLayerOptions.FileCreationTime = smbProperties.CreationTime.GetValue(); @@ -409,7 +412,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::SetMetadata( + Azure::Core::Response FileClient::SetMetadata( const std::map& metadata, const SetFileMetadataOptions& options) const { @@ -420,13 +423,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::UploadRange( + Azure::Core::Response FileClient::UploadRange( int64_t offset, Azure::Core::Http::BodyStream* content, const UploadFileRangeOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::UploadRangeOptions(); - protocolLayerOptions.XMsWrite = FileRangeWriteType::Update; + protocolLayerOptions.XMsWrite = Models::FileRangeWriteType::Update; protocolLayerOptions.ContentLength = content->Length(); protocolLayerOptions.XMsRange = std::string("bytes=") + std::to_string(offset) + std::string("-") + std::to_string(offset + content->Length() - 1); @@ -436,13 +439,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *content, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::ClearRange( + Azure::Core::Response FileClient::ClearRange( int64_t offset, int64_t length, const ClearFileRangeOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::UploadRangeOptions(); - protocolLayerOptions.XMsWrite = FileRangeWriteType::Clear; + protocolLayerOptions.XMsWrite = Models::FileRangeWriteType::Clear; protocolLayerOptions.ContentLength = 0; protocolLayerOptions.XMsRange = std::string("bytes=") + std::to_string(offset) + std::string("-") + std::to_string(offset + length - 1); @@ -456,7 +459,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions); } - Azure::Core::Response FileClient::GetRangeList( + Azure::Core::Response FileClient::GetRangeList( const GetFileRangeListOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::GetRangeListOptions(); @@ -481,7 +484,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::ListHandlesSegment( + Azure::Core::Response FileClient::ListHandlesSegment( const ListFileHandlesSegmentOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::ListHandlesOptions(); @@ -489,15 +492,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions.MaxResults = options.MaxResults; auto result = Details::ShareRestClient::File::ListHandles( m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); - ListFileHandlesSegmentResult ret; + Models::ListFileHandlesSegmentResult ret; ret.ContinuationToken = std::move(result->ContinuationToken); ret.HandleList = std::move(result->HandleList); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::ForceCloseHandle( + Azure::Core::Response FileClient::ForceCloseHandle( const std::string& handleId, const ForceCloseFileHandleOptions& options) const { @@ -505,11 +508,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { protocolLayerOptions.HandleId = handleId; auto result = Details::ShareRestClient::File::ForceCloseHandles( m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); - return Azure::Core::Response( - ForceCloseFileHandleResult(), result.ExtractRawResponse()); + return Azure::Core::Response( + Models::ForceCloseFileHandleResult(), result.ExtractRawResponse()); } - Azure::Core::Response FileClient::ForceCloseAllHandles( + Azure::Core::Response FileClient::ForceCloseAllHandles( const ForceCloseAllFileHandlesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::File::ForceCloseHandlesOptions(); @@ -519,7 +522,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::AcquireLease( + Azure::Core::Response FileClient::AcquireLease( const std::string& proposedLeaseId, const AcquireFileLeaseOptions& options) const { @@ -530,7 +533,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::ChangeLease( + Azure::Core::Response FileClient::ChangeLease( const std::string& leaseId, const std::string& proposedLeaseId, const ChangeFileLeaseOptions& options) const @@ -542,7 +545,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::ReleaseLease( + Azure::Core::Response FileClient::ReleaseLease( const std::string& leaseId, const ReleaseFileLeaseOptions& options) const { @@ -552,7 +555,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::BreakLease( + Azure::Core::Response FileClient::BreakLease( const BreakFileLeaseOptions& options) const { Details::ShareRestClient::File::BreakLeaseOptions protocolLayerOptions; @@ -560,7 +563,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_shareFileUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response FileClient::DownloadTo( + Azure::Core::Response FileClient::DownloadTo( uint8_t* buffer, std::size_t bufferSize, const DownloadFileToOptions& options) const @@ -622,14 +625,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } firstChunk->BodyStream.reset(); - auto returnTypeConverter = [](Azure::Core::Response& response) { - DownloadFileToResult ret; + auto returnTypeConverter = [](Azure::Core::Response& response) { + Models::DownloadFileToResult ret; ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.HttpHeaders = std::move(response->HttpHeaders); ret.Metadata = std::move(response->Metadata); ret.IsServerEncrypted = response->IsServerEncrypted; - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), std::make_unique(std::move(response.GetRawResponse()))); }; @@ -680,7 +683,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return ret; } - Azure::Core::Response FileClient::DownloadTo( + Azure::Core::Response FileClient::DownloadTo( const std::string& fileName, const DownloadFileToOptions& options) const { @@ -755,14 +758,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { *(firstChunk->BodyStream), fileWriter, 0, firstChunkLength, firstChunkOptions.Context); firstChunk->BodyStream.reset(); - auto returnTypeConverter = [](Azure::Core::Response& response) { - DownloadFileToResult ret; + auto returnTypeConverter = [](Azure::Core::Response& response) { + Models::DownloadFileToResult ret; ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.HttpHeaders = std::move(response->HttpHeaders); ret.Metadata = std::move(response->Metadata); ret.IsServerEncrypted = response->IsServerEncrypted; - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), std::make_unique(std::move(response.GetRawResponse()))); }; @@ -810,17 +813,19 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return ret; } - Azure::Core::Response FileClient::UploadFrom( + Azure::Core::Response FileClient::UploadFrom( const uint8_t* buffer, std::size_t bufferSize, const UploadFileFromOptions& options) const { Details::ShareRestClient::File::CreateOptions protocolLayerOptions; protocolLayerOptions.XMsContentLength = bufferSize; - protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(options.SmbProperties.Attributes); if (protocolLayerOptions.FileAttributes.empty()) { - protocolLayerOptions.FileAttributes = FileAttributesToString(FileAttributes::None); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(Models::FileAttributes::None); } if (options.SmbProperties.CreationTime.HasValue()) { @@ -893,14 +898,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::ConcurrentTransfer( 0, bufferSize, chunkSize, options.Concurrency, uploadPageFunc); - UploadFileFromResult result; + Models::UploadFileFromResult result; result.IsServerEncrypted = createResult->IsServerEncrypted; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::make_unique(std::move(createResult.GetRawResponse()))); } - Azure::Core::Response FileClient::UploadFrom( + Azure::Core::Response FileClient::UploadFrom( const std::string& fileName, const UploadFileFromOptions& options) const { @@ -908,10 +913,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Details::ShareRestClient::File::CreateOptions protocolLayerOptions; protocolLayerOptions.XMsContentLength = fileReader.GetFileSize(); - protocolLayerOptions.FileAttributes = FileAttributesToString(options.SmbProperties.Attributes); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(options.SmbProperties.Attributes); if (protocolLayerOptions.FileAttributes.empty()) { - protocolLayerOptions.FileAttributes = FileAttributesToString(FileAttributes::None); + protocolLayerOptions.FileAttributes + = Details::FileAttributesToString(Models::FileAttributes::None); } if (options.SmbProperties.CreationTime.HasValue()) { @@ -984,9 +991,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::ConcurrentTransfer( 0, fileReader.GetFileSize(), chunkSize, options.Concurrency, uploadPageFunc); - UploadFileFromResult result; + Models::UploadFileFromResult result; result.IsServerEncrypted = createResult->IsServerEncrypted; - return Azure::Core::Response( + return Azure::Core::Response( std::move(result), std::make_unique(std::move(createResult.GetRawResponse()))); } diff --git a/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp index 0c5dc3927..bd0bf4484 100644 --- a/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp @@ -117,7 +117,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return ShareClient(builder, m_pipeline); } - Azure::Core::Response ShareServiceClient::ListSharesSegment( + Azure::Core::Response ShareServiceClient::ListSharesSegment( const ListSharesSegmentOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Service::ListSharesSegmentOptions(); @@ -129,8 +129,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_serviceUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareServiceClient::SetProperties( - StorageServiceProperties properties, + Azure::Core::Response ShareServiceClient::SetProperties( + Models::StorageServiceProperties properties, const SetServicePropertiesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Service::SetPropertiesOptions(); @@ -139,18 +139,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { m_serviceUri, *m_pipeline, options.Context, protocolLayerOptions); } - Azure::Core::Response ShareServiceClient::GetProperties( + Azure::Core::Response ShareServiceClient::GetProperties( const GetServicePropertiesOptions& options) const { auto protocolLayerOptions = Details::ShareRestClient::Service::GetPropertiesOptions(); auto result = Details::ShareRestClient::Service::GetProperties( m_serviceUri, *m_pipeline, options.Context, protocolLayerOptions); - StorageServiceProperties ret; + Models::StorageServiceProperties ret; ret.Cors = std::move(result->Cors); ret.HourMetrics = std::move(result->HourMetrics); ret.MinuteMetrics = std::move(result->MinuteMetrics); ret.Protocol = std::move(result->Protocol); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } diff --git a/sdk/storage/azure-storage-files-shares/test/share_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_client_test.cpp index fa6719bf9..211dac00d 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/share_client_test.cpp @@ -6,17 +6,17 @@ #include -namespace Azure { namespace Storage { namespace Files { namespace Shares { +namespace Azure { namespace Storage { namespace Files { namespace Shares { namespace Models { bool operator==( - const Azure::Storage::Files::Shares::SignedIdentifier& lhs, - const Azure::Storage::Files::Shares::SignedIdentifier& rhs) + const Azure::Storage::Files::Shares::Models::SignedIdentifier& lhs, + const Azure::Storage::Files::Shares::Models::SignedIdentifier& rhs) { return lhs.Id == rhs.Id && lhs.Policy.Start == rhs.Policy.Start && lhs.Policy.Expiry == rhs.Policy.Expiry && lhs.Policy.Permission == rhs.Policy.Permission; } -}}}} // namespace Azure::Storage::Files::Shares +}}}}} // namespace Azure::Storage::Files::Shares::Models namespace Azure { namespace Storage { namespace Test { @@ -39,10 +39,10 @@ namespace Azure { namespace Storage { namespace Test { m_shareClient->Delete(deleteOptions); } - Files::Shares::FileShareHttpHeaders FileShareClientTest::GetInterestingHttpHeaders() + Files::Shares::Models::FileShareHttpHeaders FileShareClientTest::GetInterestingHttpHeaders() { - static Files::Shares::FileShareHttpHeaders result = []() { - Files::Shares::FileShareHttpHeaders ret; + static Files::Shares::Models::FileShareHttpHeaders result = []() { + Files::Shares::Models::FileShareHttpHeaders ret; ret.CacheControl = std::string("no-cache"); ret.ContentDisposition = std::string("attachment"); ret.ContentEncoding = std::string("deflate"); @@ -151,10 +151,10 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(FileShareClientTest, ShareAccessPolicy) { - std::vector identifiers; + std::vector identifiers; for (unsigned i = 0; i < 3; ++i) { - Files::Shares::SignedIdentifier identifier; + Files::Shares::Models::SignedIdentifier identifier; identifier.Id = RandomString(64); identifier.Policy.Start = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(10), 7); diff --git a/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp index e4e0e3cd0..cdd8ae8a4 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp +++ b/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp @@ -11,7 +11,7 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static Files::Shares::FileShareHttpHeaders GetInterestingHttpHeaders(); + static Files::Shares::Models::FileShareHttpHeaders GetInterestingHttpHeaders(); static std::shared_ptr m_shareClient; static std::string m_shareName; diff --git a/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.cpp index 1057218c4..a4de9708c 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.cpp @@ -26,10 +26,11 @@ namespace Azure { namespace Storage { namespace Test { void FileShareDirectoryClientTest::TearDownTestSuite() { m_shareClient->Delete(); } - Files::Shares::FileShareHttpHeaders FileShareDirectoryClientTest::GetInterestingHttpHeaders() + Files::Shares::Models::FileShareHttpHeaders + FileShareDirectoryClientTest::GetInterestingHttpHeaders() { - static Files::Shares::FileShareHttpHeaders result = []() { - Files::Shares::FileShareHttpHeaders ret; + static Files::Shares::Models::FileShareHttpHeaders result = []() { + Files::Shares::Models::FileShareHttpHeaders ret; ret.CacheControl = std::string("no-cache"); ret.ContentDisposition = std::string("attachment"); ret.ContentEncoding = std::string("deflate"); @@ -40,13 +41,15 @@ namespace Azure { namespace Storage { namespace Test { return result; } - std::pair, std::vector> + std::pair< + std::vector, + std::vector> FileShareDirectoryClientTest::ListAllFilesAndDirectories( const std::string& directoryPath, const std::string& prefix) { - std::vector directoryResult; - std::vector fileResult; + std::vector directoryResult; + std::vector fileResult; std::string continuation; Files::Shares::ListFilesAndDirectoriesSegmentOptions options; if (!prefix.empty()) @@ -63,9 +66,10 @@ namespace Azure { namespace Storage { namespace Test { continuation = response->ContinuationToken; options.ContinuationToken = continuation; } while (!continuation.empty()); - return std:: - make_pair, std::vector>( - std::move(fileResult), std::move(directoryResult)); + return std::make_pair< + std::vector, + std::vector>( + std::move(fileResult), std::move(directoryResult)); } TEST_F(FileShareDirectoryClientTest, CreateDeleteDirectories) @@ -161,9 +165,9 @@ namespace Azure { namespace Storage { namespace Test { { // Set permission with SetProperties works - Files::Shares::FileShareSmbProperties properties; - properties.Attributes = Files::Shares::FileAttributes::Directory - | Files::Shares::FileAttributes::NotContentIndexed; + Files::Shares::Models::FileShareSmbProperties properties; + properties.Attributes = Files::Shares::Models::FileAttributes::Directory + | Files::Shares::Models::FileAttributes::NotContentIndexed; properties.CreationTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.LastWriteTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.PermissionKey = ""; @@ -194,9 +198,9 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(FileShareDirectoryClientTest, DirectorySmbProperties) { - Files::Shares::FileShareSmbProperties properties; - properties.Attributes = Files::Shares::FileAttributes::Directory - | Files::Shares::FileAttributes::NotContentIndexed; + Files::Shares::Models::FileShareSmbProperties properties; + properties.Attributes = Files::Shares::Models::FileAttributes::Directory + | Files::Shares::Models::FileAttributes::NotContentIndexed; properties.CreationTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.LastWriteTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.PermissionKey = m_fileShareDirectoryClient->GetProperties()->FilePermissionKey; @@ -275,7 +279,7 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( result.second.begin(), result.second.end(), - [&directoryNameA](const Files::Shares::DirectoryItem& item) { + [&directoryNameA](const Files::Shares::Models::DirectoryItem& item) { return item.Name == directoryNameA; }); EXPECT_EQ(iter->Name, directoryNameA); @@ -283,7 +287,7 @@ namespace Azure { namespace Storage { namespace Test { iter = std::find_if( result.second.begin(), result.second.end(), - [&directoryNameB](const Files::Shares::DirectoryItem& item) { + [&directoryNameB](const Files::Shares::Models::DirectoryItem& item) { return item.Name == directoryNameB; }); EXPECT_EQ(iter->Name, directoryNameB); @@ -297,16 +301,18 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( result.second.begin(), result.second.end(), - [&name](const Files::Shares::DirectoryItem& item) { return item.Name == name; }); + [&name](const Files::Shares::Models::DirectoryItem& item) { + return item.Name == name; + }); EXPECT_EQ(iter->Name, name); EXPECT_NE(result.second.end(), iter); } for (const auto& name : fileNameSetA) { auto iter = std::find_if( - result.first.begin(), result.first.end(), [&name](const Files::Shares::FileItem& item) { - return item.Name == name; - }); + result.first.begin(), + result.first.end(), + [&name](const Files::Shares::Models::FileItem& item) { return item.Name == name; }); EXPECT_EQ(iter->Name, name); EXPECT_EQ(1024, iter->Properties.ContentLength); EXPECT_NE(result.first.end(), iter); @@ -316,15 +322,17 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( result.second.begin(), result.second.end(), - [&name](const Files::Shares::DirectoryItem& item) { return item.Name == name; }); + [&name](const Files::Shares::Models::DirectoryItem& item) { + return item.Name == name; + }); EXPECT_EQ(result.second.end(), iter); } for (const auto& name : fileNameSetB) { auto iter = std::find_if( - result.first.begin(), result.first.end(), [&name](const Files::Shares::FileItem& item) { - return item.Name == name; - }); + result.first.begin(), + result.first.end(), + [&name](const Files::Shares::Models::FileItem& item) { return item.Name == name; }); EXPECT_EQ(result.first.end(), iter); } } diff --git a/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp index b01d82cab..a476b8c1d 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp +++ b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp @@ -12,13 +12,14 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static std:: - pair, std::vector> - ListAllFilesAndDirectories( - const std::string& directoryPath = std::string(), - const std::string& prefix = std::string()); + static std::pair< + std::vector, + std::vector> + ListAllFilesAndDirectories( + const std::string& directoryPath = std::string(), + const std::string& prefix = std::string()); - static Files::Shares::FileShareHttpHeaders GetInterestingHttpHeaders(); + static Files::Shares::Models::FileShareHttpHeaders GetInterestingHttpHeaders(); static std::shared_ptr m_fileShareDirectoryClient; static std::string m_directoryName; diff --git a/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp index e0784785f..9e4d380a8 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp @@ -132,9 +132,9 @@ namespace Azure { namespace Storage { namespace Test { { // Set permission with SetProperties works - Files::Shares::FileShareSmbProperties properties; - properties.Attributes = Files::Shares::FileAttributes::System - | Files::Shares::FileAttributes::NotContentIndexed; + Files::Shares::Models::FileShareSmbProperties properties; + properties.Attributes = Files::Shares::Models::FileAttributes::System + | Files::Shares::Models::FileAttributes::NotContentIndexed; properties.CreationTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.LastWriteTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.PermissionKey = ""; @@ -165,9 +165,9 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(FileShareFileClientTest, FileSmbProperties) { - Files::Shares::FileShareSmbProperties properties; - properties.Attributes - = Files::Shares::FileAttributes::System | Files::Shares::FileAttributes::NotContentIndexed; + Files::Shares::Models::FileShareSmbProperties properties; + properties.Attributes = Files::Shares::Models::FileAttributes::System + | Files::Shares::Models::FileAttributes::NotContentIndexed; properties.CreationTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.LastWriteTime = ToIso8601(std::chrono::system_clock::now(), 7); properties.PermissionKey = m_fileClient->GetProperties()->FilePermissionKey; @@ -227,8 +227,8 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(aLease.LeaseId, leaseId1); auto properties = *m_fileClient->GetProperties(); - EXPECT_EQ(properties.LeaseState.GetValue(), Files::Shares::LeaseStateType::Leased); - EXPECT_EQ(properties.LeaseStatus.GetValue(), Files::Shares::LeaseStatusType::Locked); + EXPECT_EQ(properties.LeaseState.GetValue(), Files::Shares::Models::LeaseStateType::Leased); + EXPECT_EQ(properties.LeaseStatus.GetValue(), Files::Shares::Models::LeaseStatusType::Locked); std::string leaseId2 = CreateUniqueLeaseId(); EXPECT_NE(leaseId1, leaseId2); @@ -582,9 +582,9 @@ namespace Azure { namespace Storage { namespace Test { fileClient.Create(fileSize); auto destFileClient = m_shareClient->GetFileClient(LowercaseRandomString(10)); - Files::Shares::StartCopyFileResult result; + Files::Shares::Models::StartCopyFileResult result; EXPECT_NO_THROW(result = destFileClient.StartCopy(fileClient.GetUri()).ExtractValue()); - EXPECT_EQ(Files::Shares::CopyStatusType::Success, result.CopyStatus); + EXPECT_EQ(Files::Shares::Models::CopyStatusType::Success, result.CopyStatus); EXPECT_FALSE(result.CopyId.empty()); } @@ -595,7 +595,7 @@ namespace Azure { namespace Storage { namespace Test { auto destFileClient = m_shareClient->GetFileClient(LowercaseRandomString(10)); Files::Shares::StartCopyFileOptions copyOptions; - copyOptions.PermissionCopyMode = Files::Shares::PermissionCopyModeType::Override; + copyOptions.PermissionCopyMode = Files::Shares::Models::PermissionCopyModeType::Override; EXPECT_THROW(destFileClient.StartCopy(fileClient.GetUri(), copyOptions), std::runtime_error); } } @@ -618,7 +618,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(halfContent, downloadContent); EXPECT_NO_THROW(fileClient.ClearRange(512, 512)); - Files::Shares::GetFileRangeListResult result; + Files::Shares::Models::GetFileRangeListResult result; EXPECT_NO_THROW(result = fileClient.GetRangeList().ExtractValue()); EXPECT_EQ(2U, result.Ranges.size()); EXPECT_EQ(0, result.Ranges[0].Start); @@ -647,7 +647,7 @@ namespace Azure { namespace Storage { namespace Test { auto snapshot1 = m_shareClient->CreateSnapshot()->Snapshot; EXPECT_NO_THROW(fileClient.ClearRange(500, 2048)); auto snapshot2 = m_shareClient->CreateSnapshot()->Snapshot; - Files::Shares::GetFileRangeListResult result; + Files::Shares::Models::GetFileRangeListResult result; Files::Shares::GetFileRangeListOptions options; options.PrevShareSnapshot = snapshot1; EXPECT_NO_THROW(result = fileClient.GetRangeList(options).ExtractValue()); diff --git a/sdk/storage/azure-storage-files-shares/test/share_sas_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_sas_test.cpp index bfdbc87cc..e8d3243e7 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_sas_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/share_sas_test.cpp @@ -172,7 +172,7 @@ namespace Azure { namespace Storage { namespace Test { // Identifier { - Files::Shares::SignedIdentifier identifier; + Files::Shares::Models::SignedIdentifier identifier; identifier.Id = RandomString(64); identifier.Policy.Start = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(5)); @@ -194,7 +194,7 @@ namespace Azure { namespace Storage { namespace Test { // response headers override { - Files::Shares::FileShareHttpHeaders headers; + Files::Shares::Models::FileShareHttpHeaders headers; headers.ContentType = "application/x-binary"; headers.ContentLanguage = "en-US"; headers.ContentDisposition = "attachment"; diff --git a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp index 2e48cfc7a..945c82b79 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.cpp @@ -63,10 +63,10 @@ namespace Azure { namespace Storage { namespace Test { } } - std::vector FileShareServiceClientTest::ListAllShares( + std::vector FileShareServiceClientTest::ListAllShares( const std::string& prefix) { - std::vector result; + std::vector result; std::string continuation; Files::Shares::ListSharesSegmentOptions options; if (!prefix.empty()) @@ -91,7 +91,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_shareNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::Shares::ShareItem& share) { + result.begin(), result.end(), [&name](const Files::Shares::Models::ShareItem& share) { return share.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_sharePrefixA.size()), m_sharePrefixA); @@ -100,7 +100,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_shareNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::Shares::ShareItem& share) { + result.begin(), result.end(), [&name](const Files::Shares::Models::ShareItem& share) { return share.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_sharePrefixB.size()), m_sharePrefixB); @@ -113,7 +113,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_shareNameSetA) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::Shares::ShareItem& share) { + result.begin(), result.end(), [&name](const Files::Shares::Models::ShareItem& share) { return share.Name == name; }); EXPECT_EQ(iter->Name.substr(0U, m_sharePrefixA.size()), m_sharePrefixA); @@ -122,7 +122,7 @@ namespace Azure { namespace Storage { namespace Test { for (const auto& name : m_shareNameSetB) { auto iter = std::find_if( - result.begin(), result.end(), [&name](const Files::Shares::ShareItem& share) { + result.begin(), result.end(), [&name](const Files::Shares::Models::ShareItem& share) { return share.Name == name; }); EXPECT_EQ(result.end(), iter); @@ -157,7 +157,7 @@ namespace Azure { namespace Storage { namespace Test { { auto properties = *m_fileShareServiceClient->GetProperties(); // Has to remove before set, otherwise would return failure. - properties.Protocol = Core::Nullable(); + properties.Protocol = Core::Nullable(); auto originalProperties = properties; properties.HourMetrics.Enabled = true; @@ -170,7 +170,7 @@ namespace Azure { namespace Storage { namespace Test { properties.MinuteMetrics.RetentionPolicy.Days = 3; properties.MinuteMetrics.IncludeApis = true; - Files::Shares::CorsRule corsRule; + Files::Shares::Models::CorsRule corsRule; corsRule.AllowedOrigins = "http://www.example1.com"; corsRule.AllowedMethods = "GET,PUT"; corsRule.AllowedHeaders = "x-ms-header1,x-ms-header2"; @@ -231,7 +231,7 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( properties.Cors.begin(), properties.Cors.end(), - [&cors](const Files::Shares::CorsRule& rule) { + [&cors](const Files::Shares::Models::CorsRule& rule) { return rule.AllowedOrigins == cors.AllowedOrigins; }); EXPECT_EQ(iter->AllowedMethods, cors.AllowedMethods); @@ -262,7 +262,7 @@ namespace Azure { namespace Storage { namespace Test { properties.MinuteMetrics.RetentionPolicy.Days = 3; properties.MinuteMetrics.IncludeApis = true; - Files::Shares::CorsRule corsRule; + Files::Shares::Models::CorsRule corsRule; corsRule.AllowedOrigins = "http://www.example1.com"; corsRule.AllowedMethods = "GET,PUT"; corsRule.AllowedHeaders = "x-ms-header1,x-ms-header2"; @@ -277,7 +277,7 @@ namespace Azure { namespace Storage { namespace Test { corsRule.MaxAgeInSeconds = 20; properties.Cors.emplace_back(corsRule); - auto protocolSettings = Files::Shares::ShareProtocolSettings(); + auto protocolSettings = Files::Shares::Models::ShareProtocolSettings(); protocolSettings.Settings.Multichannel.Enabled = true; properties.Protocol = protocolSettings; @@ -327,7 +327,7 @@ namespace Azure { namespace Storage { namespace Test { auto iter = std::find_if( properties.Cors.begin(), properties.Cors.end(), - [&cors](const Files::Shares::CorsRule& rule) { + [&cors](const Files::Shares::Models::CorsRule& rule) { return rule.AllowedOrigins == cors.AllowedOrigins; }); EXPECT_EQ(iter->AllowedMethods, cors.AllowedMethods); diff --git a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp index 66783c41d..62ebbb391 100644 --- a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp +++ b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp @@ -11,7 +11,7 @@ namespace Azure { namespace Storage { namespace Test { static void SetUpTestSuite(); static void TearDownTestSuite(); - static std::vector ListAllShares( + static std::vector ListAllShares( const std::string& prefix = std::string()); static std::shared_ptr m_fileShareServiceClient;