github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update GetString to ToString (#1677)

Browse Source 
* Update GetString to ToString
This commit is contained in:
Victor Vazquez 2021-02-12 14:25:01 -08:00 committed by GitHub
parent d76cdf4c6d
commit b41c53509b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 116 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/core/azure-core/CHANGELOG.md
View File

@ -7,6 +7,8 @@
- Removed `Azure::Core::Http::HttpPipeline` by making it internal, used only within the SDK.
- Split `Azure::Core::RequestConditions` into `Azure::Core::MatchConditions` and `Azure::Core::ModifiedConditions`.
- Removed `TransportKind` enum from `Azure::Core::Http`.
- Renamed `GetString()` to `ToString()` in `Azure::Core::DateTime`.
- Renamed `GetUuidString()` tp `ToString()` in `Azure::Core::Uuid`.
## 1.0.0-beta.6 (2021-02-09)

8
sdk/core/azure-core/inc/azure/core/datetime.hpp
View File

@ -167,7 +167,7 @@ namespace Azure { namespace Core {
*
* @throw std::invalid_argument If year exceeds 9999, or if \p format is not recognized.
*/
std::string GetString(DateFormat format, TimeFractionFormat fractionFormat) const;
std::string ToString(DateFormat format, TimeFractionFormat fractionFormat) const;
public:
/**
@ -177,9 +177,9 @@ namespace Azure { namespace Core {
*
* @throw std::invalid_argument If year exceeds 9999, or if \p format is not recognized.
*/
std::string GetString(DateFormat format) const
std::string ToString(DateFormat format) const
{
return GetString(format, TimeFractionFormat::DropTrailingZeros);
return ToString(format, TimeFractionFormat::DropTrailingZeros);
};
/**
@ -191,7 +191,7 @@ namespace Azure { namespace Core {
*/
std::string GetRfc3339String(TimeFractionFormat fractionFormat) const
{
return GetString(DateFormat::Rfc3339, fractionFormat);
return ToString(DateFormat::Rfc3339, fractionFormat);
};
};

2
sdk/core/azure-core/inc/azure/core/http/policy.hpp
View File

@ -243,7 +243,7 @@ namespace Azure { namespace Core { namespace Http {
Request& request,
NextHttpPolicy nextHttpPolicy) const override
{
auto uuid = Uuid::CreateUuid().GetUuidString();
auto uuid = Uuid::CreateUuid().ToString();
request.AddHeader(RequestIdHeader, uuid);
return nextHttpPolicy.Send(ctx, request);

2
sdk/core/azure-core/inc/azure/core/uuid.hpp
View File

@ -38,7 +38,7 @@ namespace Azure { namespace Core {
* Gets UUID as a string.
* @detail A string is in canonical format (4-2-2-2-6 lowercase hex and dashes only)
*/
std::string GetUuidString()
std::string ToString()
{
// Guid is 36 characters
// Add one byte for the \0

2
sdk/core/azure-core/src/datetime.cpp
View File

@ -718,7 +718,7 @@ DateTime DateTime::Parse(std::string const& dateTime, DateFormat format)
}
}
std::string DateTime::GetString(DateFormat format, TimeFractionFormat fractionFormat) const
std::string DateTime::ToString(DateFormat format, TimeFractionFormat fractionFormat) const
{
{
static DateTime const Year0001 = DateTime();

6
sdk/core/azure-core/test/ut/datetime.cpp
View File

@ -127,7 +127,7 @@ TEST(DateTime, sameResultFromDefaultRfc3339)
auto dt = DateTime::Parse("2020-10-13T21:06:15.33000000Z", DateTime::DateFormat::Rfc3339);
auto dt2 = DateTime::Parse("2020-10-13T21:06:15.330000000Z", DateTime::DateFormat::Rfc3339);
auto const str1 = dt.GetRfc3339String(DateTime::TimeFractionFormat::DropTrailingZeros);
auto const str2 = dt2.GetString(DateTime::DateFormat::Rfc3339);
auto const str2 = dt2.ToString(DateTime::DateFormat::Rfc3339);
EXPECT_EQ(str1, str2);
}
}
@ -164,7 +164,7 @@ TEST(DateTime, EmittingTimeCorrectDay)
{
DateTime const test
= DateTime() + std::chrono::seconds(63691573964LL); // 2019-04-22T23:52:44 is a Monday
auto const actual = test.GetString(DateTime::DateFormat::Rfc1123);
auto const actual = test.ToString(DateTime::DateFormat::Rfc1123);
std::string const expected("Mon");
EXPECT_EQ(actual.substr(0, 3), expected);
}
@ -435,7 +435,7 @@ TEST(DateTime, ParseTimeRoundtripAcceptsInvalidNoTrailingTimezone)
for (auto const& str : badStrings)
{
auto const dt = DateTime::Parse(str, DateTime::DateFormat::Rfc3339);
auto const str2 = dt.GetString(DateTime::DateFormat::Rfc3339);
auto const str2 = dt.ToString(DateTime::DateFormat::Rfc3339);
EXPECT_EQ(str2, strCorrected);
}
}

4
sdk/core/azure-core/test/ut/modified_conditions.cpp
View File

@ -18,9 +18,9 @@ TEST(ModifiedConditions, Basic)
= DateTime::Parse("2013-11-19T14:30:59.1234567Z", DateTime::DateFormat::Rfc3339);
EXPECT_EQ(
conditions.IfModifiedSince.GetString(DateTime::DateFormat::Rfc3339),
conditions.IfModifiedSince.ToString(DateTime::DateFormat::Rfc3339),
"2013-11-19T14:30:59.1234567Z");
EXPECT_EQ(
conditions.IfUnmodifiedSince.GetString(DateTime::DateFormat::Rfc3339),
conditions.IfUnmodifiedSince.ToString(DateTime::DateFormat::Rfc3339),
"2013-11-19T14:30:59.1234567Z");
}

8
sdk/core/azure-core/test/ut/uuid.cpp
View File

@ -11,7 +11,7 @@ using namespace Azure::Core;
TEST(Uuid, Basic)
{
auto uuid = Uuid::CreateUuid();
EXPECT_TRUE(uuid.GetUuidString().length() == 36);
EXPECT_TRUE(uuid.ToString().length() == 36);
}
TEST(Uuid, Randomness)
@ -20,7 +20,7 @@ TEST(Uuid, Randomness)
std::set<std::string> uuids;
for (int i = 0; i < size; i++)
{
auto ret = uuids.insert(Uuid::CreateUuid().GetUuidString());
auto ret = uuids.insert(Uuid::CreateUuid().ToString());
// If the value already exists in the set then the insert will fail
// ret.second == false means the insert failed.
EXPECT_TRUE(ret.second);
@ -30,7 +30,7 @@ TEST(Uuid, Randomness)
TEST(Uuid, separatorPosition)
{
auto uuidKey = Uuid::CreateUuid().GetUuidString();
auto uuidKey = Uuid::CreateUuid().ToString();
// validate expected format '8-4-4-4-12'
EXPECT_PRED5(
[](std::string const& uuidKey, char pos1, char pos2, char pos3, char pos4) {
@ -45,7 +45,7 @@ TEST(Uuid, separatorPosition)
TEST(Uuid, validChars)
{
auto uuidKey = Uuid::CreateUuid().GetUuidString();
auto uuidKey = Uuid::CreateUuid().ToString();
// validate valid chars and separators count
EXPECT_PRED2(
[](std::string const& uuidKey, int expectedSeparators) {

138
sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp
View File

@ -3177,14 +3177,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -3351,7 +3351,7 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -3619,14 +3619,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -3684,14 +3684,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -3745,14 +3745,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -3808,14 +3808,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -3869,14 +3869,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -3933,14 +3933,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
auto pHttpResponse = pipeline.Send(context, request);
@ -4890,14 +4890,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -5230,14 +5230,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -5415,14 +5415,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -5761,14 +5761,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -5871,14 +5871,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -6045,14 +6045,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -6071,14 +6071,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"x-ms-source-if-modified-since",
options.SourceIfModifiedSince.GetValue().GetString(
options.SourceIfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.SourceIfUnmodifiedSince.HasValue())
{
request.AddHeader(
"x-ms-source-if-unmodified-since",
options.SourceIfUnmodifiedSince.GetValue().GetString(
options.SourceIfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.SourceIfMatch.HasValue() && !options.SourceIfMatch.ToString().empty())
@ -6227,14 +6227,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -6426,14 +6426,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -6501,14 +6501,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -6578,14 +6578,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -6653,14 +6653,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -6737,14 +6737,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -7029,14 +7029,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -7319,14 +7319,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"x-ms-source-if-modified-since",
options.SourceIfModifiedSince.GetValue().GetString(
options.SourceIfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.SourceIfUnmodifiedSince.HasValue())
{
request.AddHeader(
"x-ms-source-if-unmodified-since",
options.SourceIfUnmodifiedSince.GetValue().GetString(
options.SourceIfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.SourceIfMatch.HasValue() && !options.SourceIfMatch.ToString().empty())
@ -7493,14 +7493,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -7868,14 +7868,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -8037,14 +8037,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -8232,14 +8232,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -8399,14 +8399,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -8523,14 +8523,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -8624,14 +8624,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -8705,14 +8705,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -9028,14 +9028,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -9177,14 +9177,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -9357,14 +9357,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())
@ -9472,14 +9472,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.AddHeader(
"If-Modified-Since",
options.IfModifiedSince.GetValue().GetString(
options.IfModifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
"If-Unmodified-Since",
options.IfUnmodifiedSince.GetValue().GetString(
options.IfUnmodifiedSince.GetValue().ToString(
Azure::Core::DateTime::DateFormat::Rfc1123));
}
if (options.IfMatch.HasValue() && !options.IfMatch.ToString().empty())

2
sdk/storage/azure-storage-blobs/src/blob_lease_client.cpp
View File

@ -11,7 +11,7 @@ namespace Azure { namespace Storage { namespace Blobs {
std::string BlobLeaseClient::CreateUniqueLeaseId()
{
return Azure::Core::Uuid::CreateUuid().GetUuidString();
return Azure::Core::Uuid::CreateUuid().ToString();
}
Azure::Core::Response<Models::AcquireBlobLeaseResult> BlobLeaseClient::Acquire(

20
sdk/storage/azure-storage-blobs/test/storage_retry_policy_test.cpp
View File

@ -73,7 +73,7 @@ namespace Azure { namespace Storage { namespace Test {
auto ConstructTransportException
= []() { return Azure::Core::Http::TransportException("Error while sending request. "); };
auto ConstructNotFoundResponse = []() {
auto requestId = Core::Uuid::CreateUuid().GetUuidString();
auto requestId = Core::Uuid::CreateUuid().ToString();
std::string errorResponseBody
= "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
"<Error><Code>BlobNotFound</Code><Message>The specified blob does not exist.\n"
@ -84,17 +84,17 @@ namespace Azure { namespace Storage { namespace Test {
response->SetBody(std::vector<uint8_t>(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().GetUuidString());
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(
"date",
Azure::Core::DateTime(std::chrono::system_clock::now())
.GetString(Azure::Core::DateTime::DateFormat::Rfc1123));
.ToString(Azure::Core::DateTime::DateFormat::Rfc1123));
return response;
};
auto ConstructPreconditionFailedResponse = []() {
auto requestId = Core::Uuid::CreateUuid().GetUuidString();
auto requestId = Core::Uuid::CreateUuid().ToString();
std::string errorResponseBody
= "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
"<Error><Code>ConditionNotMet</Code>"
@ -109,13 +109,13 @@ namespace Azure { namespace Storage { namespace Test {
response->SetBody(std::vector<uint8_t>(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().GetUuidString());
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(
"date",
Azure::Core::DateTime(std::chrono::system_clock::now())
.GetString(Azure::Core::DateTime::DateFormat::Rfc1123));
.ToString(Azure::Core::DateTime::DateFormat::Rfc1123));
return response;
};
auto ConstructPrimaryResponse
@ -135,7 +135,7 @@ namespace Azure { namespace Storage { namespace Test {
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().GetUuidString());
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");
@ -145,7 +145,7 @@ namespace Azure { namespace Storage { namespace Test {
response->AddHeader(
"date",
Azure::Core::DateTime(std::chrono::system_clock::now())
.GetString(Azure::Core::DateTime::DateFormat::Rfc1123));
.ToString(Azure::Core::DateTime::DateFormat::Rfc1123));
return response;
};
auto ConstructSecondaryResponse =
@ -165,7 +165,7 @@ namespace Azure { namespace Storage { namespace Test {
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().GetUuidString());
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");
@ -175,7 +175,7 @@ namespace Azure { namespace Storage { namespace Test {
response->AddHeader(
"date",
Azure::Core::DateTime(std::chrono::system_clock::now())
.GetString(Azure::Core::DateTime::DateFormat::Rfc1123));
.ToString(Azure::Core::DateTime::DateFormat::Rfc1123));
return response;
};

2
sdk/storage/azure-storage-common/src/storage_common.cpp
View File

@ -12,7 +12,7 @@ namespace Azure { namespace Storage {
std::string CreateUniqueLeaseId()
{
auto uuid = Azure::Core::Uuid::CreateUuid();
return uuid.GetUuidString();
return uuid.ToString();
}
namespace Details {

2
sdk/storage/azure-storage-common/src/storage_per_retry_policy.cpp
View File

@ -25,7 +25,7 @@ namespace Azure { namespace Storage { namespace Details {
request.AddHeader(
HttpHeaderXMsDate,
Core::DateTime(std::chrono::system_clock::now())
.GetString(Azure::Core::DateTime::DateFormat::Rfc1123));
.ToString(Azure::Core::DateTime::DateFormat::Rfc1123));
}
return nextHttpPolicy.Send(ctx, request);

24
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp
View File

@ -656,14 +656,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
request.AddHeader(
Details::HeaderIfModifiedSince,
createOptions.IfModifiedSince.GetValue().GetString(
createOptions.IfModifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
if (createOptions.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
Details::HeaderIfUnmodifiedSince,
createOptions.IfUnmodifiedSince.GetValue().GetString(
createOptions.IfUnmodifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
if (createOptions.SourceIfMatch.HasValue())
@ -679,14 +679,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
request.AddHeader(
Details::HeaderSourceIfModifiedSince,
createOptions.SourceIfModifiedSince.GetValue().GetString(
createOptions.SourceIfModifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
if (createOptions.SourceIfUnmodifiedSince.HasValue())
{
request.AddHeader(
Details::HeaderSourceIfUnmodifiedSince,
createOptions.SourceIfUnmodifiedSince.GetValue().GetString(
createOptions.SourceIfUnmodifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
return CreateParseResult(context, pipeline.Send(context, request));
@ -752,14 +752,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
request.AddHeader(
Details::HeaderIfModifiedSince,
getPropertiesOptions.IfModifiedSince.GetValue().GetString(
getPropertiesOptions.IfModifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
if (getPropertiesOptions.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
Details::HeaderIfUnmodifiedSince,
getPropertiesOptions.IfUnmodifiedSince.GetValue().GetString(
getPropertiesOptions.IfUnmodifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
return GetPropertiesParseResult(context, pipeline.Send(context, request));
@ -823,14 +823,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
request.AddHeader(
Details::HeaderIfModifiedSince,
deleteOptions.IfModifiedSince.GetValue().GetString(
deleteOptions.IfModifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
if (deleteOptions.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
Details::HeaderIfUnmodifiedSince,
deleteOptions.IfUnmodifiedSince.GetValue().GetString(
deleteOptions.IfUnmodifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
return DeleteParseResult(context, pipeline.Send(context, request));
@ -901,14 +901,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
request.AddHeader(
Details::HeaderIfModifiedSince,
setAccessControlOptions.IfModifiedSince.GetValue().GetString(
setAccessControlOptions.IfModifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
if (setAccessControlOptions.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
Details::HeaderIfUnmodifiedSince,
setAccessControlOptions.IfUnmodifiedSince.GetValue().GetString(
setAccessControlOptions.IfUnmodifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
request.AddHeader(Details::HeaderVersion, setAccessControlOptions.ApiVersionParameter);
@ -1084,14 +1084,14 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
request.AddHeader(
Details::HeaderIfModifiedSince,
flushDataOptions.IfModifiedSince.GetValue().GetString(
flushDataOptions.IfModifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
if (flushDataOptions.IfUnmodifiedSince.HasValue())
{
request.AddHeader(
Details::HeaderIfUnmodifiedSince,
flushDataOptions.IfUnmodifiedSince.GetValue().GetString(
flushDataOptions.IfUnmodifiedSince.GetValue().ToString(
Core::DateTime::DateFormat::Rfc1123));
}
request.AddHeader(Details::HeaderVersion, flushDataOptions.ApiVersionParameter);

2
sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp
View File

@ -468,7 +468,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
if (options.ExpiresOn.HasValue())
{
protocolLayerOptions.ExpiryTime
= options.ExpiresOn.GetValue().GetString(Azure::Core::DateTime::DateFormat::Rfc1123);
= options.ExpiresOn.GetValue().ToString(Azure::Core::DateTime::DateFormat::Rfc1123);
}
else if (options.TimeToExpire.HasValue())
{

4
sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp
View File

@ -376,8 +376,8 @@ namespace Azure { namespace Storage { namespace Test {
// PreauthorizedAgentObjectId
{
Sas::DataLakeSasBuilder builder2 = fileSasBuilder;
builder2.PreauthorizedAgentObjectId = Azure::Core::Uuid::CreateUuid().GetUuidString();
builder2.CorrelationId = Azure::Core::Uuid::CreateUuid().GetUuidString();
builder2.PreauthorizedAgentObjectId = Azure::Core::Uuid::CreateUuid().ToString();
builder2.CorrelationId = Azure::Core::Uuid::CreateUuid().ToString();
auto sasToken2 = builder2.GenerateSasToken(userDelegationKey, accountName);
EXPECT_NO_THROW(verify_file_read(sasToken2));
}

2
sdk/storage/azure-storage-files-shares/src/share_lease_client.cpp
View File

@ -11,7 +11,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::string ShareLeaseClient::CreateUniqueLeaseId()
{
return Azure::Core::Uuid::CreateUuid().GetUuidString();
return Azure::Core::Uuid::CreateUuid().ToString();
}
Azure::Core::Response<Models::AcquireShareLeaseResult> ShareLeaseClient::Acquire(