From fcd64f7bd2b983148c0b5099afa8edf3ba05091c Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Wed, 10 Feb 2021 11:24:15 -0800 Subject: [PATCH] Split RequestConditions into MatchCondtions and ModifiedConditions (#1644) * Split the inheritance on the RequestConditions Rename RequestConditions to ModifiedConditions --- sdk/core/azure-core/CHANGELOG.md | 3 +++ sdk/core/azure-core/CMakeLists.txt | 2 +- sdk/core/azure-core/inc/azure/core.hpp | 2 +- ...equest_conditions.hpp => modified_conditions.hpp} | 6 ++---- sdk/core/azure-core/test/ut/CMakeLists.txt | 2 +- ...equest_conditions.cpp => modified_conditions.cpp} | 12 +++--------- sdk/core/azure-core/test/ut/simplified_header.cpp | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) rename sdk/core/azure-core/inc/azure/core/{request_conditions.hpp => modified_conditions.hpp} (81%) rename sdk/core/azure-core/test/ut/{request_conditions.cpp => modified_conditions.cpp} (67%) diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index 1894ccf44..94080cd82 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.0.0-beta.7 (Unreleased) +### Breaking Changes + +- Split `Azure::Core::RequestConditions` into `Azure::Core::MatchConditions` and `Auzre::Core::ModifiedConditions`. ## 1.0.0-beta.6 (2021-02-09) diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt index 0b393491b..9429da9fe 100644 --- a/sdk/core/azure-core/CMakeLists.txt +++ b/sdk/core/azure-core/CMakeLists.txt @@ -65,11 +65,11 @@ set( inc/azure/core/etag.hpp inc/azure/core/exception.hpp inc/azure/core/match_conditions.hpp + inc/azure/core/modified_conditions.hpp inc/azure/core/nullable.hpp inc/azure/core/operation.hpp inc/azure/core/operation_status.hpp inc/azure/core/platform.hpp - inc/azure/core/request_conditions.hpp inc/azure/core/response.hpp inc/azure/core/uuid.hpp inc/azure/core/version.hpp diff --git a/sdk/core/azure-core/inc/azure/core.hpp b/sdk/core/azure-core/inc/azure/core.hpp index 7be1a28ef..6f9ea8018 100644 --- a/sdk/core/azure-core/inc/azure/core.hpp +++ b/sdk/core/azure-core/inc/azure/core.hpp @@ -19,11 +19,11 @@ #include "azure/core/etag.hpp" #include "azure/core/exception.hpp" #include "azure/core/match_conditions.hpp" +#include "azure/core/modified_conditions.hpp" #include "azure/core/nullable.hpp" #include "azure/core/operation.hpp" #include "azure/core/operation_status.hpp" #include "azure/core/platform.hpp" -#include "azure/core/request_conditions.hpp" #include "azure/core/response.hpp" #include "azure/core/uuid.hpp" #include "azure/core/version.hpp" diff --git a/sdk/core/azure-core/inc/azure/core/request_conditions.hpp b/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp similarity index 81% rename from sdk/core/azure-core/inc/azure/core/request_conditions.hpp rename to sdk/core/azure-core/inc/azure/core/modified_conditions.hpp index 586113b95..b4698a8b0 100644 --- a/sdk/core/azure-core/inc/azure/core/request_conditions.hpp +++ b/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp @@ -3,14 +3,12 @@ /** * @file - * @brief Define RequestConditions + * @brief Define ModifiedConditions */ #pragma once #include "azure/core/datetime.hpp" -#include "azure/core/etag.hpp" -#include "azure/core/match_conditions.hpp" #include @@ -19,7 +17,7 @@ namespace Azure { namespace Core { /** * @brief Specifies HTTP options for conditional requests based on modification time. */ - struct RequestConditions : MatchConditions + struct ModifiedConditions { /** * @brief Optionally limit requests to resources that have only been modified since this point diff --git a/sdk/core/azure-core/test/ut/CMakeLists.txt b/sdk/core/azure-core/test/ut/CMakeLists.txt index b65c3993a..6f5342256 100644 --- a/sdk/core/azure-core/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core/test/ut/CMakeLists.txt @@ -42,12 +42,12 @@ add_executable ( main.cpp match_conditions.cpp md5.cpp + modified_conditions.cpp nullable.cpp operation.cpp operation_status.cpp pipeline.cpp policy.cpp - request_conditions.cpp simplified_header.cpp string.cpp telemetry_policy.cpp diff --git a/sdk/core/azure-core/test/ut/request_conditions.cpp b/sdk/core/azure-core/test/ut/modified_conditions.cpp similarity index 67% rename from sdk/core/azure-core/test/ut/request_conditions.cpp rename to sdk/core/azure-core/test/ut/modified_conditions.cpp index 7654b4ab7..7d18b5b80 100644 --- a/sdk/core/azure-core/test/ut/request_conditions.cpp +++ b/sdk/core/azure-core/test/ut/modified_conditions.cpp @@ -2,27 +2,21 @@ // SPDX-License-Identifier: MIT #include -#include -#include +#include #include #include #include using namespace Azure::Core; -TEST(RequestConditions, Basic) +TEST(ModifiedConditions, Basic) { - RequestConditions conditions; - conditions.IfMatch = ETag("IfMatch"); - conditions.IfNoneMatch = ETag("IfNoneMatch"); + ModifiedConditions conditions; conditions.IfModifiedSince = DateTime::Parse("2013-11-19T14:30:59.1234567Z", DateTime::DateFormat::Rfc3339); conditions.IfUnmodifiedSince = DateTime::Parse("2013-11-19T14:30:59.1234567Z", DateTime::DateFormat::Rfc3339); - EXPECT_EQ(conditions.IfMatch.ToString(), "IfMatch"); - EXPECT_EQ(conditions.IfNoneMatch.ToString(), "IfNoneMatch"); - EXPECT_EQ( conditions.IfModifiedSince.GetString(DateTime::DateFormat::Rfc3339), "2013-11-19T14:30:59.1234567Z"); diff --git a/sdk/core/azure-core/test/ut/simplified_header.cpp b/sdk/core/azure-core/test/ut/simplified_header.cpp index 8cc5d4ab6..bbe271b80 100644 --- a/sdk/core/azure-core/test/ut/simplified_header.cpp +++ b/sdk/core/azure-core/test/ut/simplified_header.cpp @@ -27,9 +27,9 @@ TEST(SimplifiedHeader, core) EXPECT_NO_THROW(Azure::Core::Http::RawResponse r( 1, 1, Azure::Core::Http::HttpStatusCode::Accepted, "phrase")); EXPECT_NO_THROW(Azure::Core::MatchConditions mc); + EXPECT_NO_THROW(Azure::Core::ModifiedConditions mc); EXPECT_NO_THROW(Azure::Core::Nullable n); EXPECT_NO_THROW(Azure::Core::Uuid::CreateUuid()); - EXPECT_NO_THROW(Azure::Core::RequestConditions rc); EXPECT_NO_THROW(Azure::Core::RequestFailedException("foo")); EXPECT_NO_THROW(Azure::Core::OperationStatus("foo")); EXPECT_NO_THROW(Azure::Core::Details::Version::VersionString());