From 288d1c7652298b6de624304d7efe9270d0570f9a Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Wed, 27 Jan 2021 21:50:10 +0800 Subject: [PATCH] fix typo Expiries -> Expires (#1485) * fix typo * changelog --- sdk/storage/azure-storage-blobs/CHANGELOG.md | 1 + .../storage/blobs/protocol/blob_rest_client.hpp | 12 ++++++------ .../src/datalake_file_client.cpp | 2 +- .../src/datalake_path_client.cpp | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md index 5ec08e59d..f79cc6d51 100644 --- a/sdk/storage/azure-storage-blobs/CHANGELOG.md +++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md @@ -17,6 +17,7 @@ - `startsOn` parameter for `GetUserDelegationKey` was changed to optional. - Removed `IfUnmodifiedSince` from `SetBlobContainerMetadataOptions`. - Return types of `BlobClient::StartCopyFromUri` and `PageBlobClient::StartCopyIncremental` were changed to `StartCopyBlobResult`, supporting poll operations. +- Fixed typo `Expiries` in model types. - Removed `PreviousContinuationToken` from `ListBlobContainersSinglePageResult`, `ListBlobsByHierarchySinglePageResult` and `ListBlobsSinglePageResult`. ## 12.0.0-beta.6 (2020-01-14) 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 02c289f12..69af82430 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 @@ -1024,7 +1024,7 @@ namespace Azure { namespace Storage { namespace Blobs { BlobHttpHeaders HttpHeaders; Storage::Metadata Metadata; Azure::Core::DateTime CreatedOn; - Azure::Core::Nullable ExpiriesOn; + Azure::Core::Nullable ExpiresOn; Azure::Core::Nullable LastAccessedOn; Azure::Core::DateTime LastModified; std::string ETag; @@ -1051,7 +1051,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; Azure::Core::DateTime LastModified; Azure::Core::DateTime CreatedOn; - Azure::Core::Nullable ExpiriesOn; + Azure::Core::Nullable ExpiresOn; Azure::Core::Nullable LastAccessedOn; Azure::Core::Http::Range ContentRange; int64_t BlobSize = 0; @@ -1081,7 +1081,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; Azure::Core::DateTime LastModified; Azure::Core::DateTime CreatedOn; - Azure::Core::Nullable ExpiriesOn; + Azure::Core::Nullable ExpiresOn; Azure::Core::Nullable LastAccessedOn; Storage::Metadata Metadata; Models::BlobType BlobType; @@ -4498,7 +4498,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.size() == 2 && path[0] == XmlTagName::k_Properties && path[1] == XmlTagName::k_ExpiryTime) { - ret.ExpiriesOn = Azure::Core::DateTime::Parse( + ret.ExpiresOn = Azure::Core::DateTime::Parse( node.Value, Azure::Core::DateTime::DateFormat::Rfc1123); } else if ( @@ -5073,7 +5073,7 @@ namespace Azure { namespace Storage { namespace Blobs { auto x_ms_expiry_time__iterator = httpResponse.GetHeaders().find("x-ms-expiry-time"); if (x_ms_expiry_time__iterator != httpResponse.GetHeaders().end()) { - response.ExpiriesOn = Azure::Core::DateTime::Parse( + response.ExpiresOn = Azure::Core::DateTime::Parse( x_ms_expiry_time__iterator->second, Azure::Core::DateTime::DateFormat::Rfc1123); } auto x_ms_last_access_time__iterator @@ -5439,7 +5439,7 @@ namespace Azure { namespace Storage { namespace Blobs { auto x_ms_expiry_time__iterator = httpResponse.GetHeaders().find("x-ms-expiry-time"); if (x_ms_expiry_time__iterator != httpResponse.GetHeaders().end()) { - response.ExpiriesOn = Azure::Core::DateTime::Parse( + response.ExpiresOn = Azure::Core::DateTime::Parse( x_ms_expiry_time__iterator->second, Azure::Core::DateTime::DateFormat::Rfc1123); } auto x_ms_last_access_time__iterator diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp index d445c40b3..f72095759 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp @@ -346,7 +346,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { : ret.LeaseStatus; ret.Metadata = std::move(result->Metadata); ret.CreatedOn = std::move(result->CreatedOn); - ret.ExpiresOn = std::move(result->ExpiriesOn); + ret.ExpiresOn = std::move(result->ExpiresOn); ret.LastAccessedOn = std::move(result->LastAccessedOn); ret.RequestId = std::move(result->RequestId); return Azure::Core::Response( diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp index e5c77ba8f..9e450dd17 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp @@ -386,7 +386,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.CopyStatus = std::move(result->CopyStatus); ret.CopyProgress = std::move(result->CopyProgress); ret.CopyCompletedOn = std::move(result->CopyCompletedOn); - ret.ExpiresOn = std::move(result->ExpiriesOn); + ret.ExpiresOn = std::move(result->ExpiresOn); ret.LastAccessedOn = std::move(result->LastAccessedOn); ret.FileSize = result->ContentLength; ret.RequestId = std::move(result->RequestId);