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

Change ChangeLease return type (#1573)

Browse Source 
* ChangeLease return type

* file client

* Add comment

* return Result rather than Client

* fix

* fix
This commit is contained in:
JinmingHu 2021-02-03 14:49:24 +08:00 committed by GitHub
parent 9b7849c155
commit c8da53d544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_lease_client.hpp
View File

@ -70,7 +70,7 @@ namespace Azure { namespace Storage { namespace Blobs {
*/
Azure::Core::Response<Models::AcquireBlobLeaseResult> Acquire(
std::chrono::seconds duration,
const AcquireBlobLeaseOptions& options = AcquireBlobLeaseOptions());
const AcquireBlobLeaseOptions& options = AcquireBlobLeaseOptions()) const;
/**
* @brief Renews the blob or blob container's previously-acquired lease.
@ -80,17 +80,17 @@ namespace Azure { namespace Storage { namespace Blobs {
* @return A RenewBlobLeaseResult describing the lease.
*/
Azure::Core::Response<Models::RenewBlobLeaseResult> Renew(
const RenewBlobLeaseOptions& options = RenewBlobLeaseOptions());
const RenewBlobLeaseOptions& options = RenewBlobLeaseOptions()) const;
/**
* @brief Releases the blob or blob container's previously-acquired lease.
*
* @param leaseId ID of the previously-acquired lease.
* @param options Optional parameters to execute this function.
* @return A ReleaseBlobLeaseResult describing the updated container.
* @return A ReleaseBlobLeaseResult describing the updated container or blob.
*/
Azure::Core::Response<Models::ReleaseBlobLeaseResult> Release(
const ReleaseBlobLeaseOptions& options = ReleaseBlobLeaseOptions());
const ReleaseBlobLeaseOptions& options = ReleaseBlobLeaseOptions()) const;
/**
* @brief Changes the lease of an active lease.
@ -98,11 +98,12 @@ namespace Azure { namespace Storage { namespace Blobs {
* @param leaseId ID of the previously-acquired lease.
* @param proposedLeaseId Proposed lease ID, in a GUID string format.
* @param options Optional parameters to execute this function.
* @return A ChangeBlobLeaseResult describing the lease.
* @return A ChangeBlobLeaseResult describing the changed lease.
* @remarks The current BlobLeaseClient becomes invalid if this operation succeeds.
*/
Azure::Core::Response<Models::ChangeBlobLeaseResult> Change(
const std::string& proposedLeaseId,
const ChangeBlobLeaseOptions& options = ChangeBlobLeaseOptions());
const ChangeBlobLeaseOptions& options = ChangeBlobLeaseOptions()) const;
/**
* @brief Breaks the previously-acquired lease.
@ -111,7 +112,7 @@ namespace Azure { namespace Storage { namespace Blobs {
* @return A BreakBlobLeaseResult describing the broken lease.
*/
Azure::Core::Response<Models::BreakBlobLeaseResult> Break(
const BreakBlobLeaseOptions& options = BreakBlobLeaseOptions());
const BreakBlobLeaseOptions& options = BreakBlobLeaseOptions()) const;
private:
Azure::Core::Nullable<BlobClient> m_blobClient;

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

@ -16,7 +16,7 @@ namespace Azure { namespace Storage { namespace Blobs {
Azure::Core::Response<Models::AcquireBlobLeaseResult> BlobLeaseClient::Acquire(
std::chrono::seconds duration,
const AcquireBlobLeaseOptions& options)
const AcquireBlobLeaseOptions& options) const
{
if (m_blobClient.HasValue())
{
@ -40,7 +40,6 @@ namespace Azure { namespace Storage { namespace Blobs {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::AcquireBlobLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -70,7 +69,6 @@ namespace Azure { namespace Storage { namespace Blobs {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::AcquireBlobLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -82,7 +80,7 @@ namespace Azure { namespace Storage { namespace Blobs {
}
Azure::Core::Response<Models::RenewBlobLeaseResult> BlobLeaseClient::Renew(
const RenewBlobLeaseOptions& options)
const RenewBlobLeaseOptions& options) const
{
if (m_blobClient.HasValue())
{
@ -105,7 +103,6 @@ namespace Azure { namespace Storage { namespace Blobs {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::RenewBlobLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -135,7 +132,6 @@ namespace Azure { namespace Storage { namespace Blobs {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::RenewBlobLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -147,7 +143,7 @@ namespace Azure { namespace Storage { namespace Blobs {
}
Azure::Core::Response<Models::ReleaseBlobLeaseResult> BlobLeaseClient::Release(
const ReleaseBlobLeaseOptions& options)
const ReleaseBlobLeaseOptions& options) const
{
if (m_blobClient.HasValue())
{
@ -209,7 +205,7 @@ namespace Azure { namespace Storage { namespace Blobs {
Azure::Core::Response<Models::ChangeBlobLeaseResult> BlobLeaseClient::Change(
const std::string& proposedLeaseId,
const ChangeBlobLeaseOptions& options)
const ChangeBlobLeaseOptions& options) const
{
if (m_blobClient.HasValue())
{
@ -233,7 +229,6 @@ namespace Azure { namespace Storage { namespace Blobs {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::ChangeBlobLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -264,7 +259,6 @@ namespace Azure { namespace Storage { namespace Blobs {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::ChangeBlobLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -276,7 +270,7 @@ namespace Azure { namespace Storage { namespace Blobs {
}
Azure::Core::Response<Models::BreakBlobLeaseResult> BlobLeaseClient::Break(
const BreakBlobLeaseOptions& options)
const BreakBlobLeaseOptions& options) const
{
if (m_blobClient.HasValue())
{

1
sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp
View File

@ -452,6 +452,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_TRUE(cLease.ETag.HasValue());
EXPECT_TRUE(IsValidTime(cLease.LastModified));
EXPECT_EQ(cLease.LeaseId, leaseId2);
leaseClient = Blobs::BlobLeaseClient(containerClient, cLease.LeaseId);
EXPECT_EQ(leaseClient.GetLeaseId(), leaseId2);
auto containerInfo = *leaseClient.Release();

1
sdk/storage/azure-storage-blobs/test/page_blob_client_test.cpp
View File

@ -208,6 +208,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_TRUE(cLease.ETag.HasValue());
EXPECT_TRUE(IsValidTime(cLease.LastModified));
EXPECT_EQ(cLease.LeaseId, leaseId2);
leaseClient = Blobs::BlobLeaseClient(*m_pageBlobClient, cLease.LeaseId);
EXPECT_EQ(leaseClient.GetLeaseId(), leaseId2);
auto blobInfo = *leaseClient.Release();

15
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_lease_client.hpp
View File

@ -75,7 +75,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
*/
Azure::Core::Response<Models::AcquireDataLakeLeaseResult> Acquire(
std::chrono::seconds duration,
const AcquireDataLakeLeaseOptions& options = AcquireDataLakeLeaseOptions())
const AcquireDataLakeLeaseOptions& options = AcquireDataLakeLeaseOptions()) const
{
return m_blobLeaseClient.Acquire(duration, options);
}
@ -88,7 +88,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
* @return A RenewDataLakeLeaseResult describing the lease.
*/
Azure::Core::Response<Models::RenewDataLakeLeaseResult> Renew(
const RenewDataLakeLeaseOptions& options = RenewDataLakeLeaseOptions())
const RenewDataLakeLeaseOptions& options = RenewDataLakeLeaseOptions()) const
{
return m_blobLeaseClient.Renew(options);
}
@ -98,10 +98,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
*
* @param leaseId ID of the previously-acquired lease.
* @param options Optional parameters to execute this function.
* @return A ReleaseDataLakeLeaseResult describing the updated container.
* @return A ReleaseDataLakeLeaseResult describing the updated container or blob.
*/
Azure::Core::Response<Models::ReleaseDataLakeLeaseResult> Release(
const ReleaseDataLakeLeaseOptions& options = ReleaseDataLakeLeaseOptions())
const ReleaseDataLakeLeaseOptions& options = ReleaseDataLakeLeaseOptions()) const
{
return m_blobLeaseClient.Release(options);
}
@ -112,11 +112,12 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
* @param leaseId ID of the previously-acquired lease.
* @param proposedLeaseId Proposed lease ID, in a GUID string format.
* @param options Optional parameters to execute this function.
* @return A ChangeDataLakeLeaseResult describing the lease.
* @return A ChangeDataLakeLeaseResult describing the changed lease.
* @remarks The current DataLakeLeaseClient becomes invalid if this operation succeeds.
*/
Azure::Core::Response<Models::ChangeDataLakeLeaseResult> Change(
const std::string& proposedLeaseId,
const ChangeDataLakeLeaseOptions& options = ChangeDataLakeLeaseOptions())
const ChangeDataLakeLeaseOptions& options = ChangeDataLakeLeaseOptions()) const
{
return m_blobLeaseClient.Change(proposedLeaseId, options);
}
@ -128,7 +129,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
* @return A BreakDataLakeLeaseResult describing the broken lease.
*/
Azure::Core::Response<Models::BreakDataLakeLeaseResult> Break(
const BreakDataLakeLeaseOptions& options = BreakDataLakeLeaseOptions())
const BreakDataLakeLeaseOptions& options = BreakDataLakeLeaseOptions()) const
{
return m_blobLeaseClient.Break(options);
}

15
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_lease_client.hpp
View File

@ -57,17 +57,17 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
*/
Azure::Core::Response<Models::AcquireShareLeaseResult> Acquire(
std::chrono::seconds duration,
const AcquireShareLeaseOptions& options = AcquireShareLeaseOptions());
const AcquireShareLeaseOptions& options = AcquireShareLeaseOptions()) const;
/**
* @brief Releases the file or share's previously-acquired lease.
*
* @param leaseId ID of the previously-acquired lease.
* @param options Optional parameters to execute this function.
* @return A ReleaseShareLeaseResult describing the updated container.
* @return A ReleaseShareLeaseResult describing the updated share or file.
*/
Azure::Core::Response<Models::ReleaseShareLeaseResult> Release(
const ReleaseShareLeaseOptions& options = ReleaseShareLeaseOptions());
const ReleaseShareLeaseOptions& options = ReleaseShareLeaseOptions()) const;
/**
* @brief Changes the lease of an active lease.
@ -75,11 +75,12 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
* @param leaseId ID of the previously-acquired lease.
* @param proposedLeaseId Proposed lease ID, in a GUID string format.
* @param options Optional parameters to execute this function.
* @return A ChangeShareLeaseResult describing the lease.
* @return A ChangeShareLeaseResult describing the updated lease.
* @remarks The current ShareLeaseClient becomes invalid if this operation succeeds.
*/
Azure::Core::Response<Models::ChangeShareLeaseResult> Change(
const std::string& proposedLeaseId,
const ChangeShareLeaseOptions& options = ChangeShareLeaseOptions());
const ChangeShareLeaseOptions& options = ChangeShareLeaseOptions()) const;
/**
* @brief Breaks the previously-acquired lease.
@ -88,7 +89,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
* @return A BreakShareLeaseResult describing the broken lease.
*/
Azure::Core::Response<Models::BreakShareLeaseResult> Break(
const BreakShareLeaseOptions& options = BreakShareLeaseOptions());
const BreakShareLeaseOptions& options = BreakShareLeaseOptions()) const;
private:
/**
@ -110,7 +111,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
* @return A RenewShareLeaseResult describing the lease.
*/
Azure::Core::Response<Models::RenewShareLeaseResult> Renew(
const RenewShareLeaseOptions& options = RenewShareLeaseOptions());
const RenewShareLeaseOptions& options = RenewShareLeaseOptions()) const;
Azure::Core::Nullable<ShareFileClient> m_fileClient;
Azure::Core::Nullable<ShareClient> m_shareClient;

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

@ -16,7 +16,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<Models::AcquireShareLeaseResult> ShareLeaseClient::Acquire(
std::chrono::seconds duration,
const AcquireShareLeaseOptions& options)
const AcquireShareLeaseOptions& options) const
{
if (m_fileClient.HasValue())
{
@ -34,7 +34,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::AcquireShareLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -55,7 +54,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::AcquireShareLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -67,7 +65,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
Azure::Core::Response<Models::RenewShareLeaseResult> ShareLeaseClient::Renew(
const RenewShareLeaseOptions& options)
const RenewShareLeaseOptions& options) const
{
if (m_fileClient.HasValue())
{
@ -89,7 +87,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::RenewShareLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -101,7 +98,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
Azure::Core::Response<Models::ReleaseShareLeaseResult> ShareLeaseClient::Release(
const ReleaseShareLeaseOptions& options)
const ReleaseShareLeaseOptions& options) const
{
if (m_fileClient.HasValue())
{
@ -147,7 +144,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
Azure::Core::Response<Models::ChangeShareLeaseResult> ShareLeaseClient::Change(
const std::string& proposedLeaseId,
const ChangeShareLeaseOptions& options)
const ChangeShareLeaseOptions& options) const
{
if (m_fileClient.HasValue())
{
@ -165,7 +162,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::ChangeShareLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -186,7 +182,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
ret.ETag = std::move(response->ETag);
ret.LastModified = std::move(response->LastModified);
ret.LeaseId = std::move(response->LeaseId);
m_leaseId = ret.LeaseId;
return Azure::Core::Response<Models::ChangeShareLeaseResult>(
std::move(ret), response.ExtractRawResponse());
@ -198,7 +193,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
}
Azure::Core::Response<Models::BreakShareLeaseResult> ShareLeaseClient::Break(
const BreakShareLeaseOptions& options)
const BreakShareLeaseOptions& options) const
{
if (m_fileClient.HasValue())
{

2
sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp
View File

@ -272,6 +272,8 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_TRUE(cLease.ETag.HasValue());
EXPECT_TRUE(cLease.LastModified >= lastModified);
EXPECT_EQ(cLease.LeaseId, leaseId2);
leaseClient = Files::Shares::ShareLeaseClient(*m_fileClient, cLease.LeaseId);
EXPECT_EQ(leaseClient.GetLeaseId(), leaseId2);
lastModified = m_fileClient->GetProperties()->LastModified;
auto fileInfo = *leaseClient.Release();