diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp index b20168650..77ad70c1d 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp @@ -38,7 +38,7 @@ namespace Azure { namespace Storage { namespace Blobs { const std::string& connectionString, const std::string& containerName, const std::string& blobName, - const AppendBlobClientOptions& options = AppendBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of AppendBlobClient. @@ -54,7 +54,7 @@ namespace Azure { namespace Storage { namespace Blobs { explicit AppendBlobClient( const std::string& blobUri, std::shared_ptr credential, - const AppendBlobClientOptions& options = AppendBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of AppendBlobClient. @@ -69,7 +69,7 @@ namespace Azure { namespace Storage { namespace Blobs { explicit AppendBlobClient( const std::string& blobUri, std::shared_ptr credential, - const AppendBlobClientOptions& options = AppendBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of AppendBlobClient. @@ -83,7 +83,7 @@ namespace Azure { namespace Storage { namespace Blobs { */ explicit AppendBlobClient( const std::string& blobUri, - const AppendBlobClientOptions& options = AppendBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initializes a new instance of the AppendBlobClient class with an identical uri diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp index 43970d587..a84fb2d5e 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp @@ -244,12 +244,12 @@ namespace Azure { namespace Storage { namespace Blobs { * @brief Downloads a blob or a blob range from the service to a file using parallel * requests. * - * @param file A file path to write the downloaded content to. + * @param fileName A file path to write the downloaded content to. * @param options Optional parameters to execute this function. * @return A DownloadBlobToResult describing the downloaded blob. */ Azure::Core::Response DownloadTo( - const std::string& file, + const std::string& fileName, const DownloadBlobToOptions& options = DownloadBlobToOptions()) const; /** diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp index f7dc7d5b6..5f8edd1f0 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp @@ -16,8 +16,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Specifies access conditions for a container. */ - struct ContainerAccessConditions : public LastModifiedTimeAccessConditions, - public LeaseAccessConditions + struct ContainerAccessConditions : public ModifiedTimeConditions, public LeaseAccessConditions { }; @@ -37,7 +36,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Specifies access conditions for a blob. */ - struct BlobAccessConditions : public LastModifiedTimeAccessConditions, + struct BlobAccessConditions : public ModifiedTimeConditions, public ETagAccessConditions, public LeaseAccessConditions, public TagAccessConditions @@ -456,7 +455,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobContainerClient::AcquireLease. */ - struct AcquireContainerLeaseOptions : public LastModifiedTimeAccessConditions + struct AcquireContainerLeaseOptions : public ModifiedTimeConditions { /** * @brief Context for cancelling long running operations. @@ -467,7 +466,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobContainerClient::RenewLease. */ - struct RenewContainerLeaseOptions : public LastModifiedTimeAccessConditions + struct RenewContainerLeaseOptions : public ModifiedTimeConditions { /** * @brief Context for cancelling long running operations. @@ -478,7 +477,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobContainerClient::ChangeLease. */ - struct ChangeContainerLeaseOptions : public LastModifiedTimeAccessConditions + struct ChangeContainerLeaseOptions : public ModifiedTimeConditions { /** * @brief Context for cancelling long running operations. @@ -489,7 +488,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobContainerClient::ReleaseLease. */ - struct ReleaseContainerLeaseOptions : public LastModifiedTimeAccessConditions + struct ReleaseContainerLeaseOptions : public ModifiedTimeConditions { /** * @brief Context for cancelling long running operations. @@ -500,7 +499,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobContainerClient::BreakLease. */ - struct BreakContainerLeaseOptions : public LastModifiedTimeAccessConditions + struct BreakContainerLeaseOptions : public ModifiedTimeConditions { /** * @brief Context for cancelling long running operations. @@ -550,27 +549,6 @@ namespace Azure { namespace Storage { namespace Blobs { StorageRetryWithSecondaryOptions RetryOptions; }; - /** - * @brief Block blob client options used to initalize BlockBlobClient. - */ - struct BlockBlobClientOptions : public BlobClientOptions - { - }; - - /** - * @brief Append blob client options used to initalize AppendBlobClient. - */ - struct AppendBlobClientOptions : public BlobClientOptions - { - }; - - /** - * @brief Page blob client options used to initalize PageBlobClient. - */ - struct PageBlobClientOptions : public BlobClientOptions - { - }; - /** * @brief Optional parameters for BlobClient::GetProperties. */ @@ -827,7 +805,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobClient::AcquireLease. */ - struct AcquireBlobLeaseOptions : public LastModifiedTimeAccessConditions, + struct AcquireBlobLeaseOptions : public ModifiedTimeConditions, public ETagAccessConditions, public TagAccessConditions { @@ -840,7 +818,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobClient::RenewLease. */ - struct RenewBlobLeaseOptions : public LastModifiedTimeAccessConditions, + struct RenewBlobLeaseOptions : public ModifiedTimeConditions, public ETagAccessConditions, public TagAccessConditions { @@ -853,7 +831,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobClient::ChangeLease. */ - struct ChangeBlobLeaseOptions : public LastModifiedTimeAccessConditions, + struct ChangeBlobLeaseOptions : public ModifiedTimeConditions, public ETagAccessConditions, public TagAccessConditions { @@ -866,7 +844,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobClient::ReleaseLease. */ - struct ReleaseBlobLeaseOptions : public LastModifiedTimeAccessConditions, + struct ReleaseBlobLeaseOptions : public ModifiedTimeConditions, public ETagAccessConditions, public TagAccessConditions { @@ -879,7 +857,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional parameters for BlobClient::BreakLease. */ - struct BreakBlobLeaseOptions : public LastModifiedTimeAccessConditions, + struct BreakBlobLeaseOptions : public ModifiedTimeConditions, public ETagAccessConditions, public TagAccessConditions { @@ -1074,7 +1052,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional conditions that the source must meet to perform this operation. */ - struct : public LastModifiedTimeAccessConditions, public ETagAccessConditions + struct : public ModifiedTimeConditions, public ETagAccessConditions { } SourceConditions; }; diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp index 04c671115..b7972ac11 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp @@ -48,7 +48,7 @@ namespace Azure { namespace Storage { namespace Blobs { const std::string& connectionString, const std::string& containerName, const std::string& blobName, - const BlockBlobClientOptions& options = BlockBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of BlockBlobClient. @@ -64,7 +64,7 @@ namespace Azure { namespace Storage { namespace Blobs { explicit BlockBlobClient( const std::string& blobUri, std::shared_ptr credential, - const BlockBlobClientOptions& options = BlockBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of BlockBlobClient. @@ -79,7 +79,7 @@ namespace Azure { namespace Storage { namespace Blobs { explicit BlockBlobClient( const std::string& blobUri, std::shared_ptr credential, - const BlockBlobClientOptions& options = BlockBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of BlockBlobClient. @@ -93,7 +93,7 @@ namespace Azure { namespace Storage { namespace Blobs { */ explicit BlockBlobClient( const std::string& blobUri, - const BlockBlobClientOptions& options = BlockBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initializes a new instance of the BlockBlobClient class with an identical uri @@ -146,12 +146,12 @@ namespace Azure { namespace Storage { namespace Blobs { * @brief Creates a new block blob, or updates the content of an existing block blob. Updating * an existing block blob overwrites any existing metadata on the blob. * - * @param file A file containing the content to upload. + * @param fileName A file containing the content to upload. * @param options Optional parameters to execute this function. * @return A UploadBlockBlobFromResult describing the state of the updated block blob. */ Azure::Core::Response UploadFrom( - const std::string& file, + const std::string& fileName, const UploadBlockBlobFromOptions& options = UploadBlockBlobFromOptions()) const; /** diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp index 6f915aa95..da2aa2060 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp @@ -40,7 +40,7 @@ namespace Azure { namespace Storage { namespace Blobs { const std::string& connectionString, const std::string& containerName, const std::string& blobName, - const PageBlobClientOptions& options = PageBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of PageBlobClient. @@ -56,7 +56,7 @@ namespace Azure { namespace Storage { namespace Blobs { explicit PageBlobClient( const std::string& blobUri, std::shared_ptr credential, - const PageBlobClientOptions& options = PageBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of PageBlobClient. @@ -71,7 +71,7 @@ namespace Azure { namespace Storage { namespace Blobs { explicit PageBlobClient( const std::string& blobUri, std::shared_ptr credential, - const PageBlobClientOptions& options = PageBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initialize a new instance of PageBlobClient. @@ -85,7 +85,7 @@ namespace Azure { namespace Storage { namespace Blobs { */ explicit PageBlobClient( const std::string& blobUri, - const PageBlobClientOptions& options = PageBlobClientOptions()); + const BlobClientOptions& options = BlobClientOptions()); /** * @brief Initializes a new instance of the PageBlobClient class with an identical uri @@ -156,7 +156,7 @@ namespace Azure { namespace Storage { namespace Blobs { * @return A UploadPageBlobPagesFromUriResult describing the state of the updated pages. */ Azure::Core::Response UploadPagesFromUri( - int64_t destinationoffset, + int64_t destinationOffset, std::string sourceUri, int64_t sourceOffset, int64_t sourceLength, diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp index 4f41b9446..3b4f7d4c9 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp @@ -11,7 +11,7 @@ #include "azure/core/strings.hpp" #include "azure/storage/common/crypt.hpp" #include "azure/storage/common/storage_common.hpp" -#include "azure/storage/common/storage_error.hpp" +#include "azure/storage/common/storage_exception.hpp" #include "azure/storage/common/xml_wrapper.hpp" #include @@ -1789,11 +1789,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = ListContainersSegmentResultFromXml(reader); } @@ -1817,10 +1817,10 @@ namespace Azure { namespace Storage { namespace Blobs { unused(options); std::string xml_body; { - XmlWriter writer; + Storage::Details::XmlWriter writer; GetUserDelegationKeyOptionsToXml(writer, options); xml_body = writer.GetDocument(); - writer.Write(XmlNode{XmlNodeType::End}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::End}); } Azure::Core::Http::MemoryBodyStream xml_body_stream( reinterpret_cast(xml_body.data()), xml_body.length()); @@ -1843,11 +1843,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetUserDelegationKeyResultFromXml(reader); } @@ -1884,11 +1884,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetServicePropertiesResultFromXml(reader); } @@ -1911,10 +1911,10 @@ namespace Azure { namespace Storage { namespace Blobs { unused(options); std::string xml_body; { - XmlWriter writer; + Storage::Details::XmlWriter writer; SetServicePropertiesOptionsToXml(writer, options); xml_body = writer.GetDocument(); - writer.Write(XmlNode{XmlNodeType::End}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::End}); } Azure::Core::Http::MemoryBodyStream xml_body_stream( reinterpret_cast(xml_body.data()), xml_body.length()); @@ -1937,7 +1937,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -1972,7 +1972,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.SkuName = SkuNameFromString(httpResponse.GetHeaders().at("x-ms-sku-name")); response.AccountKind @@ -2010,11 +2010,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetServiceStatisticsResultFromXml(reader); } @@ -2066,11 +2066,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = FilterBlobsSegmentResultFromXml(reader); } @@ -2079,7 +2079,8 @@ namespace Azure { namespace Storage { namespace Blobs { } private: - static FilterBlobsSegmentResult FilterBlobsSegmentResultFromXml(XmlReader& reader) + static FilterBlobsSegmentResult FilterBlobsSegmentResultFromXml( + Storage::Details::XmlReader& reader) { FilterBlobsSegmentResult ret; enum class XmlTagName @@ -2095,11 +2096,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2110,7 +2111,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "EnumerationResults") == 0) { @@ -2143,7 +2144,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::k_EnumerationResults && path[1] == XmlTagName::k_Where) @@ -2157,7 +2158,7 @@ namespace Azure { namespace Storage { namespace Blobs { ret.ContinuationToken = node.Value; } } - else if (node.Type == XmlNodeType::Attribute) + else if (node.Type == Storage::Details::XmlNodeType::Attribute) { if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults && std::strcmp(node.Name, "ServiceEndpoint") == 0) @@ -2169,7 +2170,8 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static GetServicePropertiesResult GetServicePropertiesResultFromXml(XmlReader& reader) + static GetServicePropertiesResult GetServicePropertiesResultFromXml( + Storage::Details::XmlReader& reader) { GetServicePropertiesResult ret; enum class XmlTagName @@ -2189,11 +2191,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2204,7 +2206,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "StorageServiceProperties") == 0) { @@ -2288,7 +2290,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::k_StorageServiceProperties && path[1] == XmlTagName::k_DefaultServiceVersion) @@ -2300,7 +2302,8 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static GetServiceStatisticsResult GetServiceStatisticsResultFromXml(XmlReader& reader) + static GetServiceStatisticsResult GetServiceStatisticsResultFromXml( + Storage::Details::XmlReader& reader) { GetServiceStatisticsResult ret; enum class XmlTagName @@ -2313,11 +2316,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2328,7 +2331,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "StorageServiceStats") == 0) { @@ -2349,14 +2352,15 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } return ret; } - static GetUserDelegationKeyResult GetUserDelegationKeyResultFromXml(XmlReader& reader) + static GetUserDelegationKeyResult GetUserDelegationKeyResultFromXml( + Storage::Details::XmlReader& reader) { GetUserDelegationKeyResult ret; enum class XmlTagName @@ -2375,11 +2379,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2390,7 +2394,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "UserDelegationKey") == 0) { @@ -2429,7 +2433,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::k_UserDelegationKey && path[1] == XmlTagName::k_SignedOid) @@ -2477,7 +2481,8 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static ListContainersSegmentResult ListContainersSegmentResultFromXml(XmlReader& reader) + static ListContainersSegmentResult ListContainersSegmentResultFromXml( + Storage::Details::XmlReader& reader) { ListContainersSegmentResult ret; enum class XmlTagName @@ -2494,11 +2499,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2509,7 +2514,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "EnumerationResults") == 0) { @@ -2546,7 +2551,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::k_EnumerationResults && path[1] == XmlTagName::k_Prefix) @@ -2566,7 +2571,7 @@ namespace Azure { namespace Storage { namespace Blobs { ret.ContinuationToken = node.Value; } } - else if (node.Type == XmlNodeType::Attribute) + else if (node.Type == Storage::Details::XmlNodeType::Attribute) { if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults && std::strcmp(node.Name, "ServiceEndpoint") == 0) @@ -2578,7 +2583,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobAnalyticsLogging BlobAnalyticsLoggingFromXml(XmlReader& reader) + static BlobAnalyticsLogging BlobAnalyticsLoggingFromXml(Storage::Details::XmlReader& reader) { BlobAnalyticsLogging ret; enum class XmlTagName @@ -2594,11 +2599,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2609,7 +2614,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Version") == 0) { @@ -2641,7 +2646,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Version) { @@ -2664,7 +2669,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobContainerItem BlobContainerItemFromXml(XmlReader& reader) + static BlobContainerItem BlobContainerItemFromXml(Storage::Details::XmlReader& reader) { BlobContainerItem ret; enum class XmlTagName @@ -2692,11 +2697,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2707,7 +2712,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Name") == 0) { @@ -2787,7 +2792,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Name) { @@ -2878,7 +2883,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobCorsRule BlobCorsRuleFromXml(XmlReader& reader) + static BlobCorsRule BlobCorsRuleFromXml(Storage::Details::XmlReader& reader) { BlobCorsRule ret; enum class XmlTagName @@ -2894,11 +2899,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2909,7 +2914,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "AllowedOrigins") == 0) { @@ -2936,7 +2941,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_AllowedOrigins) { @@ -2963,7 +2968,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobGeoReplication BlobGeoReplicationFromXml(XmlReader& reader) + static BlobGeoReplication BlobGeoReplicationFromXml(Storage::Details::XmlReader& reader) { BlobGeoReplication ret; enum class XmlTagName @@ -2976,11 +2981,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2991,7 +2996,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Status") == 0) { @@ -3006,7 +3011,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Status) { @@ -3021,7 +3026,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobMetrics BlobMetricsFromXml(XmlReader& reader) + static BlobMetrics BlobMetricsFromXml(Storage::Details::XmlReader& reader) { BlobMetrics ret; enum class XmlTagName @@ -3036,11 +3041,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -3051,7 +3056,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Version") == 0) { @@ -3079,7 +3084,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Version) { @@ -3098,7 +3103,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobRetentionPolicy BlobRetentionPolicyFromXml(XmlReader& reader) + static BlobRetentionPolicy BlobRetentionPolicyFromXml(Storage::Details::XmlReader& reader) { BlobRetentionPolicy ret; enum class XmlTagName @@ -3111,11 +3116,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -3126,7 +3131,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Enabled") == 0) { @@ -3141,7 +3146,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Enabled) { @@ -3156,7 +3161,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobStaticWebsite BlobStaticWebsiteFromXml(XmlReader& reader) + static BlobStaticWebsite BlobStaticWebsiteFromXml(Storage::Details::XmlReader& reader) { BlobStaticWebsite ret; enum class XmlTagName @@ -3171,11 +3176,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -3186,7 +3191,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Enabled") == 0) { @@ -3209,7 +3214,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Enabled) { @@ -3232,7 +3237,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static FilterBlobItem FilterBlobItemFromXml(XmlReader& reader) + static FilterBlobItem FilterBlobItemFromXml(Storage::Details::XmlReader& reader) { FilterBlobItem ret; enum class XmlTagName @@ -3246,11 +3251,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -3261,7 +3266,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Name") == 0) { @@ -3280,7 +3285,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Name) { @@ -3299,7 +3304,8 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static std::map MetadataFromXml(XmlReader& reader) + static std::map MetadataFromXml( + Storage::Details::XmlReader& reader) { std::map ret; int depth = 0; @@ -3307,25 +3313,25 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (depth++ == 0) { key = node.Name; } } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (depth-- == 0) { break; } } - else if (depth == 1 && node.Type == XmlNodeType::Text) + else if (depth == 1 && node.Type == Storage::Details::XmlNodeType::Text) { ret.emplace(std::move(key), std::string(node.Value)); } @@ -3334,160 +3340,223 @@ namespace Azure { namespace Storage { namespace Blobs { } static void GetUserDelegationKeyOptionsToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const GetUserDelegationKeyOptions& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "KeyInfo"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Start"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.StartsOn.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Expiry"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.ExpiresOn.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "KeyInfo"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Start"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.StartsOn.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Expiry"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.ExpiresOn.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static void SetServicePropertiesOptionsToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const SetServicePropertiesOptions& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "StorageServiceProperties"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "StorageServiceProperties"}); BlobServicePropertiesToXml(writer, options.Properties); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static void BlobServicePropertiesToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const BlobServiceProperties& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Logging"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Logging"}); BlobAnalyticsLoggingToXml(writer, options.Logging); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "HourMetrics"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "HourMetrics"}); BlobMetricsToXml(writer, options.HourMetrics); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "MinuteMetrics"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "MinuteMetrics"}); BlobMetricsToXml(writer, options.MinuteMetrics); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Cors"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Cors"}); for (const auto& i : options.Cors) { BlobCorsRuleToXml(writer, i); } - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "DefaultServiceVersion"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.DefaultServiceVersion.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "DeleteRetentionPolicy"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "DefaultServiceVersion"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.DefaultServiceVersion.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "DeleteRetentionPolicy"}); BlobRetentionPolicyToXml(writer, options.DeleteRetentionPolicy); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "StaticWebsite"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "StaticWebsite"}); BlobStaticWebsiteToXml(writer, options.StaticWebsite); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static void BlobAnalyticsLoggingToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const BlobAnalyticsLogging& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Version"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Version.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Delete"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Delete ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Read"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Read ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Write"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Write ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "RetentionPolicy"}); - BlobRetentionPolicyToXml(writer, options.RetentionPolicy); - writer.Write(XmlNode{XmlNodeType::EndTag}); - } - - static void BlobCorsRuleToXml(XmlWriter& writer, const BlobCorsRule& options) - { - writer.Write(XmlNode{XmlNodeType::StartTag, "CorsRule"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "AllowedOrigins"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.AllowedOrigins.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "AllowedMethods"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.AllowedMethods.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "AllowedHeaders"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.AllowedHeaders.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "ExposedHeaders"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.ExposedHeaders.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "MaxAgeInSeconds"}); writer.Write( - XmlNode{XmlNodeType::Text, nullptr, std::to_string(options.MaxAgeInSeconds).data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Version"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Version.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Delete"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Delete ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Read"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Read ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Write"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Write ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "RetentionPolicy"}); + BlobRetentionPolicyToXml(writer, options.RetentionPolicy); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void BlobMetricsToXml(XmlWriter& writer, const BlobMetrics& options) + static void BlobCorsRuleToXml( + Storage::Details::XmlWriter& writer, + const BlobCorsRule& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Version"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Version.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Enabled"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Enabled ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "CorsRule"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AllowedOrigins"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.AllowedOrigins.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AllowedMethods"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.AllowedMethods.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AllowedHeaders"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.AllowedHeaders.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "ExposedHeaders"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.ExposedHeaders.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "MaxAgeInSeconds"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + std::to_string(options.MaxAgeInSeconds).data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + } + + static void BlobMetricsToXml( + Storage::Details::XmlWriter& writer, + const BlobMetrics& options) + { + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Version"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Version.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Enabled ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (options.IncludeApis.HasValue()) { - writer.Write(XmlNode{XmlNodeType::StartTag, "IncludeAPIs"}); - writer.Write(XmlNode{ - XmlNodeType::Text, nullptr, options.IncludeApis.GetValue() ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "IncludeAPIs"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.IncludeApis.GetValue() ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - writer.Write(XmlNode{XmlNodeType::StartTag, "RetentionPolicy"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "RetentionPolicy"}); BlobRetentionPolicyToXml(writer, options.RetentionPolicy); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void BlobRetentionPolicyToXml(XmlWriter& writer, const BlobRetentionPolicy& options) + static void BlobRetentionPolicyToXml( + Storage::Details::XmlWriter& writer, + const BlobRetentionPolicy& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Enabled"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Enabled ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Enabled ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (options.Days.HasValue()) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Days"}); - writer.Write(XmlNode{ - XmlNodeType::Text, nullptr, std::to_string(options.Days.GetValue()).data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Days"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + std::to_string(options.Days.GetValue()).data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } } - static void BlobStaticWebsiteToXml(XmlWriter& writer, const BlobStaticWebsite& options) + static void BlobStaticWebsiteToXml( + Storage::Details::XmlWriter& writer, + const BlobStaticWebsite& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Enabled"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Enabled ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Enabled ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (options.IndexDocument.HasValue()) { - writer.Write(XmlNode{XmlNodeType::StartTag, "IndexDocument"}); - writer.Write( - XmlNode{XmlNodeType::Text, nullptr, options.IndexDocument.GetValue().data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "IndexDocument"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.IndexDocument.GetValue().data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } if (options.DefaultIndexDocumentPath.HasValue()) { - writer.Write(XmlNode{XmlNodeType::StartTag, "DefaultIndexDocumentPath"}); - writer.Write(XmlNode{ - XmlNodeType::Text, nullptr, options.DefaultIndexDocumentPath.GetValue().data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "DefaultIndexDocumentPath"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.DefaultIndexDocumentPath.GetValue().data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } if (options.ErrorDocument404Path.HasValue()) { - writer.Write(XmlNode{XmlNodeType::StartTag, "ErrorDocument404Path"}); - writer.Write(XmlNode{ - XmlNodeType::Text, nullptr, options.ErrorDocument404Path.GetValue().data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "ErrorDocument404Path"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.ErrorDocument404Path.GetValue().data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } } @@ -3554,7 +3623,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -3605,7 +3674,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -3645,7 +3714,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -3684,7 +3753,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -3772,7 +3841,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -3835,11 +3904,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = ListBlobsFlatSegmentResultFromXml(reader); } @@ -3909,11 +3978,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = ListBlobsByHierarchySegmentResultFromXml(reader); } @@ -3951,11 +4020,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetContainerAccessPolicyResultFromXml(reader); } @@ -3986,10 +4055,10 @@ namespace Azure { namespace Storage { namespace Blobs { unused(options); std::string xml_body; { - XmlWriter writer; + Storage::Details::XmlWriter writer; SetContainerAccessPolicyOptionsToXml(writer, options); xml_body = writer.GetDocument(); - writer.Write(XmlNode{XmlNodeType::End}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::End}); } Azure::Core::Http::MemoryBodyStream xml_body_stream( reinterpret_cast(xml_body.data()), xml_body.length()); @@ -4029,7 +4098,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -4085,7 +4154,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -4137,7 +4206,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -4191,7 +4260,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -4243,7 +4312,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -4298,7 +4367,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -4309,7 +4378,7 @@ namespace Azure { namespace Storage { namespace Blobs { private: static GetContainerAccessPolicyResult GetContainerAccessPolicyResultFromXml( - XmlReader& reader) + Storage::Details::XmlReader& reader) { GetContainerAccessPolicyResult ret; enum class XmlTagName @@ -4322,11 +4391,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4337,7 +4406,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "SignedIdentifiers") == 0) { @@ -4358,7 +4427,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } @@ -4366,7 +4435,7 @@ namespace Azure { namespace Storage { namespace Blobs { } static ListBlobsByHierarchySegmentResult ListBlobsByHierarchySegmentResultFromXml( - XmlReader& reader) + Storage::Details::XmlReader& reader) { ListBlobsByHierarchySegmentResult ret; enum class XmlTagName @@ -4385,11 +4454,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4400,7 +4469,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "EnumerationResults") == 0) { @@ -4452,7 +4521,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::k_EnumerationResults && path[1] == XmlTagName::k_Prefix) @@ -4478,7 +4547,7 @@ namespace Azure { namespace Storage { namespace Blobs { ret.ContinuationToken = node.Value; } } - else if (node.Type == XmlNodeType::Attribute) + else if (node.Type == Storage::Details::XmlNodeType::Attribute) { if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults && std::strcmp(node.Name, "ServiceEndpoint") == 0) @@ -4496,7 +4565,8 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static ListBlobsFlatSegmentResult ListBlobsFlatSegmentResultFromXml(XmlReader& reader) + static ListBlobsFlatSegmentResult ListBlobsFlatSegmentResultFromXml( + Storage::Details::XmlReader& reader) { ListBlobsFlatSegmentResult ret; enum class XmlTagName @@ -4513,11 +4583,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4528,7 +4598,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "EnumerationResults") == 0) { @@ -4565,7 +4635,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::k_EnumerationResults && path[1] == XmlTagName::k_Prefix) @@ -4585,7 +4655,7 @@ namespace Azure { namespace Storage { namespace Blobs { ret.ContinuationToken = node.Value; } } - else if (node.Type == XmlNodeType::Attribute) + else if (node.Type == Storage::Details::XmlNodeType::Attribute) { if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults && std::strcmp(node.Name, "ServiceEndpoint") == 0) @@ -4603,7 +4673,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobItem BlobItemFromXml(XmlReader& reader) + static BlobItem BlobItemFromXml(Storage::Details::XmlReader& reader) { BlobItem ret; enum class XmlTagName @@ -4644,11 +4714,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4659,7 +4729,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Name") == 0) { @@ -4797,7 +4867,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Name) { @@ -4956,7 +5026,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobPrefix BlobPrefixFromXml(XmlReader& reader) + static BlobPrefix BlobPrefixFromXml(Storage::Details::XmlReader& reader) { BlobPrefix ret; enum class XmlTagName @@ -4968,11 +5038,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4983,7 +5053,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Name") == 0) { @@ -4994,7 +5064,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Name) { @@ -5005,7 +5075,7 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static BlobSignedIdentifier BlobSignedIdentifierFromXml(XmlReader& reader) + static BlobSignedIdentifier BlobSignedIdentifierFromXml(Storage::Details::XmlReader& reader) { BlobSignedIdentifier ret; enum class XmlTagName @@ -5021,11 +5091,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -5036,7 +5106,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Id") == 0) { @@ -5063,7 +5133,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Id) { @@ -5092,7 +5162,8 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static std::map MetadataFromXml(XmlReader& reader) + static std::map MetadataFromXml( + Storage::Details::XmlReader& reader) { std::map ret; int depth = 0; @@ -5100,25 +5171,25 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (depth++ == 0) { key = node.Name; } } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (depth-- == 0) { break; } } - else if (depth == 1 && node.Type == XmlNodeType::Text) + else if (depth == 1 && node.Type == Storage::Details::XmlNodeType::Text) { ret.emplace(std::move(key), std::string(node.Value)); } @@ -5127,7 +5198,7 @@ namespace Azure { namespace Storage { namespace Blobs { } static std::vector ObjectReplicationSourcePropertiesFromXml( - XmlReader& reader) + Storage::Details::XmlReader& reader) { int depth = 0; std::map> orPropertiesMap; @@ -5136,11 +5207,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { ++depth; std::string startTagName = node.Name; @@ -5152,14 +5223,14 @@ namespace Azure { namespace Storage { namespace Blobs { ruleId = startTagName.substr(underscorePos + 1); } } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (depth-- == 0) { break; } } - if (depth == 1 && node.Type == XmlNodeType::Text) + if (depth == 1 && node.Type == Storage::Details::XmlNodeType::Text) { ObjectReplicationRule rule; rule.RuleId = std::move(ruleId); @@ -5179,37 +5250,46 @@ namespace Azure { namespace Storage { namespace Blobs { } static void SetContainerAccessPolicyOptionsToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const SetContainerAccessPolicyOptions& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "SignedIdentifiers"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "SignedIdentifiers"}); for (const auto& i : options.SignedIdentifiers) { BlobSignedIdentifierToXml(writer, i); } - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static void BlobSignedIdentifierToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const BlobSignedIdentifier& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "SignedIdentifier"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Id"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Id.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "AccessPolicy"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Start"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.StartsOn.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Expiry"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.ExpiresOn.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Permission"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, options.Permissions.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "SignedIdentifier"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Id"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Id.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AccessPolicy"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Start"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.StartsOn.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Expiry"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.ExpiresOn.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Permission"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, options.Permissions.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } }; // class Container @@ -5306,7 +5386,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200 || http_status_code == 206)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.BodyStream = httpResponse.GetBodyStream(); response.ETag = httpResponse.GetHeaders().at("etag"); @@ -5562,7 +5642,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -5616,7 +5696,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -5651,7 +5731,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -5731,7 +5811,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6036,7 +6116,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6142,7 +6222,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6198,7 +6278,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200 || http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -6336,7 +6416,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6390,7 +6470,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 204)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -6488,7 +6568,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6553,11 +6633,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetBlobTagsResultFromXml(reader); } @@ -6581,10 +6661,10 @@ namespace Azure { namespace Storage { namespace Blobs { unused(options); std::string xml_body; { - XmlWriter writer; + Storage::Details::XmlWriter writer; SetBlobTagsOptionsToXml(writer, options); xml_body = writer.GetDocument(); - writer.Write(XmlNode{XmlNodeType::End}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::End}); } Azure::Core::Http::MemoryBodyStream xml_body_stream( reinterpret_cast(xml_body.data()), xml_body.length()); @@ -6611,7 +6691,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 204)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); @@ -6679,7 +6759,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6745,7 +6825,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6813,7 +6893,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6879,7 +6959,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6954,7 +7034,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -6964,7 +7044,7 @@ namespace Azure { namespace Storage { namespace Blobs { } private: - static GetBlobTagsResult GetBlobTagsResultFromXml(XmlReader& reader) + static GetBlobTagsResult GetBlobTagsResultFromXml(Storage::Details::XmlReader& reader) { GetBlobTagsResult ret; enum class XmlTagName @@ -6977,11 +7057,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -6992,7 +7072,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Tags") == 0) { @@ -7013,14 +7093,14 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } return ret; } - static std::map TagsFromXml(XmlReader& reader) + static std::map TagsFromXml(Storage::Details::XmlReader& reader) { std::map ret; int depth = 0; @@ -7030,11 +7110,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { ++depth; if (strcmp(node.Name, "Key") == 0) @@ -7046,14 +7126,14 @@ namespace Azure { namespace Storage { namespace Blobs { is_value = true; } } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (depth-- == 0) { break; } } - if (depth == 2 && node.Type == XmlNodeType::Text) + if (depth == 2 && node.Type == Storage::Details::XmlNodeType::Text) { if (is_key) { @@ -7070,23 +7150,29 @@ namespace Azure { namespace Storage { namespace Blobs { return ret; } - static void SetBlobTagsOptionsToXml(XmlWriter& writer, const SetBlobTagsOptions& options) + static void SetBlobTagsOptionsToXml( + Storage::Details::XmlWriter& writer, + const SetBlobTagsOptions& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Tags"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "TagSet"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Tags"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "TagSet"}); for (const auto& i : options.Tags) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Tag"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Key"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, i.first.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Value"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, i.second.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Tag"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Key"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, i.first.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Value"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, i.second.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } }; // class Blob @@ -7228,7 +7314,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -7343,7 +7429,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } auto response_transactional_content_md5_iterator = httpResponse.GetHeaders().find("content-md5"); @@ -7491,7 +7577,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } auto response_transactional_content_md5_iterator = httpResponse.GetHeaders().find("content-md5"); @@ -7556,10 +7642,10 @@ namespace Azure { namespace Storage { namespace Blobs { unused(options); std::string xml_body; { - XmlWriter writer; + Storage::Details::XmlWriter writer; CommitBlockListOptionsToXml(writer, options); xml_body = writer.GetDocument(); - writer.Write(XmlNode{XmlNodeType::End}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::End}); } Azure::Core::Http::MemoryBodyStream xml_body_stream( reinterpret_cast(xml_body.data()), xml_body.length()); @@ -7662,7 +7748,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -7739,11 +7825,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetBlockListResultFromXml(reader); } @@ -7757,7 +7843,7 @@ namespace Azure { namespace Storage { namespace Blobs { } private: - static GetBlockListResult GetBlockListResultFromXml(XmlReader& reader) + static GetBlockListResult GetBlockListResultFromXml(Storage::Details::XmlReader& reader) { GetBlockListResult ret; enum class XmlTagName @@ -7772,11 +7858,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -7787,7 +7873,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "BlockList") == 0) { @@ -7823,14 +7909,14 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } return ret; } - static BlobBlock BlobBlockFromXml(XmlReader& reader) + static BlobBlock BlobBlockFromXml(Storage::Details::XmlReader& reader) { BlobBlock ret; enum class XmlTagName @@ -7843,11 +7929,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -7858,7 +7944,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Name") == 0) { @@ -7873,7 +7959,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.emplace_back(XmlTagName::k_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::k_Name) { @@ -7889,16 +7975,19 @@ namespace Azure { namespace Storage { namespace Blobs { } static void CommitBlockListOptionsToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const CommitBlockListOptions& options) { - writer.Write(XmlNode{XmlNodeType::StartTag, "BlockList"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "BlockList"}); for (const auto& i : options.BlockList) { - writer.Write( - XmlNode{XmlNodeType::StartTag, BlockTypeToString(i.first).data(), i.second.data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, + BlockTypeToString(i.first).data(), + i.second.data()}); } - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } }; // class BlockBlob @@ -8036,7 +8125,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -8187,7 +8276,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -8355,7 +8444,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -8504,7 +8593,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -8636,7 +8725,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -8732,11 +8821,11 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } { const auto& httpResponseBody = httpResponse.GetBody(); - XmlReader reader( + Storage::Details::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetPageBlobPageRangesResultInternalFromXml(reader); } @@ -8804,7 +8893,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -8822,7 +8911,7 @@ namespace Azure { namespace Storage { namespace Blobs { private: static GetPageBlobPageRangesResultInternal GetPageBlobPageRangesResultInternalFromXml( - XmlReader& reader) + Storage::Details::XmlReader& reader) { GetPageBlobPageRangesResultInternal ret; enum class XmlTagName @@ -8836,11 +8925,11 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -8851,7 +8940,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "PageList") == 0) { @@ -8883,14 +8972,14 @@ namespace Azure { namespace Storage { namespace Blobs { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } return ret; } - static std::pair ClearRangesFromXml(XmlReader& reader) + static std::pair ClearRangesFromXml(Storage::Details::XmlReader& reader) { int depth = 0; bool is_start = false; @@ -8900,21 +8989,25 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::StartTag && strcmp(node.Name, "Start") == 0) + else if ( + node.Type == Storage::Details::XmlNodeType::StartTag + && strcmp(node.Name, "Start") == 0) { ++depth; is_start = true; } - else if (node.Type == XmlNodeType::StartTag && strcmp(node.Name, "End") == 0) + else if ( + node.Type == Storage::Details::XmlNodeType::StartTag + && strcmp(node.Name, "End") == 0) { ++depth; is_end = true; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { is_start = false; is_end = false; @@ -8923,7 +9016,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - if (depth == 1 && node.Type == XmlNodeType::Text) + if (depth == 1 && node.Type == Storage::Details::XmlNodeType::Text) { if (is_start) { @@ -8938,7 +9031,7 @@ namespace Azure { namespace Storage { namespace Blobs { return std::make_pair(start, end); } - static std::pair PageRangesFromXml(XmlReader& reader) + static std::pair PageRangesFromXml(Storage::Details::XmlReader& reader) { int depth = 0; bool is_start = false; @@ -8948,21 +9041,25 @@ namespace Azure { namespace Storage { namespace Blobs { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::StartTag && strcmp(node.Name, "Start") == 0) + else if ( + node.Type == Storage::Details::XmlNodeType::StartTag + && strcmp(node.Name, "Start") == 0) { ++depth; is_start = true; } - else if (node.Type == XmlNodeType::StartTag && strcmp(node.Name, "End") == 0) + else if ( + node.Type == Storage::Details::XmlNodeType::StartTag + && strcmp(node.Name, "End") == 0) { ++depth; is_end = true; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { is_start = false; is_end = false; @@ -8971,7 +9068,7 @@ namespace Azure { namespace Storage { namespace Blobs { break; } } - if (depth == 1 && node.Type == XmlNodeType::Text) + if (depth == 1 && node.Type == Storage::Details::XmlNodeType::Text) { if (is_start) { @@ -9108,7 +9205,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -9244,7 +9341,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -9410,7 +9507,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 201)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -9518,7 +9615,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 200)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); @@ -9564,7 +9661,7 @@ namespace Azure { namespace Storage { namespace Blobs { httpResponse.GetStatusCode()); if (!(http_status_code == 202)) { - throw StorageError::CreateFromResponse(std::move(pHttpResponse)); + throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.ContentType = httpResponse.GetHeaders().at("content-type"); return Azure::Core::Response( diff --git a/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp index 118ad5935..f151086f4 100644 --- a/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp @@ -12,7 +12,7 @@ namespace Azure { namespace Storage { namespace Blobs { const std::string& connectionString, const std::string& containerName, const std::string& blobName, - const AppendBlobClientOptions& options) + const BlobClientOptions& options) { AppendBlobClient newClient( BlobClient::CreateFromConnectionString(connectionString, containerName, blobName, options)); @@ -22,7 +22,7 @@ namespace Azure { namespace Storage { namespace Blobs { AppendBlobClient::AppendBlobClient( const std::string& blobUri, std::shared_ptr credential, - const AppendBlobClientOptions& options) + const BlobClientOptions& options) : BlobClient(blobUri, std::move(credential), options) { } @@ -30,14 +30,12 @@ namespace Azure { namespace Storage { namespace Blobs { AppendBlobClient::AppendBlobClient( const std::string& blobUri, std::shared_ptr credential, - const AppendBlobClientOptions& options) + const BlobClientOptions& options) : BlobClient(blobUri, std::move(credential), options) { } - AppendBlobClient::AppendBlobClient( - const std::string& blobUri, - const AppendBlobClientOptions& options) + AppendBlobClient::AppendBlobClient(const std::string& blobUri, const BlobClientOptions& options) : BlobClient(blobUri, options) { } diff --git a/sdk/storage/azure-storage-blobs/src/blob_batch_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_batch_client.cpp index c327bf537..cb6a592ff 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_batch_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_batch_client.cpp @@ -401,7 +401,7 @@ namespace Azure { namespace Storage { namespace Blobs { Details::BlobRestClient::Blob::DeleteCreateResponse( options.Context, std::move(rawSubresponse))); } - catch (StorageError& e) + catch (StorageException& e) { batchResult.DeleteBlobResults.emplace_back(Azure::Core::Response( DeleteBlobResult{}, std::move(e.RawResponse))); @@ -415,7 +415,7 @@ namespace Azure { namespace Storage { namespace Blobs { Details::BlobRestClient::Blob::SetAccessTierCreateResponse( options.Context, std::move(rawSubresponse))); } - catch (StorageError& e) + catch (StorageException& e) { batchResult.SetBlobAccessTierResults.emplace_back( Azure::Core::Response( diff --git a/sdk/storage/azure-storage-blobs/src/blob_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_client.cpp index 3553d554c..a1c398db4 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_client.cpp @@ -344,7 +344,7 @@ namespace Azure { namespace Storage { namespace Blobs { } Azure::Core::Response BlobClient::DownloadTo( - const std::string& file, + const std::string& fileName, const DownloadBlobToOptions& options) const { constexpr int64_t c_defaultChunkSize = 4 * 1024 * 1024; @@ -371,7 +371,7 @@ namespace Azure { namespace Storage { namespace Blobs { firstChunkOptions.Length = firstChunkLength; } - Storage::Details::FileWriter fileWriter(file); + Storage::Details::FileWriter fileWriter(fileName); auto firstChunk = Download(firstChunkOptions); diff --git a/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp index 35e4f7c9b..1234bfde5 100644 --- a/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp @@ -15,7 +15,7 @@ namespace Azure { namespace Storage { namespace Blobs { const std::string& connectionString, const std::string& containerName, const std::string& blobName, - const BlockBlobClientOptions& options) + const BlobClientOptions& options) { BlockBlobClient newClient( BlobClient::CreateFromConnectionString(connectionString, containerName, blobName, options)); @@ -25,7 +25,7 @@ namespace Azure { namespace Storage { namespace Blobs { BlockBlobClient::BlockBlobClient( const std::string& blobUri, std::shared_ptr credential, - const BlockBlobClientOptions& options) + const BlobClientOptions& options) : BlobClient(blobUri, std::move(credential), options) { } @@ -33,14 +33,12 @@ namespace Azure { namespace Storage { namespace Blobs { BlockBlobClient::BlockBlobClient( const std::string& blobUri, std::shared_ptr credential, - const BlockBlobClientOptions& options) + const BlobClientOptions& options) : BlobClient(blobUri, std::move(credential), options) { } - BlockBlobClient::BlockBlobClient( - const std::string& blobUri, - const BlockBlobClientOptions& options) + BlockBlobClient::BlockBlobClient(const std::string& blobUri, const BlobClientOptions& options) : BlobClient(blobUri, options) { } @@ -186,14 +184,14 @@ namespace Azure { namespace Storage { namespace Blobs { } Azure::Core::Response BlockBlobClient::UploadFrom( - const std::string& file, + const std::string& fileName, const UploadBlockBlobFromOptions& options) const { constexpr int64_t c_defaultBlockSize = 8 * 1024 * 1024; constexpr int64_t c_maximumNumberBlocks = 50000; constexpr int64_t c_grainSize = 4 * 1024; - Storage::Details::FileReader fileReader(file); + Storage::Details::FileReader fileReader(fileName); int64_t chunkSize = c_defaultBlockSize; if (options.ChunkSize.HasValue()) diff --git a/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp index 19de6699c..cd2d1b449 100644 --- a/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp @@ -14,7 +14,7 @@ namespace Azure { namespace Storage { namespace Blobs { const std::string& connectionString, const std::string& containerName, const std::string& blobName, - const PageBlobClientOptions& options) + const BlobClientOptions& options) { PageBlobClient newClient( BlobClient::CreateFromConnectionString(connectionString, containerName, blobName, options)); @@ -24,7 +24,7 @@ namespace Azure { namespace Storage { namespace Blobs { PageBlobClient::PageBlobClient( const std::string& blobUri, std::shared_ptr credential, - const PageBlobClientOptions& options) + const BlobClientOptions& options) : BlobClient(blobUri, std::move(credential), options) { } @@ -32,12 +32,12 @@ namespace Azure { namespace Storage { namespace Blobs { PageBlobClient::PageBlobClient( const std::string& blobUri, std::shared_ptr credential, - const PageBlobClientOptions& options) + const BlobClientOptions& options) : BlobClient(blobUri, std::move(credential), options) { } - PageBlobClient::PageBlobClient(const std::string& blobUri, const PageBlobClientOptions& options) + PageBlobClient::PageBlobClient(const std::string& blobUri, const BlobClientOptions& options) : BlobClient(blobUri, options) { } @@ -130,7 +130,7 @@ namespace Azure { namespace Storage { namespace Blobs { } Azure::Core::Response PageBlobClient::UploadPagesFromUri( - int64_t destinationoffset, + int64_t destinationOffset, std::string sourceUri, int64_t sourceOffset, int64_t sourceLength, @@ -141,7 +141,7 @@ namespace Azure { namespace Storage { namespace Blobs { protocolLayerOptions.SourceRange = std::make_pair(sourceOffset, sourceOffset + sourceLength - 1); protocolLayerOptions.Range - = std::make_pair(destinationoffset, destinationoffset + sourceLength - 1); + = std::make_pair(destinationOffset, destinationOffset + sourceLength - 1); protocolLayerOptions.TransactionalContentMd5 = options.TransactionalContentMd5; protocolLayerOptions.TransactionalContentCrc64 = options.TransactionalContentCrc64; protocolLayerOptions.LeaseId = options.AccessConditions.LeaseId; diff --git a/sdk/storage/azure-storage-blobs/test/append_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/append_blob_client_test.cpp index b2047ab3f..70a9816d6 100644 --- a/sdk/storage/azure-storage-blobs/test/append_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/append_blob_client_test.cpp @@ -65,7 +65,7 @@ namespace Azure { namespace Storage { namespace Test { Azure::Storage::Blobs::AppendBlockOptions options; options.AccessConditions.AppendPosition = 1_MB; blockContent = Azure::Core::Http::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); - EXPECT_THROW(appendBlobClient.AppendBlock(&blockContent, options), StorageError); + EXPECT_THROW(appendBlobClient.AppendBlock(&blockContent, options), StorageException); options.AccessConditions.AppendPosition = properties.ContentLength; blockContent = Azure::Core::Http::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); appendBlobClient.AppendBlock(&blockContent, options); @@ -74,7 +74,7 @@ namespace Azure { namespace Storage { namespace Test { options = Azure::Storage::Blobs::AppendBlockOptions(); options.AccessConditions.MaxSize = properties.ContentLength + m_blobContent.size() - 1; blockContent = Azure::Core::Http::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); - EXPECT_THROW(appendBlobClient.AppendBlock(&blockContent, options), StorageError); + EXPECT_THROW(appendBlobClient.AppendBlock(&blockContent, options), StorageException); options.AccessConditions.MaxSize = properties.ContentLength + m_blobContent.size(); blockContent = Azure::Core::Http::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); appendBlobClient.AppendBlock(&blockContent, options); @@ -87,7 +87,7 @@ namespace Azure { namespace Storage { namespace Test { properties.ContentLength, static_cast(originalLength + m_blobContent.size())); appendBlobClient.Delete(); - EXPECT_THROW(appendBlobClient.Delete(), StorageError); + EXPECT_THROW(appendBlobClient.Delete(), StorageException); } TEST_F(AppendBlobClientTest, AccessConditionLastModifiedTime) @@ -132,7 +132,7 @@ namespace Azure { namespace Storage { namespace Test { || (condition == Condition::UnmodifiedSince && sinceTime == TimePoint::TimeBefore); if (shouldThrow) { - EXPECT_THROW(appendBlobClient.GetProperties(options), StorageError); + EXPECT_THROW(appendBlobClient.GetProperties(options), StorageException); } else { @@ -150,7 +150,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::CreateAppendBlobOptions createOptions; createOptions.AccessConditions.IfNoneMatch = "*"; EXPECT_NO_THROW(appendBlobClient.Create(createOptions)); - EXPECT_THROW(appendBlobClient.Create(createOptions), StorageError); + EXPECT_THROW(appendBlobClient.Create(createOptions), StorageException); std::string eTag = appendBlobClient.GetProperties()->ETag; for (std::string match : {eTag, std::string(c_dummyETag), std::string()}) @@ -169,7 +169,7 @@ namespace Azure { namespace Storage { namespace Test { bool shouldThrow = (!match.empty() && match != eTag) || noneMatch == eTag; if (shouldThrow) { - EXPECT_THROW(appendBlobClient.GetProperties(options), StorageError); + EXPECT_THROW(appendBlobClient.GetProperties(options), StorageException); } else { @@ -187,7 +187,7 @@ namespace Azure { namespace Storage { namespace Test { std::string leaseId = CreateUniqueLeaseId(); appendBlobClient.AcquireLease(leaseId, 30); - EXPECT_THROW(appendBlobClient.Delete(), StorageError); + EXPECT_THROW(appendBlobClient.Delete(), StorageException); Blobs::DeleteBlobOptions options; options.AccessConditions.LeaseId = leaseId; EXPECT_NO_THROW(appendBlobClient.Delete(options)); @@ -215,7 +215,7 @@ namespace Azure { namespace Storage { namespace Test { /* don't know why, the copy operation also succeeds even if the lease id doesn't match. EXPECT_THROW( - destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageError); + destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageException); */ options.SourceConditions.LeaseId = leaseId; EXPECT_NO_THROW(destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options)); @@ -227,7 +227,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options)); options.SourceConditions.IfMatch = c_dummyETag; EXPECT_THROW( - destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageError); + destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageException); } { Blobs::StartCopyBlobFromUriOptions options; @@ -235,7 +235,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options)); options.SourceConditions.IfNoneMatch = eTag; EXPECT_THROW( - destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageError); + destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageException); } { Blobs::StartCopyBlobFromUriOptions options; @@ -243,7 +243,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options)); options.SourceConditions.IfModifiedSince = timeAfterStr; EXPECT_THROW( - destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageError); + destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageException); } { Blobs::StartCopyBlobFromUriOptions options; @@ -251,7 +251,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options)); options.SourceConditions.IfUnmodifiedSince = timeBeforeStr; EXPECT_THROW( - destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageError); + destBlobClient.StartCopyFromUri(sourceBlobClient.GetUri(), options), StorageException); } } @@ -278,7 +278,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::SealAppendBlobOptions sealOptions; sealOptions.AccessConditions.AppendPosition = m_blobContent.size() + 1; - EXPECT_THROW(blobClient.Seal(sealOptions), StorageError); + EXPECT_THROW(blobClient.Seal(sealOptions), StorageException); sealOptions.AccessConditions.AppendPosition = m_blobContent.size(); auto sealResult = blobClient.Seal(sealOptions); diff --git a/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp index a5d5ee4a5..d49379af0 100644 --- a/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp @@ -48,7 +48,7 @@ namespace Azure { namespace Storage { namespace Test { auto batchClient = Blobs::BlobBatchClient(serviceClient.GetUri()); - EXPECT_THROW(batchClient.SubmitBatch(batch), StorageError); + EXPECT_THROW(batchClient.SubmitBatch(batch), StorageException); batchClient = Blobs::BlobBatchClient( serviceClient.GetUri() + accountSasBuilder.ToSasQueryParameters(*keyCredential)); @@ -89,7 +89,7 @@ namespace Azure { namespace Storage { namespace Test { int32_t id3 = batch.SetBlobAccessTier(containerName2, blobName21, Blobs::AccessTier::Hot); int32_t id4 = batch.SetBlobAccessTier(containerName2, blobName22, Blobs::AccessTier::Cool); unused(id1, id2, id3, id4); - + std::size_t failedId = static_cast(id4); std::size_t batchSize = static_cast(id4) + 1; diff --git a/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp index 4010546d7..1b27cb63a 100644 --- a/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp @@ -66,7 +66,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(Details::c_HttpHeaderXMsVersion).empty()); EXPECT_FALSE(res->ETag.empty()); EXPECT_FALSE(res->LastModified.empty()); - EXPECT_THROW(container_client.Create(), StorageError); + EXPECT_THROW(container_client.Create(), StorageException); auto res2 = container_client.Delete(); EXPECT_FALSE(res2.GetRawResponse().GetHeaders().at(Details::c_HttpHeaderRequestId).empty()); @@ -470,7 +470,7 @@ namespace Azure { namespace Storage { namespace Test { } { std::string blobName = RandomString(); - Blobs::AppendBlobClientOptions options; + Blobs::BlobClientOptions options; options.EncryptionScope = c_TestEncryptionScope; auto appendBlobClient = Azure::Storage::Blobs::AppendBlobClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName, blobName, options); @@ -488,8 +488,9 @@ namespace Azure { namespace Storage { namespace Test { auto appendBlobClientWithoutEncryptionScope = Azure::Storage::Blobs::AppendBlobClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName, blobName); - EXPECT_THROW(appendBlobClientWithoutEncryptionScope.AppendBlock(&bodyStream), StorageError); - EXPECT_THROW(appendBlobClientWithoutEncryptionScope.CreateSnapshot(), StorageError); + EXPECT_THROW( + appendBlobClientWithoutEncryptionScope.AppendBlock(&bodyStream), StorageException); + EXPECT_THROW(appendBlobClientWithoutEncryptionScope.CreateSnapshot(), StorageException); appendBlobClient.Delete(); } } @@ -529,14 +530,14 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(blockBlob.StageBlockFromUri(blockId2, copySourceBlob.GetUri() + GetSas())); EXPECT_NO_THROW(blockBlob.CommitBlockList( {{Blobs::BlockType::Uncommitted, blockId1}, {Blobs::BlockType::Uncommitted, blockId2}})); - EXPECT_THROW(blockBlob.SetAccessTier(Blobs::AccessTier::Cool), StorageError); + EXPECT_THROW(blockBlob.SetAccessTier(Blobs::AccessTier::Cool), StorageException); auto appendBlobClientWithoutEncryptionKey = Azure::Storage::Blobs::BlockBlobClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName, blockBlobName); EXPECT_THROW( appendBlobClientWithoutEncryptionKey.SetAccessTier(Blobs::AccessTier::Cool), - StorageError); + StorageException); EXPECT_NO_THROW(appendBlobClientWithoutEncryptionKey.GetBlockList()); } @@ -563,15 +564,15 @@ namespace Azure { namespace Storage { namespace Test { = Azure::Storage::Blobs::AppendBlobClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName, appendBlobName); bodyStream.Rewind(); - EXPECT_THROW(appendBlobClientWithoutEncryptionKey.AppendBlock(&bodyStream), StorageError); + EXPECT_THROW(appendBlobClientWithoutEncryptionKey.AppendBlock(&bodyStream), StorageException); EXPECT_THROW( appendBlobClientWithoutEncryptionKey.AppendBlockFromUri( copySourceBlob.GetUri() + GetSas()), - StorageError); - EXPECT_THROW(appendBlobClientWithoutEncryptionKey.Download(), StorageError); - EXPECT_THROW(appendBlobClientWithoutEncryptionKey.GetProperties(), StorageError); - EXPECT_THROW(appendBlobClientWithoutEncryptionKey.SetMetadata({}), StorageError); - EXPECT_THROW(appendBlobClientWithoutEncryptionKey.CreateSnapshot(), StorageError); + StorageException); + EXPECT_THROW(appendBlobClientWithoutEncryptionKey.Download(), StorageException); + EXPECT_THROW(appendBlobClientWithoutEncryptionKey.GetProperties(), StorageException); + EXPECT_THROW(appendBlobClientWithoutEncryptionKey.SetMetadata({}), StorageException); + EXPECT_THROW(appendBlobClientWithoutEncryptionKey.CreateSnapshot(), StorageException); EXPECT_NO_THROW( appendBlobClientWithoutEncryptionKey.SetHttpHeaders(Blobs::BlobHttpHeaders())); Blobs::DeleteBlobOptions deleteOptions; @@ -647,7 +648,7 @@ namespace Azure { namespace Storage { namespace Test { || (condition == Condition::UnmodifiedSince && sinceTime == TimePoint::TimeBefore); if (shouldThrow) { - EXPECT_THROW(containerClient.SetAccessPolicy(options), StorageError); + EXPECT_THROW(containerClient.SetAccessPolicy(options), StorageException); } else { @@ -666,7 +667,7 @@ namespace Azure { namespace Storage { namespace Test { std::string leaseId = CreateUniqueLeaseId(); containerClient.AcquireLease(leaseId, 30); - EXPECT_THROW(containerClient.Delete(), StorageError); + EXPECT_THROW(containerClient.Delete(), StorageException); Blobs::DeleteContainerOptions options; options.AccessConditions.LeaseId = leaseId; EXPECT_NO_THROW(containerClient.Delete(options)); @@ -719,7 +720,7 @@ namespace Azure { namespace Storage { namespace Test { deletedContainerItem.Name, deletedContainerItem.VersionId.GetValue()); break; } - catch (StorageError& e) + catch (StorageException& e) { if (e.StatusCode == Azure::Core::Http::HttpStatusCode::Conflict && e.ReasonPhrase == "The specified container is being deleted.") @@ -842,7 +843,7 @@ namespace Azure { namespace Storage { namespace Test { options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.GetProperties(options)); options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.GetProperties(options), StorageError); + EXPECT_THROW(appendBlobClient.GetProperties(options), StorageException); } { @@ -851,7 +852,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(appendBlobClient.SetHttpHeaders(Blobs::BlobHttpHeaders(), options)); options.AccessConditions.TagConditions = failWhereExpression; EXPECT_THROW( - appendBlobClient.SetHttpHeaders(Blobs::BlobHttpHeaders(), options), StorageError); + appendBlobClient.SetHttpHeaders(Blobs::BlobHttpHeaders(), options), StorageException); } { @@ -859,7 +860,7 @@ namespace Azure { namespace Storage { namespace Test { options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.SetMetadata({}, options)); options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.SetMetadata({}, options), StorageError); + EXPECT_THROW(appendBlobClient.SetMetadata({}, options), StorageException); } { @@ -867,7 +868,7 @@ namespace Azure { namespace Storage { namespace Test { options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.Download(options)); options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.Download(options), StorageError); + EXPECT_THROW(appendBlobClient.Download(options), StorageException); } { @@ -875,13 +876,13 @@ namespace Azure { namespace Storage { namespace Test { options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.CreateSnapshot(options)); options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.CreateSnapshot(options), StorageError); + EXPECT_THROW(appendBlobClient.CreateSnapshot(options), StorageException); } { Blobs::CreateAppendBlobOptions options; options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.Create(options), StorageError); + EXPECT_THROW(appendBlobClient.Create(options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.Create(options)); appendBlobClient.SetTags(tags); @@ -891,7 +892,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::AppendBlockOptions options; options.AccessConditions.TagConditions = failWhereExpression; content.Rewind(); - EXPECT_THROW(appendBlobClient.AppendBlock(&content, options), StorageError); + EXPECT_THROW(appendBlobClient.AppendBlock(&content, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; content.Rewind(); EXPECT_NO_THROW(appendBlobClient.AppendBlock(&content, options)); @@ -899,7 +900,7 @@ namespace Azure { namespace Storage { namespace Test { std::string uri = appendBlobClient.GetUri() + GetSas(); Blobs::AppendBlockFromUriOptions options2; options2.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.AppendBlockFromUri(uri, options2), StorageError); + EXPECT_THROW(appendBlobClient.AppendBlockFromUri(uri, options2), StorageException); options2.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.AppendBlockFromUri(uri, options2)); } @@ -911,7 +912,7 @@ namespace Azure { namespace Storage { namespace Test { auto blobClient2 = Azure::Storage::Blobs::AppendBlobClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName, RandomString()); options.SourceConditions.TagConditions = failWhereExpression; - EXPECT_THROW(blobClient2.StartCopyFromUri(uri, options), StorageError); + EXPECT_THROW(blobClient2.StartCopyFromUri(uri, options), StorageException); options.SourceConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(blobClient2.StartCopyFromUri(uri, options)); @@ -919,7 +920,7 @@ namespace Azure { namespace Storage { namespace Test { blobClient2.SetTags(tags); options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(blobClient2.StartCopyFromUri(uri, options), StorageError); + EXPECT_THROW(blobClient2.StartCopyFromUri(uri, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(blobClient2.StartCopyFromUri(uri, options)); } @@ -928,13 +929,13 @@ namespace Azure { namespace Storage { namespace Test { std::string leaseId = CreateUniqueLeaseId(); Blobs::AcquireBlobLeaseOptions options; options.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.AcquireLease(leaseId, 60, options), StorageError); + EXPECT_THROW(appendBlobClient.AcquireLease(leaseId, 60, options), StorageException); options.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.AcquireLease(leaseId, 60, options)); Blobs::BreakBlobLeaseOptions options2; options2.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.BreakLease(options2), StorageError); + EXPECT_THROW(appendBlobClient.BreakLease(options2), StorageException); options2.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.BreakLease(options2)); @@ -944,7 +945,7 @@ namespace Azure { namespace Storage { namespace Test { options3.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(appendBlobClient.Delete(options3)); options3.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(appendBlobClient.Delete(options3), StorageError); + EXPECT_THROW(appendBlobClient.Delete(options3), StorageException); } blobName = RandomString(); @@ -956,7 +957,7 @@ namespace Azure { namespace Storage { namespace Test { { Blobs::CreatePageBlobOptions options; options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(pageBlobClient.Create(contentSize, options), StorageError); + EXPECT_THROW(pageBlobClient.Create(contentSize, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(pageBlobClient.Create(contentSize, options)); @@ -967,7 +968,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::UploadPageBlobPagesOptions options; options.AccessConditions.TagConditions = failWhereExpression; content.Rewind(); - EXPECT_THROW(pageBlobClient.UploadPages(0, &content, options), StorageError); + EXPECT_THROW(pageBlobClient.UploadPages(0, &content, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; content.Rewind(); EXPECT_NO_THROW(pageBlobClient.UploadPages(0, &content, options)); @@ -978,7 +979,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::UploadPageBlobPagesFromUriOptions options; options.AccessConditions.TagConditions = failWhereExpression; EXPECT_THROW( - pageBlobClient.UploadPagesFromUri(0, uri, 0, contentSize, options), StorageError); + pageBlobClient.UploadPagesFromUri(0, uri, 0, contentSize, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(pageBlobClient.UploadPagesFromUri(0, uri, 0, contentSize, options)); } @@ -986,7 +987,7 @@ namespace Azure { namespace Storage { namespace Test { { Blobs::ClearPageBlobPagesOptions options; options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(pageBlobClient.ClearPages(0, contentSize, options), StorageError); + EXPECT_THROW(pageBlobClient.ClearPages(0, contentSize, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(pageBlobClient.ClearPages(0, contentSize, options)); } @@ -994,7 +995,7 @@ namespace Azure { namespace Storage { namespace Test { { Blobs::ResizePageBlobOptions options; options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(pageBlobClient.Resize(contentSize, options), StorageError); + EXPECT_THROW(pageBlobClient.Resize(contentSize, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(pageBlobClient.Resize(contentSize, options)); } @@ -1002,7 +1003,7 @@ namespace Azure { namespace Storage { namespace Test { { Blobs::GetPageBlobPageRangesOptions options; options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(pageBlobClient.GetPageRanges(options), StorageError); + EXPECT_THROW(pageBlobClient.GetPageRanges(options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(pageBlobClient.GetPageRanges(options)); } @@ -1017,7 +1018,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::UploadBlockBlobOptions options; options.AccessConditions.TagConditions = failWhereExpression; content.Rewind(); - EXPECT_THROW(blockBlobClient.Upload(&content, options), StorageError); + EXPECT_THROW(blockBlobClient.Upload(&content, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; content.Rewind(); EXPECT_NO_THROW(blockBlobClient.Upload(&content, options)); @@ -1033,7 +1034,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::CommitBlockListOptions options; options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(blockBlobClient.CommitBlockList(blockIds, options), StorageError); + EXPECT_THROW(blockBlobClient.CommitBlockList(blockIds, options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(blockBlobClient.CommitBlockList(blockIds, options)); blockBlobClient.SetTags(tags); @@ -1042,7 +1043,7 @@ namespace Azure { namespace Storage { namespace Test { { Blobs::GetBlockListOptions options; options.AccessConditions.TagConditions = failWhereExpression; - EXPECT_THROW(blockBlobClient.GetBlockList(options), StorageError); + EXPECT_THROW(blockBlobClient.GetBlockList(options), StorageException); options.AccessConditions.TagConditions = successWhereExpression; EXPECT_NO_THROW(blockBlobClient.GetBlockList(options)); } diff --git a/sdk/storage/azure-storage-blobs/test/blob_sas_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_sas_test.cpp index 8fcd5a915..bb4ee2dd5 100644 --- a/sdk/storage/azure-storage-blobs/test/blob_sas_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_sas_test.cpp @@ -92,7 +92,7 @@ namespace Azure { namespace Storage { namespace Test { { blobClient0.Delete(); } - catch (StorageError&) + catch (StorageException&) { } auto blobClient = Blobs::AppendBlobClient(blobUri + sas); @@ -220,7 +220,7 @@ namespace Azure { namespace Storage { namespace Test { builder2.StartsOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(5)); builder2.ExpiresOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(1)); auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_blob_create(sasToken), StorageError); + EXPECT_THROW(verify_blob_create(sasToken), StorageException); } // Without start time @@ -236,7 +236,7 @@ namespace Azure { namespace Storage { namespace Test { AccountSasBuilder builder2 = accountSasBuilder; builder2.IPRange = "1.1.1.1"; auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_blob_create(sasToken), StorageError); + EXPECT_THROW(verify_blob_create(sasToken), StorageException); // TODO: Add this test case back with support to contain IPv6 ranges when service is ready. // builder2.IPRange = "0.0.0.0-255.255.255.255"; @@ -249,7 +249,7 @@ namespace Azure { namespace Storage { namespace Test { AccountSasBuilder builder2 = accountSasBuilder; builder2.Services = AccountSasServices::Files; auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_blob_create(sasToken), StorageError); + EXPECT_THROW(verify_blob_create(sasToken), StorageException); builder2.Services = AccountSasServices::All; sasToken = builder2.ToSasQueryParameters(*keyCredential); @@ -261,7 +261,7 @@ namespace Azure { namespace Storage { namespace Test { AccountSasBuilder builder2 = accountSasBuilder; builder2.ResourceTypes = AccountSasResource::Service; auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_blob_create(sasToken), StorageError); + EXPECT_THROW(verify_blob_create(sasToken), StorageException); auto serviceClient = Blobs::BlobServiceClient(serviceUri + sasToken); EXPECT_NO_THROW(serviceClient.ListBlobContainersSegment()); @@ -332,10 +332,10 @@ namespace Azure { namespace Storage { namespace Test { builder2.StartsOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(5)); builder2.ExpiresOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(1)); auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_blob_create(sasToken), StorageError); + EXPECT_THROW(verify_blob_create(sasToken), StorageException); auto sasToken2 = builder2.ToSasQueryParameters(userDelegationKey, accountName); - EXPECT_THROW(verify_blob_create(sasToken2), StorageError); + EXPECT_THROW(verify_blob_create(sasToken2), StorageException); } // Without start time @@ -353,9 +353,9 @@ namespace Azure { namespace Storage { namespace Test { Blobs::BlobSasBuilder builder2 = blobSasBuilder; builder2.IPRange = "0.0.0.0-0.0.0.1"; auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_blob_create(sasToken), StorageError); + EXPECT_THROW(verify_blob_create(sasToken), StorageException); auto sasToken2 = builder2.ToSasQueryParameters(userDelegationKey, accountName); - EXPECT_THROW(verify_blob_create(sasToken2), StorageError); + EXPECT_THROW(verify_blob_create(sasToken2), StorageException); // TODO: Add this test case back with support to contain IPv6 ranges when service is ready. // builder2.IPRange = "0.0.0.0-255.255.255.255"; diff --git a/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp index 6896cb6c7..07be13417 100644 --- a/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp @@ -320,7 +320,7 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(BlobServiceClientTest, Statistics) { - EXPECT_THROW(m_blobServiceClient.GetStatistics(), StorageError); + EXPECT_THROW(m_blobServiceClient.GetStatistics(), StorageException); auto keyCredential = Details::ParseConnectionString(StandardStorageConnectionString()).KeyCredential; diff --git a/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp index 6bec82e10..5f4393866 100644 --- a/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp @@ -73,7 +73,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_FALSE(blobContentInfo->EncryptionKeySha256.HasValue()); blockBlobClient.Delete(); - EXPECT_THROW(blockBlobClient.Delete(), StorageError); + EXPECT_THROW(blockBlobClient.Delete(), StorageException); } TEST_F(BlockBlobClientTest, UploadDownload) @@ -161,9 +161,9 @@ namespace Azure { namespace Storage { namespace Test { Azure::Storage::Blobs::DownloadBlobOptions options; options.Offset = 0; - EXPECT_THROW(blockBlobClient.Download(options), StorageError); + EXPECT_THROW(blockBlobClient.Download(options), StorageException); options.Length = 1; - EXPECT_THROW(blockBlobClient.Download(options), StorageError); + EXPECT_THROW(blockBlobClient.Download(options), StorageException); } TEST_F(BlockBlobClientTest, CopyFromUri) @@ -213,16 +213,16 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(ReadBodyStream(versionClient.Download()->BodyStream), m_blobContent); EXPECT_EQ(versionClient.GetProperties()->Metadata, m_blobUploadOptions.Metadata); auto emptyContent = Azure::Core::Http::MemoryBodyStream(nullptr, 0); - EXPECT_THROW(snapshotClient.Upload(&emptyContent), StorageError); - EXPECT_THROW(snapshotClient.SetMetadata({}), StorageError); + EXPECT_THROW(snapshotClient.Upload(&emptyContent), StorageException); + EXPECT_THROW(snapshotClient.SetMetadata({}), StorageException); EXPECT_NO_THROW(snapshotClient.SetAccessTier(Azure::Storage::Blobs::AccessTier::Cool)); EXPECT_THROW( - snapshotClient.SetHttpHeaders(Azure::Storage::Blobs::BlobHttpHeaders()), StorageError); - EXPECT_THROW(versionClient.Upload(&emptyContent), StorageError); - EXPECT_THROW(versionClient.SetMetadata({}), StorageError); + snapshotClient.SetHttpHeaders(Azure::Storage::Blobs::BlobHttpHeaders()), StorageException); + EXPECT_THROW(versionClient.Upload(&emptyContent), StorageException); + EXPECT_THROW(versionClient.SetMetadata({}), StorageException); EXPECT_NO_THROW(versionClient.SetAccessTier(Azure::Storage::Blobs::AccessTier::Cool)); EXPECT_THROW( - versionClient.SetHttpHeaders(Azure::Storage::Blobs::BlobHttpHeaders()), StorageError); + versionClient.SetHttpHeaders(Azure::Storage::Blobs::BlobHttpHeaders()), StorageException); Azure::Storage::Blobs::CreateBlobSnapshotOptions options; options.Metadata = {{"snapshotkey1", "snapshotvalue1"}, {"snapshotkey2", "SNAPSHOTVALUE2"}}; @@ -372,7 +372,7 @@ namespace Azure { namespace Storage { namespace Test { { EXPECT_THROW( m_blockBlobClient->DownloadTo(downloadBuffer.data(), downloadBuffer.size(), options), - StorageError); + StorageException); } }; auto testDownloadToFile = [](int concurrency, @@ -428,7 +428,7 @@ namespace Azure { namespace Storage { namespace Test { } else { - EXPECT_THROW(m_blockBlobClient->DownloadTo(tempFilename, options), StorageError); + EXPECT_THROW(m_blockBlobClient->DownloadTo(tempFilename, options), StorageException); } DeleteFile(tempFilename); }; @@ -515,7 +515,7 @@ namespace Azure { namespace Storage { namespace Test { StandardStorageConnectionString(), m_containerName, RandomString()); std::string emptyFilename = RandomString(); EXPECT_THROW(blockBlobClient.UploadFrom(emptyFilename), std::runtime_error); - EXPECT_THROW(blockBlobClient.Delete(), StorageError); + EXPECT_THROW(blockBlobClient.Delete(), StorageException); } TEST_F(BlockBlobClientTest, ConcurrentDownloadNonExistingBlob) @@ -525,8 +525,9 @@ namespace Azure { namespace Storage { namespace Test { std::vector blobContent(100); std::string tempFilename = RandomString(); - EXPECT_THROW(blockBlobClient.DownloadTo(blobContent.data(), blobContent.size()), StorageError); - EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename), StorageError); + EXPECT_THROW( + blockBlobClient.DownloadTo(blobContent.data(), blobContent.size()), StorageException); + EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename), StorageException); DeleteFile(tempFilename); } @@ -624,28 +625,28 @@ namespace Azure { namespace Storage { namespace Test { options.Offset = 0; EXPECT_THROW( blockBlobClient.DownloadTo(emptyContent.data(), static_cast(8_MB), options), - StorageError); - EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageError); + StorageException); + EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageException); options.Offset = 1; EXPECT_THROW( blockBlobClient.DownloadTo(emptyContent.data(), static_cast(8_MB), options), - StorageError); - EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageError); + StorageException); + EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageException); options.Offset = 0; options.Length = 1; EXPECT_THROW( blockBlobClient.DownloadTo(emptyContent.data(), static_cast(8_MB), options), - StorageError); - EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageError); + StorageException); + EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageException); options.Offset = 100; options.Length = 100; EXPECT_THROW( blockBlobClient.DownloadTo(emptyContent.data(), static_cast(8_MB), options), - StorageError); - EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageError); + StorageException); + EXPECT_THROW(blockBlobClient.DownloadTo(tempFilename, options), StorageException); DeleteFile(tempFilename); } } @@ -746,7 +747,7 @@ namespace Azure { namespace Storage { namespace Test { { blockBlobClient.Download(); } - catch (StorageError& e) + catch (StorageException& e) { exceptionCaught = true; EXPECT_EQ(e.StatusCode, Azure::Core::Http::HttpStatusCode::NotFound); diff --git a/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp b/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp index 78dc14330..d49d27411 100644 --- a/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp @@ -18,7 +18,7 @@ namespace Azure { namespace Storage { namespace Test { { containerClient.Create(); } - catch (StorageError& e) + catch (StorageException& e) { if (e.StatusCode != Azure::Core::Http::HttpStatusCode::Conflict) { diff --git a/sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp index a88b87235..8951905f5 100644 --- a/sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp @@ -57,7 +57,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_FALSE(blobContentInfo->EncryptionKeySha256.HasValue()); pageBlobClient.Delete(); - EXPECT_THROW(pageBlobClient.Delete(), StorageError); + EXPECT_THROW(pageBlobClient.Delete(), StorageException); } TEST_F(PageBlobClientTest, Resize) @@ -227,7 +227,7 @@ namespace Azure { namespace Storage { namespace Test { pageContent.Rewind(); options.TransactionalContentMd5 = c_dummyMd5; - EXPECT_THROW(pageBlobClient.UploadPages(0, &pageContent, options), StorageError); + EXPECT_THROW(pageBlobClient.UploadPages(0, &pageContent, options), StorageException); } TEST_F(PageBlobClientTest, ContentCrc64) @@ -248,7 +248,7 @@ namespace Azure { namespace Storage { namespace Test { pageContent.Rewind(); options.TransactionalContentCrc64 = c_dummyCrc64; - EXPECT_THROW(pageBlobClient.UploadPages(0, &pageContent, options), StorageError); + EXPECT_THROW(pageBlobClient.UploadPages(0, &pageContent, options), StorageException); } }}} // namespace Azure::Storage::Test diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt index 1ade307e4..e1e286b50 100644 --- a/sdk/storage/azure-storage-common/CMakeLists.txt +++ b/sdk/storage/azure-storage-common/CMakeLists.txt @@ -15,7 +15,7 @@ set(AZURE_STORAGE_COMMON_HEADER inc/azure/storage/common/shared_key_policy.hpp inc/azure/storage/common/storage_common.hpp inc/azure/storage/common/storage_credential.hpp - inc/azure/storage/common/storage_error.hpp + inc/azure/storage/common/storage_exception.hpp inc/azure/storage/common/storage_per_retry_policy.hpp inc/azure/storage/common/storage_retry_policy.hpp inc/azure/storage/common/version.hpp @@ -30,7 +30,7 @@ set(AZURE_STORAGE_COMMON_SOURCE src/shared_key_policy.cpp src/storage_common.cpp src/storage_credential.cpp - src/storage_error.cpp + src/storage_exception.cpp src/storage_per_retry_policy.cpp src/storage_retry_policy.cpp src/xml_wrapper.cpp diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp index 33dbeec05..99793aae6 100644 --- a/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp @@ -12,7 +12,7 @@ namespace Azure { namespace Storage { /** * @brief Specifies HTTP options for conditional requests based on modification time value. */ - struct LastModifiedTimeAccessConditions + struct ModifiedTimeConditions { /** * @brief Specify this header to perform the operation only if the resource has been diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp index 823bc87d6..b2ffdf52a 100644 --- a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp @@ -25,8 +25,8 @@ namespace Azure { namespace Storage { } } // namespace Files - struct SharedKeyCredential - { + class SharedKeyCredential { + public: explicit SharedKeyCredential(std::string accountName, std::string accountKey) : AccountName(std::move(accountName)), m_accountKey(std::move(accountKey)) { diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_error.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_exception.hpp similarity index 77% rename from sdk/storage/azure-storage-common/inc/azure/storage/common/storage_error.hpp rename to sdk/storage/azure-storage-common/inc/azure/storage/common/storage_exception.hpp index f7ea192a2..321ba45e0 100644 --- a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_error.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_exception.hpp @@ -11,9 +11,9 @@ namespace Azure { namespace Storage { - struct StorageError : public std::runtime_error + struct StorageException : public std::runtime_error { - explicit StorageError(const std::string& message) : std::runtime_error(message) {} + explicit StorageException(const std::string& message) : std::runtime_error(message) {} Azure::Core::Http::HttpStatusCode StatusCode = Azure::Core::Http::HttpStatusCode::None; std::string ReasonPhrase; @@ -23,7 +23,7 @@ namespace Azure { namespace Storage { std::string Message; std::unique_ptr RawResponse; - static StorageError CreateFromResponse( + static StorageException CreateFromResponse( std::unique_ptr response); }; }} // namespace Azure::Storage diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/xml_wrapper.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/xml_wrapper.hpp index 829de9ee8..ac2f4d426 100644 --- a/sdk/storage/azure-storage-common/inc/azure/storage/common/xml_wrapper.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/xml_wrapper.hpp @@ -10,7 +10,7 @@ struct _xmlTextReader; struct _xmlTextWriter; struct _xmlBuffer; -namespace Azure { namespace Storage { +namespace Azure { namespace Storage { namespace Details { enum class XmlNodeType { @@ -59,4 +59,4 @@ namespace Azure { namespace Storage { _xmlTextWriter* m_writer = nullptr; }; -}} // namespace Azure::Storage +}}} // namespace Azure::Storage::Details diff --git a/sdk/storage/azure-storage-common/src/storage_error.cpp b/sdk/storage/azure-storage-common/src/storage_exception.cpp similarity index 88% rename from sdk/storage/azure-storage-common/src/storage_error.cpp rename to sdk/storage/azure-storage-common/src/storage_exception.cpp index f66cd6d06..bf9345b51 100644 --- a/sdk/storage/azure-storage-common/src/storage_error.cpp +++ b/sdk/storage/azure-storage-common/src/storage_exception.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "azure/storage/common/storage_error.hpp" +#include "azure/storage/common/storage_exception.hpp" #include "azure/core/http/policy.hpp" #include "azure/storage/common/constants.hpp" @@ -12,7 +12,7 @@ #include namespace Azure { namespace Storage { - StorageError StorageError::CreateFromResponse( + StorageException StorageException::CreateFromResponse( std::unique_ptr response) { std::vector bodyBuffer = std::move(response->GetBody()); @@ -40,8 +40,8 @@ namespace Azure { namespace Storage { if (response->GetHeaders().at(Details::c_HttpHeaderContentType).find("xml") != std::string::npos) { - auto xmlReader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto xmlReader = Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); enum class XmlTagName { @@ -54,11 +54,11 @@ namespace Azure { namespace Storage { while (true) { auto node = xmlReader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -69,7 +69,7 @@ namespace Azure { namespace Storage { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Error") == 0) { @@ -84,7 +84,7 @@ namespace Azure { namespace Storage { path.emplace_back(XmlTagName::c_Message); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::c_Error && path[1] == XmlTagName::c_Code) { @@ -121,7 +121,7 @@ namespace Azure { namespace Storage { } } - StorageError result = StorageError( + StorageException result = StorageException( std::to_string(static_cast::type>( httpStatusCode)) + " " + reasonPhrase + "\n" + message + "\nRequest ID: " + requestId); diff --git a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp index d1b37289f..95ac0588f 100644 --- a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp +++ b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp @@ -9,7 +9,7 @@ #include #include -namespace Azure { namespace Storage { +namespace Azure { namespace Storage { namespace Details { struct XmlGlobalInitializer { @@ -174,4 +174,4 @@ namespace Azure { namespace Storage { return std::string(reinterpret_cast(m_buffer->content), m_buffer->use); } -}} // namespace Azure::Storage +}}} // namespace Azure::Storage::Details diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp index 2ab972edc..f363be623 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp @@ -188,14 +188,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Creates a new file, or updates the content of an existing file. Updating * an existing file overwrites any existing metadata on the file. - * @param file A file containing the content to upload. + * @param fileName A file containing the content to upload. * @param options Optional parameters to execute this function. * @return Azure::Core::Response containing the information returned when * uploading a file from a local file. * @remark This request is sent to blob endpoint. */ Azure::Core::Response UploadFrom( - const std::string& file, + const std::string& fileName, const UploadFileFromOptions& options = UploadFileFromOptions()) const; /** @@ -217,14 +217,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Downloads a file or a file range from the service to a file using parallel * requests. - * @param file A file path to write the downloaded content to. + * @param fileName A file path to write the downloaded content to. * @param options Optional parameters to execute this function. * @return Azure::Core::Response containing the information returned when * downloading a file to a local file. * @remark This request is sent to blob endpoint. */ Azure::Core::Response DownloadTo( - const std::string& file, + const std::string& fileName, const DownloadFileToOptions& options = DownloadFileToOptions()) const; /** diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp index 306274b05..213195317 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp @@ -77,15 +77,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Specifies access conditions for a file system. */ - struct FileSystemAccessConditions : public LastModifiedTimeAccessConditions, - public LeaseAccessConditions + struct FileSystemAccessConditions : public ModifiedTimeConditions, public LeaseAccessConditions { }; /** * @brief Specifies access conditions for a path. */ - struct PathAccessConditions : public LastModifiedTimeAccessConditions, + struct PathAccessConditions : public ModifiedTimeConditions, public ETagAccessConditions, public LeaseAccessConditions { diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp index bad48ba22..54b8bd6d5 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp @@ -11,7 +11,7 @@ #include "azure/storage/common/crypt.hpp" #include "azure/storage/common/json.hpp" #include "azure/storage/common/storage_common.hpp" -#include "azure/storage/common/storage_error.hpp" +#include "azure/storage/common/storage_exception.hpp" #include #include @@ -771,24 +771,23 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static Azure::Storage::Files::DataLake::FileSystem FileSystemFromJson( - const nlohmann::json& node) + static Storage::Files::DataLake::FileSystem FileSystemFromJson(const nlohmann::json& node) { - Azure::Storage::Files::DataLake::FileSystem result; + Storage::Files::DataLake::FileSystem result; result.Name = node["name"].get(); result.LastModified = node["lastModified"].get(); result.ETag = node["etag"].get(); return result; } - static Azure::Storage::Files::DataLake::FileSystemList FileSystemListFromJson( + static Storage::Files::DataLake::FileSystemList FileSystemListFromJson( const nlohmann::json& node) { - Azure::Storage::Files::DataLake::FileSystemList result; + Storage::Files::DataLake::FileSystemList result; for (const auto& element : node["filesystems"]) { result.Filesystems.emplace_back(FileSystemFromJson(element)); @@ -1161,7 +1160,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -1182,7 +1181,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -1206,7 +1205,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -1225,7 +1224,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -1253,13 +1252,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static Azure::Storage::Files::DataLake::Path PathFromJson(const nlohmann::json& node) + static Storage::Files::DataLake::Path PathFromJson(const nlohmann::json& node) { - Azure::Storage::Files::DataLake::Path result; + Storage::Files::DataLake::Path result; result.Name = node["name"].get(); if (node.contains("isDirectory")) { @@ -1277,10 +1276,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { return result; } - static Azure::Storage::Files::DataLake::PathList PathListFromJson( - const nlohmann::json& node) + static Storage::Files::DataLake::PathList PathListFromJson(const nlohmann::json& node) { - Azure::Storage::Files::DataLake::PathList result; + Storage::Files::DataLake::PathList result; for (const auto& element : node["paths"]) { result.Paths.emplace_back(PathFromJson(element)); @@ -2549,7 +2547,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -2599,7 +2597,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -2740,7 +2738,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -2849,7 +2847,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -2873,7 +2871,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -2894,7 +2892,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -2923,24 +2921,24 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static Azure::Storage::Files::DataLake::AclFailedEntry AclFailedEntryFromJson( + static Storage::Files::DataLake::AclFailedEntry AclFailedEntryFromJson( const nlohmann::json& node) { - Azure::Storage::Files::DataLake::AclFailedEntry result; + Storage::Files::DataLake::AclFailedEntry result; result.Name = node["name"].get(); result.Type = node["type"].get(); result.ErrorMessage = node["errorMessage"].get(); return result; } - static Azure::Storage::Files::DataLake::SetAccessControlRecursiveResponse + static Storage::Files::DataLake::SetAccessControlRecursiveResponse SetAccessControlRecursiveResponseFromJson(const nlohmann::json& node) { - Azure::Storage::Files::DataLake::SetAccessControlRecursiveResponse result; + Storage::Files::DataLake::SetAccessControlRecursiveResponse result; result.DirectoriesSuccessful = node["directoriesSuccessful"].get(); result.FilesSuccessful = node["filesSuccessful"].get(); result.FailureCount = node["failureCount"].get(); @@ -2986,7 +2984,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3017,7 +3015,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3038,7 +3036,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } }; diff --git a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp index 842f42ff1..ae008244c 100644 --- a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp +++ b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp @@ -32,7 +32,7 @@ void DataLakeGettingStarted() { fileSystemClient.Create(); } - catch (Azure::Storage::StorageError& e) + catch (Azure::Storage::StorageException& e) { if (e.ErrorCode != "ContainerAlreadyExists") { @@ -104,7 +104,7 @@ void DataLakeGettingStarted() std::cout << "Successfully finished sample." << std::endl; } - catch (const Azure::Storage::StorageError& e) + catch (const Azure::Storage::StorageException& e) { // Deal with the information when storage error is met. std::cout << "Error encountered when sending the request." << std::endl; diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp index eaa48ced4..18a92dd57 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp @@ -334,7 +334,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } Azure::Core::Response FileClient::UploadFrom( - const std::string& file, + const std::string& fileName, const UploadFileFromOptions& options) const { Blobs::UploadBlockBlobFromOptions blobOptions; @@ -343,7 +343,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { blobOptions.HttpHeaders = FromDataLakeHttpHeaders(options.HttpHeaders); blobOptions.Metadata = options.Metadata; blobOptions.Concurrency = options.Concurrency; - return m_blockBlobClient.UploadFrom(file, blobOptions); + return m_blockBlobClient.UploadFrom(fileName, blobOptions); } Azure::Core::Response FileClient::UploadFrom( @@ -378,10 +378,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } Azure::Core::Response FileClient::DownloadTo( - const std::string& file, + const std::string& fileName, const DownloadFileToOptions& options) const { - auto result = m_blockBlobClient.DownloadTo(file, options); + auto result = m_blockBlobClient.DownloadTo(fileName, options); DownloadFileToResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp index c9ccc8a02..a2e495151 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp @@ -55,7 +55,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::DeleteDirectoryOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; - EXPECT_THROW(client.Delete(false, options1), StorageError); + EXPECT_THROW(client.Delete(false, options1), StorageException); Files::DataLake::DeleteDirectoryOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(client.Delete(false, options2)); @@ -75,7 +75,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::DeleteDirectoryOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; - EXPECT_THROW(client.Delete(false, options1), StorageError); + EXPECT_THROW(client.Delete(false, options1), StorageException); Files::DataLake::DeleteDirectoryOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(client.Delete(false, options2)); @@ -95,7 +95,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(client.Create()); directoryClient.emplace_back(std::move(client)); } - EXPECT_THROW(rootDirClient.Delete(false), StorageError); + EXPECT_THROW(rootDirClient.Delete(false), StorageException); EXPECT_NO_THROW(rootDirClient.Delete(true)); } } @@ -120,7 +120,7 @@ namespace Azure { namespace Storage { namespace Test { } for (const auto& client : directoryClients) { - EXPECT_THROW(client.Delete(false), StorageError); + EXPECT_THROW(client.Delete(false), StorageException); } for (const auto& newPath : newPaths) { @@ -141,7 +141,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::RenameDirectoryOptions options1; options1.SourceAccessConditions.IfModifiedSince = response->LastModified; - EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); + EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageException); Files::DataLake::RenameDirectoryOptions options2; options2.SourceAccessConditions.IfUnmodifiedSince = response->LastModified; auto newPath = LowercaseRandomString(); @@ -163,7 +163,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::RenameDirectoryOptions options1; options1.SourceAccessConditions.IfNoneMatch = response->ETag; - EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); + EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageException); Files::DataLake::RenameDirectoryOptions options2; options2.SourceAccessConditions.IfMatch = response->ETag; auto newPath = LowercaseRandomString(); @@ -186,7 +186,7 @@ namespace Azure { namespace Storage { namespace Test { options.DestinationFileSystem = LowercaseRandomString(); for (auto& client : directoryClient) { - EXPECT_THROW(client.Rename(LowercaseRandomString(), options), StorageError); + EXPECT_THROW(client.Rename(LowercaseRandomString(), options), StorageException); EXPECT_NO_THROW(client.GetProperties()); } } diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.cpp index 5b28af2aa..626de3e1b 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.cpp @@ -55,7 +55,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::FileDeleteOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; - EXPECT_THROW(client.Delete(options1), StorageError); + EXPECT_THROW(client.Delete(options1), StorageException); Files::DataLake::FileDeleteOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(client.Delete(options2)); @@ -75,7 +75,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::FileDeleteOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; - EXPECT_THROW(client.Delete(options1), StorageError); + EXPECT_THROW(client.Delete(options1), StorageException); Files::DataLake::FileDeleteOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(client.Delete(options2)); @@ -103,7 +103,7 @@ namespace Azure { namespace Storage { namespace Test { } for (const auto& client : fileClients) { - EXPECT_THROW(client.Delete(), StorageError); + EXPECT_THROW(client.Delete(), StorageException); } for (const auto& newPath : newPaths) { @@ -124,7 +124,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::RenameFileOptions options1; options1.SourceAccessConditions.IfModifiedSince = response->LastModified; - EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); + EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageException); Files::DataLake::RenameFileOptions options2; options2.SourceAccessConditions.IfUnmodifiedSince = response->LastModified; auto newPath = LowercaseRandomString(); @@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::RenameFileOptions options1; options1.SourceAccessConditions.IfNoneMatch = response->ETag; - EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageError); + EXPECT_THROW(client.Rename(LowercaseRandomString(), options1), StorageException); Files::DataLake::RenameFileOptions options2; options2.SourceAccessConditions.IfMatch = response->ETag; auto newPath = LowercaseRandomString(); @@ -169,7 +169,7 @@ namespace Azure { namespace Storage { namespace Test { options.DestinationFileSystem = LowercaseRandomString(); for (auto& client : fileClient) { - EXPECT_THROW(client.Rename(LowercaseRandomString(), options), StorageError); + EXPECT_THROW(client.Rename(LowercaseRandomString(), options), StorageException); EXPECT_NO_THROW(client.GetProperties()); } } @@ -356,7 +356,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = newFileClient->GetProperties(); Files::DataLake::ReadFileOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; - EXPECT_THROW(newFileClient->Read(options1), StorageError); + EXPECT_THROW(newFileClient->Read(options1), StorageException); Files::DataLake::ReadFileOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(result = newFileClient->Read(options2)); @@ -368,7 +368,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = newFileClient->GetProperties(); Files::DataLake::ReadFileOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; - EXPECT_THROW(newFileClient->Read(options1), StorageError); + EXPECT_THROW(newFileClient->Read(options1), StorageException); Files::DataLake::ReadFileOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(result = newFileClient->Read(options2)); @@ -392,7 +392,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_THROW( client.ScheduleDeletion( Files::DataLake::ScheduleFileExpiryOriginType::RelativeToNow, options), - StorageError); + StorageException); options.TimeToExpireInMs = 1000; EXPECT_NO_THROW(client.ScheduleDeletion( Files::DataLake::ScheduleFileExpiryOriginType::RelativeToNow, options)); @@ -403,11 +403,11 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::ScheduleFileDeletionOptions options; EXPECT_THROW( client.ScheduleDeletion(Files::DataLake::ScheduleFileExpiryOriginType::Absolute, options), - StorageError); + StorageException); options.TimeToExpireInMs = 1000; EXPECT_THROW( client.ScheduleDeletion(Files::DataLake::ScheduleFileExpiryOriginType::Absolute, options), - StorageError); + StorageException); options.ExpiresOn = "Tue, 29 Sep 2100 09:53:03 GMT"; EXPECT_THROW( client.ScheduleDeletion(Files::DataLake::ScheduleFileExpiryOriginType::Absolute, options), diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp index d8aab550f..3bbf57cce 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp @@ -123,7 +123,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = client.GetProperties(); Files::DataLake::DeleteFileSystemOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; - EXPECT_THROW(client.Delete(options1), StorageError); + EXPECT_THROW(client.Delete(options1), StorageException); Files::DataLake::DeleteFileSystemOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(client.Delete(options2)); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp index 3f236dad0..c01b01b75 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp @@ -166,7 +166,7 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::SetPathHttpHeadersOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; EXPECT_THROW( - m_pathClient->SetHttpHeaders(GetInterestingHttpHeaders(), options1), StorageError); + m_pathClient->SetHttpHeaders(GetInterestingHttpHeaders(), options1), StorageException); Files::DataLake::SetPathHttpHeadersOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(m_pathClient->SetHttpHeaders(GetInterestingHttpHeaders(), options2)); @@ -178,7 +178,7 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::SetPathHttpHeadersOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; EXPECT_THROW( - m_pathClient->SetHttpHeaders(GetInterestingHttpHeaders(), options1), StorageError); + m_pathClient->SetHttpHeaders(GetInterestingHttpHeaders(), options1), StorageException); Files::DataLake::SetPathHttpHeadersOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(m_pathClient->SetHttpHeaders(GetInterestingHttpHeaders(), options2)); @@ -213,7 +213,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = m_pathClient->GetProperties(); Files::DataLake::SetPathAccessControlOptions options1; options1.AccessConditions.IfModifiedSince = response->LastModified; - EXPECT_THROW(m_pathClient->SetAccessControl(acls, options1), StorageError); + EXPECT_THROW(m_pathClient->SetAccessControl(acls, options1), StorageException); Files::DataLake::SetPathAccessControlOptions options2; options2.AccessConditions.IfUnmodifiedSince = response->LastModified; EXPECT_NO_THROW(m_pathClient->SetAccessControl(acls, options2)); @@ -225,7 +225,7 @@ namespace Azure { namespace Storage { namespace Test { auto response = m_pathClient->GetProperties(); Files::DataLake::SetPathAccessControlOptions options1; options1.AccessConditions.IfNoneMatch = response->ETag; - EXPECT_THROW(m_pathClient->SetAccessControl(acls, options1), StorageError); + EXPECT_THROW(m_pathClient->SetAccessControl(acls, options1), StorageException); Files::DataLake::SetPathAccessControlOptions options2; options2.AccessConditions.IfMatch = response->ETag; EXPECT_NO_THROW(m_pathClient->SetAccessControl(acls, options2)); diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp index 0c46add06..162ebfb0a 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp @@ -100,7 +100,7 @@ namespace Azure { namespace Storage { namespace Test { { fileClient0.Delete(); } - catch (StorageError&) + catch (StorageException&) { } auto fileClient = Files::DataLake::FileClient(fileUri + sas); @@ -112,7 +112,7 @@ namespace Azure { namespace Storage { namespace Test { { fileClient0.Delete(); } - catch (StorageError&) + catch (StorageException&) { } std::string newFilename = RandomString(); @@ -340,10 +340,10 @@ namespace Azure { namespace Storage { namespace Test { builder2.StartsOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(5)); builder2.ExpiresOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(1)); auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_file_create(sasToken), StorageError); + EXPECT_THROW(verify_file_create(sasToken), StorageException); auto sasToken2 = builder2.ToSasQueryParameters(userDelegationKey, accountName); - EXPECT_THROW(verify_file_create(sasToken2), StorageError); + EXPECT_THROW(verify_file_create(sasToken2), StorageException); } // Without start time @@ -361,9 +361,9 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::DataLakeSasBuilder builder2 = fileSasBuilder; builder2.IPRange = "0.0.0.0-0.0.0.1"; auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verify_file_create(sasToken), StorageError); + EXPECT_THROW(verify_file_create(sasToken), StorageException); auto sasToken2 = builder2.ToSasQueryParameters(userDelegationKey, accountName); - EXPECT_THROW(verify_file_create(sasToken2), StorageError); + EXPECT_THROW(verify_file_create(sasToken2), StorageException); // TODO: Add this test case back with support to contain IPv6 ranges when service is ready. // builder2.IPRange = "0.0.0.0-255.255.255.255"; 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 6de911064..cc967883b 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 @@ -11,7 +11,7 @@ #include "azure/storage/common/crypt.hpp" #include "azure/storage/common/json.hpp" #include "azure/storage/common/storage_common.hpp" -#include "azure/storage/common/storage_error.hpp" +#include "azure/storage/common/storage_exception.hpp" #include "azure/storage/common/xml_wrapper.hpp" #include @@ -1205,9 +1205,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string xml_body; { - XmlWriter writer; + Storage::Details::XmlWriter writer; StorageServicePropertiesToXml(writer, setPropertiesOptions.ServiceProperties); - writer.Write(XmlNode{XmlNodeType::End}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::End}); xml_body = writer.GetDocument(); } auto body = Azure::Core::Http::MemoryBodyStream( @@ -1350,116 +1350,153 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static void ShareRetentionPolicyToXml(XmlWriter& writer, const ShareRetentionPolicy& object) + static void ShareRetentionPolicyToXml( + Storage::Details::XmlWriter& writer, + const ShareRetentionPolicy& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Enabled"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (object.Days.HasValue()) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Days"}); writer.Write( - XmlNode{XmlNodeType::Text, nullptr, std::to_string(object.Days.GetValue()).data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Days"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + std::to_string(object.Days.GetValue()).data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } } - static void MetricsToXml(XmlWriter& writer, const Metrics& object) + static void MetricsToXml(Storage::Details::XmlWriter& writer, const Metrics& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Version"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Version.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Enabled"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Version"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Version.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (object.IncludeApis.HasValue()) { - writer.Write(XmlNode{XmlNodeType::StartTag, "IncludeAPIs"}); - writer.Write(XmlNode{ - XmlNodeType::Text, nullptr, object.IncludeApis.GetValue() ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "IncludeAPIs"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + object.IncludeApis.GetValue() ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - writer.Write(XmlNode{XmlNodeType::StartTag, "RetentionPolicy"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "RetentionPolicy"}); ShareRetentionPolicyToXml(writer, object.RetentionPolicy); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void CorsRuleToXml(XmlWriter& writer, const CorsRule& object) + static void CorsRuleToXml(Storage::Details::XmlWriter& writer, const CorsRule& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "CorsRule"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "AllowedOrigins"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.AllowedOrigins.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "AllowedMethods"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.AllowedMethods.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "AllowedHeaders"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.AllowedHeaders.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "ExposedHeaders"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.ExposedHeaders.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "MaxAgeInSeconds"}); writer.Write( - XmlNode{XmlNodeType::Text, nullptr, std::to_string(object.MaxAgeInSeconds).data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "CorsRule"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AllowedOrigins"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.AllowedOrigins.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AllowedMethods"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.AllowedMethods.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AllowedHeaders"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.AllowedHeaders.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "ExposedHeaders"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.ExposedHeaders.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "MaxAgeInSeconds"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + std::to_string(object.MaxAgeInSeconds).data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void SmbMultichannelToXml(XmlWriter& writer, const SmbMultichannel& object) + static void SmbMultichannelToXml( + Storage::Details::XmlWriter& writer, + const SmbMultichannel& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Multichannel"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Enabled"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Multichannel"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void SmbSettingsToXml(XmlWriter& writer, const SmbSettings& object) + static void SmbSettingsToXml(Storage::Details::XmlWriter& writer, const SmbSettings& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "SMB"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "SMB"}); SmbMultichannelToXml(writer, object.Multichannel); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static void ShareProtocolSettingsToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const ShareProtocolSettings& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "ProtocolSettings"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "ProtocolSettings"}); SmbSettingsToXml(writer, object.Settings); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static void StorageServicePropertiesToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const StorageServiceProperties& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "StorageServiceProperties"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "HourMetrics"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "StorageServiceProperties"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "HourMetrics"}); MetricsToXml(writer, object.HourMetrics); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "MinuteMetrics"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "MinuteMetrics"}); MetricsToXml(writer, object.MinuteMetrics); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (object.Cors.size() > 0) { - writer.Write(XmlNode{XmlNodeType::StartTag, "Cors"}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Cors"}); for (const auto& item : object.Cors) { CorsRuleToXml(writer, item); } - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } if (object.Protocol.HasValue()) { ShareProtocolSettingsToXml(writer, object.Protocol.GetValue()); } - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static Azure::Core::Response GetPropertiesParseResult( Azure::Core::Context context, @@ -1470,8 +1507,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success. const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); ServiceGetPropertiesResult result = bodyBuffer.empty() ? ServiceGetPropertiesResult() : ServiceGetPropertiesResultFromStorageServiceProperties( @@ -1482,11 +1519,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static ShareRetentionPolicy ShareRetentionPolicyFromXml(XmlReader& reader) + static ShareRetentionPolicy ShareRetentionPolicyFromXml(Storage::Details::XmlReader& reader) { auto result = ShareRetentionPolicy(); enum class XmlTagName @@ -1500,11 +1537,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -1515,7 +1552,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Days") == 0) @@ -1531,7 +1568,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Days) { @@ -1546,7 +1583,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static Metrics MetricsFromXml(XmlReader& reader) + static Metrics MetricsFromXml(Storage::Details::XmlReader& reader) { auto result = Metrics(); enum class XmlTagName @@ -1562,11 +1599,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -1577,7 +1614,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Enabled") == 0) @@ -1607,7 +1644,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Enabled) { @@ -1626,7 +1663,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static CorsRule CorsRuleFromXml(XmlReader& reader) + static CorsRule CorsRuleFromXml(Storage::Details::XmlReader& reader) { auto result = CorsRule(); enum class XmlTagName @@ -1643,11 +1680,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -1658,7 +1695,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "AllowedHeaders") == 0) @@ -1686,7 +1723,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_AllowedHeaders) { @@ -1713,7 +1750,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static SmbMultichannel SmbMultichannelFromXml(XmlReader& reader) + static SmbMultichannel SmbMultichannelFromXml(Storage::Details::XmlReader& reader) { auto result = SmbMultichannel(); enum class XmlTagName @@ -1726,11 +1763,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -1741,7 +1778,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Enabled") == 0) @@ -1753,7 +1790,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Enabled) { @@ -1764,7 +1801,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static SmbSettings SmbSettingsFromXml(XmlReader& reader) + static SmbSettings SmbSettingsFromXml(Storage::Details::XmlReader& reader) { auto result = SmbSettings(); enum class XmlTagName @@ -1777,11 +1814,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -1792,7 +1829,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Multichannel") == 0) @@ -1810,14 +1847,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } return result; } - static ShareProtocolSettings ShareProtocolSettingsFromXml(XmlReader& reader) + static ShareProtocolSettings ShareProtocolSettingsFromXml( + Storage::Details::XmlReader& reader) { auto result = ShareProtocolSettings(); enum class XmlTagName @@ -1830,11 +1868,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -1845,7 +1883,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "SMB") == 0) @@ -1863,14 +1901,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } return result; } - static StorageServiceProperties StorageServicePropertiesFromXml(XmlReader& reader) + static StorageServiceProperties StorageServicePropertiesFromXml( + Storage::Details::XmlReader& reader) { auto result = StorageServiceProperties(); enum class XmlTagName @@ -1888,11 +1927,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -1903,7 +1942,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Cors") == 0) @@ -1963,7 +2002,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } @@ -1990,8 +2029,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success. const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); ServiceListSharesSegmentResult result = bodyBuffer.empty() ? ServiceListSharesSegmentResult() : ServiceListSharesSegmentResultFromListSharesResponse( @@ -2002,11 +2041,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static LeaseStatusType LeaseStatusTypeFromXml(XmlReader& reader) + static LeaseStatusType LeaseStatusTypeFromXml(Storage::Details::XmlReader& reader) { auto result = LeaseStatusType::Unknown; enum class XmlTagName @@ -2019,11 +2058,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2034,7 +2073,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "LeaseStatus") == 0) @@ -2046,7 +2085,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_LeaseStatus) { @@ -2057,7 +2096,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static LeaseStateType LeaseStateTypeFromXml(XmlReader& reader) + static LeaseStateType LeaseStateTypeFromXml(Storage::Details::XmlReader& reader) { auto result = LeaseStateType::Unknown; enum class XmlTagName @@ -2070,11 +2109,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2085,7 +2124,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "LeaseState") == 0) @@ -2097,7 +2136,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_LeaseState) { @@ -2108,7 +2147,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static LeaseDurationType LeaseDurationTypeFromXml(XmlReader& reader) + static LeaseDurationType LeaseDurationTypeFromXml(Storage::Details::XmlReader& reader) { auto result = LeaseDurationType::Unknown; enum class XmlTagName @@ -2121,11 +2160,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2136,7 +2175,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "LeaseDuration") == 0) @@ -2148,7 +2187,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_LeaseDuration) { @@ -2159,7 +2198,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareProperties SharePropertiesFromXml(XmlReader& reader) + static ShareProperties SharePropertiesFromXml(Storage::Details::XmlReader& reader) { auto result = ShareProperties(); enum class XmlTagName @@ -2183,11 +2222,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2198,7 +2237,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "DeletedTime") == 0) @@ -2270,7 +2309,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_DeletedTime) { @@ -2313,7 +2352,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static std::map MetadataFromXml(XmlReader& reader) + static std::map MetadataFromXml( + Storage::Details::XmlReader& reader) { std::map result; int depth = 0; @@ -2321,25 +2361,25 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (depth++ == 0) { key = node.Name; } } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (depth-- == 0) { break; } } - else if (depth == 1 && node.Type == XmlNodeType::Text) + else if (depth == 1 && node.Type == Storage::Details::XmlNodeType::Text) { result.emplace(std::move(key), std::string(node.Value)); } @@ -2347,7 +2387,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareItem ShareItemFromXml(XmlReader& reader) + static ShareItem ShareItemFromXml(Storage::Details::XmlReader& reader) { auto result = ShareItem(); enum class XmlTagName @@ -2365,11 +2405,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2380,7 +2420,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Deleted") == 0) @@ -2423,7 +2463,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Deleted) { @@ -2446,7 +2486,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ListSharesResponse ListSharesResponseFromXml(XmlReader& reader) + static ListSharesResponse ListSharesResponseFromXml(Storage::Details::XmlReader& reader) { auto result = ListSharesResponse(); enum class XmlTagName @@ -2465,11 +2505,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -2480,7 +2520,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "EnumerationResults") == 0) @@ -2522,7 +2562,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::c_EnumerationResults && path[1] == XmlTagName::c_NextMarker) @@ -2548,7 +2588,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.PreviousContinuationToken = node.Value; } } - else if (node.Type == XmlNodeType::Attribute) + else if (node.Type == Storage::Details::XmlNodeType::Attribute) { if (path.size() == 1 && path[0] == XmlTagName::c_EnumerationResults && (std::strcmp(node.Name, "ServiceEndpoint") == 0)) @@ -3360,9 +3400,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string xml_body; { - XmlWriter writer; + Storage::Details::XmlWriter writer; SignedIdentifiersToXml(writer, setAccessPolicyOptions.ShareAcl); - writer.Write(XmlNode{XmlNodeType::End}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::End}); xml_body = writer.GetDocument(); } auto body = Azure::Core::Http::MemoryBodyStream( @@ -3502,7 +3542,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3574,7 +3614,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3593,7 +3633,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3620,7 +3660,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3646,7 +3686,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3673,7 +3713,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3700,7 +3740,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3730,7 +3770,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3752,7 +3792,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3772,7 +3812,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3800,7 +3840,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3836,7 +3876,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3857,7 +3897,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -3870,8 +3910,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); ShareGetAccessPolicyResult result = bodyBuffer.empty() ? ShareGetAccessPolicyResult() : ShareGetAccessPolicyResultFromSignedIdentifiers(SignedIdentifiersFromXml(reader)); @@ -3883,11 +3923,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static AccessPolicy AccessPolicyFromXml(XmlReader& reader) + static AccessPolicy AccessPolicyFromXml(Storage::Details::XmlReader& reader) { auto result = AccessPolicy(); enum class XmlTagName @@ -3902,11 +3942,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -3917,7 +3957,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Expiry") == 0) @@ -3937,7 +3977,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Expiry) { @@ -3956,7 +3996,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static SignedIdentifier SignedIdentifierFromXml(XmlReader& reader) + static SignedIdentifier SignedIdentifierFromXml(Storage::Details::XmlReader& reader) { auto result = SignedIdentifier(); enum class XmlTagName @@ -3970,11 +4010,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -3985,7 +4025,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "AccessPolicy") == 0) @@ -4007,7 +4047,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Id) { @@ -4018,7 +4058,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static std::vector SignedIdentifiersFromXml(XmlReader& reader) + static std::vector SignedIdentifiersFromXml( + Storage::Details::XmlReader& reader) { auto result = std::vector(); enum class XmlTagName @@ -4032,11 +4073,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4047,7 +4088,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "SignedIdentifier") == 0) @@ -4070,7 +4111,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } @@ -4102,45 +4143,58 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static void AccessPolicyToXml(XmlWriter& writer, const AccessPolicy& object) + static void AccessPolicyToXml( + Storage::Details::XmlWriter& writer, + const AccessPolicy& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "AccessPolicy"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Start"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Start.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Expiry"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Expiry.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Permission"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Permission.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "AccessPolicy"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Start"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Start.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Expiry"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Expiry.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write( + Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Permission"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Permission.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - static void SignedIdentifierToXml(XmlWriter& writer, const SignedIdentifier& object) + static void SignedIdentifierToXml( + Storage::Details::XmlWriter& writer, + const SignedIdentifier& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "SignedIdentifier"}); - writer.Write(XmlNode{XmlNodeType::StartTag, "Id"}); - writer.Write(XmlNode{XmlNodeType::Text, nullptr, object.Id.data()}); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "SignedIdentifier"}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Id"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, nullptr, object.Id.data()}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); AccessPolicyToXml(writer, object.Policy); - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static void SignedIdentifiersToXml( - XmlWriter& writer, + Storage::Details::XmlWriter& writer, const std::vector& object) { - writer.Write(XmlNode{XmlNodeType::StartTag, "SignedIdentifiers"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "SignedIdentifiers"}); for (const auto& item : object) { SignedIdentifierToXml(writer, item); } - writer.Write(XmlNode{XmlNodeType::EndTag}); + writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } static Azure::Core::Response GetStatisticsParseResult( Azure::Core::Context context, @@ -4151,8 +4205,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); ShareGetStatisticsResult result = bodyBuffer.empty() ? ShareGetStatisticsResult() : ShareGetStatisticsResultFromShareStats(ShareStatsFromXml(reader)); @@ -4164,11 +4218,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static ShareStats ShareStatsFromXml(XmlReader& reader) + static ShareStats ShareStatsFromXml(Storage::Details::XmlReader& reader) { auto result = ShareStats(); enum class XmlTagName @@ -4182,11 +4236,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4197,7 +4251,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "ShareStats") == 0) @@ -4213,7 +4267,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::c_ShareStats && path[1] == XmlTagName::c_ShareUsageBytes) @@ -4249,7 +4303,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } }; @@ -4770,7 +4824,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -4808,7 +4862,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -4827,7 +4881,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -4857,7 +4911,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -4879,7 +4933,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -4893,8 +4947,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success. const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); DirectoryListFilesAndDirectoriesSegmentResult result = bodyBuffer.empty() ? DirectoryListFilesAndDirectoriesSegmentResult() : DirectoryListFilesAndDirectoriesSegmentResultFromListFilesAndDirectoriesSegmentResponse( @@ -4906,11 +4960,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static DirectoryItem DirectoryItemFromXml(XmlReader& reader) + static DirectoryItem DirectoryItemFromXml(Storage::Details::XmlReader& reader) { auto result = DirectoryItem(); enum class XmlTagName @@ -4923,11 +4977,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4938,7 +4992,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Name") == 0) @@ -4950,7 +5004,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Name) { @@ -4961,7 +5015,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileProperty FilePropertyFromXml(XmlReader& reader) + static FileProperty FilePropertyFromXml(Storage::Details::XmlReader& reader) { auto result = FileProperty(); enum class XmlTagName @@ -4974,11 +5028,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -4989,7 +5043,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Content-Length") == 0) @@ -5001,7 +5055,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_ContentLength) { @@ -5012,7 +5066,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static FileItem FileItemFromXml(XmlReader& reader) + static FileItem FileItemFromXml(Storage::Details::XmlReader& reader) { auto result = FileItem(); enum class XmlTagName @@ -5026,11 +5080,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -5041,7 +5095,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Name") == 0) @@ -5063,7 +5117,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_Name) { @@ -5075,7 +5129,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } static FilesAndDirectoriesListSegment FilesAndDirectoriesListSegmentFromXml( - XmlReader& reader) + Storage::Details::XmlReader& reader) { auto result = FilesAndDirectoriesListSegment(); enum class XmlTagName @@ -5089,11 +5143,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -5104,7 +5158,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Directory") == 0) @@ -5130,7 +5184,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } @@ -5138,7 +5192,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } static ListFilesAndDirectoriesSegmentResponse ListFilesAndDirectoriesSegmentResponseFromXml( - XmlReader& reader) + Storage::Details::XmlReader& reader) { auto result = ListFilesAndDirectoriesSegmentResponse(); enum class XmlTagName @@ -5156,11 +5210,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -5171,7 +5225,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Entries") == 0) @@ -5210,7 +5264,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::c_EnumerationResults && path[1] == XmlTagName::c_NextMarker) @@ -5236,7 +5290,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.PreviousContinuationToken = node.Value; } } - else if (node.Type == XmlNodeType::Attribute) + else if (node.Type == Storage::Details::XmlNodeType::Attribute) { if (path.size() == 1 && path[0] == XmlTagName::c_EnumerationResults && (std::strcmp(node.Name, "DirectoryPath") == 0)) @@ -5292,8 +5346,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success. const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); DirectoryListHandlesResult result = bodyBuffer.empty() ? DirectoryListHandlesResult() : DirectoryListHandlesResultFromListHandlesResponse( @@ -5305,11 +5359,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static HandleItem HandleItemFromXml(XmlReader& reader) + static HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) { auto result = HandleItem(); enum class XmlTagName @@ -5329,11 +5383,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -5344,7 +5398,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "ClientIp") == 0) @@ -5384,7 +5438,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_ClientIp) { @@ -5423,7 +5477,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ListHandlesResponse ListHandlesResponseFromXml(XmlReader& reader) + static ListHandlesResponse ListHandlesResponseFromXml(Storage::Details::XmlReader& reader) { auto result = ListHandlesResponse(); enum class XmlTagName @@ -5439,11 +5493,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -5454,7 +5508,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Entries") == 0) @@ -5484,7 +5538,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::c_EnumerationResults && path[1] == XmlTagName::c_NextMarker) @@ -5530,7 +5584,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } }; @@ -6797,7 +6851,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7059,7 +7113,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7190,7 +7244,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7209,7 +7263,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7239,7 +7293,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7261,7 +7315,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7283,7 +7337,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7304,7 +7358,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7326,7 +7380,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7351,7 +7405,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7384,7 +7438,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7408,7 +7462,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7421,8 +7475,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success. const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); FileGetRangeListResult result = bodyBuffer.empty() ? FileGetRangeListResult() : FileGetRangeListResultFromShareFileRangeList(ShareFileRangeListFromXml(reader)); @@ -7436,11 +7490,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static FileRange FileRangeFromXml(XmlReader& reader) + static FileRange FileRangeFromXml(Storage::Details::XmlReader& reader) { auto result = FileRange(); enum class XmlTagName @@ -7454,11 +7508,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -7469,7 +7523,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "End") == 0) @@ -7485,7 +7539,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_End) { @@ -7500,7 +7554,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ClearRange ClearRangeFromXml(XmlReader& reader) + static ClearRange ClearRangeFromXml(Storage::Details::XmlReader& reader) { auto result = ClearRange(); enum class XmlTagName @@ -7514,11 +7568,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -7529,7 +7583,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "End") == 0) @@ -7545,7 +7599,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_End) { @@ -7560,7 +7614,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ShareFileRangeList ShareFileRangeListFromXml(XmlReader& reader) + static ShareFileRangeList ShareFileRangeListFromXml(Storage::Details::XmlReader& reader) { auto result = ShareFileRangeList(); enum class XmlTagName @@ -7575,11 +7629,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -7590,7 +7644,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "ClearRange") == 0) @@ -7623,7 +7677,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { } } @@ -7666,7 +7720,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7685,7 +7739,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } @@ -7698,8 +7752,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success. const auto& bodyBuffer = response.GetBody(); - auto reader - = XmlReader(reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); + auto reader = Storage::Details::XmlReader( + reinterpret_cast(bodyBuffer.data()), bodyBuffer.size()); FileListHandlesResult result = bodyBuffer.empty() ? FileListHandlesResult() : FileListHandlesResultFromListHandlesResponse(ListHandlesResponseFromXml(reader)); @@ -7710,11 +7764,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } - static HandleItem HandleItemFromXml(XmlReader& reader) + static HandleItem HandleItemFromXml(Storage::Details::XmlReader& reader) { auto result = HandleItem(); enum class XmlTagName @@ -7734,11 +7788,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -7749,7 +7803,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "ClientIp") == 0) @@ -7789,7 +7843,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.emplace_back(XmlTagName::c_Unknown); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 1 && path[0] == XmlTagName::c_ClientIp) { @@ -7828,7 +7882,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { return result; } - static ListHandlesResponse ListHandlesResponseFromXml(XmlReader& reader) + static ListHandlesResponse ListHandlesResponseFromXml(Storage::Details::XmlReader& reader) { auto result = ListHandlesResponse(); enum class XmlTagName @@ -7844,11 +7898,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { while (true) { auto node = reader.Read(); - if (node.Type == XmlNodeType::End) + if (node.Type == Storage::Details::XmlNodeType::End) { break; } - else if (node.Type == XmlNodeType::EndTag) + else if (node.Type == Storage::Details::XmlNodeType::EndTag) { if (path.size() > 0) { @@ -7859,7 +7913,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { break; } } - else if (node.Type == XmlNodeType::StartTag) + else if (node.Type == Storage::Details::XmlNodeType::StartTag) { if (std::strcmp(node.Name, "Entries") == 0) @@ -7889,7 +7943,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { path.pop_back(); } } - else if (node.Type == XmlNodeType::Text) + else if (node.Type == Storage::Details::XmlNodeType::Text) { if (path.size() == 2 && path[0] == XmlTagName::c_EnumerationResults && path[1] == XmlTagName::c_NextMarker) @@ -7935,7 +7989,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { else { unused(context); - throw Azure::Storage::StorageError::CreateFromResponse(std::move(responsePtr)); + throw Storage::StorageException::CreateFromResponse(std::move(responsePtr)); } } }; 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 c640311a5..312261a16 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 @@ -135,13 +135,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Downloads a file or a file range from the service to a memory buffer using parallel * requests. * - * @param file A file path to write the downloaded content to. + * @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 * downloaded file/file range. */ Azure::Core::Response DownloadTo( - const std::string& file, + const std::string& fileName, const DownloadFileToOptions& options = DownloadFileToOptions()) const; /** @@ -162,12 +162,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { * @brief Creates a new file, or updates the content of an existing file. Updating * an existing file overwrites any existing metadata on the file. * - * @param file A file containing the content to upload. + * @param 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. */ Azure::Core::Response UploadFrom( - const std::string& file, + const std::string& fileName, const UploadFileFromOptions& options = UploadFileFromOptions()) const; /** 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 ec77af89c..9ec65036b 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 @@ -678,7 +678,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } Azure::Core::Response FileClient::DownloadTo( - const std::string& file, + const std::string& fileName, const DownloadFileToOptions& options) const { // Just start downloading using an initial chunk. If it's a small file, we'll get the whole @@ -703,7 +703,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { firstChunkOptions.Length = firstChunkLength; } - Storage::Details::FileWriter fileWriter(file); + Storage::Details::FileWriter fileWriter(fileName); auto firstChunk = Download(firstChunkOptions); @@ -898,10 +898,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } Azure::Core::Response FileClient::UploadFrom( - const std::string& file, + const std::string& fileName, const UploadFileFromOptions& options) const { - Storage::Details::FileReader fileReader(file); + Storage::Details::FileReader fileReader(fileName); Details::ShareRestClient::File::CreateOptions protocolLayerOptions; protocolLayerOptions.XMsContentLength = fileReader.GetFileSize(); 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 58a7849d8..2c08d53c5 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 @@ -296,7 +296,7 @@ namespace Azure { namespace Storage { namespace Test { // options.BreakPeriod = 0; // shareSnapshot.BreakLease(options); - // EXPECT_THROW(m_shareClient->Delete(), StorageError); + // EXPECT_THROW(m_shareClient->Delete(), StorageException); //} TEST_F(FileShareClientTest, UnencodedDirectoryFileNameWorks) 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 64386ac32..1057218c4 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 @@ -93,7 +93,7 @@ namespace Azure { namespace Storage { namespace Test { auto name = RandomString(10); Files::Shares::DirectoryClient client = m_shareClient->GetDirectoryClient(name); EXPECT_NO_THROW(client.Create()); - EXPECT_THROW(client.Create(), StorageError); + EXPECT_THROW(client.Create(), StorageException); } } } 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 d93fa48e6..e0784785f 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 @@ -388,7 +388,7 @@ namespace Azure { namespace Storage { namespace Test { { EXPECT_THROW( m_fileClient->DownloadTo(downloadBuffer.data(), downloadBuffer.size(), options), - StorageError); + StorageException); } }; auto testDownloadToFile = [](int concurrency, @@ -444,7 +444,7 @@ namespace Azure { namespace Storage { namespace Test { } else { - EXPECT_THROW(m_fileClient->DownloadTo(tempFilename, options), StorageError); + EXPECT_THROW(m_fileClient->DownloadTo(tempFilename, options), StorageException); } DeleteFile(tempFilename); }; @@ -567,7 +567,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_NO_THROW(fileClient.UploadRange(0, &memBodyStream, uploadOptions)); uploadOptions.TransactionalMd5 = invalidMd5String; memBodyStream.Rewind(); - EXPECT_THROW(fileClient.UploadRange(0, &memBodyStream, uploadOptions), StorageError); + EXPECT_THROW(fileClient.UploadRange(0, &memBodyStream, uploadOptions), StorageException); } } 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 d24f4e75e..a65f89b4a 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 @@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Test { builder2.StartsOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(5)); builder2.ExpiresOn = ToIso8601(std::chrono::system_clock::now() - std::chrono::minutes(1)); auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verifyFileRead(sasToken), StorageError); + EXPECT_THROW(verifyFileRead(sasToken), StorageException); } // Without start time @@ -162,7 +162,7 @@ namespace Azure { namespace Storage { namespace Test { Files::Shares::ShareSasBuilder builder2 = fileSasBuilder; builder2.IPRange = "0.0.0.0-0.0.0.1"; auto sasToken = builder2.ToSasQueryParameters(*keyCredential); - EXPECT_THROW(verifyFileRead(sasToken), StorageError); + EXPECT_THROW(verifyFileRead(sasToken), StorageException); // TODO: Add this test case back with support to contain IPv6 ranges when service is ready. // builder2.IPRange = "0.0.0.0-255.255.255.255";