diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index 3e6803c24..0b1c80f09 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -16,6 +16,7 @@ - Moved `BodyStream` and its derived types from `Azure::Core::Http` namespace to `Azure::IO`, and moved the `body_stream.hpp` header from `azure/core/http` to `azure/core/io`. - Moved `NullBodyStream` to internal usage only. It is not meant for public use. - Removed `LimitBodyStream`. +- Renamed `AddHeader()` from `Request` and `RawResponse` to `SetHeader()`. - Introduced `Azure::Core::CaseInsensitiveMap` which is now used to store headers in `Azure::Core::Http::Request` and `Azure::Core::Http::RawResponse`. - Renamed `TransportPolicyOptions` to `TransportOptions`. - Renamed `TelemetryPolicyOptions` to `TelemetryOptions`. diff --git a/sdk/core/azure-core/inc/azure/core/http/http.hpp b/sdk/core/azure-core/inc/azure/core/http/http.hpp index b0339d3e1..18733137a 100644 --- a/sdk/core/azure-core/inc/azure/core/http/http.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/http.hpp @@ -525,14 +525,17 @@ namespace Azure { namespace Core { namespace Http { explicit Request(HttpMethod httpMethod, Url url); /** - * @brief Add HTTP header to the #Azure::Core::Http::Request. + * @brief Set an HTTP header to the #Azure::Core::Http::Request. * - * @param name The name for the header to be added. - * @param value The value for the header to be added. + * @remark If the header key does not exists, it is added. + * + * + * @param name The name for the header to be set or added. + * @param value The value for the header to be set or added. * * @throw if \p name is an invalid header key. */ - void AddHeader(std::string const& name, std::string const& value); + void SetHeader(std::string const& name, std::string const& value); /** * @brief Remove an HTTP header. @@ -660,19 +663,19 @@ namespace Azure { namespace Core { namespace Http { // ===== Methods used to build HTTP response ===== /** - * @brief Add HTTP header to the #Azure::Core::Http::RawResponse. + * @brief Set an HTTP header to the #Azure::Core::Http::Request. * * @remark The \p name must contain valid header name characters (RFC 7230). * - * @param name The name for the header to be added. - * @param value The value for the header to be added. + * @param name The name for the header to be set or added. + * @param value The value for the header to be set or added. * * @throw if \p name contains invalid characters. */ - void AddHeader(std::string const& name, std::string const& value); + void SetHeader(std::string const& name, std::string const& value); /** - * @brief Add HTTP header to the #Azure::Core::Http::RawResponse. + * @brief Set an HTTP header to the #Azure::Core::Http::Request. * * @remark The \p header must contain valid header name characters (RFC 7230). * @remark Header name, value and delimiter are expected to be in \p header. @@ -681,10 +684,10 @@ namespace Azure { namespace Core { namespace Http { * * @throw if \p header has an invalid header name or if the delimiter is missing. */ - void AddHeader(std::string const& header); + void SetHeader(std::string const& header); /** - * @brief Add HTTP header to the #Azure::Core::Http::RawResponse. + * @brief Set an HTTP header to the #Azure::Core::Http::Request. * * @remark The string referenced by \p first and \p last must contain valid header name * characters (RFC 7230). @@ -697,7 +700,7 @@ namespace Azure { namespace Core { namespace Http { * @throw if the string referenced by \p first and \p last contains an invalid header name or if * the delimiter is missing. */ - void AddHeader(uint8_t const* const first, uint8_t const* const last); + void SetHeader(uint8_t const* const first, uint8_t const* const last); /** * @brief Set #Azure::IO::BodyStream for this HTTP response. diff --git a/sdk/core/azure-core/inc/azure/core/http/policy.hpp b/sdk/core/azure-core/inc/azure/core/http/policy.hpp index 1f40dcecd..22e2e40ed 100644 --- a/sdk/core/azure-core/inc/azure/core/http/policy.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/policy.hpp @@ -277,7 +277,7 @@ namespace Azure { namespace Core { namespace Http { { auto uuid = Uuid::CreateUuid().ToString(); - request.AddHeader(RequestIdHeader, uuid); + request.SetHeader(RequestIdHeader, uuid); return nextHttpPolicy.Send(ctx, request); } }; @@ -454,7 +454,7 @@ namespace Azure { namespace Core { namespace Http { { for (auto const& hdrPair : m_options.HeaderValues) { - request.AddHeader(hdrPair.first, hdrPair.second); + request.SetHeader(hdrPair.first, hdrPair.second); } { diff --git a/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp b/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp index 943811fbb..2fd62921a 100644 --- a/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp +++ b/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp @@ -22,7 +22,7 @@ std::unique_ptr BearerTokenAuthenticationPolicy::Send( m_accessToken = m_credential->GetToken(context, m_tokenRequestOptions); } - request.AddHeader("authorization", "Bearer " + m_accessToken.Token); + request.SetHeader("authorization", "Bearer " + m_accessToken.Token); } return policy.Send(context, request); diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp index dff2d57da..fc22292e6 100644 --- a/sdk/core/azure-core/src/http/curl/curl.cpp +++ b/sdk/core/azure-core/src/http/curl/curl.cpp @@ -217,13 +217,13 @@ CURLcode CurlSession::Perform(Context const& context) if (hostHeader == headers.end()) { Log(LogLevel::Verbose, LogMsgPrefix + "No Host in request headers. Adding it"); - this->m_request.AddHeader("Host", this->m_request.GetUrl().GetHost()); + this->m_request.SetHeader("Host", this->m_request.GetUrl().GetHost()); } auto isContentLengthHeaderInRequest = headers.find("content-length"); if (isContentLengthHeaderInRequest == headers.end()) { Log(LogLevel::Verbose, LogMsgPrefix + "No content-length in headers. Adding it"); - this->m_request.AddHeader( + this->m_request.SetHeader( "content-length", std::to_string(this->m_request.GetBodyStream()->Length())); } } @@ -232,7 +232,7 @@ CURLcode CurlSession::Perform(Context const& context) if (this->m_request.GetMethod() == HttpMethod::Put) { Log(LogLevel::Verbose, LogMsgPrefix + "Using 100-continue for PUT request"); - this->m_request.AddHeader("expect", "100-continue"); + this->m_request.SetHeader("expect", "100-continue"); } // Send request. If the connection assigned to this curlSession is closed or the socket is @@ -851,7 +851,7 @@ int64_t CurlSession::ResponseBufferParser::Parse( else if (this->state == ResponseParserState::Headers) { // will throw if header is invalid - this->m_response->AddHeader(this->m_internalBuffer); + this->m_response->SetHeader(this->m_internalBuffer); this->m_delimiterStartInPrevPosition = false; start = index + 1; // jump \n } @@ -888,7 +888,7 @@ int64_t CurlSession::ResponseBufferParser::Parse( } // will throw if header is invalid - this->m_response->AddHeader(buffer + start, buffer + index - 1); + this->m_response->SetHeader(buffer + start, buffer + index - 1); this->m_delimiterStartInPrevPosition = false; start = index + 1; // jump \n } @@ -1035,14 +1035,14 @@ int64_t CurlSession::ResponseBufferParser::BuildHeader( this->m_internalBuffer.append(start, indexOfEndOfStatusLine); } // will throw if header is invalid - m_response->AddHeader(this->m_internalBuffer); + m_response->SetHeader(this->m_internalBuffer); } else { // Internal Buffer was not required, create response directly from buffer std::string header(std::string(start, indexOfEndOfStatusLine)); // will throw if header is invalid - this->m_response->AddHeader(header); + this->m_response->SetHeader(header); } // reuse buffer diff --git a/sdk/core/azure-core/src/http/http.cpp b/sdk/core/azure-core/src/http/http.cpp index a5b081203..e45133f15 100644 --- a/sdk/core/azure-core/src/http/http.cpp +++ b/sdk/core/azure-core/src/http/http.cpp @@ -15,7 +15,7 @@ void Azure::Core::Http::Details::InsertHeaderWithValidation( std::string const& headerValue) { // Static table for validating header names. It is created just once for the program and reused - // each time AddHeader is called + // each time SetHeader is called static const uint8_t validChars[256] = { 0, /* 0 - null */ 0, /* 1 - start of heading */ diff --git a/sdk/core/azure-core/src/http/raw_response.cpp b/sdk/core/azure-core/src/http/raw_response.cpp index d2e13ed79..9463dc417 100644 --- a/sdk/core/azure-core/src/http/raw_response.cpp +++ b/sdk/core/azure-core/src/http/raw_response.cpp @@ -18,7 +18,7 @@ std::string const& RawResponse::GetReasonPhrase() const { return m_reasonPhrase; Azure::Core::CaseInsensitiveMap const& RawResponse::GetHeaders() const { return this->m_headers; } -void RawResponse::AddHeader(uint8_t const* const first, uint8_t const* const last) +void RawResponse::SetHeader(uint8_t const* const first, uint8_t const* const last) { // get name and value from header auto start = first; @@ -40,17 +40,17 @@ void RawResponse::AddHeader(uint8_t const* const first, uint8_t const* const las end = std::find(start, last, '\r'); auto headerValue = std::string(start, end); // remove \r - AddHeader(headerName, headerValue); + SetHeader(headerName, headerValue); } -void RawResponse::AddHeader(std::string const& header) +void RawResponse::SetHeader(std::string const& header) { - return AddHeader( + return SetHeader( reinterpret_cast(header.data()), reinterpret_cast(header.data() + header.size())); } -void RawResponse::AddHeader(std::string const& name, std::string const& value) +void RawResponse::SetHeader(std::string const& name, std::string const& value) { return Details::InsertHeaderWithValidation(this->m_headers, name, value); } diff --git a/sdk/core/azure-core/src/http/request.cpp b/sdk/core/azure-core/src/http/request.cpp index 79f950b9f..f687a9c3b 100644 --- a/sdk/core/azure-core/src/http/request.cpp +++ b/sdk/core/azure-core/src/http/request.cpp @@ -22,7 +22,7 @@ static Azure::Core::CaseInsensitiveMap MergeMaps( } } // namespace -void Request::AddHeader(std::string const& name, std::string const& value) +void Request::SetHeader(std::string const& name, std::string const& value) { auto headerNameLowerCase = Azure::Core::Internal::Strings::ToLower(name); return this->m_retryModeEnabled diff --git a/sdk/core/azure-core/src/http/telemetry_policy.cpp b/sdk/core/azure-core/src/http/telemetry_policy.cpp index b644cce93..c018ed6d2 100644 --- a/sdk/core/azure-core/src/http/telemetry_policy.cpp +++ b/sdk/core/azure-core/src/http/telemetry_policy.cpp @@ -119,6 +119,6 @@ std::unique_ptr TelemetryPolicy::Send( Request& request, NextHttpPolicy nextHttpPolicy) const { - request.AddHeader("User-Agent", m_telemetryId); + request.SetHeader("User-Agent", m_telemetryId); return nextHttpPolicy.Send(ctx, request); } diff --git a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp index ff8a22bb5..97b637cbd 100644 --- a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp +++ b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp @@ -154,7 +154,7 @@ void ParseHttpVersion( * * @throw if \p headers has an invalid header name or if the delimiter is missing. */ -void AddHeaders(std::string const& headers, std::unique_ptr& rawResponse) +void SetHeaders(std::string const& headers, std::unique_ptr& rawResponse) { auto begin = headers.data(); auto end = begin + headers.size(); @@ -164,7 +164,7 @@ void AddHeaders(std::string const& headers, std::unique_ptr& rawRes auto delimiter = std::find(begin, end, '\0'); if (delimiter < end) { - rawResponse->AddHeader( + rawResponse->SetHeader( reinterpret_cast(begin), reinterpret_cast(delimiter)); } else @@ -537,7 +537,7 @@ std::unique_ptr WinHttpTransport::GetRawResponse( auto rawResponse = std::make_unique(majorVersion, minorVersion, httpStatusCode, reasonPhrase); - AddHeaders(responseHeaders, rawResponse); + SetHeaders(responseHeaders, rawResponse); int64_t contentLength = GetContentLength(handleManager, requestMethod, rawResponse->GetStatusCode()); diff --git a/sdk/core/azure-core/test/ut/http.cpp b/sdk/core/azure-core/test/ut/http.cpp index 6471700d2..5fcf69c17 100644 --- a/sdk/core/azure-core/test/ut/http.cpp +++ b/sdk/core/azure-core/test/ut/http.cpp @@ -23,7 +23,7 @@ namespace Azure { namespace Core { namespace Test { Http::Request req(httpMethod, url); std::pair expected("valid", "header"); - EXPECT_NO_THROW(req.AddHeader(expected.first, expected.second)); + EXPECT_NO_THROW(req.SetHeader(expected.first, expected.second)); EXPECT_PRED2( [](Azure::Core::CaseInsensitiveMap headers, std::pair expected) { auto firstHeader = headers.begin(); @@ -33,11 +33,11 @@ namespace Azure { namespace Core { namespace Test { req.GetHeaders(), expected); - EXPECT_THROW(req.AddHeader("invalid()", "header"), std::runtime_error); + EXPECT_THROW(req.SetHeader("invalid()", "header"), std::runtime_error); // same header will just override std::pair expectedOverride("valid", "override"); - EXPECT_NO_THROW(req.AddHeader(expectedOverride.first, expectedOverride.second)); + EXPECT_NO_THROW(req.SetHeader(expectedOverride.first, expectedOverride.second)); EXPECT_PRED2( [](Azure::Core::CaseInsensitiveMap headers, std::pair expected) { auto firstHeader = headers.begin(); @@ -49,7 +49,7 @@ namespace Azure { namespace Core { namespace Test { // adding header after one error happened before std::pair expected2("valid2", "header2"); - EXPECT_NO_THROW(req.AddHeader(expected2.first, expected2.second)); + EXPECT_NO_THROW(req.SetHeader(expected2.first, expected2.second)); EXPECT_PRED2( [](Azure::Core::CaseInsensitiveMap headers, std::pair expected) { auto secondHeader = headers.begin(); @@ -68,7 +68,7 @@ namespace Azure { namespace Core { namespace Test { Http::RawResponse response(1, 1, Http::HttpStatusCode::Accepted, "Test"); std::pair expected("valid", "header"); - EXPECT_NO_THROW(response.AddHeader(expected.first, expected.second)); + EXPECT_NO_THROW(response.SetHeader(expected.first, expected.second)); EXPECT_PRED2( [](Azure::Core::CaseInsensitiveMap headers, std::pair expected) { auto firstHeader = headers.begin(); @@ -79,11 +79,11 @@ namespace Azure { namespace Core { namespace Test { expected); EXPECT_THROW( - response.AddHeader("invalid()", "header"), Azure::Core::Http::InvalidHeaderException); + response.SetHeader("invalid()", "header"), Azure::Core::Http::InvalidHeaderException); // same header will just override std::pair expectedOverride("valid", "override"); - EXPECT_NO_THROW(response.AddHeader(expectedOverride.first, expectedOverride.second)); + EXPECT_NO_THROW(response.SetHeader(expectedOverride.first, expectedOverride.second)); EXPECT_PRED2( [](Azure::Core::CaseInsensitiveMap headers, std::pair expected) { auto firstHeader = headers.begin(); @@ -95,7 +95,7 @@ namespace Azure { namespace Core { namespace Test { // adding header after on error happened std::pair expected2("valid2", "header2"); - EXPECT_NO_THROW(response.AddHeader(expected2.first, expected2.second)); + EXPECT_NO_THROW(response.SetHeader(expected2.first, expected2.second)); EXPECT_PRED2( [](Azure::Core::CaseInsensitiveMap headers, std::pair expected) { auto secondtHeader = headers.begin(); @@ -106,13 +106,13 @@ namespace Azure { namespace Core { namespace Test { response.GetHeaders(), expected2); - // Response addHeader overload method to add from string - EXPECT_THROW(response.AddHeader("inv(): header"), Azure::Core::Http::InvalidHeaderException); + // Response SetHeader overload method to add from string + EXPECT_THROW(response.SetHeader("inv(): header"), Azure::Core::Http::InvalidHeaderException); EXPECT_THROW( - response.AddHeader("no delimiter header"), Azure::Core::Http::InvalidHeaderException); + response.SetHeader("no delimiter header"), Azure::Core::Http::InvalidHeaderException); // adding header after previous error just happened on add from string - EXPECT_NO_THROW(response.AddHeader("valid3: header3")); + EXPECT_NO_THROW(response.SetHeader("valid3: header3")); EXPECT_PRED2( [](Azure::Core::CaseInsensitiveMap headers, std::pair expected) { auto secondtHeader = headers.begin(); @@ -167,7 +167,7 @@ namespace Azure { namespace Core { namespace Test { req.StartTry(); - EXPECT_NO_THROW(req.AddHeader("namE", "retryValue")); + EXPECT_NO_THROW(req.SetHeader("namE", "retryValue")); auto headers = req.GetHeaders(); diff --git a/sdk/core/azure-core/test/ut/transport_adapter_base.cpp b/sdk/core/azure-core/test/ut/transport_adapter_base.cpp index 2c14a5da6..e28aa571d 100644 --- a/sdk/core/azure-core/test/ut/transport_adapter_base.cpp +++ b/sdk/core/azure-core/test/ut/transport_adapter_base.cpp @@ -41,7 +41,7 @@ namespace Azure { namespace Core { namespace Test { // Need to init request again, since retry would be on after it is sent request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, host); // Add a header and send again. RawResponse should return that header in the body - request.AddHeader("123", "456"); + request.SetHeader("123", "456"); response = m_pipeline->Send(Azure::Core::GetApplicationContext(), request); checkResponseCode(response->GetStatusCode()); // header length is 6 (data) + 13 (formating) -> ` "123": "456"\r\n,` @@ -189,7 +189,7 @@ namespace Azure { namespace Core { namespace Test { request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, host, true); // Add a header and send again. Response should return that header in the body - request.AddHeader("123", "456"); + request.SetHeader("123", "456"); response = m_pipeline->Send(Azure::Core::GetApplicationContext(), request); checkResponseCode(response->GetStatusCode()); // header length is 6 (data) + 13 (formating) -> ` "123": "456"\r\n,` diff --git a/sdk/core/azure-core/test/ut/url.cpp b/sdk/core/azure-core/test/ut/url.cpp index bb544b061..f476a09d7 100644 --- a/sdk/core/azure-core/test/ut/url.cpp +++ b/sdk/core/azure-core/test/ut/url.cpp @@ -30,8 +30,8 @@ namespace Azure { namespace Core { namespace Test { req.GetUrl().GetAbsoluteUrl(), url.GetAbsoluteUrl()); - EXPECT_NO_THROW(req.AddHeader("Name", "value")); - EXPECT_NO_THROW(req.AddHeader("naME2", "value2")); + EXPECT_NO_THROW(req.SetHeader("Name", "value")); + EXPECT_NO_THROW(req.SetHeader("naME2", "value2")); auto headers = req.GetHeaders(); @@ -49,9 +49,9 @@ namespace Azure { namespace Core { namespace Test { req.StartTry(); // same headers first, then one new - EXPECT_NO_THROW(req.AddHeader("namE", "retryValue")); - EXPECT_NO_THROW(req.AddHeader("HEADER-to-Lower-123", "retryValue2")); - EXPECT_NO_THROW(req.AddHeader("newHeader", "new")); + EXPECT_NO_THROW(req.SetHeader("namE", "retryValue")); + EXPECT_NO_THROW(req.SetHeader("HEADER-to-Lower-123", "retryValue2")); + EXPECT_NO_THROW(req.SetHeader("newHeader", "new")); headers = req.GetHeaders(); diff --git a/sdk/identity/azure-identity/src/client_secret_credential.cpp b/sdk/identity/azure-identity/src/client_secret_credential.cpp index cad81b915..9b58e1d18 100644 --- a/sdk/identity/azure-identity/src/client_secret_credential.cpp +++ b/sdk/identity/azure-identity/src/client_secret_credential.cpp @@ -54,8 +54,8 @@ Azure::Core::AccessToken ClientSecretCredential::GetToken( Request request(HttpMethod::Post, url, bodyStream.get()); bodyStream.release(); - request.AddHeader("Content-Type", "application/x-www-form-urlencoded"); - request.AddHeader("Content-Length", std::to_string(bodyString.size())); + request.SetHeader("Content-Type", "application/x-www-form-urlencoded"); + request.SetHeader("Content-Length", std::to_string(bodyString.size())); HttpPipeline httpPipeline(m_options, "Identity-client-secret-credential", "", {}, {}); diff --git a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp index e31ef8ce0..098fa73ea 100644 --- a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp +++ b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp @@ -29,8 +29,8 @@ Azure::Core::Http::Request Internal::KeyVaultPipeline::CreateRequest( auto request = ::InitRequest(method, content, m_vaultUrl); - request.AddHeader(Details::ContentType, Details::ApplicationJson); - request.AddHeader(Details::Accept, Details::ApplicationJson); + request.SetHeader(Details::ContentType, Details::ApplicationJson); + request.SetHeader(Details::Accept, Details::ApplicationJson); request.GetUrl().AppendQueryParameter(Details::ApiVersion, m_apiVersion); diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp index 6bef2f6a6..56396fdda 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp @@ -44,7 +44,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam // Copy headers for (auto header : request.GetHeaders()) { - response->AddHeader(header.first, header.second); + response->SetHeader(header.first, header.second); } std::string bodyCount(Details::FakeKey); response->SetBodyStream(std::make_unique( 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 6481b1198..54f3fd658 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 @@ -1244,7 +1244,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -1321,10 +1321,10 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(xml_body.data()), xml_body.length()); auto request = Azure::Core::Http::Request( Azure::Core::Http::HttpMethod::Post, url, &xml_body_stream); - request.AddHeader("Content-Length", std::to_string(xml_body_stream.Length())); + request.SetHeader("Content-Length", std::to_string(xml_body_stream.Length())); request.GetUrl().AppendQueryParameter("restype", "service"); request.GetUrl().AppendQueryParameter("comp", "userdelegationkey"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -1366,7 +1366,7 @@ namespace Azure { namespace Storage { namespace Blobs { auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); request.GetUrl().AppendQueryParameter("restype", "service"); request.GetUrl().AppendQueryParameter("comp", "properties"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -1417,10 +1417,10 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(xml_body.data()), xml_body.length()); auto request = Azure::Core::Http::Request( Azure::Core::Http::HttpMethod::Put, url, &xml_body_stream); - request.AddHeader("Content-Length", std::to_string(xml_body_stream.Length())); + request.SetHeader("Content-Length", std::to_string(xml_body_stream.Length())); request.GetUrl().AppendQueryParameter("restype", "service"); request.GetUrl().AppendQueryParameter("comp", "properties"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -1456,7 +1456,7 @@ namespace Azure { namespace Storage { namespace Blobs { auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Head, url); request.GetUrl().AppendQueryParameter("restype", "account"); request.GetUrl().AppendQueryParameter("comp", "properties"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -1496,7 +1496,7 @@ namespace Azure { namespace Storage { namespace Blobs { auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); request.GetUrl().AppendQueryParameter("restype", "service"); request.GetUrl().AppendQueryParameter("comp", "stats"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -1539,7 +1539,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3100,9 +3100,9 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("restype", "container"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3110,20 +3110,20 @@ namespace Azure { namespace Storage { namespace Blobs { } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (!options.AccessType.ToString().empty()) { - request.AddHeader("x-ms-blob-public-access", options.AccessType.ToString()); + request.SetHeader("x-ms-blob-public-access", options.AccessType.ToString()); } if (options.DefaultEncryptionScope.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-default-encryption-scope", options.DefaultEncryptionScope.GetValue()); } if (options.PreventEncryptionScopeOverride.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-deny-encryption-scope-override", options.PreventEncryptionScopeOverride.GetValue() ? "true" : "false"); } @@ -3163,7 +3163,7 @@ namespace Azure { namespace Storage { namespace Blobs { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Delete, url); request.GetUrl().AppendQueryParameter("restype", "container"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3171,18 +3171,18 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -3217,17 +3217,17 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("restype", "container"); request.GetUrl().AppendQueryParameter("comp", "undelete"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } - request.AddHeader("x-ms-deleted-container-name", options.DeletedBlobContainerName); - request.AddHeader("x-ms-deleted-container-version", options.DeletedBlobContainerVersion); + request.SetHeader("x-ms-deleted-container-name", options.DeletedBlobContainerName); + request.SetHeader("x-ms-deleted-container-version", options.DeletedBlobContainerVersion); auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; UndeleteBlobContainerResult response; @@ -3258,7 +3258,7 @@ namespace Azure { namespace Storage { namespace Blobs { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Head, url); request.GetUrl().AppendQueryParameter("restype", "container"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3266,7 +3266,7 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -3330,10 +3330,10 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("restype", "container"); request.GetUrl().AppendQueryParameter("comp", "metadata"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3341,15 +3341,15 @@ namespace Azure { namespace Storage { namespace Blobs { } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -3390,7 +3390,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3460,7 +3460,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3531,7 +3531,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3598,8 +3598,8 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(xml_body.data()), xml_body.length()); auto request = Azure::Core::Http::Request( Azure::Core::Http::HttpMethod::Put, url, &xml_body_stream); - request.AddHeader("Content-Length", std::to_string(xml_body_stream.Length())); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", std::to_string(xml_body_stream.Length())); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3609,22 +3609,22 @@ namespace Azure { namespace Storage { namespace Blobs { request.GetUrl().AppendQueryParameter("comp", "acl"); if (!options.AccessType.ToString().empty()) { - request.AddHeader("x-ms-blob-public-access", options.AccessType.ToString()); + request.SetHeader("x-ms-blob-public-access", options.AccessType.ToString()); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -3665,8 +3665,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3674,22 +3674,22 @@ namespace Azure { namespace Storage { namespace Blobs { } request.GetUrl().AppendQueryParameter("restype", "container"); request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "acquire"); - request.AddHeader("x-ms-lease-duration", std::to_string(options.LeaseDuration.count())); + request.SetHeader("x-ms-lease-action", "acquire"); + request.SetHeader("x-ms-lease-duration", std::to_string(options.LeaseDuration.count())); if (options.ProposedLeaseId.HasValue()) { - request.AddHeader("x-ms-proposed-lease-id", options.ProposedLeaseId.GetValue()); + request.SetHeader("x-ms-proposed-lease-id", options.ProposedLeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -3730,8 +3730,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3739,18 +3739,18 @@ namespace Azure { namespace Storage { namespace Blobs { } request.GetUrl().AppendQueryParameter("restype", "container"); request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "renew"); - request.AddHeader("x-ms-lease-id", options.LeaseId); + request.SetHeader("x-ms-lease-action", "renew"); + request.SetHeader("x-ms-lease-id", options.LeaseId); if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -3792,8 +3792,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3801,19 +3801,19 @@ namespace Azure { namespace Storage { namespace Blobs { } request.GetUrl().AppendQueryParameter("restype", "container"); request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "change"); - request.AddHeader("x-ms-lease-id", options.LeaseId); - request.AddHeader("x-ms-proposed-lease-id", options.ProposedLeaseId); + request.SetHeader("x-ms-lease-action", "change"); + request.SetHeader("x-ms-lease-id", options.LeaseId); + request.SetHeader("x-ms-proposed-lease-id", options.ProposedLeaseId); if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -3854,8 +3854,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3863,18 +3863,18 @@ namespace Azure { namespace Storage { namespace Blobs { } request.GetUrl().AppendQueryParameter("restype", "container"); request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "release"); - request.AddHeader("x-ms-lease-id", options.LeaseId); + request.SetHeader("x-ms-lease-action", "release"); + request.SetHeader("x-ms-lease-id", options.LeaseId); if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -3914,8 +3914,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -3923,22 +3923,22 @@ namespace Azure { namespace Storage { namespace Blobs { } request.GetUrl().AppendQueryParameter("restype", "container"); request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "break"); + request.SetHeader("x-ms-lease-action", "break"); if (options.BreakPeriod.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-lease-break-period", std::to_string(options.BreakPeriod.GetValue().count())); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -4854,7 +4854,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url, true); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -4869,62 +4869,62 @@ namespace Azure { namespace Storage { namespace Blobs { headerValue += std::to_string( options.Range.GetValue().Offset + options.Range.GetValue().Length.GetValue() - 1); } - request.AddHeader("x-ms-range", std::move(headerValue)); + request.SetHeader("x-ms-range", std::move(headerValue)); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.RangeHashAlgorithm.HasValue()) { if (options.RangeHashAlgorithm.GetValue() == HashAlgorithm::Md5) { - request.AddHeader("x-ms-range-get-content-md5", "true"); + request.SetHeader("x-ms-range-get-content-md5", "true"); } else if (options.RangeHashAlgorithm.GetValue() == HashAlgorithm::Crc64) { - request.AddHeader("x-ms-range-get-content-crc64", "true"); + request.SetHeader("x-ms-range-get-content-crc64", "true"); } } auto pHttpResponse = pipeline.Send(context, request); @@ -5212,7 +5212,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Delete, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5220,38 +5220,38 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.DeleteSnapshots.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-delete-snapshots", options.DeleteSnapshots.GetValue().ToString()); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } return request; } @@ -5301,18 +5301,18 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } request.GetUrl().AppendQueryParameter("comp", "expiry"); - request.AddHeader("x-ms-expiry-option", options.ExpiryOrigin.ToString()); + request.SetHeader("x-ms-expiry-option", options.ExpiryOrigin.ToString()); if (options.ExpiryTime.HasValue()) { - request.AddHeader("x-ms-expiry-time", options.ExpiryTime.GetValue()); + request.SetHeader("x-ms-expiry-time", options.ExpiryTime.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -5342,8 +5342,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5387,7 +5387,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Head, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5395,48 +5395,48 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -5719,9 +5719,9 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "properties"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5729,60 +5729,60 @@ namespace Azure { namespace Storage { namespace Blobs { } if (!options.HttpHeaders.ContentType.empty()) { - request.AddHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); + request.SetHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); } if (!options.HttpHeaders.ContentEncoding.empty()) { - request.AddHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); + request.SetHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); } if (!options.HttpHeaders.ContentLanguage.empty()) { - request.AddHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); + request.SetHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); } if (!options.HttpHeaders.CacheControl.empty()) { - request.AddHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); + request.SetHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); } if (!Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value).empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-md5", Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value)); } if (!options.HttpHeaders.ContentDisposition.empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-disposition", options.HttpHeaders.ContentDisposition); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -5833,9 +5833,9 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "metadata"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5843,56 +5843,56 @@ namespace Azure { namespace Storage { namespace Blobs { } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -5927,23 +5927,23 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "tier"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } - request.AddHeader("x-ms-access-tier", options.Tier.ToString()); + request.SetHeader("x-ms-access-tier", options.Tier.ToString()); if (options.RehydratePriority.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-rehydrate-priority", options.RehydratePriority.GetValue().ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } return request; } @@ -6008,8 +6008,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -6017,82 +6017,82 @@ namespace Azure { namespace Storage { namespace Blobs { } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } - request.AddHeader("x-ms-copy-source", options.SourceUri); + request.SetHeader("x-ms-copy-source", options.SourceUri); if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.SourceLeaseId.HasValue()) { - request.AddHeader("x-ms-source-lease-id", options.SourceLeaseId.GetValue()); + request.SetHeader("x-ms-source-lease-id", options.SourceLeaseId.GetValue()); } if (options.Tier.HasValue()) { - request.AddHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); + request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); } if (options.RehydratePriority.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-rehydrate-priority", options.RehydratePriority.GetValue().ToString()); } if (options.ShouldSealDestination.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-seal-blob", options.ShouldSealDestination.GetValue() ? "true" : "false"); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } if (options.SourceIfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-source-if-modified-since", options.SourceIfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.SourceIfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-source-if-unmodified-since", options.SourceIfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.SourceIfMatch.HasValue() && !options.SourceIfMatch.ToString().empty()) { - request.AddHeader("x-ms-source-if-match", options.SourceIfMatch.ToString()); + request.SetHeader("x-ms-source-if-match", options.SourceIfMatch.ToString()); } if (options.SourceIfNoneMatch.HasValue() && !options.SourceIfNoneMatch.ToString().empty()) { - request.AddHeader("x-ms-source-if-none-match", options.SourceIfNoneMatch.ToString()); + request.SetHeader("x-ms-source-if-none-match", options.SourceIfNoneMatch.ToString()); } if (options.SourceIfTags.HasValue()) { - request.AddHeader("x-ms-source-if-tags", options.SourceIfTags.GetValue()); + request.SetHeader("x-ms-source-if-tags", options.SourceIfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6135,8 +6135,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -6145,10 +6145,10 @@ namespace Azure { namespace Storage { namespace Blobs { request.GetUrl().AppendQueryParameter("comp", "copy"); request.GetUrl().AppendQueryParameter( "copyid", Storage::Details::UrlEncodeQueryParameter(options.CopyId)); - request.AddHeader("x-ms-copy-action", "abort"); + request.SetHeader("x-ms-copy-action", "abort"); if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6189,9 +6189,9 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "snapshot"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -6199,56 +6199,56 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6304,7 +6304,7 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Get, url); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -6313,7 +6313,7 @@ namespace Azure { namespace Storage { namespace Blobs { request.GetUrl().AppendQueryParameter("comp", "tags"); if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6361,18 +6361,18 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(xml_body.data()), xml_body.length()); auto request = Azure::Core::Http::Request( Azure::Core::Http::HttpMethod::Put, url, &xml_body_stream); - request.AddHeader("Content-Length", std::to_string(xml_body_stream.Length())); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", std::to_string(xml_body_stream.Length())); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } request.GetUrl().AppendQueryParameter("comp", "tags"); - request.AddHeader("Content-Type", "application/xml; charset=UTF-8"); + request.SetHeader("Content-Type", "application/xml; charset=UTF-8"); if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6409,45 +6409,45 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "acquire"); - request.AddHeader("x-ms-lease-duration", std::to_string(options.LeaseDuration.count())); + request.SetHeader("x-ms-lease-action", "acquire"); + request.SetHeader("x-ms-lease-duration", std::to_string(options.LeaseDuration.count())); if (options.ProposedLeaseId.HasValue()) { - request.AddHeader("x-ms-proposed-lease-id", options.ProposedLeaseId.GetValue()); + request.SetHeader("x-ms-proposed-lease-id", options.ProposedLeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6488,41 +6488,41 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "renew"); - request.AddHeader("x-ms-lease-id", options.LeaseId); + request.SetHeader("x-ms-lease-action", "renew"); + request.SetHeader("x-ms-lease-id", options.LeaseId); if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6564,42 +6564,42 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "change"); - request.AddHeader("x-ms-lease-id", options.LeaseId); - request.AddHeader("x-ms-proposed-lease-id", options.ProposedLeaseId); + request.SetHeader("x-ms-lease-action", "change"); + request.SetHeader("x-ms-lease-id", options.LeaseId); + request.SetHeader("x-ms-proposed-lease-id", options.ProposedLeaseId); if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6640,41 +6640,41 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "release"); - request.AddHeader("x-ms-lease-id", options.LeaseId); + request.SetHeader("x-ms-lease-action", "release"); + request.SetHeader("x-ms-lease-id", options.LeaseId); if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6720,45 +6720,45 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } request.GetUrl().AppendQueryParameter("comp", "lease"); - request.AddHeader("x-ms-lease-action", "break"); + request.SetHeader("x-ms-lease-action", "break"); if (options.BreakPeriod.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-lease-break-period", std::to_string(options.BreakPeriod.GetValue().count())); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -6945,8 +6945,8 @@ namespace Azure { namespace Storage { namespace Blobs { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url, requestBody); - request.AddHeader("Content-Length", std::to_string(requestBody->Length())); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", std::to_string(requestBody->Length())); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -6954,103 +6954,103 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.TransactionalContentHash.HasValue()) { if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Md5) { - request.AddHeader( + request.SetHeader( "Content-MD5", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } else if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Crc64) { - request.AddHeader( + request.SetHeader( "x-ms-content-crc64", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } } if (!options.HttpHeaders.ContentType.empty()) { - request.AddHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); + request.SetHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); } if (!options.HttpHeaders.ContentEncoding.empty()) { - request.AddHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); + request.SetHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); } if (!options.HttpHeaders.ContentLanguage.empty()) { - request.AddHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); + request.SetHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); } if (!options.HttpHeaders.CacheControl.empty()) { - request.AddHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); + request.SetHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); } if (!Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value).empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-md5", Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value)); } if (!options.HttpHeaders.ContentDisposition.empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-disposition", options.HttpHeaders.ContentDisposition); } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } - request.AddHeader("x-ms-blob-type", "BlockBlob"); + request.SetHeader("x-ms-blob-type", "BlockBlob"); if (options.Tier.HasValue()) { - request.AddHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); + request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -7132,11 +7132,11 @@ namespace Azure { namespace Storage { namespace Blobs { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url, requestBody); - request.AddHeader("Content-Length", std::to_string(requestBody->Length())); + request.SetHeader("Content-Length", std::to_string(requestBody->Length())); request.GetUrl().AppendQueryParameter("comp", "block"); request.GetUrl().AppendQueryParameter( "blockid", Storage::Details::UrlEncodeQueryParameter(options.BlockId)); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -7146,39 +7146,39 @@ namespace Azure { namespace Storage { namespace Blobs { { if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Md5) { - request.AddHeader( + request.SetHeader( "Content-MD5", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } else if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Crc64) { - request.AddHeader( + request.SetHeader( "x-ms-content-crc64", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -7255,17 +7255,17 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "block"); request.GetUrl().AppendQueryParameter( "blockid", Storage::Details::UrlEncodeQueryParameter(options.BlockId)); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } - request.AddHeader("x-ms-copy-source", options.SourceUri); + request.SetHeader("x-ms-copy-source", options.SourceUri); if (options.SourceRange.HasValue()) { std::string headerValue @@ -7276,67 +7276,67 @@ namespace Azure { namespace Storage { namespace Blobs { options.SourceRange.GetValue().Offset + options.SourceRange.GetValue().Length.GetValue() - 1); } - request.AddHeader("x-ms-source_range", std::move(headerValue)); + request.SetHeader("x-ms-source_range", std::move(headerValue)); } if (options.TransactionalContentHash.HasValue()) { if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Md5) { - request.AddHeader( + request.SetHeader( "x-ms-source-content-md5", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } else if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Crc64) { - request.AddHeader( + request.SetHeader( "x-ms-source-content-crc64", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.SourceIfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-source-if-modified-since", options.SourceIfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.SourceIfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-source-if-unmodified-since", options.SourceIfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.SourceIfMatch.HasValue() && !options.SourceIfMatch.ToString().empty()) { - request.AddHeader("x-ms-source-if-match", options.SourceIfMatch.ToString()); + request.SetHeader("x-ms-source-if-match", options.SourceIfMatch.ToString()); } if (options.SourceIfNoneMatch.HasValue() && !options.SourceIfNoneMatch.ToString().empty()) { - request.AddHeader("x-ms-source-if-none-match", options.SourceIfNoneMatch.ToString()); + request.SetHeader("x-ms-source-if-none-match", options.SourceIfNoneMatch.ToString()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -7424,9 +7424,9 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(xml_body.data()), xml_body.length()); auto request = Azure::Core::Http::Request( Azure::Core::Http::HttpMethod::Put, url, &xml_body_stream); - request.AddHeader("Content-Length", std::to_string(xml_body_stream.Length())); + request.SetHeader("Content-Length", std::to_string(xml_body_stream.Length())); request.GetUrl().AppendQueryParameter("comp", "blocklist"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -7434,87 +7434,87 @@ namespace Azure { namespace Storage { namespace Blobs { } if (!options.HttpHeaders.ContentType.empty()) { - request.AddHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); + request.SetHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); } if (!options.HttpHeaders.ContentEncoding.empty()) { - request.AddHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); + request.SetHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); } if (!options.HttpHeaders.ContentLanguage.empty()) { - request.AddHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); + request.SetHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); } if (!options.HttpHeaders.CacheControl.empty()) { - request.AddHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); + request.SetHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); } if (!Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value).empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-md5", Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value)); } if (!options.HttpHeaders.ContentDisposition.empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-disposition", options.HttpHeaders.ContentDisposition); } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.Tier.HasValue()) { - request.AddHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); + request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -7575,7 +7575,7 @@ namespace Azure { namespace Storage { namespace Blobs { request.GetUrl().AppendQueryParameter( "blocklisttype", Storage::Details::UrlEncodeQueryParameter(options.ListType.ToString())); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -7583,11 +7583,11 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -7796,8 +7796,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -7805,94 +7805,94 @@ namespace Azure { namespace Storage { namespace Blobs { } if (!options.HttpHeaders.ContentType.empty()) { - request.AddHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); + request.SetHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); } if (!options.HttpHeaders.ContentEncoding.empty()) { - request.AddHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); + request.SetHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); } if (!options.HttpHeaders.ContentLanguage.empty()) { - request.AddHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); + request.SetHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); } if (!options.HttpHeaders.CacheControl.empty()) { - request.AddHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); + request.SetHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); } if (!Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value).empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-md5", Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value)); } if (!options.HttpHeaders.ContentDisposition.empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-disposition", options.HttpHeaders.ContentDisposition); } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } - request.AddHeader("x-ms-blob-type", "PageBlob"); - request.AddHeader("x-ms-blob-content-length", std::to_string(options.BlobSize)); + request.SetHeader("x-ms-blob-type", "PageBlob"); + request.SetHeader("x-ms-blob-content-length", std::to_string(options.BlobSize)); if (options.SequenceNumber.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-sequence-number", std::to_string(options.SequenceNumber.GetValue())); } if (options.Tier.HasValue()) { - request.AddHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); + request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString()); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -7963,9 +7963,9 @@ namespace Azure { namespace Storage { namespace Blobs { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url, requestBody); - request.AddHeader("Content-Length", std::to_string(requestBody->Length())); + request.SetHeader("Content-Length", std::to_string(requestBody->Length())); request.GetUrl().AppendQueryParameter("comp", "page"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -7978,90 +7978,90 @@ namespace Azure { namespace Storage { namespace Blobs { headerValue += std::to_string(options.Range.Offset + options.Range.Length.GetValue() - 1); } - request.AddHeader("x-ms-range", std::move(headerValue)); + request.SetHeader("x-ms-range", std::move(headerValue)); } if (options.TransactionalContentHash.HasValue()) { if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Md5) { - request.AddHeader( + request.SetHeader( "Content-MD5", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } else if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Crc64) { - request.AddHeader( + request.SetHeader( "x-ms-content-crc64", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } } - request.AddHeader("x-ms-page-write", "update"); + request.SetHeader("x-ms-page-write", "update"); if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfSequenceNumberLessThanOrEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-le", std::to_string(options.IfSequenceNumberLessThanOrEqualTo.GetValue())); } if (options.IfSequenceNumberLessThan.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-lt", std::to_string(options.IfSequenceNumberLessThan.GetValue())); } if (options.IfSequenceNumberEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-eq", std::to_string(options.IfSequenceNumberEqualTo.GetValue())); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -8148,9 +8148,9 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "page"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -8163,9 +8163,9 @@ namespace Azure { namespace Storage { namespace Blobs { headerValue += std::to_string(options.Range.Offset + options.Range.Length.GetValue() - 1); } - request.AddHeader("x-ms-range", std::move(headerValue)); + request.SetHeader("x-ms-range", std::move(headerValue)); } - request.AddHeader("x-ms-copy-source", options.SourceUri); + request.SetHeader("x-ms-copy-source", options.SourceUri); { std::string headerValue = "bytes=" + std::to_string(options.SourceRange.Offset) + "-"; if (options.SourceRange.Length.HasValue()) @@ -8173,90 +8173,90 @@ namespace Azure { namespace Storage { namespace Blobs { headerValue += std::to_string( options.SourceRange.Offset + options.SourceRange.Length.GetValue() - 1); } - request.AddHeader("x-ms-source-range", std::move(headerValue)); + request.SetHeader("x-ms-source-range", std::move(headerValue)); } if (options.TransactionalContentHash.HasValue()) { if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Md5) { - request.AddHeader( + request.SetHeader( "x-ms-source-content-md5", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } else if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Crc64) { - request.AddHeader( + request.SetHeader( "x-ms-source-content-crc64", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } } - request.AddHeader("x-ms-page-write", "update"); + request.SetHeader("x-ms-page-write", "update"); if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfSequenceNumberLessThanOrEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-le", std::to_string(options.IfSequenceNumberLessThanOrEqualTo.GetValue())); } if (options.IfSequenceNumberLessThan.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-lt", std::to_string(options.IfSequenceNumberLessThan.GetValue())); } if (options.IfSequenceNumberEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-eq", std::to_string(options.IfSequenceNumberEqualTo.GetValue())); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -8340,9 +8340,9 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "page"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -8355,75 +8355,75 @@ namespace Azure { namespace Storage { namespace Blobs { headerValue += std::to_string(options.Range.Offset + options.Range.Length.GetValue() - 1); } - request.AddHeader("x-ms-range", std::move(headerValue)); + request.SetHeader("x-ms-range", std::move(headerValue)); } - request.AddHeader("x-ms-page-write", "clear"); + request.SetHeader("x-ms-page-write", "clear"); if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfSequenceNumberLessThanOrEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-le", std::to_string(options.IfSequenceNumberLessThanOrEqualTo.GetValue())); } if (options.IfSequenceNumberLessThan.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-lt", std::to_string(options.IfSequenceNumberLessThan.GetValue())); } if (options.IfSequenceNumberEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-eq", std::to_string(options.IfSequenceNumberEqualTo.GetValue())); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -8473,81 +8473,81 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "properties"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } - request.AddHeader("x-ms-blob-content-length", std::to_string(options.BlobSize)); + request.SetHeader("x-ms-blob-content-length", std::to_string(options.BlobSize)); if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfSequenceNumberLessThanOrEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-le", std::to_string(options.IfSequenceNumberLessThanOrEqualTo.GetValue())); } if (options.IfSequenceNumberLessThan.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-lt", std::to_string(options.IfSequenceNumberLessThan.GetValue())); } if (options.IfSequenceNumberEqualTo.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-if-sequence-number-eq", std::to_string(options.IfSequenceNumberEqualTo.GetValue())); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -8599,7 +8599,7 @@ namespace Azure { namespace Storage { namespace Blobs { "prevsnapshot", Storage::Details::UrlEncodeQueryParameter(options.PreviousSnapshot.GetValue())); } - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -8614,41 +8614,41 @@ namespace Azure { namespace Storage { namespace Blobs { headerValue += std::to_string( options.Range.GetValue().Offset + options.Range.GetValue().Length.GetValue() - 1); } - request.AddHeader("x-ms-range", std::move(headerValue)); + request.SetHeader("x-ms-range", std::move(headerValue)); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.PreviousSnapshotUrl.HasValue()) { - request.AddHeader("x-ms-previous-snapshot-url", options.PreviousSnapshotUrl.GetValue()); + request.SetHeader("x-ms-previous-snapshot-url", options.PreviousSnapshotUrl.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -8696,40 +8696,40 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "incrementalcopy"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } - request.AddHeader("x-ms-copy-source", options.CopySource); + request.SetHeader("x-ms-copy-source", options.CopySource); if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -8966,8 +8966,8 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("Content-Length", "0"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -8975,84 +8975,84 @@ namespace Azure { namespace Storage { namespace Blobs { } if (!options.HttpHeaders.ContentType.empty()) { - request.AddHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); + request.SetHeader("x-ms-blob-content-type", options.HttpHeaders.ContentType); } if (!options.HttpHeaders.ContentEncoding.empty()) { - request.AddHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); + request.SetHeader("x-ms-blob-content-encoding", options.HttpHeaders.ContentEncoding); } if (!options.HttpHeaders.ContentLanguage.empty()) { - request.AddHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); + request.SetHeader("x-ms-blob-content-language", options.HttpHeaders.ContentLanguage); } if (!options.HttpHeaders.CacheControl.empty()) { - request.AddHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); + request.SetHeader("x-ms-blob-cache-control", options.HttpHeaders.CacheControl); } if (!Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value).empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-md5", Azure::Core::Base64Encode(options.HttpHeaders.ContentHash.Value)); } if (!options.HttpHeaders.ContentDisposition.empty()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-content-disposition", options.HttpHeaders.ContentDisposition); } for (const auto& pair : options.Metadata) { - request.AddHeader("x-ms-meta-" + pair.first, pair.second); + request.SetHeader("x-ms-meta-" + pair.first, pair.second); } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } - request.AddHeader("x-ms-blob-type", "AppendBlob"); + request.SetHeader("x-ms-blob-type", "AppendBlob"); if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -9121,9 +9121,9 @@ namespace Azure { namespace Storage { namespace Blobs { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url, requestBody); - request.AddHeader("Content-Length", std::to_string(requestBody->Length())); + request.SetHeader("Content-Length", std::to_string(requestBody->Length())); request.GetUrl().AppendQueryParameter("comp", "appendblock"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -9133,75 +9133,75 @@ namespace Azure { namespace Storage { namespace Blobs { { if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Md5) { - request.AddHeader( + request.SetHeader( "Content-MD5", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } else if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Crc64) { - request.AddHeader( + request.SetHeader( "x-ms-content-crc64", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.MaxSize.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-condition-maxsize", std::to_string(options.MaxSize.GetValue())); } if (options.AppendPosition.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-condition-appendpos", std::to_string(options.AppendPosition.GetValue())); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -9288,15 +9288,15 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "appendblock"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } - request.AddHeader("x-ms-copy-source", options.SourceUri); + request.SetHeader("x-ms-copy-source", options.SourceUri); if (options.SourceRange.HasValue()) { std::string headerValue @@ -9307,81 +9307,81 @@ namespace Azure { namespace Storage { namespace Blobs { options.SourceRange.GetValue().Offset + options.SourceRange.GetValue().Length.GetValue() - 1); } - request.AddHeader("x-ms-source-range", std::move(headerValue)); + request.SetHeader("x-ms-source-range", std::move(headerValue)); } if (options.TransactionalContentHash.HasValue()) { if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Md5) { - request.AddHeader( + request.SetHeader( "x-ms-source-content-md5", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } else if (options.TransactionalContentHash.GetValue().Algorithm == HashAlgorithm::Crc64) { - request.AddHeader( + request.SetHeader( "x-ms-source-content-crc64", Azure::Core::Base64Encode(options.TransactionalContentHash.GetValue().Value)); } } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.MaxSize.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-condition-maxsize", std::to_string(options.MaxSize.GetValue())); } if (options.AppendPosition.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-condition-appendpos", std::to_string(options.AppendPosition.GetValue())); } if (options.EncryptionKey.HasValue()) { - request.AddHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); + request.SetHeader("x-ms-encryption-key", options.EncryptionKey.GetValue()); } if (options.EncryptionKeySha256.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-key-sha256", Azure::Core::Base64Encode(options.EncryptionKeySha256.GetValue())); } if (options.EncryptionAlgorithm.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-encryption-algorithm", options.EncryptionAlgorithm.GetValue().ToString()); } if (options.EncryptionScope.HasValue()) { - request.AddHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); + request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; @@ -9460,9 +9460,9 @@ namespace Azure { namespace Storage { namespace Blobs { { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader("Content-Length", "0"); + request.SetHeader("Content-Length", "0"); request.GetUrl().AppendQueryParameter("comp", "seal"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -9470,37 +9470,37 @@ namespace Azure { namespace Storage { namespace Blobs { } if (options.LeaseId.HasValue()) { - request.AddHeader("x-ms-lease-id", options.LeaseId.GetValue()); + request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue()); } if (options.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Modified-Since", options.IfModifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( "If-Unmodified-Since", options.IfUnmodifiedSince.GetValue().ToString( Azure::Core::DateTime::DateFormat::Rfc1123)); } if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty()) { - request.AddHeader("If-Match", options.IfMatch.ToString()); + request.SetHeader("If-Match", options.IfMatch.ToString()); } if (options.IfNoneMatch.HasValue() && !options.IfNoneMatch.ToString().empty()) { - request.AddHeader("If-None-Match", options.IfNoneMatch.ToString()); + request.SetHeader("If-None-Match", options.IfNoneMatch.ToString()); } if (options.IfTags.HasValue()) { - request.AddHeader("x-ms-if-tags", options.IfTags.GetValue()); + request.SetHeader("x-ms-if-tags", options.IfTags.GetValue()); } if (options.AppendPosition.HasValue()) { - request.AddHeader( + request.SetHeader( "x-ms-blob-condition-appendpos", std::to_string(options.AppendPosition.GetValue())); } auto pHttpResponse = pipeline.Send(context, request); @@ -9543,15 +9543,15 @@ namespace Azure { namespace Storage { namespace Blobs { (void)options; auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Post, url, requestBody); - request.AddHeader("Content-Length", std::to_string(requestBody->Length())); + request.SetHeader("Content-Length", std::to_string(requestBody->Length())); request.GetUrl().AppendQueryParameter("comp", "batch"); - request.AddHeader("x-ms-version", "2020-02-10"); + request.SetHeader("x-ms-version", "2020-02-10"); if (options.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( "timeout", std::to_string(options.Timeout.GetValue())); } - request.AddHeader("Content-Type", options.ContentType); + request.SetHeader("Content-Type", options.ContentType); auto pHttpResponse = pipeline.Send(context, request); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; Models::Details::SubmitBlobBatchResult response; 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 9c66cf58e..a5cc016ff 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 @@ -83,12 +83,12 @@ namespace Azure { namespace Storage { namespace Test { auto response = std::make_unique(Core::Http::RawResponse( 1, 1, Core::Http::HttpStatusCode::NotFound, "The specified blob does not exist.")); response->SetBody(std::vector(errorResponseBody.begin(), errorResponseBody.end())); - response->AddHeader("content-length", std::to_string(errorResponseBody.length())); - response->AddHeader("content-type", "application/xml"); - response->AddHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); - response->AddHeader("x-ms-version", Blobs::Details::ApiVersion); - response->AddHeader("x-ms-error-code", "BlobNotFound"); - response->AddHeader( + response->SetHeader("content-length", std::to_string(errorResponseBody.length())); + response->SetHeader("content-type", "application/xml"); + response->SetHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); + response->SetHeader("x-ms-version", Blobs::Details::ApiVersion); + response->SetHeader("x-ms-error-code", "BlobNotFound"); + response->SetHeader( "date", Azure::Core::DateTime(std::chrono::system_clock::now()) .ToString(Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -108,12 +108,12 @@ namespace Azure { namespace Storage { namespace Test { Core::Http::HttpStatusCode::PreconditionFailed, "The condition specified using HTTP conditional header(s) is not met.")); response->SetBody(std::vector(errorResponseBody.begin(), errorResponseBody.end())); - response->AddHeader("content-length", std::to_string(errorResponseBody.length())); - response->AddHeader("content-type", "application/xml"); - response->AddHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); - response->AddHeader("x-ms-version", Blobs::Details::ApiVersion); - response->AddHeader("x-ms-error-code", "ConditionNotMet"); - response->AddHeader( + response->SetHeader("content-length", std::to_string(errorResponseBody.length())); + response->SetHeader("content-type", "application/xml"); + response->SetHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); + response->SetHeader("x-ms-version", Blobs::Details::ApiVersion); + response->SetHeader("x-ms-error-code", "ConditionNotMet"); + response->SetHeader( "date", Azure::Core::DateTime(std::chrono::system_clock::now()) .ToString(Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -133,17 +133,17 @@ namespace Azure { namespace Storage { namespace Test { reinterpret_cast(m_primaryContent->data() + requestOffset), bodyLength); response->SetBodyStream(std::move(bodyStream)); - response->AddHeader("content-length", std::to_string(bodyLength)); - response->AddHeader("etag", m_primaryETag.ToString()); - response->AddHeader("last-modified", "Thu, 23 Aug 2001 07:00:00 GMT"); - response->AddHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); - response->AddHeader("x-ms-version", Blobs::Details::ApiVersion); - response->AddHeader("x-ms-creation-time", "Thu, 22 Aug 2002 07:00:00 GMT"); - response->AddHeader("x-ms-lease-status", "unlocked"); - response->AddHeader("x-ms-lease-state", "available"); - response->AddHeader("x-ms-blob-type", "BlockBlob"); - response->AddHeader("x-ms-server-encrypted", "true"); - response->AddHeader( + response->SetHeader("content-length", std::to_string(bodyLength)); + response->SetHeader("etag", m_primaryETag.ToString()); + response->SetHeader("last-modified", "Thu, 23 Aug 2001 07:00:00 GMT"); + response->SetHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); + response->SetHeader("x-ms-version", Blobs::Details::ApiVersion); + response->SetHeader("x-ms-creation-time", "Thu, 22 Aug 2002 07:00:00 GMT"); + response->SetHeader("x-ms-lease-status", "unlocked"); + response->SetHeader("x-ms-lease-state", "available"); + response->SetHeader("x-ms-blob-type", "BlockBlob"); + response->SetHeader("x-ms-server-encrypted", "true"); + response->SetHeader( "date", Azure::Core::DateTime(std::chrono::system_clock::now()) .ToString(Azure::Core::DateTime::DateFormat::Rfc1123)); @@ -163,17 +163,17 @@ namespace Azure { namespace Storage { namespace Test { reinterpret_cast(m_secondaryContent->data() + requestOffset), bodyLength); response->SetBodyStream(std::move(bodyStream)); - response->AddHeader("content-length", std::to_string(bodyLength)); - response->AddHeader("etag", m_secondaryETag.ToString()); - response->AddHeader("last-modified", "Thu, 23 Aug 2001 07:00:00 GMT"); - response->AddHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); - response->AddHeader("x-ms-version", Blobs::Details::ApiVersion); - response->AddHeader("x-ms-creation-time", "Thu, 22 Aug 2002 07:00:00 GMT"); - response->AddHeader("x-ms-lease-status", "unlocked"); - response->AddHeader("x-ms-lease-state", "available"); - response->AddHeader("x-ms-blob-type", "BlockBlob"); - response->AddHeader("x-ms-server-encrypted", "true"); - response->AddHeader( + response->SetHeader("content-length", std::to_string(bodyLength)); + response->SetHeader("etag", m_secondaryETag.ToString()); + response->SetHeader("last-modified", "Thu, 23 Aug 2001 07:00:00 GMT"); + response->SetHeader("x-ms-request-id", Core::Uuid::CreateUuid().ToString()); + response->SetHeader("x-ms-version", Blobs::Details::ApiVersion); + response->SetHeader("x-ms-creation-time", "Thu, 22 Aug 2002 07:00:00 GMT"); + response->SetHeader("x-ms-lease-status", "unlocked"); + response->SetHeader("x-ms-lease-state", "available"); + response->SetHeader("x-ms-blob-type", "BlockBlob"); + response->SetHeader("x-ms-server-encrypted", "true"); + response->SetHeader( "date", Azure::Core::DateTime(std::chrono::system_clock::now()) .ToString(Azure::Core::DateTime::DateFormat::Rfc1123)); diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp index 978e3a909..0818cc270 100644 --- a/sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp +++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/shared_key_policy.hpp @@ -31,7 +31,7 @@ namespace Azure { namespace Storage { namespace Details { Core::Http::Request& request, Core::Http::NextHttpPolicy nextHttpPolicy) const override { - request.AddHeader( + request.SetHeader( "Authorization", "SharedKey " + m_credential->AccountName + ":" + GetSignature(request)); return nextHttpPolicy.Send(ctx, request); } diff --git a/sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp b/sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp index dc5fe21f6..e9145126a 100644 --- a/sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp +++ b/sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp @@ -22,7 +22,7 @@ namespace Azure { namespace Storage { namespace Details { if (headers.find(HttpHeaderDate) == headers.end()) { // add x-ms-date header in RFC1123 format - request.AddHeader( + request.SetHeader( HttpHeaderXMsDate, Core::DateTime(std::chrono::system_clock::now()) .ToString(Azure::Core::DateTime::DateFormat::Rfc1123)); 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 74d7e2410..aa5503fe8 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 @@ -426,7 +426,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Storage::Details::UrlEncodeQueryParameter( std::to_string(listPathsOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, listPathsOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, listPathsOptions.ApiVersionParameter); if (listPathsOptions.ContinuationToken.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -568,7 +568,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { const CreateOptions& createOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); if (createOptions.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -576,7 +576,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Storage::Details::UrlEncodeQueryParameter( std::to_string(createOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); if (createOptions.Resource.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -600,92 +600,92 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (createOptions.CacheControl.HasValue()) { - request.AddHeader(Details::HeaderCacheControl, createOptions.CacheControl.GetValue()); + request.SetHeader(Details::HeaderCacheControl, createOptions.CacheControl.GetValue()); } if (createOptions.ContentEncoding.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentEncoding, createOptions.ContentEncoding.GetValue()); } if (createOptions.ContentLanguage.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentLanguage, createOptions.ContentLanguage.GetValue()); } if (createOptions.ContentDisposition.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentDisposition, createOptions.ContentDisposition.GetValue()); } if (createOptions.ContentType.HasValue()) { - request.AddHeader(Details::HeaderContentType, createOptions.ContentType.GetValue()); + request.SetHeader(Details::HeaderContentType, createOptions.ContentType.GetValue()); } if (createOptions.RenameSource.HasValue()) { - request.AddHeader(Details::HeaderRenameSource, createOptions.RenameSource.GetValue()); + request.SetHeader(Details::HeaderRenameSource, createOptions.RenameSource.GetValue()); } if (createOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, createOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, createOptions.LeaseIdOptional.GetValue()); } if (createOptions.SourceLeaseId.HasValue()) { - request.AddHeader(Details::HeaderSourceLeaseId, createOptions.SourceLeaseId.GetValue()); + request.SetHeader(Details::HeaderSourceLeaseId, createOptions.SourceLeaseId.GetValue()); } if (createOptions.Properties.HasValue()) { - request.AddHeader(Details::HeaderProperties, createOptions.Properties.GetValue()); + request.SetHeader(Details::HeaderProperties, createOptions.Properties.GetValue()); } if (createOptions.Permissions.HasValue()) { - request.AddHeader(Details::HeaderPermissions, createOptions.Permissions.GetValue()); + request.SetHeader(Details::HeaderPermissions, createOptions.Permissions.GetValue()); } if (createOptions.Umask.HasValue()) { - request.AddHeader(Details::HeaderUmask, createOptions.Umask.GetValue()); + request.SetHeader(Details::HeaderUmask, createOptions.Umask.GetValue()); } if (createOptions.IfMatch.HasValue()) { - request.AddHeader(Details::HeaderIfMatch, createOptions.IfMatch.ToString()); + request.SetHeader(Details::HeaderIfMatch, createOptions.IfMatch.ToString()); } if (createOptions.IfNoneMatch.HasValue()) { - request.AddHeader(Details::HeaderIfNoneMatch, createOptions.IfNoneMatch.ToString()); + request.SetHeader(Details::HeaderIfNoneMatch, createOptions.IfNoneMatch.ToString()); } if (createOptions.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfModifiedSince, createOptions.IfModifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } if (createOptions.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfUnmodifiedSince, createOptions.IfUnmodifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } if (createOptions.SourceIfMatch.HasValue()) { - request.AddHeader(Details::HeaderSourceIfMatch, createOptions.SourceIfMatch.ToString()); + request.SetHeader(Details::HeaderSourceIfMatch, createOptions.SourceIfMatch.ToString()); } if (createOptions.SourceIfNoneMatch.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSourceIfNoneMatch, createOptions.SourceIfNoneMatch.ToString()); } if (createOptions.SourceIfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSourceIfModifiedSince, createOptions.SourceIfModifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } if (createOptions.SourceIfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSourceIfUnmodifiedSince, createOptions.SourceIfUnmodifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); @@ -720,7 +720,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Storage::Details::UrlEncodeQueryParameter( std::to_string(getPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); if (getPropertiesOptions.Action.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -737,28 +737,28 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (getPropertiesOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, getPropertiesOptions.LeaseIdOptional.GetValue()); } if (getPropertiesOptions.IfMatch.HasValue()) { - request.AddHeader(Details::HeaderIfMatch, getPropertiesOptions.IfMatch.ToString()); + request.SetHeader(Details::HeaderIfMatch, getPropertiesOptions.IfMatch.ToString()); } if (getPropertiesOptions.IfNoneMatch.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfNoneMatch, getPropertiesOptions.IfNoneMatch.ToString()); } if (getPropertiesOptions.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfModifiedSince, getPropertiesOptions.IfModifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } if (getPropertiesOptions.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfUnmodifiedSince, getPropertiesOptions.IfUnmodifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); @@ -793,7 +793,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Storage::Details::UrlEncodeQueryParameter( std::to_string(deleteOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); if (deleteOptions.RecursiveOptional.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -810,26 +810,26 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (deleteOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, deleteOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, deleteOptions.LeaseIdOptional.GetValue()); } if (deleteOptions.IfMatch.HasValue()) { - request.AddHeader(Details::HeaderIfMatch, deleteOptions.IfMatch.ToString()); + request.SetHeader(Details::HeaderIfMatch, deleteOptions.IfMatch.ToString()); } if (deleteOptions.IfNoneMatch.HasValue()) { - request.AddHeader(Details::HeaderIfNoneMatch, deleteOptions.IfNoneMatch.ToString()); + request.SetHeader(Details::HeaderIfNoneMatch, deleteOptions.IfNoneMatch.ToString()); } if (deleteOptions.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfModifiedSince, deleteOptions.IfModifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } if (deleteOptions.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfUnmodifiedSince, deleteOptions.IfUnmodifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); @@ -869,50 +869,50 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (setAccessControlOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, setAccessControlOptions.LeaseIdOptional.GetValue()); } if (setAccessControlOptions.Owner.HasValue()) { - request.AddHeader(Details::HeaderOwner, setAccessControlOptions.Owner.GetValue()); + request.SetHeader(Details::HeaderOwner, setAccessControlOptions.Owner.GetValue()); } if (setAccessControlOptions.Group.HasValue()) { - request.AddHeader(Details::HeaderGroup, setAccessControlOptions.Group.GetValue()); + request.SetHeader(Details::HeaderGroup, setAccessControlOptions.Group.GetValue()); } if (setAccessControlOptions.Permissions.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderPermissions, setAccessControlOptions.Permissions.GetValue()); } if (setAccessControlOptions.Acl.HasValue()) { - request.AddHeader(Details::HeaderAcl, setAccessControlOptions.Acl.GetValue()); + request.SetHeader(Details::HeaderAcl, setAccessControlOptions.Acl.GetValue()); } if (setAccessControlOptions.IfMatch.HasValue()) { - request.AddHeader(Details::HeaderIfMatch, setAccessControlOptions.IfMatch.ToString()); + request.SetHeader(Details::HeaderIfMatch, setAccessControlOptions.IfMatch.ToString()); } if (setAccessControlOptions.IfNoneMatch.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfNoneMatch, setAccessControlOptions.IfNoneMatch.ToString()); } if (setAccessControlOptions.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfModifiedSince, setAccessControlOptions.IfModifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } if (setAccessControlOptions.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfUnmodifiedSince, setAccessControlOptions.IfUnmodifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } - request.AddHeader(Details::HeaderVersion, setAccessControlOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setAccessControlOptions.ApiVersionParameter); return SetAccessControlParseResult(context, pipeline.Send(context, request)); } @@ -969,9 +969,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (setAccessControlRecursiveOptions.Acl.HasValue()) { - request.AddHeader(Details::HeaderAcl, setAccessControlRecursiveOptions.Acl.GetValue()); + request.SetHeader(Details::HeaderAcl, setAccessControlRecursiveOptions.Acl.GetValue()); } - request.AddHeader( + request.SetHeader( Details::HeaderVersion, setAccessControlRecursiveOptions.ApiVersionParameter); return SetAccessControlRecursiveParseResult(context, pipeline.Send(context, request)); } @@ -1035,67 +1035,67 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (flushDataOptions.ContentLength.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentLength, std::to_string(flushDataOptions.ContentLength.GetValue())); } if (flushDataOptions.ContentMd5.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentHashMd5, Storage::Details::ToBase64String(flushDataOptions.ContentMd5.GetValue())); } if (flushDataOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, flushDataOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, flushDataOptions.LeaseIdOptional.GetValue()); } if (flushDataOptions.CacheControl.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderCacheControl, flushDataOptions.CacheControl.GetValue()); } if (flushDataOptions.ContentType.HasValue()) { - request.AddHeader(Details::HeaderContentType, flushDataOptions.ContentType.GetValue()); + request.SetHeader(Details::HeaderContentType, flushDataOptions.ContentType.GetValue()); } if (flushDataOptions.ContentDisposition.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentDisposition, flushDataOptions.ContentDisposition.GetValue()); } if (flushDataOptions.ContentEncoding.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentEncoding, flushDataOptions.ContentEncoding.GetValue()); } if (flushDataOptions.ContentLanguage.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentLanguage, flushDataOptions.ContentLanguage.GetValue()); } if (flushDataOptions.IfMatch.HasValue()) { - request.AddHeader(Details::HeaderIfMatch, flushDataOptions.IfMatch.ToString()); + request.SetHeader(Details::HeaderIfMatch, flushDataOptions.IfMatch.ToString()); } if (flushDataOptions.IfNoneMatch.HasValue()) { - request.AddHeader(Details::HeaderIfNoneMatch, flushDataOptions.IfNoneMatch.ToString()); + request.SetHeader(Details::HeaderIfNoneMatch, flushDataOptions.IfNoneMatch.ToString()); } if (flushDataOptions.IfModifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfModifiedSince, flushDataOptions.IfModifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } if (flushDataOptions.IfUnmodifiedSince.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIfUnmodifiedSince, flushDataOptions.IfUnmodifiedSince.GetValue().ToString( Core::DateTime::DateFormat::Rfc1123)); } - request.AddHeader(Details::HeaderVersion, flushDataOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, flushDataOptions.ApiVersionParameter); return FlushDataParseResult(context, pipeline.Send(context, request)); } @@ -1136,29 +1136,29 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } if (appendDataOptions.ContentLength.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentLength, std::to_string(appendDataOptions.ContentLength.GetValue())); } if (appendDataOptions.TransactionalContentMd5.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderTransactionalContentHashMd5, Storage::Details::ToBase64String( appendDataOptions.TransactionalContentMd5.GetValue())); } if (appendDataOptions.TransactionalContentCrc64.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderTransactionalContentHashCrc64, Storage::Details::ToBase64String( appendDataOptions.TransactionalContentCrc64.GetValue())); } if (appendDataOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, appendDataOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, appendDataOptions.LeaseIdOptional.GetValue()); } - request.AddHeader(Details::HeaderVersion, appendDataOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, appendDataOptions.ApiVersionParameter); return AppendDataParseResult(context, pipeline.Send(context, request)); } 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 aec098482..9c04c2650 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 @@ -1130,7 +1130,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { auto body = Azure::IO::MemoryBodyStream( reinterpret_cast(xml_body.data()), xml_body.length()); auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url, &body); - request.AddHeader("Content-Length", std::to_string(body.Length())); + request.SetHeader("Content-Length", std::to_string(body.Length())); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "service"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "properties"); if (setPropertiesOptions.Timeout.HasValue()) @@ -1140,7 +1140,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(setPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, setPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setPropertiesOptions.ApiVersionParameter); return SetPropertiesParseResult(context, pipeline.Send(context, request)); } @@ -1166,7 +1166,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); return GetPropertiesParseResult(context, pipeline.Send(context, request)); } @@ -1223,7 +1223,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(listSharesSinglePageOptions.Timeout.GetValue()))); } - request.AddHeader( + request.SetHeader( Details::HeaderVersion, listSharesSinglePageOptions.ApiVersionParameter); return ListSharesSinglePageParseResult(context, pipeline.Send(context, request)); } @@ -2549,7 +2549,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const CreateOptions& createOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); if (createOptions.Timeout.HasValue()) { @@ -2560,19 +2560,19 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } for (const auto& pair : createOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } if (createOptions.ShareQuota.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderQuota, std::to_string(createOptions.ShareQuota.GetValue())); } if (createOptions.XMsAccessTier.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderAccessTier, (createOptions.XMsAccessTier.GetValue().ToString())); } - request.AddHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); return CreateParseResult(context, pipeline.Send(context, request)); } @@ -2606,10 +2606,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); if (getPropertiesOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, getPropertiesOptions.LeaseIdOptional.GetValue()); } return GetPropertiesParseResult(context, pipeline.Send(context, request)); @@ -2645,16 +2645,16 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(deleteOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); if (deleteOptions.XMsDeleteSnapshots.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderDeleteSnapshots, (deleteOptions.XMsDeleteSnapshots.GetValue().ToString())); } if (deleteOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, deleteOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, deleteOptions.LeaseIdOptional.GetValue()); } return DeleteParseResult(context, pipeline.Send(context, request)); } @@ -2675,9 +2675,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const AcquireLeaseOptions& acquireLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "acquire"); + request.SetHeader(Details::HeaderAction, "acquire"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); if (acquireLeaseOptions.Timeout.HasValue()) { @@ -2686,15 +2686,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(acquireLeaseOptions.Timeout.GetValue()))); } - request.AddHeader( + request.SetHeader( Details::HeaderDuration, std::to_string(acquireLeaseOptions.LeaseDuration)); if (acquireLeaseOptions.ProposedLeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderProposedLeaseId, acquireLeaseOptions.ProposedLeaseIdOptional.GetValue()); } - request.AddHeader(Details::HeaderVersion, acquireLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, acquireLeaseOptions.ApiVersionParameter); if (acquireLeaseOptions.ShareSnapshot.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -2720,9 +2720,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const ReleaseLeaseOptions& releaseLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "release"); + request.SetHeader(Details::HeaderAction, "release"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); if (releaseLeaseOptions.Timeout.HasValue()) { @@ -2731,8 +2731,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(releaseLeaseOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderLeaseId, releaseLeaseOptions.LeaseIdRequired); - request.AddHeader(Details::HeaderVersion, releaseLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderLeaseId, releaseLeaseOptions.LeaseIdRequired); + request.SetHeader(Details::HeaderVersion, releaseLeaseOptions.ApiVersionParameter); if (releaseLeaseOptions.ShareSnapshot.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -2759,9 +2759,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const ChangeLeaseOptions& changeLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "change"); + request.SetHeader(Details::HeaderAction, "change"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); if (changeLeaseOptions.Timeout.HasValue()) { @@ -2770,14 +2770,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(changeLeaseOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderLeaseId, changeLeaseOptions.LeaseIdRequired); + request.SetHeader(Details::HeaderLeaseId, changeLeaseOptions.LeaseIdRequired); if (changeLeaseOptions.ProposedLeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderProposedLeaseId, changeLeaseOptions.ProposedLeaseIdOptional.GetValue()); } - request.AddHeader(Details::HeaderVersion, changeLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, changeLeaseOptions.ApiVersionParameter); if (changeLeaseOptions.ShareSnapshot.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -2803,9 +2803,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const RenewLeaseOptions& renewLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "renew"); + request.SetHeader(Details::HeaderAction, "renew"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); if (renewLeaseOptions.Timeout.HasValue()) { @@ -2814,8 +2814,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(renewLeaseOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderLeaseId, renewLeaseOptions.LeaseIdRequired); - request.AddHeader(Details::HeaderVersion, renewLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderLeaseId, renewLeaseOptions.LeaseIdRequired); + request.SetHeader(Details::HeaderVersion, renewLeaseOptions.ApiVersionParameter); if (renewLeaseOptions.ShareSnapshot.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -2842,9 +2842,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const BreakLeaseOptions& breakLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "break"); + request.SetHeader(Details::HeaderAction, "break"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); if (breakLeaseOptions.Timeout.HasValue()) { @@ -2855,15 +2855,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } if (breakLeaseOptions.LeaseBreakPeriod.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderBreakPeriod, std::to_string(breakLeaseOptions.LeaseBreakPeriod.GetValue())); } if (breakLeaseOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, breakLeaseOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, breakLeaseOptions.LeaseIdOptional.GetValue()); } - request.AddHeader(Details::HeaderVersion, breakLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, breakLeaseOptions.ApiVersionParameter); if (breakLeaseOptions.ShareSnapshot.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -2888,7 +2888,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const CreateSnapshotOptions& createSnapshotOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "snapshot"); if (createSnapshotOptions.Timeout.HasValue()) @@ -2900,9 +2900,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } for (const auto& pair : createSnapshotOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } - request.AddHeader(Details::HeaderVersion, createSnapshotOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, createSnapshotOptions.ApiVersionParameter); return CreateSnapshotParseResult(context, pipeline.Send(context, request)); } @@ -2929,7 +2929,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { auto body = Azure::IO::MemoryBodyStream( reinterpret_cast(json_body.data()), json_body.length()); auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url, &body); - request.AddHeader("Content-Length", std::to_string(body.Length())); + request.SetHeader("Content-Length", std::to_string(body.Length())); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "filepermission"); if (createPermissionOptions.Timeout.HasValue()) @@ -2939,7 +2939,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(createPermissionOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, createPermissionOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, createPermissionOptions.ApiVersionParameter); return CreatePermissionParseResult(context, pipeline.Send(context, request)); } @@ -2959,7 +2959,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Get, url); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "filepermission"); - request.AddHeader( + request.SetHeader( Details::HeaderFilePermissionKey, getPermissionOptions.FilePermissionKeyRequired); if (getPermissionOptions.Timeout.HasValue()) { @@ -2968,7 +2968,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getPermissionOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getPermissionOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getPermissionOptions.ApiVersionParameter); return GetPermissionParseResult(context, pipeline.Send(context, request)); } @@ -2988,7 +2988,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const SetPropertiesOptions& setPropertiesOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "properties"); if (setPropertiesOptions.Timeout.HasValue()) @@ -2998,21 +2998,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(setPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, setPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setPropertiesOptions.ApiVersionParameter); if (setPropertiesOptions.ShareQuota.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderQuota, std::to_string(setPropertiesOptions.ShareQuota.GetValue())); } if (setPropertiesOptions.XMsAccessTier.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderAccessTier, (setPropertiesOptions.XMsAccessTier.GetValue().ToString())); } if (setPropertiesOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, setPropertiesOptions.LeaseIdOptional.GetValue()); } return SetPropertiesParseResult(context, pipeline.Send(context, request)); @@ -3033,7 +3033,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const SetMetadataOptions& setMetadataOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "metadata"); if (setMetadataOptions.Timeout.HasValue()) @@ -3045,12 +3045,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } for (const auto& pair : setMetadataOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } - request.AddHeader(Details::HeaderVersion, setMetadataOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setMetadataOptions.ApiVersionParameter); if (setMetadataOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, setMetadataOptions.LeaseIdOptional.GetValue()); } return SetMetadataParseResult(context, pipeline.Send(context, request)); @@ -3079,10 +3079,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getAccessPolicyOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getAccessPolicyOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getAccessPolicyOptions.ApiVersionParameter); if (getAccessPolicyOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, getAccessPolicyOptions.LeaseIdOptional.GetValue()); } return GetAccessPolicyParseResult(context, pipeline.Send(context, request)); @@ -3113,7 +3113,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { auto body = Azure::IO::MemoryBodyStream( reinterpret_cast(xml_body.data()), xml_body.length()); auto request = Azure::Core::Http::Request(Azure::Core::Http::HttpMethod::Put, url, &body); - request.AddHeader("Content-Length", std::to_string(body.Length())); + request.SetHeader("Content-Length", std::to_string(body.Length())); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "acl"); if (setAccessPolicyOptions.Timeout.HasValue()) @@ -3123,10 +3123,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(setAccessPolicyOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, setAccessPolicyOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setAccessPolicyOptions.ApiVersionParameter); if (setAccessPolicyOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, setAccessPolicyOptions.LeaseIdOptional.GetValue()); } return SetAccessPolicyParseResult(context, pipeline.Send(context, request)); @@ -3155,10 +3155,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getStatisticsOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getStatisticsOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getStatisticsOptions.ApiVersionParameter); if (getStatisticsOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, getStatisticsOptions.LeaseIdOptional.GetValue()); } return GetStatisticsParseResult(context, pipeline.Send(context, request)); @@ -3179,7 +3179,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const RestoreOptions& restoreOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "share"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "undelete"); if (restoreOptions.Timeout.HasValue()) @@ -3189,15 +3189,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(restoreOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, restoreOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, restoreOptions.ApiVersionParameter); if (restoreOptions.DeletedShareName.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderDeletedShareName, restoreOptions.DeletedShareName.GetValue()); } if (restoreOptions.DeletedShareVersion.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderDeletedShareVersion, restoreOptions.DeletedShareVersion.GetValue()); } return RestoreParseResult(context, pipeline.Send(context, request)); @@ -4053,7 +4053,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const CreateOptions& createOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "directory"); if (createOptions.Timeout.HasValue()) { @@ -4064,22 +4064,22 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } for (const auto& pair : createOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } - request.AddHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); if (createOptions.FilePermission.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermission, createOptions.FilePermission.GetValue()); } if (createOptions.FilePermissionKey.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermissionKey, createOptions.FilePermissionKey.GetValue()); } - request.AddHeader(Details::HeaderFileAttributes, createOptions.FileAttributes); - request.AddHeader(Details::HeaderFileCreatedOn, createOptions.FileCreationTime); - request.AddHeader(Details::HeaderFileLastWrittenOn, createOptions.FileLastWriteTime); + request.SetHeader(Details::HeaderFileAttributes, createOptions.FileAttributes); + request.SetHeader(Details::HeaderFileCreatedOn, createOptions.FileCreationTime); + request.SetHeader(Details::HeaderFileLastWrittenOn, createOptions.FileLastWriteTime); return CreateParseResult(context, pipeline.Send(context, request)); } @@ -4112,7 +4112,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); return GetPropertiesParseResult(context, pipeline.Send(context, request)); } @@ -4137,7 +4137,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(deleteOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); return DeleteParseResult(context, pipeline.Send(context, request)); } @@ -4159,7 +4159,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const SetPropertiesOptions& setPropertiesOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "directory"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "properties"); if (setPropertiesOptions.Timeout.HasValue()) @@ -4169,21 +4169,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(setPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, setPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setPropertiesOptions.ApiVersionParameter); if (setPropertiesOptions.FilePermission.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermission, setPropertiesOptions.FilePermission.GetValue()); } if (setPropertiesOptions.FilePermissionKey.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermissionKey, setPropertiesOptions.FilePermissionKey.GetValue()); } - request.AddHeader(Details::HeaderFileAttributes, setPropertiesOptions.FileAttributes); - request.AddHeader(Details::HeaderFileCreatedOn, setPropertiesOptions.FileCreationTime); - request.AddHeader( + request.SetHeader(Details::HeaderFileAttributes, setPropertiesOptions.FileAttributes); + request.SetHeader(Details::HeaderFileCreatedOn, setPropertiesOptions.FileCreationTime); + request.SetHeader( Details::HeaderFileLastWrittenOn, setPropertiesOptions.FileLastWriteTime); return SetPropertiesParseResult(context, pipeline.Send(context, request)); } @@ -4202,7 +4202,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const SetMetadataOptions& setMetadataOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryRestype, "directory"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "metadata"); if (setMetadataOptions.Timeout.HasValue()) @@ -4214,9 +4214,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } for (const auto& pair : setMetadataOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } - request.AddHeader(Details::HeaderVersion, setMetadataOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setMetadataOptions.ApiVersionParameter); return SetMetadataParseResult(context, pipeline.Send(context, request)); } @@ -4276,7 +4276,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(listFilesAndDirectoriesSinglePageOptions.Timeout.GetValue()))); } - request.AddHeader( + request.SetHeader( Details::HeaderVersion, listFilesAndDirectoriesSinglePageOptions.ApiVersionParameter); return ListFilesAndDirectoriesSinglePageParseResult( context, pipeline.Send(context, request)); @@ -4330,11 +4330,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } if (listHandlesOptions.Recursive.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderRecursive, (listHandlesOptions.Recursive.GetValue() ? "true" : "false")); } - request.AddHeader(Details::HeaderVersion, listHandlesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, listHandlesOptions.ApiVersionParameter); return ListHandlesParseResult(context, pipeline.Send(context, request)); } @@ -4355,7 +4355,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const ForceCloseHandlesOptions& forceCloseHandlesOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "forceclosehandles"); if (forceCloseHandlesOptions.Timeout.HasValue()) { @@ -4378,14 +4378,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( forceCloseHandlesOptions.ShareSnapshot.GetValue())); } - request.AddHeader(Details::HeaderHandleId, forceCloseHandlesOptions.HandleId); + request.SetHeader(Details::HeaderHandleId, forceCloseHandlesOptions.HandleId); if (forceCloseHandlesOptions.Recursive.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderRecursive, (forceCloseHandlesOptions.Recursive.GetValue() ? "true" : "false")); } - request.AddHeader(Details::HeaderVersion, forceCloseHandlesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, forceCloseHandlesOptions.ApiVersionParameter); return ForceCloseHandlesParseResult(context, pipeline.Send(context, request)); } @@ -5240,7 +5240,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const CreateOptions& createOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); if (createOptions.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5248,62 +5248,62 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(createOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); - request.AddHeader( + request.SetHeader(Details::HeaderVersion, createOptions.ApiVersionParameter); + request.SetHeader( Details::HeaderXMsContentLength, std::to_string(createOptions.XMsContentLength)); - request.AddHeader(Details::HeaderFileTypeConstant, "file"); + request.SetHeader(Details::HeaderFileTypeConstant, "file"); if (createOptions.FileContentType.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentType, createOptions.FileContentType.GetValue()); } if (createOptions.FileContentEncoding.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentEncoding, createOptions.FileContentEncoding.GetValue()); } if (createOptions.FileContentLanguage.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentLanguage, createOptions.FileContentLanguage.GetValue()); } if (createOptions.FileCacheControl.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileCacheControl, createOptions.FileCacheControl.GetValue()); } if (createOptions.ContentMd5.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentHashMd5, Storage::Details::ToBase64String(createOptions.ContentMd5.GetValue())); } if (createOptions.FileContentDisposition.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentDisposition, createOptions.FileContentDisposition.GetValue()); } for (const auto& pair : createOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } if (createOptions.FilePermission.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermission, createOptions.FilePermission.GetValue()); } if (createOptions.FilePermissionKey.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermissionKey, createOptions.FilePermissionKey.GetValue()); } - request.AddHeader(Details::HeaderFileAttributes, createOptions.FileAttributes); - request.AddHeader(Details::HeaderFileCreatedOn, createOptions.FileCreationTime); - request.AddHeader(Details::HeaderFileLastWrittenOn, createOptions.FileLastWriteTime); + request.SetHeader(Details::HeaderFileAttributes, createOptions.FileAttributes); + request.SetHeader(Details::HeaderFileCreatedOn, createOptions.FileCreationTime); + request.SetHeader(Details::HeaderFileLastWrittenOn, createOptions.FileLastWriteTime); if (createOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, createOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, createOptions.LeaseIdOptional.GetValue()); } return CreateParseResult(context, pipeline.Send(context, request)); } @@ -5331,20 +5331,20 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(downloadOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, downloadOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, downloadOptions.ApiVersionParameter); if (downloadOptions.Range.HasValue()) { - request.AddHeader(Details::HeaderRange, downloadOptions.Range.GetValue()); + request.SetHeader(Details::HeaderRange, downloadOptions.Range.GetValue()); } if (downloadOptions.GetRangeContentMd5.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderRangeGetContentMd5, (downloadOptions.GetRangeContentMd5.GetValue() ? "true" : "false")); } if (downloadOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, downloadOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, downloadOptions.LeaseIdOptional.GetValue()); } return DownloadParseResult(context, pipeline.Send(context, request)); } @@ -5378,10 +5378,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getPropertiesOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getPropertiesOptions.ApiVersionParameter); if (getPropertiesOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, getPropertiesOptions.LeaseIdOptional.GetValue()); } return GetPropertiesParseResult(context, pipeline.Send(context, request)); @@ -5408,10 +5408,10 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(deleteOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, deleteOptions.ApiVersionParameter); if (deleteOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, deleteOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, deleteOptions.LeaseIdOptional.GetValue()); } return DeleteParseResult(context, pipeline.Send(context, request)); } @@ -5442,7 +5442,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const SetHttpHeadersOptions& setHttpHeadersOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "properties"); if (setHttpHeadersOptions.Timeout.HasValue()) { @@ -5451,65 +5451,65 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(setHttpHeadersOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, setHttpHeadersOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setHttpHeadersOptions.ApiVersionParameter); if (setHttpHeadersOptions.XMsContentLength.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderXMsContentLength, std::to_string(setHttpHeadersOptions.XMsContentLength.GetValue())); } if (setHttpHeadersOptions.FileContentType.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentType, setHttpHeadersOptions.FileContentType.GetValue()); } if (setHttpHeadersOptions.FileContentEncoding.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentEncoding, setHttpHeadersOptions.FileContentEncoding.GetValue()); } if (setHttpHeadersOptions.FileContentLanguage.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentLanguage, setHttpHeadersOptions.FileContentLanguage.GetValue()); } if (setHttpHeadersOptions.FileCacheControl.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileCacheControl, setHttpHeadersOptions.FileCacheControl.GetValue()); } if (setHttpHeadersOptions.ContentMd5.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentHashMd5, Storage::Details::ToBase64String(setHttpHeadersOptions.ContentMd5.GetValue())); } if (setHttpHeadersOptions.FileContentDisposition.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileContentDisposition, setHttpHeadersOptions.FileContentDisposition.GetValue()); } if (setHttpHeadersOptions.FilePermission.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermission, setHttpHeadersOptions.FilePermission.GetValue()); } if (setHttpHeadersOptions.FilePermissionKey.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermissionKey, setHttpHeadersOptions.FilePermissionKey.GetValue()); } - request.AddHeader(Details::HeaderFileAttributes, setHttpHeadersOptions.FileAttributes); - request.AddHeader(Details::HeaderFileCreatedOn, setHttpHeadersOptions.FileCreationTime); - request.AddHeader( + request.SetHeader(Details::HeaderFileAttributes, setHttpHeadersOptions.FileAttributes); + request.SetHeader(Details::HeaderFileCreatedOn, setHttpHeadersOptions.FileCreationTime); + request.SetHeader( Details::HeaderFileLastWrittenOn, setHttpHeadersOptions.FileLastWriteTime); if (setHttpHeadersOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, setHttpHeadersOptions.LeaseIdOptional.GetValue()); } return SetHttpHeadersParseResult(context, pipeline.Send(context, request)); @@ -5530,7 +5530,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const SetMetadataOptions& setMetadataOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "metadata"); if (setMetadataOptions.Timeout.HasValue()) { @@ -5541,12 +5541,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } for (const auto& pair : setMetadataOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } - request.AddHeader(Details::HeaderVersion, setMetadataOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, setMetadataOptions.ApiVersionParameter); if (setMetadataOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, setMetadataOptions.LeaseIdOptional.GetValue()); } return SetMetadataParseResult(context, pipeline.Send(context, request)); @@ -5567,9 +5567,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const AcquireLeaseOptions& acquireLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "acquire"); + request.SetHeader(Details::HeaderAction, "acquire"); if (acquireLeaseOptions.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5577,15 +5577,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(acquireLeaseOptions.Timeout.GetValue()))); } - request.AddHeader( + request.SetHeader( Details::HeaderDuration, std::to_string(acquireLeaseOptions.LeaseDuration)); if (acquireLeaseOptions.ProposedLeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderProposedLeaseId, acquireLeaseOptions.ProposedLeaseIdOptional.GetValue()); } - request.AddHeader(Details::HeaderVersion, acquireLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, acquireLeaseOptions.ApiVersionParameter); return AcquireLeaseParseResult(context, pipeline.Send(context, request)); } @@ -5603,9 +5603,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const ReleaseLeaseOptions& releaseLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "release"); + request.SetHeader(Details::HeaderAction, "release"); if (releaseLeaseOptions.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5613,8 +5613,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(releaseLeaseOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderLeaseId, releaseLeaseOptions.LeaseIdRequired); - request.AddHeader(Details::HeaderVersion, releaseLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderLeaseId, releaseLeaseOptions.LeaseIdRequired); + request.SetHeader(Details::HeaderVersion, releaseLeaseOptions.ApiVersionParameter); return ReleaseLeaseParseResult(context, pipeline.Send(context, request)); } @@ -5633,9 +5633,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const ChangeLeaseOptions& changeLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "change"); + request.SetHeader(Details::HeaderAction, "change"); if (changeLeaseOptions.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5643,14 +5643,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(changeLeaseOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderLeaseId, changeLeaseOptions.LeaseIdRequired); + request.SetHeader(Details::HeaderLeaseId, changeLeaseOptions.LeaseIdRequired); if (changeLeaseOptions.ProposedLeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderProposedLeaseId, changeLeaseOptions.ProposedLeaseIdOptional.GetValue()); } - request.AddHeader(Details::HeaderVersion, changeLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, changeLeaseOptions.ApiVersionParameter); return ChangeLeaseParseResult(context, pipeline.Send(context, request)); } @@ -5668,9 +5668,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const BreakLeaseOptions& breakLeaseOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "lease"); - request.AddHeader(Details::HeaderAction, "break"); + request.SetHeader(Details::HeaderAction, "break"); if (breakLeaseOptions.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5680,9 +5680,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { } if (breakLeaseOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, breakLeaseOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, breakLeaseOptions.LeaseIdOptional.GetValue()); } - request.AddHeader(Details::HeaderVersion, breakLeaseOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, breakLeaseOptions.ApiVersionParameter); return BreakLeaseParseResult(context, pipeline.Send(context, request)); } @@ -5713,21 +5713,21 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(uploadRangeOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderXMsRange, uploadRangeOptions.XMsRange); - request.AddHeader( + request.SetHeader(Details::HeaderXMsRange, uploadRangeOptions.XMsRange); + request.SetHeader( Details::HeaderFileRangeWrite, (uploadRangeOptions.XMsWrite.ToString())); - request.AddHeader( + request.SetHeader( Details::HeaderContentLength, std::to_string(uploadRangeOptions.ContentLength)); if (uploadRangeOptions.ContentMd5.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderContentHashMd5, Storage::Details::ToBase64String(uploadRangeOptions.ContentMd5.GetValue())); } - request.AddHeader(Details::HeaderVersion, uploadRangeOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, uploadRangeOptions.ApiVersionParameter); if (uploadRangeOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, uploadRangeOptions.LeaseIdOptional.GetValue()); } return UploadRangeParseResult(context, pipeline.Send(context, request)); @@ -5755,7 +5755,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const UploadRangeFromUrlOptions& uploadRangeFromUrlOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "range"); if (uploadRangeFromUrlOptions.Timeout.HasValue()) { @@ -5764,44 +5764,44 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(uploadRangeFromUrlOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderRange, uploadRangeFromUrlOptions.TargetRange); - request.AddHeader(Details::HeaderCopySource, uploadRangeFromUrlOptions.CopySource); + request.SetHeader(Details::HeaderRange, uploadRangeFromUrlOptions.TargetRange); + request.SetHeader(Details::HeaderCopySource, uploadRangeFromUrlOptions.CopySource); if (uploadRangeFromUrlOptions.SourceRange.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSourceRange, uploadRangeFromUrlOptions.SourceRange.GetValue()); } - request.AddHeader( + request.SetHeader( Details::HeaderFileRangeWriteFromUrl, (uploadRangeFromUrlOptions.XMsWrite.ToString())); - request.AddHeader( + request.SetHeader( Details::HeaderContentLength, std::to_string(uploadRangeFromUrlOptions.ContentLength)); if (uploadRangeFromUrlOptions.SourceContentCrc64.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSourceContentHashCrc64, Storage::Details::ToBase64String( uploadRangeFromUrlOptions.SourceContentCrc64.GetValue())); } if (uploadRangeFromUrlOptions.SourceIfMatchCrc64.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSourceIfMatchHashCrc64, Storage::Details::ToBase64String( uploadRangeFromUrlOptions.SourceIfMatchCrc64.GetValue())); } if (uploadRangeFromUrlOptions.SourceIfNoneMatchCrc64.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSourceIfNoneMatchHashCrc64, Storage::Details::ToBase64String( uploadRangeFromUrlOptions.SourceIfNoneMatchCrc64.GetValue())); } - request.AddHeader(Details::HeaderVersion, uploadRangeFromUrlOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, uploadRangeFromUrlOptions.ApiVersionParameter); if (uploadRangeFromUrlOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, uploadRangeFromUrlOptions.LeaseIdOptional.GetValue()); } return UploadRangeFromUrlParseResult(context, pipeline.Send(context, request)); @@ -5846,14 +5846,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(getRangeListOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, getRangeListOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, getRangeListOptions.ApiVersionParameter); if (getRangeListOptions.XMsRange.HasValue()) { - request.AddHeader(Details::HeaderXMsRange, getRangeListOptions.XMsRange.GetValue()); + request.SetHeader(Details::HeaderXMsRange, getRangeListOptions.XMsRange.GetValue()); } if (getRangeListOptions.LeaseIdOptional.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderLeaseId, getRangeListOptions.LeaseIdOptional.GetValue()); } return GetRangeListParseResult(context, pipeline.Send(context, request)); @@ -5883,7 +5883,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const StartCopyOptions& startCopyOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); if (startCopyOptions.Timeout.HasValue()) { request.GetUrl().AppendQueryParameter( @@ -5891,59 +5891,59 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(startCopyOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderVersion, startCopyOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, startCopyOptions.ApiVersionParameter); for (const auto& pair : startCopyOptions.Metadata) { - request.AddHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); + request.SetHeader(Details::HeaderMetadata + ("-" + pair.first), pair.second); } - request.AddHeader(Details::HeaderCopySource, startCopyOptions.CopySource); + request.SetHeader(Details::HeaderCopySource, startCopyOptions.CopySource); if (startCopyOptions.FilePermission.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermission, startCopyOptions.FilePermission.GetValue()); } if (startCopyOptions.FilePermissionKey.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermissionKey, startCopyOptions.FilePermissionKey.GetValue()); } if (startCopyOptions.XMsFilePermissionCopyMode.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFilePermissionCopyMode, (startCopyOptions.XMsFilePermissionCopyMode.GetValue().ToString())); } if (startCopyOptions.FileCopyIgnoreReadOnly.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderIgnoreReadOnly, (startCopyOptions.FileCopyIgnoreReadOnly.GetValue() ? "true" : "false")); } if (startCopyOptions.FileCopyFileAttributes.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileAttributes, startCopyOptions.FileCopyFileAttributes.GetValue()); } if (startCopyOptions.FileCopyFileCreationTime.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileCreatedOn, startCopyOptions.FileCopyFileCreationTime.GetValue()); } if (startCopyOptions.FileCopyFileLastWriteTime.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderFileLastWrittenOn, startCopyOptions.FileCopyFileLastWriteTime.GetValue()); } if (startCopyOptions.FileCopySetArchiveAttribute.HasValue()) { - request.AddHeader( + request.SetHeader( Details::HeaderSetArchiveAttribute, (startCopyOptions.FileCopySetArchiveAttribute.GetValue() ? "true" : "false")); } if (startCopyOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, startCopyOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, startCopyOptions.LeaseIdOptional.GetValue()); } return StartCopyParseResult(context, pipeline.Send(context, request)); } @@ -5963,7 +5963,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const AbortCopyOptions& abortCopyOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "copy"); request.GetUrl().AppendQueryParameter( Details::QueryCopyId, @@ -5975,11 +5975,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( std::to_string(abortCopyOptions.Timeout.GetValue()))); } - request.AddHeader(Details::HeaderCopyActionAbortConstant, "abort"); - request.AddHeader(Details::HeaderVersion, abortCopyOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderCopyActionAbortConstant, "abort"); + request.SetHeader(Details::HeaderVersion, abortCopyOptions.ApiVersionParameter); if (abortCopyOptions.LeaseIdOptional.HasValue()) { - request.AddHeader(Details::HeaderLeaseId, abortCopyOptions.LeaseIdOptional.GetValue()); + request.SetHeader(Details::HeaderLeaseId, abortCopyOptions.LeaseIdOptional.GetValue()); } return AbortCopyParseResult(context, pipeline.Send(context, request)); } @@ -6029,7 +6029,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( listHandlesOptions.ShareSnapshot.GetValue())); } - request.AddHeader(Details::HeaderVersion, listHandlesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderVersion, listHandlesOptions.ApiVersionParameter); return ListHandlesParseResult(context, pipeline.Send(context, request)); } @@ -6049,7 +6049,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const ForceCloseHandlesOptions& forceCloseHandlesOptions) { Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Put, url); - request.AddHeader(Details::HeaderContentLength, "0"); + request.SetHeader(Details::HeaderContentLength, "0"); request.GetUrl().AppendQueryParameter(Details::QueryComp, "forceclosehandles"); if (forceCloseHandlesOptions.Timeout.HasValue()) { @@ -6072,8 +6072,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { Storage::Details::UrlEncodeQueryParameter( forceCloseHandlesOptions.ShareSnapshot.GetValue())); } - request.AddHeader(Details::HeaderHandleId, forceCloseHandlesOptions.HandleId); - request.AddHeader(Details::HeaderVersion, forceCloseHandlesOptions.ApiVersionParameter); + request.SetHeader(Details::HeaderHandleId, forceCloseHandlesOptions.HandleId); + request.SetHeader(Details::HeaderVersion, forceCloseHandlesOptions.ApiVersionParameter); return ForceCloseHandlesParseResult(context, pipeline.Send(context, request)); }