From af71e0167daa87494996b6ef9296cdb8e6e5eed9 Mon Sep 17 00:00:00 2001 From: Kan Tang Date: Mon, 12 Oct 2020 19:41:23 -0700 Subject: [PATCH] Removed Nullable return value that never returns. (#747) --- .../files/datalake/datalake_responses.hpp | 8 ++------ .../protocol/datalake_rest_client.hpp | 20 ++----------------- .../src/datalake_directory_client.cpp | 2 -- .../src/datalake_file_client.cpp | 2 -- .../src/datalake_path_client.cpp | 4 ++-- 5 files changed, 6 insertions(+), 30 deletions(-) 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 bed64df95..9ad9dde24 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 @@ -118,8 +118,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct CreatePathResult { - Azure::Core::Nullable ETag; - Azure::Core::Nullable LastModified; + std::string ETag; + std::string LastModified; Azure::Core::Nullable ContentLength; }; @@ -153,8 +153,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct RenameFileResult { - Azure::Core::Nullable ETag; - Azure::Core::Nullable LastModified; }; struct DeleteFileResult @@ -178,8 +176,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct RenameDirectoryResult { - Azure::Core::Nullable ETag; - Azure::Core::Nullable LastModified; Azure::Core::Nullable Continuation; }; 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 c7189da1e..bd9f4bbc4 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 @@ -709,8 +709,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct FileSystemListPathsResult { - Azure::Core::Nullable ETag; - Azure::Core::Nullable LastModified; Azure::Core::Nullable Continuation; std::vector Paths; @@ -848,9 +846,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { struct PathAppendDataResult { - Azure::Core::Nullable ETag; Azure::Core::Nullable ContentMD5; - Azure::Core::Nullable XMsContentCrc64; + Azure::Core::Nullable ContentCrc64; bool IsServerEncrypted = bool(); }; @@ -1392,15 +1389,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ? FileSystemListPathsResult() : FileSystemListPathsResult::FileSystemListPathsResultFromPathList( PathList::CreateFromJson(nlohmann::json::parse(bodyBuffer))); - if (response.GetHeaders().find(Details::c_HeaderETag) != response.GetHeaders().end()) - { - result.ETag = response.GetHeaders().at(Details::c_HeaderETag); - } - if (response.GetHeaders().find(Details::c_HeaderLastModified) - != response.GetHeaders().end()) - { - result.LastModified = response.GetHeaders().at(Details::c_HeaderLastModified); - } if (response.GetHeaders().find(Details::c_HeaderXMsContinuation) != response.GetHeaders().end()) { @@ -3434,10 +3422,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { // Append data to file control response. PathAppendDataResult result; - if (response.GetHeaders().find(Details::c_HeaderETag) != response.GetHeaders().end()) - { - result.ETag = response.GetHeaders().at(Details::c_HeaderETag); - } if (response.GetHeaders().find(Details::c_HeaderContentMD5) != response.GetHeaders().end()) { @@ -3446,7 +3430,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { if (response.GetHeaders().find(Details::c_HeaderXMsContentCrc64) != response.GetHeaders().end()) { - result.XMsContentCrc64 = response.GetHeaders().at(Details::c_HeaderXMsContentCrc64); + result.ContentCrc64 = response.GetHeaders().at(Details::c_HeaderXMsContentCrc64); } result.IsServerEncrypted = response.GetHeaders().at(Details::c_HeaderXMsRequestServerEncrypted) == "true"; diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp index 3433c3e07..4de080e18 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp @@ -182,8 +182,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { destinationDfsUri, *m_pipeline, options.Context, protocolLayerOptions); // At this point, there is not more exception thrown, meaning the rename is successful. auto ret = RenameDirectoryResult(); - ret.ETag = std::move(result->ETag); - ret.LastModified = std::move(result->LastModified); ret.Continuation = std::move(result->Continuation); return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); 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 2c0dff278..5f65a2aa3 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 @@ -278,8 +278,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { destinationDfsUri, *m_pipeline, options.Context, protocolLayerOptions); // At this point, there is not more exception thrown, meaning the rename is successful. auto ret = RenameFileResult(); - ret.ETag = std::move(result->ETag); - ret.LastModified = std::move(result->LastModified); return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); } 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 2ac8a74f1..eb6c286a6 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 @@ -259,8 +259,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = DataLakeRestClient::Path::Create( m_dfsUri, *m_pipeline, options.Context, protocolLayerOptions); auto ret = CreatePathResult(); - ret.ETag = std::move(result->ETag); - ret.LastModified = std::move(result->LastModified); + ret.ETag = std::move(result->ETag.GetValue()); + ret.LastModified = std::move(result->LastModified.GetValue()); ret.ContentLength = std::move(result->ContentLength); return Azure::Core::Response(std::move(ret), result.ExtractRawResponse()); }