From d6cd0af3cc7eab63b782402a4c68b675434bcfdf Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Tue, 23 Mar 2021 15:31:54 -0700 Subject: [PATCH] remove value policy from core (#1917) --- .../inc/azure/core/http/policies/policy.hpp | 55 ------------------- sdk/core/azure-core/test/ut/policy.cpp | 28 ---------- 2 files changed, 83 deletions(-) diff --git a/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp b/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp index 93e820cd0..36c561234 100644 --- a/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp @@ -427,59 +427,4 @@ namespace Azure { namespace Core { namespace Http { namespace Policies { Context const& ctx) const override; }; - namespace _internal { - /** - * @brief #Azure::Core::Http::Policies::_internal::ValuePolicy options. - */ - struct ValueOptions - { - CaseInsensitiveMap HeaderValues; - std::map QueryValues; - }; - - /** - * @brief Value policy. - * - * @details Applies key-value pair values to each HTTP request (either HTTP headers or query - * parameters). - */ - class ValuePolicy : public HttpPolicy { - private: - ValueOptions m_options; - - public: - /** - * @brief Construct a #Azure::Core::Http::Policies::_internal::ValuePolicy with the - * #Azure::Core::Http::Policies::_internal::ValueOptions provided. - * @param options #Azure::Core::Http::Policies::_internal::ValueOptions. - */ - explicit ValuePolicy(ValueOptions options) : m_options(std::move(options)) {} - - std::unique_ptr Clone() const override - { - return std::make_unique(*this); - } - - std::unique_ptr Send( - Request& request, - NextHttpPolicy nextHttpPolicy, - Context const& ctx) const override - { - for (auto const& hdrPair : m_options.HeaderValues) - { - request.SetHeader(hdrPair.first, hdrPair.second); - } - - { - auto& url = request.GetUrl(); - for (auto const& qryPair : m_options.QueryValues) - { - url.AppendQueryParameter(qryPair.first, qryPair.second); - } - } - - return nextHttpPolicy.Send(request, ctx); - } - }; - } // namespace _internal }}}} // namespace Azure::Core::Http::Policies diff --git a/sdk/core/azure-core/test/ut/policy.cpp b/sdk/core/azure-core/test/ut/policy.cpp index a4428012b..148430bcb 100644 --- a/sdk/core/azure-core/test/ut/policy.cpp +++ b/sdk/core/azure-core/test/ut/policy.cpp @@ -124,34 +124,6 @@ TEST(Policy, throwWhenNoTransportPolicyMessage) } } -TEST(Policy, ValuePolicy) -{ - using namespace Azure::Core; - using namespace Azure::Core::Http; - using namespace Azure::Core::Http::Policies; - using namespace Azure::Core::Http::_internal; - - Azure::Core::Http::Policies::_internal::ValueOptions options - = {{{"hdrkey1", "HdrVal1"}, {"hdrkey2", "HdrVal2"}}, - {{"QryKey1", "QryVal1"}, {"QryKey2", "QryVal2"}}}; - - std::vector> policies; - policies.emplace_back( - std::make_unique(options)); - policies.emplace_back(std::make_unique()); - HttpPipeline pipeline(policies); - - Request request(HttpMethod::Get, Url("https:://www.example.com")); - - pipeline.Send(request, Context::GetApplicationContext()); - - auto headers = request.GetHeaders(); - auto queryParams = request.GetUrl().GetQueryParameters(); - - ASSERT_EQ(headers, decltype(headers)({{"hdrkey1", "HdrVal1"}, {"hdrkey2", "HdrVal2"}})); - ASSERT_EQ(queryParams, decltype(queryParams)({{"QryKey1", "QryVal1"}, {"QryKey2", "QryVal2"}})); -} - TEST(Policy, RetryPolicyCounter) { using namespace Azure::Core;