diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index a29a34c5b..ab0cbed5e 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -37,6 +37,7 @@ - Moved `Azure::Core::Logging` namespace entities to `Azure::Core::Logger` class. - Removed `Azure::Core::DateTime::GetRfc3339String()`: `Azure::Core::DateTime::ToString()` was extended to provide the same functionality. - Moved `Azure::Core::Response` to `Azure::Response`. +- Moved `Azure::Core::ETag` to `Azure::ETag`. ### Bug Fixes diff --git a/sdk/core/azure-core/inc/azure/core/etag.hpp b/sdk/core/azure-core/inc/azure/core/etag.hpp index 59f6a6a18..25495a308 100644 --- a/sdk/core/azure-core/inc/azure/core/etag.hpp +++ b/sdk/core/azure-core/inc/azure/core/etag.hpp @@ -12,184 +12,181 @@ #include -namespace Azure { namespace Core { +namespace Azure { + +/** + * @brief Represents an HTTP validator. + */ +class ETag { + // ETag is a validator based on https://tools.ietf.org/html/rfc7232#section-2.3.2 +private: + Azure::Core::Nullable m_value; + +public: + /** + * @brief The comparison type. + */ + enum class ETagComparison + { + Strong, + Weak + }; + + /* + 2.3.2. Comparison + + There are two entity-tag comparison functions, depending on whether + or not the comparison context allows the use of weak validators: + + o Strong comparison: two entity-tags are equivalent if both are not + weak and their opaque-tags match character-by-character. + + o Weak comparison: two entity-tags are equivalent if their + opaque-tags match character-by-character, regardless of either or + both being tagged as "weak". + + +--------+--------+-------------------+-----------------+ + | ETag 1 | ETag 2 | Strong Comparison | Weak Comparison | + +--------+--------+-------------------+-----------------+ + | W/"1" | W/"1" | no match | match | + | W/"1" | W/"2" | no match | no match | + | W/"1" | "1" | no match | match | + | "1" | "1" | match | match | + +--------+--------+-------------------+-----------------+ + + // etag: //This is possible and means no etag is present + // etag:"" + // etag:"*" //This means the etag is value '*' + // etag:"some value" //This means the etag is value 'some value' + // etag:/W"" //Weak eTag + // etag:* //This is special, means any etag + // If-Match header can do this + // If-Match:"value1","value2","value3" // Do this if any of these match + + */ + + /* + * @brief Indicates whether two #Azure::Core::ETag values are equal. + * @param left #Azure::Core::ETag to compare. + * @param right #Azure::Core::ETag to compare. + * @param comparisonKind Determines what #Azure::Core::ETag::ETagComparison to perform, default + * is #Azure::Core::ETag::ETagComparison Strong. + * @return `true` if #Azure::Core::ETag matches, `false` otherwise. + */ + static bool Equals( + const ETag& left, + const ETag& right, + const ETagComparison comparisonKind = ETagComparison::Strong) + { + // ETags are != if one of the values is null + if (!left.m_value || !right.m_value) + { + // Caveat, If both values are null then we consider the ETag equal + return !left.m_value && !right.m_value; + } + + switch (comparisonKind) + { + case ETagComparison::Strong: + // Strong comparison + // If either is weak then there is no match + // else tags must match character for character + return !left.IsWeak() && !right.IsWeak() + && (left.m_value.GetValue().compare(right.m_value.GetValue()) == 0); + break; + + case ETagComparison::Weak: + + auto leftStart = left.IsWeak() ? 2 : 0; + auto rightStart = right.IsWeak() ? 2 : 0; + + auto leftVal = left.m_value.GetValue(); + auto rightVal = right.m_value.GetValue(); + + // Compare if lengths are equal + // Compare the strings character by character + return ((leftVal.length() - leftStart) == (rightVal.length() - rightStart)) + && (leftVal.compare(leftStart, leftVal.length() - leftStart, &rightVal[rightStart]) + == 0); + break; + } + // Unknown comparison + abort(); + } /** - * @brief Represents an HTTP validator. + * @brief Construct an empty (null) #Azure::Core::ETag. */ - class ETag { - // ETag is a validator based on https://tools.ietf.org/html/rfc7232#section-2.3.2 - private: - Nullable m_value; + ETag() = default; - public: - /** - * @brief The comparison type. - */ - enum class ETagComparison + /** + * @brief Construct a #Azure::Core::ETag. + * @param etag The string value representation. + */ + explicit ETag(std::string etag) : m_value(std::move(etag)) {} + + /** + * @brief Whether #Azure::Core::ETag is present. + * @return `true` if #Azure::Core::ETag has a value, `false` otherwise. + */ + bool HasValue() const { return m_value.HasValue(); } + + /* + * @brief Returns the resource metadata represented as a string. + * @return #std::string + */ + const std::string& ToString() const + { + if (!m_value.HasValue()) { - Strong, - Weak - }; - - /* - 2.3.2. Comparison - - There are two entity-tag comparison functions, depending on whether - or not the comparison context allows the use of weak validators: - - o Strong comparison: two entity-tags are equivalent if both are not - weak and their opaque-tags match character-by-character. - - o Weak comparison: two entity-tags are equivalent if their - opaque-tags match character-by-character, regardless of either or - both being tagged as "weak". - - +--------+--------+-------------------+-----------------+ - | ETag 1 | ETag 2 | Strong Comparison | Weak Comparison | - +--------+--------+-------------------+-----------------+ - | W/"1" | W/"1" | no match | match | - | W/"1" | W/"2" | no match | no match | - | W/"1" | "1" | no match | match | - | "1" | "1" | match | match | - +--------+--------+-------------------+-----------------+ - - // etag: //This is possible and means no etag is present - // etag:"" - // etag:"*" //This means the etag is value '*' - // etag:"some value" //This means the etag is value 'some value' - // etag:/W"" //Weak eTag - // etag:* //This is special, means any etag - // If-Match header can do this - // If-Match:"value1","value2","value3" // Do this if any of these match - - */ - - /* - * @brief Indicates whether two #Azure::Core::ETag values are equal. - * @param left #Azure::Core::ETag to compare. - * @param right #Azure::Core::ETag to compare. - * @param comparisonKind Determines what #Azure::Core::ETag::ETagComparison to perform, default - * is #Azure::Core::ETag::ETagComparison Strong. - * @return `true` if #Azure::Core::ETag matches, `false` otherwise. - */ - static bool Equals( - const ETag& left, - const ETag& right, - const ETagComparison comparisonKind = ETagComparison::Strong) - { - // ETags are != if one of the values is null - if (!left.m_value || !right.m_value) - { - // Caveat, If both values are null then we consider the ETag equal - return !left.m_value && !right.m_value; - } - - switch (comparisonKind) - { - case ETagComparison::Strong: - // Strong comparison - // If either is weak then there is no match - // else tags must match character for character - return !left.IsWeak() && !right.IsWeak() - && (left.m_value.GetValue().compare(right.m_value.GetValue()) == 0); - break; - - case ETagComparison::Weak: - - auto leftStart = left.IsWeak() ? 2 : 0; - auto rightStart = right.IsWeak() ? 2 : 0; - - auto leftVal = left.m_value.GetValue(); - auto rightVal = right.m_value.GetValue(); - - // Compare if lengths are equal - // Compare the strings character by character - return ((leftVal.length() - leftStart) == (rightVal.length() - rightStart)) - && (leftVal.compare(leftStart, leftVal.length() - leftStart, &rightVal[rightStart]) - == 0); - break; - } - // Unknown comparison abort(); } + return m_value.GetValue(); + } - /** - * @brief Construct an empty (null) #Azure::Core::ETag. - */ - ETag() = default; + /** + * @brief Compare with \p other #Azure::Core::ETag for equality. + * @param other Other #Azure::Core::ETag to compare with. + * @return `true` if #Azure::Core::ETag instances are equal according to strong validation, + * `false` otherwise. + */ + bool operator==(const ETag& other) const { return Equals(*this, other, ETagComparison::Strong); } - /** - * @brief Construct a #Azure::Core::ETag. - * @param etag The string value representation. - */ - explicit ETag(std::string etag) : m_value(std::move(etag)) {} + /** + * @brief Compare with \p other #Azure::Core::ETag for inequality. + * @param other Other #Azure::Core::ETag to compare with. + * @return `true` if #Azure::Core::ETag instances are not equal according to strong validation, + * `false` otherwise. + */ + bool operator!=(const ETag& other) const { return !(*this == other); } - /** - * @brief Whether #Azure::Core::ETag is present. - * @return `true` if #Azure::Core::ETag has a value, `false` otherwise. - */ - bool HasValue() const { return m_value.HasValue(); } + /** + * @brief Specifies whether the #Azure::Core::ETag is strong or weak. + * @return `true` if #Azure::Core::ETag is a weak validator, `false` otherwise. + */ + bool IsWeak() const + { + // Null ETag is considered Strong + // Shortest valid weak etag has length of 4 + // W/"" + // Valid weak format must start with W/" + // Must end with a /" + const bool weak = m_value && (m_value.GetValue().length() >= 4) + && ((m_value.GetValue()[0] == 'W') && (m_value.GetValue()[1] == '/') + && (m_value.GetValue()[2] == '"') + && (m_value.GetValue()[m_value.GetValue().size() - 1] == '"')); - /* - * @brief Returns the resource metadata represented as a string. - * @return #std::string - */ - const std::string& ToString() const - { - if (!m_value.HasValue()) - { - abort(); - } - return m_value.GetValue(); - } + return weak; + } - /** - * @brief Compare with \p other #Azure::Core::ETag for equality. - * @param other Other #Azure::Core::ETag to compare with. - * @return `true` if #Azure::Core::ETag instances are equal according to strong validation, - * `false` otherwise. - */ - bool operator==(const ETag& other) const - { - return Equals(*this, other, ETagComparison::Strong); - } - - /** - * @brief Compare with \p other #Azure::Core::ETag for inequality. - * @param other Other #Azure::Core::ETag to compare with. - * @return `true` if #Azure::Core::ETag instances are not equal according to strong validation, - * `false` otherwise. - */ - bool operator!=(const ETag& other) const { return !(*this == other); } - - /** - * @brief Specifies whether the #Azure::Core::ETag is strong or weak. - * @return `true` if #Azure::Core::ETag is a weak validator, `false` otherwise. - */ - bool IsWeak() const - { - // Null ETag is considered Strong - // Shortest valid weak etag has length of 4 - // W/"" - // Valid weak format must start with W/" - // Must end with a /" - const bool weak = m_value && (m_value.GetValue().length() >= 4) - && ((m_value.GetValue()[0] == 'W') && (m_value.GetValue()[1] == '/') - && (m_value.GetValue()[2] == '"') - && (m_value.GetValue()[m_value.GetValue().size() - 1] == '"')); - - return weak; - } - - /** - * @brief #Azure::Core::ETag representing everything. - * @note The any #Azure::Core::ETag is *, (unquoted). It is NOT the same as "*". - */ - static const ETag& Any() - { - static ETag any = ETag("*"); - return any; - } - }; -}} // namespace Azure::Core + /** + * @brief #Azure::Core::ETag representing everything. + * @note The any #Azure::Core::ETag is *, (unquoted). It is NOT the same as "*". + */ + static const ETag& Any() + { + static ETag any = ETag("*"); + return any; + } +}; +} // namespace Azure diff --git a/sdk/core/azure-core/inc/azure/core/match_conditions.hpp b/sdk/core/azure-core/inc/azure/core/match_conditions.hpp index 7891be272..50daa339a 100644 --- a/sdk/core/azure-core/inc/azure/core/match_conditions.hpp +++ b/sdk/core/azure-core/inc/azure/core/match_conditions.hpp @@ -22,12 +22,12 @@ namespace Azure { namespace Core { /** * @brief Optionally limit requests to resources that match the value specified. */ - ETag IfMatch; + Azure::ETag IfMatch; /** * @brief Optionally limit requests to resources that do not match the value specified. Specify - * Azure::Core::ETag::Any() to limit requests to resources that do not exist. + * Azure::ETag::Any() to limit requests to resources that do not exist. */ - ETag IfNoneMatch; + Azure::ETag IfNoneMatch; }; }} // namespace Azure::Core diff --git a/sdk/core/azure-core/test/ut/etag.cpp b/sdk/core/azure-core/test/ut/etag.cpp index 501bedea9..4ad80b9c8 100644 --- a/sdk/core/azure-core/test/ut/etag.cpp +++ b/sdk/core/azure-core/test/ut/etag.cpp @@ -7,7 +7,7 @@ #include -using namespace Azure::Core; +using namespace Azure; TEST(ETag, ToString) { diff --git a/sdk/core/azure-core/test/ut/match_conditions.cpp b/sdk/core/azure-core/test/ut/match_conditions.cpp index 90789b27e..7a29cb348 100644 --- a/sdk/core/azure-core/test/ut/match_conditions.cpp +++ b/sdk/core/azure-core/test/ut/match_conditions.cpp @@ -7,6 +7,7 @@ #include using namespace Azure::Core; +using namespace Azure; TEST(MatchConditions, Basic) { diff --git a/sdk/core/azure-core/test/ut/simplified_header.cpp b/sdk/core/azure-core/test/ut/simplified_header.cpp index 27fce754b..efec65334 100644 --- a/sdk/core/azure-core/test/ut/simplified_header.cpp +++ b/sdk/core/azure-core/test/ut/simplified_header.cpp @@ -32,7 +32,7 @@ TEST(SimplifiedHeader, core) EXPECT_NO_THROW(Azure::Core::CaseInsensitiveSet iset); EXPECT_NO_THROW(Azure::Core::Context c); EXPECT_NO_THROW(Azure::Core::DateTime(2020, 11, 03, 15, 30, 44)); - EXPECT_NO_THROW(Azure::Core::ETag e); + EXPECT_NO_THROW(Azure::ETag e); EXPECT_NO_THROW(Azure::Core::Base64Decode("foo")); EXPECT_NO_THROW(Azure::Core::Cryptography::Md5Hash m); EXPECT_NO_THROW(Azure::Core::Http::RawResponse r( diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp index 26026e6c4..7952fc801 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp @@ -33,7 +33,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct AcquireBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; @@ -41,14 +41,14 @@ namespace Azure { namespace Storage { namespace Blobs { struct BreakBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; }; struct ChangeBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; @@ -56,14 +56,14 @@ namespace Azure { namespace Storage { namespace Blobs { struct ReleaseBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; }; struct RenewBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; @@ -73,7 +73,7 @@ namespace Azure { namespace Storage { namespace Blobs { class StartCopyBlobOperation : public Azure::Core::Operation { public: std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string CopyId; Models::CopyStatus CopyStatus; 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 dedaf5d2c..45bf573a1 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 @@ -90,7 +90,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct AcquireBlobContainerLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; // struct AcquireBlobContainerLeaseResult @@ -100,7 +100,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct AcquireBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; // struct AcquireBlobLeaseResult @@ -269,7 +269,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct BreakBlobContainerLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; int32_t LeaseTime = 0; }; // struct BreakBlobContainerLeaseResult @@ -279,7 +279,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct BreakBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; int32_t LeaseTime = 0; }; // struct BreakBlobLeaseResult @@ -289,7 +289,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct ChangeBlobContainerLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; // struct ChangeBlobContainerLeaseResult @@ -299,7 +299,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct ChangeBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; // struct ChangeBlobLeaseResult @@ -308,7 +308,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct ClearPageBlobPagesResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; int64_t SequenceNumber = 0; }; // struct ClearPageBlobPagesResult @@ -331,7 +331,7 @@ namespace Azure { namespace Storage { namespace Blobs { { std::string RequestId; bool Created = true; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable VersionId; bool IsServerEncrypted = false; @@ -343,7 +343,7 @@ namespace Azure { namespace Storage { namespace Blobs { { std::string RequestId; bool Created = true; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; }; // struct CreateBlobContainerResult @@ -351,7 +351,7 @@ namespace Azure { namespace Storage { namespace Blobs { { std::string RequestId; std::string Snapshot; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable VersionId; bool IsServerEncrypted = false; @@ -363,7 +363,7 @@ namespace Azure { namespace Storage { namespace Blobs { { std::string RequestId; bool Created = true; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable VersionId; bool IsServerEncrypted = false; @@ -429,7 +429,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct GetPageBlobPageRangesResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; int64_t BlobSize = 0; std::vector PageRanges; @@ -562,7 +562,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct ReleaseBlobContainerLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; }; // struct ReleaseBlobContainerLeaseResult } // namespace Details @@ -571,7 +571,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct ReleaseBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable SequenceNumber; }; // struct ReleaseBlobLeaseResult @@ -581,7 +581,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct RenewBlobContainerLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; // struct RenewBlobContainerLeaseResult @@ -591,7 +591,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct RenewBlobLeaseResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string LeaseId; }; // struct RenewBlobLeaseResult @@ -600,7 +600,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct ResizePageBlobResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; int64_t SequenceNumber = 0; }; // struct ResizePageBlobResult @@ -627,7 +627,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct SealAppendBlobResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; bool IsSealed = true; }; // struct SealAppendBlobResult @@ -640,14 +640,14 @@ namespace Azure { namespace Storage { namespace Blobs { struct SetBlobContainerAccessPolicyResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; }; // struct SetBlobContainerAccessPolicyResult struct SetBlobContainerMetadataResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; }; // struct SetBlobContainerMetadataResult @@ -659,7 +659,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct SetBlobHttpHeadersResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable SequenceNumber; }; // struct SetBlobHttpHeadersResult @@ -667,7 +667,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct SetBlobMetadataResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable SequenceNumber; }; // struct SetBlobMetadataResult @@ -742,7 +742,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct BlobContainerItemDetails { - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Storage::Metadata Metadata; PublicAccessType AccessType = PublicAccessType::None; @@ -791,7 +791,7 @@ namespace Azure { namespace Storage { namespace Blobs { { std::string RequestId; PublicAccessType AccessType = PublicAccessType::None; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::vector SignedIdentifiers; }; // struct GetBlobContainerAccessPolicyResult @@ -799,7 +799,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct GetBlobContainerPropertiesResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Storage::Metadata Metadata; PublicAccessType AccessType = PublicAccessType::None; @@ -815,7 +815,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct GetBlockListResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string ContentType; int64_t BlobSize = 0; @@ -839,7 +839,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct StartCopyBlobFromUriResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string CopyId; Models::CopyStatus CopyStatus; @@ -851,7 +851,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct StartCopyPageBlobIncrementalResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string CopyId; Models::CopyStatus CopyStatus; @@ -862,7 +862,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct AppendBlockFromUriResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable TransactionalContentHash; int64_t AppendOffset = 0; @@ -875,7 +875,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct AppendBlockResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable TransactionalContentHash; int64_t AppendOffset = 0; @@ -917,7 +917,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct CommitBlockListResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable VersionId; bool IsServerEncrypted = false; @@ -971,7 +971,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct UploadBlockBlobResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable VersionId; bool IsServerEncrypted = false; @@ -983,7 +983,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct UploadPageBlobPagesFromUriResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable TransactionalContentHash; int64_t SequenceNumber = 0; @@ -995,7 +995,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct UploadPageBlobPagesResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::Nullable TransactionalContentHash; int64_t SequenceNumber = 0; @@ -1012,7 +1012,7 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable ExpiresOn; Azure::Core::Nullable LastAccessedOn; Azure::Core::DateTime LastModified; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::Nullable Tier; Azure::Core::Nullable IsAccessTierInferred; BlobLeaseStatus LeaseStatus = BlobLeaseStatus::Unlocked; @@ -1029,7 +1029,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct DownloadBlobDetails { - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::DateTime CreatedOn; Azure::Core::Nullable ExpiresOn; @@ -1063,7 +1063,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct GetBlobPropertiesResult { std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Azure::Core::DateTime CreatedOn; Azure::Core::Nullable ExpiresOn; @@ -2210,7 +2210,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.size() == 2 && path[0] == XmlTagName::k_Properties && path[1] == XmlTagName::k_Etag) { - ret.Details.ETag = Azure::Core::ETag(node.Value); + ret.Details.ETag = Azure::ETag(node.Value); } else if ( path.size() == 2 && path[0] == XmlTagName::k_Properties @@ -3142,7 +3142,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3283,7 +3283,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3369,7 +3369,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3559,7 +3559,7 @@ namespace Azure { namespace Storage { namespace Blobs { response = GetBlobContainerAccessPolicyResultFromXml(reader); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3643,7 +3643,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3708,7 +3708,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3769,7 +3769,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3832,7 +3832,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3893,7 +3893,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -3957,7 +3957,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -4530,7 +4530,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.size() == 2 && path[0] == XmlTagName::k_Properties && path[1] == XmlTagName::k_Etag) { - ret.Details.ETag = Azure::Core::ETag(node.Value); + ret.Details.ETag = Azure::ETag(node.Value); } else if ( path.size() == 2 && path[0] == XmlTagName::k_Properties @@ -4848,8 +4848,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct DownloadBlobOptions @@ -4995,7 +4995,7 @@ namespace Azure { namespace Storage { namespace Blobs { { response.BlobSize = std::stoll(httpResponse.GetHeaders().at("content-length")); } - response.Details.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.Details.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.Details.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -5207,8 +5207,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct DeleteBlobOptions @@ -5378,8 +5378,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct GetBlobPropertiesOptions @@ -5453,7 +5453,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -5710,8 +5710,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct SetBlobHttpHeadersOptions @@ -5799,7 +5799,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -5824,8 +5824,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct SetBlobMetadataOptions @@ -5909,7 +5909,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -5993,13 +5993,13 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable RehydratePriority; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; Azure::Core::Nullable SourceIfModifiedSince; Azure::Core::Nullable SourceIfUnmodifiedSince; - Azure::Core::ETag SourceIfMatch; - Azure::Core::ETag SourceIfNoneMatch; + Azure::ETag SourceIfMatch; + Azure::ETag SourceIfNoneMatch; Azure::Core::Nullable SourceIfTags; Azure::Core::Nullable ShouldSealDestination; }; // struct StartCopyBlobFromUriOptions @@ -6109,7 +6109,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -6180,8 +6180,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct CreateBlobSnapshotOptions @@ -6265,7 +6265,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -6398,8 +6398,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable ProposedLeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct AcquireBlobLeaseOptions @@ -6462,7 +6462,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -6477,8 +6477,8 @@ namespace Azure { namespace Storage { namespace Blobs { std::string LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct RenewBlobLeaseOptions @@ -6537,7 +6537,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -6553,8 +6553,8 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ProposedLeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct ChangeBlobLeaseOptions @@ -6614,7 +6614,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -6629,8 +6629,8 @@ namespace Azure { namespace Storage { namespace Blobs { std::string LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct ReleaseBlobLeaseOptions @@ -6689,7 +6689,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -6709,8 +6709,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable BreakPeriod; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct BreakBlobLeaseOptions @@ -6773,7 +6773,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -6932,8 +6932,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct UploadBlockBlobOptions @@ -7065,7 +7065,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -7244,8 +7244,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable SourceIfModifiedSince; Azure::Core::Nullable SourceIfUnmodifiedSince; - Azure::Core::ETag SourceIfMatch; - Azure::Core::ETag SourceIfNoneMatch; + Azure::ETag SourceIfMatch; + Azure::ETag SourceIfNoneMatch; }; // struct StageBlockFromUriOptions static Azure::Response StageBlockFromUri( @@ -7401,8 +7401,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; Azure::Core::Nullable Tier; }; // struct CommitBlockListOptions @@ -7528,7 +7528,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -7607,7 +7607,7 @@ namespace Azure { namespace Storage { namespace Blobs { response = GetBlockListResultFromXml(reader); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -7783,8 +7783,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct CreatePageBlobOptions @@ -7905,7 +7905,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -7948,8 +7948,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct UploadPageBlobPagesOptions @@ -8074,7 +8074,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -8135,8 +8135,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct UploadPageBlobPagesFromUriOptions @@ -8269,7 +8269,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -8327,8 +8327,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct ClearPageBlobPagesOptions @@ -8436,7 +8436,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -8460,8 +8460,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct ResizePageBlobOptions @@ -8560,7 +8560,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -8579,8 +8579,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct GetPageBlobPageRangesOptions @@ -8667,7 +8667,7 @@ namespace Azure { namespace Storage { namespace Blobs { response = GetPageBlobPageRangesResultFromXml(reader); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -8682,8 +8682,8 @@ namespace Azure { namespace Storage { namespace Blobs { std::string CopySource; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct StartCopyPageBlobIncrementalOptions @@ -8742,7 +8742,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -8953,8 +8953,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct CreateAppendBlobOptions @@ -9065,7 +9065,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -9106,8 +9106,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct AppendBlockOptions @@ -9214,7 +9214,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -9274,8 +9274,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; }; // struct AppendBlockFromUriOptions @@ -9393,7 +9393,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); @@ -9445,8 +9445,8 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Azure::Core::ETag IfMatch; - Azure::Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfTags; Azure::Core::Nullable AppendPosition; }; // struct SealAppendBlobOptions @@ -9513,7 +9513,7 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); - response.ETag = Azure::Core::ETag(httpResponse.GetHeaders().at("etag")); + response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::Core::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::Core::DateTime::DateFormat::Rfc1123); 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 4e734f326..330a30381 100644 --- a/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp @@ -102,7 +102,7 @@ namespace Azure { namespace Storage { namespace Blobs { const Azure::Core::Context& context) const { auto optionsCopy = options; - optionsCopy.AccessConditions.IfNoneMatch = Azure::Core::ETag::Any(); + optionsCopy.AccessConditions.IfNoneMatch = Azure::ETag::Any(); try { return Create(optionsCopy, context); diff --git a/sdk/storage/azure-storage-blobs/src/blob_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_client.cpp index 0783c78a4..fbd1599b2 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_client.cpp @@ -190,7 +190,7 @@ namespace Azure { namespace Storage { namespace Blobs { { // In case network failure during reading the body - const Azure::Core::ETag eTag = downloadResponse->Details.ETag; + const Azure::ETag eTag = downloadResponse->Details.ETag; auto retryFunction = [this, options, eTag]( @@ -254,7 +254,7 @@ namespace Azure { namespace Storage { namespace Blobs { } auto firstChunk = Download(firstChunkOptions, context); - const Azure::Core::ETag eTag = firstChunk->Details.ETag; + const Azure::ETag eTag = firstChunk->Details.ETag; const int64_t blobSize = firstChunk->BlobSize; int64_t blobRangeSize; @@ -366,7 +366,7 @@ namespace Azure { namespace Storage { namespace Blobs { Storage::Details::FileWriter fileWriter(fileName); auto firstChunk = Download(firstChunkOptions, context); - const Azure::Core::ETag eTag = firstChunk->Details.ETag; + const Azure::ETag eTag = firstChunk->Details.ETag; const int64_t blobSize = firstChunk->BlobSize; int64_t blobRangeSize; 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 045d76abb..835bd442a 100644 --- a/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp @@ -110,7 +110,7 @@ namespace Azure { namespace Storage { namespace Blobs { const Azure::Core::Context& context) const { auto optionsCopy = options; - optionsCopy.AccessConditions.IfNoneMatch = Azure::Core::ETag::Any(); + optionsCopy.AccessConditions.IfNoneMatch = Azure::ETag::Any(); try { return Create(blobContentLength, optionsCopy, context); diff --git a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp index 54f54c913..9f4b334df 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp @@ -153,14 +153,14 @@ namespace Azure { namespace Storage { namespace Test { StandardStorageConnectionString(), m_containerName, RandomString()); Blobs::CreateAppendBlobOptions createOptions; - createOptions.AccessConditions.IfNoneMatch = Azure::Core::ETag::Any(); + createOptions.AccessConditions.IfNoneMatch = Azure::ETag::Any(); EXPECT_NO_THROW(appendBlobClient.Create(createOptions)); EXPECT_THROW(appendBlobClient.Create(createOptions), StorageException); - Azure::Core::ETag eTag = appendBlobClient.GetProperties()->ETag; - for (Azure::Core::ETag match : {eTag, DummyETag, Azure::Core::ETag()}) + Azure::ETag eTag = appendBlobClient.GetProperties()->ETag; + for (Azure::ETag match : {eTag, DummyETag, Azure::ETag()}) { - for (Azure::Core::ETag noneMatch : {eTag, DummyETag, Azure::Core::ETag()}) + for (Azure::ETag noneMatch : {eTag, DummyETag, Azure::ETag()}) { Blobs::GetBlobPropertiesOptions options; if (match.HasValue()) @@ -208,7 +208,7 @@ namespace Azure { namespace Storage { namespace Test { sourceBlobClient, Blobs::BlobLeaseClient::CreateUniqueLeaseId()); auto leaseResponse = sourceLeaseClient.Acquire(Blobs::BlobLeaseClient::InfiniteLeaseDuration); std::string leaseId = leaseResponse->LeaseId; - Azure::Core::ETag eTag = leaseResponse->ETag; + Azure::ETag eTag = leaseResponse->ETag; auto lastModifiedTime = leaseResponse->LastModified; auto timeBeforeStr = lastModifiedTime - std::chrono::seconds(1); auto timeAfterStr = lastModifiedTime + std::chrono::seconds(1); diff --git a/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp index 117410585..5c55c90e4 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp @@ -204,7 +204,7 @@ namespace Azure { namespace Storage { namespace Test { if (region == Region::Primary) { if (requestHeaders.find("if-match") == requestHeaders.end() - || Azure::Core::ETag(requestHeaders.at("if-match")) == m_primaryETag) + || Azure::ETag(requestHeaders.at("if-match")) == m_primaryETag) { return ConstructPrimaryResponse(); } @@ -213,7 +213,7 @@ namespace Azure { namespace Storage { namespace Test { else { if (requestHeaders.find("if-match") == requestHeaders.end() - || Azure::Core::ETag(requestHeaders.at("if-match")) == m_secondaryETag) + || Azure::ETag(requestHeaders.at("if-match")) == m_secondaryETag) { return ConstructSecondaryResponse(); } @@ -240,8 +240,8 @@ namespace Azure { namespace Storage { namespace Test { private: std::shared_ptr m_primaryContent; std::shared_ptr m_secondaryContent; - Azure::Core::ETag m_primaryETag; - Azure::Core::ETag m_secondaryETag; + Azure::ETag m_primaryETag; + Azure::ETag m_secondaryETag; std::function m_failPolicy; }; diff --git a/sdk/storage/azure-storage-common/test/test_base.hpp b/sdk/storage/azure-storage-common/test/test_base.hpp index 40757fecf..caa6b290d 100644 --- a/sdk/storage/azure-storage-common/test/test_base.hpp +++ b/sdk/storage/azure-storage-common/test/test_base.hpp @@ -43,8 +43,8 @@ namespace Azure { namespace Storage { namespace Test { return x * 1024 * 1024 * 1024 * 1024; } - const static Azure::Core::ETag DummyETag("0x8D83B58BDF51D75"); - const static Azure::Core::ETag DummyETag2("0x8D812645BFB0CDE"); + const static Azure::ETag DummyETag("0x8D83B58BDF51D75"); + const static Azure::ETag DummyETag2("0x8D812645BFB0CDE"); constexpr static const char* DummyMd5 = "tQbD1aMPeB+LiPffUwFQJQ=="; constexpr static const char* DummyCrc64 = "+DNR5PON4EM="; diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp index e644f2332..2cd583978 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp @@ -20,7 +20,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct FileSystemItemDetails { - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; Storage::Metadata Metadata; PublicAccessType AccessType = PublicAccessType::None; @@ -55,7 +55,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct GetDataLakeFileSystemAccessPolicyResult { PublicAccessType AccessType = PublicAccessType::None; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::vector SignedIdentifiers; std::string RequestId; @@ -65,7 +65,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct GetDataLakeFileSystemPropertiesResult { - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; Storage::Metadata Metadata; std::string RequestId; @@ -74,7 +74,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct CreateDataLakeFileSystemResult { bool Created = true; - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -87,7 +87,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct SetDataLakeFileSystemMetadataResult { - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct GetDataLakePathPropertiesResult { - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; Core::DateTime CreatedOn; int64_t FileSize = 0; @@ -179,7 +179,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct GetDataLakePathAccessControlListResult { - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string Owner; std::string Group; @@ -190,14 +190,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct SetDataLakePathHttpHeadersResult { - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; struct SetDataLakePathMetadataResult { - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -205,7 +205,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct CreateDataLakePathResult { bool Created = true; - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; Azure::Core::Nullable FileSize; std::string RequestId; @@ -224,7 +224,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam struct DownloadDataLakeFileDetails { - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; Azure::Core::Nullable LeaseDuration; LeaseStateType LeaseState; 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 c530cc7cf..a5eef36aa 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 @@ -331,7 +331,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct PathCreateResult { - Core::ETag ETag; + Azure::ETag ETag; Azure::Core::Nullable LastModified; std::string RequestId; Azure::Core::Nullable ContentLength; @@ -341,7 +341,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { Azure::Core::Nullable AcceptRanges; PathHttpHeaders HttpHeaders; - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; Azure::Core::Nullable ResourceType; @@ -363,7 +363,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct PathSetAccessControlResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -380,7 +380,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct PathFlushDataResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; int64_t ContentLength = int64_t(); std::string RequestId; @@ -551,12 +551,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable Properties; Azure::Core::Nullable Permissions; Azure::Core::Nullable Umask; - Core::ETag IfMatch; - Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; - Core::ETag SourceIfMatch; - Core::ETag SourceIfNoneMatch; + Azure::ETag SourceIfMatch; + Azure::ETag SourceIfNoneMatch; Azure::Core::Nullable SourceIfModifiedSince; Azure::Core::Nullable SourceIfUnmodifiedSince; }; @@ -700,8 +700,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable Action; Azure::Core::Nullable Upn; Azure::Core::Nullable LeaseIdOptional; - Core::ETag IfMatch; - Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; }; @@ -773,8 +773,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable RecursiveOptional; Azure::Core::Nullable ContinuationToken; Azure::Core::Nullable LeaseIdOptional; - Core::ETag IfMatch; - Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; }; @@ -845,8 +845,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable Group; Azure::Core::Nullable Permissions; Azure::Core::Nullable Acl; - Core::ETag IfMatch; - Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; @@ -990,8 +990,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Azure::Core::Nullable ContentDisposition; Azure::Core::Nullable ContentEncoding; Azure::Core::Nullable ContentLanguage; - Core::ETag IfMatch; - Core::ETag IfNoneMatch; + Azure::ETag IfMatch; + Azure::ETag IfNoneMatch; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; std::string ApiVersionParameter = Details::DefaultServiceApiVersion; @@ -1174,7 +1174,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { PathCreateResult result; if (response.GetHeaders().find(Details::HeaderETag) != response.GetHeaders().end()) { - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); } if (response.GetHeaders().find(Details::HeaderLastModified) != response.GetHeaders().end()) @@ -1242,7 +1242,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (response.GetHeaders().find(Details::HeaderETag) != response.GetHeaders().end()) { - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); } if (response.GetHeaders().find(Details::HeaderLastModified) != response.GetHeaders().end()) @@ -1342,7 +1342,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { PathSetAccessControlResult result; if (response.GetHeaders().find(Details::HeaderETag) != response.GetHeaders().end()) { - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); } if (response.GetHeaders().find(Details::HeaderLastModified) != response.GetHeaders().end()) @@ -1439,7 +1439,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { PathFlushDataResult result; if (response.GetHeaders().find(Details::HeaderETag) != response.GetHeaders().end()) { - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); } if (response.GetHeaders().find(Details::HeaderLastModified) != response.GetHeaders().end()) diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp index cf742a8c0..39d12eb40 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp @@ -276,7 +276,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { try { auto createOptions = options; - createOptions.AccessConditions.IfNoneMatch = Azure::Core::ETag::Any(); + createOptions.AccessConditions.IfNoneMatch = Azure::ETag::Any(); return Create(type, createOptions, context); } catch (StorageException& e) 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 74d430920..bbac4be1c 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 @@ -277,7 +277,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareItemDetails { Core::DateTime LastModified; - Core::ETag Etag; + Azure::ETag Etag; int64_t Quota = int64_t(); Azure::Core::Nullable ProvisionedIops; Azure::Core::Nullable ProvisionedIngressMBps; @@ -681,7 +681,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareCreateResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -689,7 +689,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareGetPropertiesResult { Storage::Metadata Metadata; - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; int64_t Quota = int64_t(); @@ -712,7 +712,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareAcquireLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string LeaseId; std::string RequestId; @@ -720,14 +720,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareReleaseLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; struct ShareChangeLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string LeaseId; std::string RequestId; @@ -735,7 +735,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareRenewLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string LeaseId; std::string RequestId; @@ -743,7 +743,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareBreakLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -751,7 +751,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareCreateSnapshotResult { std::string Snapshot; - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -770,14 +770,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareSetPropertiesResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; struct ShareSetMetadataResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -785,14 +785,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareGetAccessPolicyResult { std::vector SignedIdentifiers; - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; struct ShareSetAccessPolicyResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -800,21 +800,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct ShareGetStatisticsResult { int64_t ShareUsageInBytes = int64_t(); - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; struct ShareRestoreResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; struct DirectoryCreateResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; bool IsServerEncrypted = bool(); @@ -824,7 +824,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct DirectoryGetPropertiesResult { Storage::Metadata Metadata; - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; bool IsServerEncrypted = bool(); @@ -838,7 +838,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct DirectorySetPropertiesResult { - Core::ETag ETag; + Azure::ETag ETag; std::string RequestId; Core::DateTime LastModified; bool IsServerEncrypted = bool(); @@ -847,7 +847,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct DirectorySetMetadataResult { - Core::ETag ETag; + Azure::ETag ETag; std::string RequestId; bool IsServerEncrypted = bool(); }; @@ -884,7 +884,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileCreateResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; bool IsServerEncrypted = bool(); @@ -899,7 +899,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { FileHttpHeaders HttpHeaders; Azure::Core::Http::Range ContentRange; int64_t FileSize; - Core::ETag ETag; + Azure::ETag ETag; Azure::Core::Nullable TransactionalContentHash; std::string RequestId; std::string AcceptRanges; @@ -922,7 +922,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Metadata Metadata; int64_t FileSize = int64_t(); FileHttpHeaders HttpHeaders; - Core::ETag ETag; + Azure::ETag ETag; std::string RequestId; Azure::Core::Nullable CopyCompletedOn; Azure::Core::Nullable CopyStatusDescription; @@ -944,7 +944,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileSetHttpHeadersResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; bool IsServerEncrypted = bool(); @@ -953,14 +953,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileSetMetadataResult { - Core::ETag ETag; + Azure::ETag ETag; std::string RequestId; bool IsServerEncrypted = bool(); }; struct FileAcquireLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string LeaseId; std::string RequestId; @@ -968,14 +968,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileReleaseLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; struct FileChangeLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string LeaseId; std::string RequestId; @@ -983,7 +983,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileBreakLeaseResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; Azure::Core::Nullable LeaseId; std::string RequestId; @@ -991,7 +991,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileUploadRangeResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; Storage::ContentHash TransactionalContentHash; std::string RequestId; @@ -1000,7 +1000,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct FileUploadRangeFromUrlResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; Storage::ContentHash TransactionalContentHash; std::string RequestId; @@ -1012,14 +1012,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::vector Ranges; std::vector ClearRanges; Core::DateTime LastModified; - Core::ETag ETag; + Azure::ETag ETag; int64_t FileSize = int64_t(); std::string RequestId; }; struct FileStartCopyResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; std::string CopyId; @@ -2243,7 +2243,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } else if (path.size() == 1 && path[0] == XmlTagName::Etag) { - result.Etag = Core::ETag(node.Value); + result.Etag = Azure::ETag(node.Value); } else if (path.size() == 1 && path[0] == XmlTagName::LastModified) { @@ -3212,7 +3212,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success, Share created. ShareCreateResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3243,7 +3243,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.Metadata.emplace(i->first.substr(10), i->second); } - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3347,7 +3347,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Acquire operation completed successfully. ShareAcquireLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3372,7 +3372,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Release operation completed successfully. ShareReleaseLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3396,7 +3396,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Change operation completed successfully. ShareChangeLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3421,7 +3421,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Renew operation completed successfully. ShareRenewLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3446,7 +3446,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Break operation completed successfully. ShareBreakLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3471,7 +3471,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { // Success, Share snapshot created. ShareCreateSnapshotResult result; result.Snapshot = response.GetHeaders().at(Details::HeaderSnapshot); - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3563,7 +3563,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success ShareSetPropertiesResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3587,7 +3587,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success ShareSetMetadataResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3616,7 +3616,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ShareGetAccessPolicyResult result = bodyBuffer.empty() ? ShareGetAccessPolicyResult() : ShareGetAccessPolicyResultFromSignedIdentifiers(SignedIdentifiersFromXml(reader)); - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3841,7 +3841,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success. ShareSetAccessPolicyResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -3931,7 +3931,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ShareGetStatisticsResult result = bodyBuffer.empty() ? ShareGetStatisticsResult() : ShareGetStatisticsResultFromShareStats(ShareStatsFromXml(reader)); - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -4019,7 +4019,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Created ShareRestoreResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -4401,7 +4401,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success, Directory created. DirectoryCreateResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -4451,7 +4451,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.Metadata.emplace(i->first.substr(10), i->second); } - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -4513,7 +4513,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success DirectorySetPropertiesResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.RequestId = response.GetHeaders().at(Details::HeaderRequestId); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), @@ -4555,7 +4555,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success (OK). DirectorySetMetadataResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.RequestId = response.GetHeaders().at(Details::HeaderRequestId); result.IsServerEncrypted = response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true"; @@ -6089,7 +6089,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success, File created. FileCreateResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6173,7 +6173,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.FileSize = std::stoll(response.GetHeaders().at(Details::HeaderContentLength)); } - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); if (response.GetHeaders().find(Details::HeaderTransactionalContentHashMd5) != response.GetHeaders().end()) { @@ -6335,7 +6335,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.FileSize = std::stoll(response.GetHeaders().at(Details::HeaderContentLength)); } - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); if (response.GetHeaders().find(Details::HeaderTransactionalContentHashMd5) != response.GetHeaders().end()) { @@ -6483,7 +6483,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.HttpHeaders.ContentType = response.GetHeaders().at(Details::HeaderContentType); } - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); if (response.GetHeaders().find(Details::HeaderTransactionalContentHashMd5) != response.GetHeaders().end()) { @@ -6627,7 +6627,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success FileSetHttpHeadersResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6669,7 +6669,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success (OK). FileSetMetadataResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.RequestId = response.GetHeaders().at(Details::HeaderRequestId); result.IsServerEncrypted = response.GetHeaders().at(Details::HeaderRequestIsServerEncrypted) == "true"; @@ -6692,7 +6692,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Acquire operation completed successfully. FileAcquireLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6717,7 +6717,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Release operation completed successfully. FileReleaseLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6741,7 +6741,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Change operation completed successfully. FileChangeLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6766,7 +6766,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The Break operation completed successfully. FileBreakLeaseResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6793,7 +6793,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success (Created). FileUploadRangeResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6830,7 +6830,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // Success (Created). FileUploadRangeFromUrlResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); @@ -6867,7 +6867,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.FileSize = std::stoll(response.GetHeaders().at(Details::HeaderXMsContentLength)); result.RequestId = response.GetHeaders().at(Details::HeaderRequestId); return Azure::Response( @@ -6967,7 +6967,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { // The copy file has been accepted with the specified copy status. FileStartCopyResult result; - result.ETag = Core::ETag(response.GetHeaders().at(Details::HeaderETag)); + result.ETag = Azure::ETag(response.GetHeaders().at(Details::HeaderETag)); result.LastModified = Core::DateTime::Parse( response.GetHeaders().at(Details::HeaderLastModified), Core::DateTime::DateFormat::Rfc1123); diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp index af3855537..6962d3f19 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp @@ -24,7 +24,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct CreateShareResult { bool Created = true; - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; }; @@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct CreateShareDirectoryResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; bool IsServerEncrypted = bool(); @@ -104,7 +104,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { struct CreateShareFileResult { bool Created = true; - Azure::Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; bool IsServerEncrypted = bool(); FileSmbProperties SmbProperties; @@ -121,7 +121,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { Core::DateTime LastModified; Storage::Metadata Metadata; - Core::ETag ETag; + Azure::ETag ETag; Azure::Core::Nullable CopyCompletedOn; Azure::Core::Nullable CopyStatusDescription; Azure::Core::Nullable CopyId; @@ -155,7 +155,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { using UploadShareFileRangeResult = Details::FileUploadRangeResult; struct ClearShareFileRangeResult { - Core::ETag ETag; + Azure::ETag ETag; Core::DateTime LastModified; std::string RequestId; bool IsServerEncrypted = bool(); @@ -189,7 +189,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { : public Azure::Core::Operation { public: std::string RequestId; - Azure::Core::ETag ETag; + Azure::ETag ETag; Azure::Core::DateTime LastModified; std::string CopyId; Models::CopyStatusType CopyStatus; diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 4635b66da..5e4fb41ed 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -1,4 +1,4 @@ -# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. +NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. trigger: branches: include: