From e4b5b806d0b213f5315f07a9a31a5067bbc4d50b Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Mon, 8 Mar 2021 17:45:22 -0800 Subject: [PATCH] Move `Azure::MatchConditions` and `Azure::ModifiedConditions` (#1810) Move `Azure::MatchConditions` and `Azure::ModifiedConditions` (#1810) --- sdk/core/azure-core/CHANGELOG.md | 2 +- .../inc/azure/core/match_conditions.hpp | 32 +++++++++---------- .../inc/azure/core/modified_conditions.hpp | 32 +++++++++---------- .../test/ut/modified_conditions.cpp | 1 + .../azure-core/test/ut/simplified_header.cpp | 4 +-- .../inc/azure/storage/blobs/blob_options.hpp | 12 +++---- .../files/datalake/datalake_options.hpp | 7 ++-- sdk/storage/ci.yml | 2 +- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index ab0cbed5e..d517ffff1 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -9,7 +9,7 @@ ### Breaking Changes - Removed `Azure::Core::Http::HttpPipeline` by making it internal, used only within the SDK. -- Split `Azure::Core::RequestConditions` into `Azure::Core::MatchConditions` and `Azure::Core::ModifiedConditions`. +- Split `Azure::Core::RequestConditions` into `Azure::MatchConditions` and `Azure::ModifiedConditions`. - Removed `TransportKind` enum from `Azure::Core::Http`. - Added `Azure::Core::Operation::GetRawResponse().` - Renamed `NoRevoke` to `EnableCertificateRevocationListCheck` for `Azure::Core::Http::CurlTransportSSLOptions`. 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 50daa339a..d14589306 100644 --- a/sdk/core/azure-core/inc/azure/core/match_conditions.hpp +++ b/sdk/core/azure-core/inc/azure/core/match_conditions.hpp @@ -12,22 +12,22 @@ #include -namespace Azure { namespace Core { +namespace Azure { + +/** + * @brief Specifies HTTP options for conditional requests. + */ +struct MatchConditions +{ + /** + * @brief Optionally limit requests to resources that match the value specified. + */ + ETag IfMatch; /** - * @brief Specifies HTTP options for conditional requests. + * @brief Optionally limit requests to resources that do not match the value specified. Specify + * ETag::Any() to limit requests to resources that do not exist. */ - struct MatchConditions - { - /** - * @brief Optionally limit requests to resources that match the value specified. - */ - Azure::ETag IfMatch; - - /** - * @brief Optionally limit requests to resources that do not match the value specified. Specify - * Azure::ETag::Any() to limit requests to resources that do not exist. - */ - Azure::ETag IfNoneMatch; - }; -}} // namespace Azure::Core + ETag IfNoneMatch; +}; +} // namespace Azure diff --git a/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp b/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp index ea7268208..0df8197a8 100644 --- a/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp +++ b/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp @@ -13,22 +13,22 @@ #include -namespace Azure { namespace Core { +namespace Azure { + +/** + * @brief Specifies HTTP options for conditional requests based on modification time. + */ +struct ModifiedConditions +{ + /** + * @brief Optionally limit requests to resources that have only been modified since this point + * in time. + */ + Azure::Core::Nullable IfModifiedSince; /** - * @brief Specifies HTTP options for conditional requests based on modification time. + * @brief Optionally limit requests to resources that have remained unmodified. */ - struct ModifiedConditions - { - /** - * @brief Optionally limit requests to resources that have only been modified since this point - * in time. - */ - Azure::Core::Nullable IfModifiedSince; - - /** - * @brief Optionally limit requests to resources that have remained unmodified. - */ - Azure::Core::Nullable IfUnmodifiedSince; - }; -}} // namespace Azure::Core + Azure::Core::Nullable IfUnmodifiedSince; +}; +} // namespace Azure diff --git a/sdk/core/azure-core/test/ut/modified_conditions.cpp b/sdk/core/azure-core/test/ut/modified_conditions.cpp index 81dc2c8a0..a161c5a81 100644 --- a/sdk/core/azure-core/test/ut/modified_conditions.cpp +++ b/sdk/core/azure-core/test/ut/modified_conditions.cpp @@ -8,6 +8,7 @@ #include using namespace Azure::Core; +using namespace Azure; TEST(ModifiedConditions, Basic) { diff --git a/sdk/core/azure-core/test/ut/simplified_header.cpp b/sdk/core/azure-core/test/ut/simplified_header.cpp index efec65334..71f5be688 100644 --- a/sdk/core/azure-core/test/ut/simplified_header.cpp +++ b/sdk/core/azure-core/test/ut/simplified_header.cpp @@ -38,8 +38,8 @@ TEST(SimplifiedHeader, core) EXPECT_NO_THROW(Azure::Core::Http::RawResponse r( 1, 1, Azure::Core::Http::HttpStatusCode::Accepted, "phrase")); EXPECT_NO_THROW(Azure::Core::Logger::Listener ll = nullptr); - EXPECT_NO_THROW(Azure::Core::MatchConditions mc); - EXPECT_NO_THROW(Azure::Core::ModifiedConditions mc); + EXPECT_NO_THROW(Azure::MatchConditions mc); + EXPECT_NO_THROW(Azure::ModifiedConditions mc); EXPECT_NO_THROW(Azure::Core::Nullable n); EXPECT_NO_THROW(Azure::Core::Uuid::CreateUuid()); EXPECT_NO_THROW(Azure::Core::RequestFailedException("foo")); diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp index ce3951975..6769c4c1d 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp @@ -21,7 +21,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Specifies access conditions for a container. */ - struct BlobContainerAccessConditions : public Azure::Core::ModifiedConditions, + struct BlobContainerAccessConditions : public Azure::ModifiedConditions, public LeaseAccessConditions { }; @@ -42,8 +42,8 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Specifies access conditions for a blob. */ - struct BlobAccessConditions : public Azure::Core::ModifiedConditions, - public Azure::Core::MatchConditions, + struct BlobAccessConditions : public Azure::ModifiedConditions, + public Azure::MatchConditions, public LeaseAccessConditions, public TagAccessConditions { @@ -52,8 +52,8 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Specifies access conditions for blob lease operations. */ - struct LeaseBlobAccessConditions : public Azure::Core::ModifiedConditions, - public Azure::Core::MatchConditions, + struct LeaseBlobAccessConditions : public Azure::ModifiedConditions, + public Azure::MatchConditions, public TagAccessConditions { }; @@ -789,7 +789,7 @@ namespace Azure { namespace Storage { namespace Blobs { /** * @brief Optional conditions that the source must meet to perform this operation. */ - struct : public Azure::Core::ModifiedConditions, public Azure::Core::MatchConditions + struct : public Azure::ModifiedConditions, public Azure::MatchConditions { } SourceAccessConditions; }; diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp index d29db265f..bc19f6dae 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp @@ -44,16 +44,15 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Specifies access conditions for a file system. */ - struct FileSystemAccessConditions : public Azure::Core::ModifiedConditions, - public LeaseAccessConditions + struct FileSystemAccessConditions : public Azure::ModifiedConditions, public LeaseAccessConditions { }; /** * @brief Specifies access conditions for a path. */ - struct PathAccessConditions : public Azure::Core::ModifiedConditions, - public Azure::Core::MatchConditions, + struct PathAccessConditions : public Azure::ModifiedConditions, + public Azure::MatchConditions, public LeaseAccessConditions { }; diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 5e4fb41ed..4635b66da 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: