From d1f6d13d1ff85ec8cb8532a3eaf0d3d7f42f18c5 Mon Sep 17 00:00:00 2001 From: Kan Tang Date: Wed, 27 Jan 2021 08:12:29 -0800 Subject: [PATCH] Remove PreviousContinuationToken (#1490) --- .../azure-storage-files-datalake/CHANGELOG.md | 1 + .../files/datalake/datalake_responses.hpp | 1 - .../azure-storage-files-shares/CHANGELOG.md | 1 + .../shares/protocol/share_rest_client.hpp | 28 ------------------- .../storage/files/shares/share_responses.hpp | 1 - .../src/share_client.cpp | 1 - .../src/share_directory_client.cpp | 1 - 7 files changed, 2 insertions(+), 32 deletions(-) diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md index 1c3389ae2..0ca668984 100644 --- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md @@ -31,6 +31,7 @@ - Removed unused type `AccountResourceType` and `PathLeaseAction`. - Changed all previous `LeaseDuration` members to a new type named `LeaseDurationType`. - `startsOn` parameter for `GetUserDelegationKey` was changed to optional. +- Removed `PreviousContinuationToken` from `ListFileSystemsSinglePageResult`. ### Other Changes and Improvements diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp index 0bf90f731..705e3587b 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp @@ -37,7 +37,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam std::string RequestId; std::string ServiceEndpoint; std::string Prefix; - Azure::Core::Nullable PreviousContinuationToken; Azure::Core::Nullable ContinuationToken; std::vector Items; }; // struct ListFileSystemsSinglePageResult diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md index ba656c0af..e8df30b57 100644 --- a/sdk/storage/azure-storage-files-shares/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-shares/CHANGELOG.md @@ -14,6 +14,7 @@ - Added `ShareLeaseClient`, all lease related APIs are moved to `ShareLeaseClient`. - Changed lease duration to be `std::chrono::seconds`. - Added `RequestId` in each return types for REST API calls, except for concurrent APIs. +- Removed `PreviousContinuationToken` from `ListFilesAndDirectoriesSinglePageResult` and `ListSharesSinglePageResult`. - Removed `c_` for constants: `c_FileDefaultTimeValue`, `c_FileCopySourceTime`, `c_FileInheritPermission`, `FilePreserveSmbProperties` and `FileAllHandles`. ### Other Changes and Improvements 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 5fbba651f..644b65421 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 @@ -566,7 +566,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ShareSnapshot; std::string DirectoryPath; std::string Prefix; - std::string PreviousContinuationToken; int32_t PageSizeHint = int32_t(); FilesAndDirectoriesListSinglePage SinglePage; std::string ContinuationToken; @@ -584,7 +583,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { std::string ServiceEndpoint; std::string Prefix; - std::string PreviousContinuationToken; int32_t PageSizeHint = int32_t(); std::vector Items; std::string ContinuationToken; @@ -608,7 +606,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { std::string ServiceEndpoint; std::string Prefix; - std::string PreviousContinuationToken; int32_t PageSizeHint = int32_t(); std::vector Items; std::string ContinuationToken; @@ -816,7 +813,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::string ShareSnapshot; std::string DirectoryPath; std::string Prefix; - std::string PreviousContinuationToken; int32_t PageSizeHint = int32_t(); FilesAndDirectoriesListSinglePage SinglePage; std::string ContinuationToken; @@ -2375,7 +2371,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { enum class XmlTagName { EnumerationResults, - Marker, MaxResults, NextMarker, Prefix, @@ -2410,10 +2405,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { path.emplace_back(XmlTagName::EnumerationResults); } - else if (std::strcmp(node.Name, "Marker") == 0) - { - path.emplace_back(XmlTagName::Marker); - } else if (std::strcmp(node.Name, "MaxResults") == 0) { path.emplace_back(XmlTagName::MaxResults); @@ -2464,12 +2455,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.Prefix = node.Value; } - else if ( - path.size() == 2 && path[0] == XmlTagName::EnumerationResults - && path[1] == XmlTagName::Marker) - { - result.PreviousContinuationToken = node.Value; - } } else if (node.Type == Storage::Details::XmlNodeType::Attribute) { @@ -2489,7 +2474,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ServiceListSharesSinglePageResult result; result.ServiceEndpoint = std::move(object.ServiceEndpoint); result.Prefix = std::move(object.Prefix); - result.PreviousContinuationToken = std::move(object.PreviousContinuationToken); result.PageSizeHint = object.PageSizeHint; result.Items = std::move(object.Items); result.ContinuationToken = std::move(object.ContinuationToken); @@ -4781,7 +4765,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { Entries, EnumerationResults, - Marker, MaxResults, NextMarker, Prefix, @@ -4818,10 +4801,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { path.emplace_back(XmlTagName::EnumerationResults); } - else if (std::strcmp(node.Name, "Marker") == 0) - { - path.emplace_back(XmlTagName::Marker); - } else if (std::strcmp(node.Name, "MaxResults") == 0) { path.emplace_back(XmlTagName::MaxResults); @@ -4865,12 +4844,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { { result.Prefix = node.Value; } - else if ( - path.size() == 2 && path[0] == XmlTagName::EnumerationResults - && path[1] == XmlTagName::Marker) - { - result.PreviousContinuationToken = node.Value; - } } else if (node.Type == Storage::Details::XmlNodeType::Attribute) { @@ -4912,7 +4885,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { result.ShareSnapshot = std::move(object.ShareSnapshot); result.DirectoryPath = std::move(object.DirectoryPath); result.Prefix = std::move(object.Prefix); - result.PreviousContinuationToken = std::move(object.PreviousContinuationToken); result.PageSizeHint = object.PageSizeHint; result.SinglePage = std::move(object.SinglePage); result.ContinuationToken = std::move(object.ContinuationToken); diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp index a0f834576..c27c870d0 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp @@ -83,7 +83,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names std::string ShareSnapshot; std::string DirectoryPath; std::string Prefix; - std::string PreviousContinuationToken; int32_t PageSizeHint = int32_t(); std::string ContinuationToken; std::vector DirectoryItems; diff --git a/sdk/storage/azure-storage-files-shares/src/share_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_client.cpp index 2d2d15139..f4b57bea0 100644 --- a/sdk/storage/azure-storage-files-shares/src/share_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_client.cpp @@ -285,7 +285,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ret.ShareSnapshot = std::move(result->ShareSnapshot); ret.DirectoryPath = std::move(result->DirectoryPath); ret.Prefix = std::move(result->Prefix); - ret.PreviousContinuationToken = std::move(result->PreviousContinuationToken); ret.PageSizeHint = result->PageSizeHint; ret.ContinuationToken = std::move(result->ContinuationToken); ret.DirectoryItems = std::move(result->SinglePage.DirectoryItems); diff --git a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp index 67692576b..5b3f35e1d 100644 --- a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp @@ -320,7 +320,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { ret.ShareSnapshot = std::move(result->ShareSnapshot); ret.DirectoryPath = std::move(result->DirectoryPath); ret.Prefix = std::move(result->Prefix); - ret.PreviousContinuationToken = std::move(result->PreviousContinuationToken); ret.PageSizeHint = result->PageSizeHint; ret.ContinuationToken = std::move(result->ContinuationToken); ret.DirectoryItems = std::move(result->SinglePage.DirectoryItems);