diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md index 4a4817d92..91b8bd883 100644 --- a/sdk/storage/azure-storage-blobs/CHANGELOG.md +++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md @@ -7,6 +7,8 @@ - Renamed `HasMorePages()` in paged response to `HasPage()`. - Default chunk size for concurrent upload was changed to nullable. - `BlobLeaseClient::Change()` updates internal lease id. +- Removed `ContentType` from `GetBlockListResult`. +- Moved `GetPageRangesResult` to detail namespace. ## 12.0.0-beta.10 (2021-04-16) 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 de8e27ad4..fc447aa1a 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 @@ -1831,7 +1831,6 @@ namespace Azure { namespace Storage { namespace Blobs { * blob. */ Azure::DateTime LastModified; - std::string ContentType; /** * Size of the blob. */ @@ -1846,26 +1845,6 @@ namespace Azure { namespace Storage { namespace Blobs { std::vector UncommittedBlocks; }; // struct GetBlockListResult - struct GetPageRangesResult - { - /** - * The ETag contains a value that you can use to perform operations conditionally. - */ - Azure::ETag ETag; - /** - * The date and time the container was last modified. Any operation that modifies the blob, - * including an update of the metadata or properties, changes the last-modified time of the - * blob. - */ - Azure::DateTime LastModified; - /** - * Size of the blob. - */ - int64_t BlobSize = 0; - std::vector PageRanges; - std::vector ClearRanges; - }; // struct GetPageRangesResult - enum class ListBlobContainersIncludeFlags { /** @@ -2515,6 +2494,28 @@ namespace Azure { namespace Storage { namespace Blobs { }; // struct GetBlobTagsResult } // namespace _detail + namespace _detail { + struct GetPageRangesResult + { + /** + * The ETag contains a value that you can use to perform operations conditionally. + */ + Azure::ETag ETag; + /** + * The date and time the container was last modified. Any operation that modifies the blob, + * including an update of the metadata or properties, changes the last-modified time of the + * blob. + */ + Azure::DateTime LastModified; + /** + * Size of the blob. + */ + int64_t BlobSize = 0; + std::vector PageRanges; + std::vector ClearRanges; + }; // struct GetPageRangesResult + } // namespace _detail + namespace _detail { struct ListBlobContainersResult { @@ -8965,7 +8966,6 @@ namespace Azure { namespace Storage { namespace Blobs { response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); - response.ContentType = httpResponse.GetHeaders().at("content-type"); response.BlobSize = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-content-length")); return Azure::Response(std::move(response), std::move(pHttpResponse)); } @@ -9917,7 +9917,7 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Nullable IfTags; }; // struct GetPageBlobPageRangesOptions - static Azure::Response GetPageRanges( + static Azure::Response GetPageRanges( Azure::Core::Http::_internal::HttpPipeline& pipeline, const Azure::Core::Url& url, const GetPageBlobPageRangesOptions& options, @@ -9982,7 +9982,7 @@ namespace Azure { namespace Storage { namespace Blobs { } auto pHttpResponse = pipeline.Send(request, context); Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse; - GetPageRangesResult response; + Models::_detail::GetPageRangesResult response; auto http_status_code = static_cast::type>( httpResponse.GetStatusCode()); @@ -9994,13 +9994,13 @@ namespace Azure { namespace Storage { namespace Blobs { const auto& httpResponseBody = httpResponse.GetBody(); _internal::XmlReader reader( reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); - response = GetPageRangesResultFromXml(reader); + response = GetPageRangesResultInternalFromXml(reader); } response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); response.BlobSize = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-content-length")); - return Azure::Response( + return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -10082,9 +10082,10 @@ namespace Azure { namespace Storage { namespace Blobs { } private: - static GetPageRangesResult GetPageRangesResultFromXml(_internal::XmlReader& reader) + static Models::_detail::GetPageRangesResult GetPageRangesResultInternalFromXml( + _internal::XmlReader& reader) { - GetPageRangesResult ret; + Models::_detail::GetPageRangesResult ret; enum class XmlTagName { k_PageList,