Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ namespace Azure { namespace Data { namespace Tables { namespace Credentials {
std::string m_accountKey;
};

namespace _internal {
namespace _detail {
struct ConnectionStringParts
{
std::string AccountName;
Expand All @@ -80,6 +80,6 @@ namespace Azure { namespace Data { namespace Tables { namespace Credentials {

ConnectionStringParts ParseConnectionString(const std::string& connectionString);
std::string GetDefaultScopeForAudience(const std::string& audience);
} // namespace _internal
} // namespace _detail

}}}} // namespace Azure::Data::Tables::Credentials
44 changes: 2 additions & 42 deletions sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,6 @@ namespace Azure { namespace Data { namespace Tables {
std::vector<CorsRule> Cors;
};

/**
* @brief Get Service Properties options.
*
*/
struct GetServicePropertiesOptions final
{
};

/**
* @brief Set Service Properties options.
*
Expand Down Expand Up @@ -383,14 +375,6 @@ namespace Azure { namespace Data { namespace Tables {
Models::GeoReplication GeoReplication;
};

/**
* @brief Get Service Statistics options.
*
*/
struct GetServiceStatisticsOptions final
{
};

/**
* @brief Delete result.
*
Expand Down Expand Up @@ -435,22 +419,6 @@ namespace Azure { namespace Data { namespace Tables {
std::vector<SignedIdentifier> SignedIdentifiers;
};

/**
* @brief Get Table Access Policy options.
*
*/
struct GetTableAccessPolicyOptions final
{
};

/**
* @brief Set Table Access Policy options.
*
*/
struct SetTableAccessPolicyOptions final
{
};

/**
* @brief Set Table Access Policy result.
*
Expand Down Expand Up @@ -487,7 +455,7 @@ namespace Azure { namespace Data { namespace Tables {
* @brief Upsert Kind
*
*/
enum UpsertKind
enum class UpsertKind
{
Update,
Merge,
Expand Down Expand Up @@ -594,14 +562,6 @@ namespace Azure { namespace Data { namespace Tables {
std::string ETag;
};

/**
* @brief Delete Entity options.
*
*/
struct DeleteEntityOptions final
{
};

/**
* @brief Delete Entity result.
*
Expand Down Expand Up @@ -717,7 +677,7 @@ namespace Azure { namespace Data { namespace Tables {
* @brief Transaction Action
*
*/
enum TransactionAction
enum class TransactionAction
{
InsertEntity = 32,
DeleteEntity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,20 +215,17 @@ namespace Azure { namespace Data { namespace Tables {
* @return Get access policy result.
*/
Response<Models::TableAccessPolicy> GetAccessPolicy(
Models::GetTableAccessPolicyOptions const& options = {},
Core::Context const& context = {});

/**
* @brief Set table access policy.
*
* @param tableAccessPolicy The TableAccessPolicy to set.
* @param options Optional parameters to execute this function.
* @param context for canceling long running operations.
* @return Set access policy result.
*/
Response<Models::SetTableAccessPolicyResult> SetAccessPolicy(
Models::TableAccessPolicy const& tableAccessPolicy,
Models::SetTableAccessPolicyOptions const& options = {},
Core::Context const& context = {});

/**
Expand Down Expand Up @@ -280,7 +277,6 @@ namespace Azure { namespace Data { namespace Tables {
*/
Response<Models::DeleteEntityResult> DeleteEntity(
Models::TableEntity const& tableEntity,
Models::DeleteEntityOptions const& options = {},
Core::Context const& context = {});

/**
Expand Down Expand Up @@ -420,23 +416,19 @@ namespace Azure { namespace Data { namespace Tables {
/**
* @brief Get service properties
*
* @param options Optional parameters to execute this function.
* @param context for canceling long running operations.
* @return Get service properties result.
*/
Response<Models::TableServiceProperties> GetServiceProperties(
Models::GetServicePropertiesOptions const& options = {},
Core::Context const& context = {});

/**
* @brief Get service statistics
*
* @param options Optional parameters to execute this function.
* @param context for canceling long running operations.
* @return Get service statistics result.
*/
Response<Models::ServiceStatistics> GetStatistics(
Models::GetServiceStatisticsOptions const& options = {},
Core::Context const& context = {});

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <algorithm>

namespace Azure { namespace Data { namespace Tables { namespace Credentials { namespace _internal {
namespace Azure { namespace Data { namespace Tables { namespace Credentials { namespace _detail {

ConnectionStringParts ParseConnectionString(const std::string& connectionString)
{
Expand Down Expand Up @@ -97,4 +97,4 @@ namespace Azure { namespace Data { namespace Tables { namespace Credentials { na
}
return audience + "/.default";
}
}}}}} // namespace Azure::Data::Tables::Credentials::_internal
}}}}} // namespace Azure::Data::Tables::Credentials::_detail
12 changes: 1 addition & 11 deletions sdk/tables/azure-data-tables/src/tables_clients.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using namespace Azure::Data::Tables;
using namespace Azure::Data::Tables::_detail::Policies;
using namespace Azure::Data::Tables::_detail::Xml;
using namespace Azure::Data::Tables::Credentials::_internal;
using namespace Azure::Data::Tables::Credentials::_detail;
using namespace Azure::Data::Tables::_detail;

TableServicesClient::TableServicesClient(const TableClientOptions& options)
Expand Down Expand Up @@ -204,10 +204,8 @@ Azure::Response<Models::SetServicePropertiesResult> TableServicesClient::SetServ
}

Azure::Response<Models::TableServiceProperties> TableServicesClient::GetServiceProperties(
Models::GetServicePropertiesOptions const& options,
Core::Context const& context)
{
(void)options;
auto url = m_url;
url.AppendQueryParameter("restype", "service");
url.AppendQueryParameter("comp", "properties");
Expand All @@ -229,10 +227,8 @@ Azure::Response<Models::TableServiceProperties> TableServicesClient::GetServiceP
}

Azure::Response<Models::ServiceStatistics> TableServicesClient::GetStatistics(
Models::GetServiceStatisticsOptions const& options,
const Core::Context& context)
{
(void)options;
auto url = m_url;
std::string host = url.GetHost();
std::string accountName = host.substr(0, host.find('.'));
Expand Down Expand Up @@ -541,14 +537,12 @@ Models::ListTablesPagedResponse TableServicesClient::ListTables(

Azure::Response<Models::SetTableAccessPolicyResult> TableClient::SetAccessPolicy(
Models::TableAccessPolicy const& tableAccessPolicy,
Models::SetTableAccessPolicyOptions const& options,
Core::Context const& context)

{
auto url = m_url;
url.AppendPath(m_tableName);
url.AppendQueryParameter("comp", "acl");
(void)options;
std::string xmlBody = Serializers::SetAccessPolicy(tableAccessPolicy);
Core::IO::MemoryBodyStream requestBody(
reinterpret_cast<const uint8_t*>(xmlBody.data()), xmlBody.length());
Expand All @@ -569,10 +563,8 @@ Azure::Response<Models::SetTableAccessPolicyResult> TableClient::SetAccessPolicy
}

Azure::Response<Models::TableAccessPolicy> TableClient::GetAccessPolicy(
Models::GetTableAccessPolicyOptions const& options,
Core::Context const& context)
{
(void)options;
auto url = m_url;
url.SetPath("");
url.AppendPath(m_tableName);
Expand Down Expand Up @@ -748,10 +740,8 @@ Azure::Response<Models::MergeEntityResult> TableClient::MergeEntity(

Azure::Response<Models::DeleteEntityResult> TableClient::DeleteEntity(
Models::TableEntity const& tableEntity,
Models::DeleteEntityOptions const& options,
Core::Context const& context)
{
(void)options;
auto url = m_url;
url.AppendPath(
m_tableName + "(PartitionKey='" + tableEntity.PartitionKey + "',RowKey='" + tableEntity.RowKey
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using namespace Azure::Core::Http::Policies;
using namespace Azure::Data::Tables::_detail::Policies;
using namespace Azure::Data::Tables::Credentials;
using namespace Azure::Data::Tables::Credentials::_internal;
using namespace Azure::Data::Tables::Credentials::_detail;
namespace Azure { namespace Data { namespace Tables { namespace _internal { namespace Policies {
namespace Test {

Expand Down
13 changes: 3 additions & 10 deletions sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,7 @@ namespace Azure { namespace Data { namespace Test {
}
else
{
Azure::Data::Tables::Models::GetServicePropertiesOptions getOptions;

auto response = m_tableServiceClient->GetServiceProperties(getOptions);
auto response = m_tableServiceClient->GetServiceProperties();
EXPECT_EQ(response.Value.Logging.RetentionPolicyDefinition.IsEnabled, false);
EXPECT_EQ(response.Value.Logging.Version, "1.0");
EXPECT_EQ(response.Value.Logging.Delete, false);
Expand All @@ -241,10 +239,7 @@ namespace Azure { namespace Data { namespace Test {

TEST_P(TablesClientTest, ServiceClientSet_LIVEONLY_)
{

Azure::Data::Tables::Models::GetServicePropertiesOptions getOptions;

auto response = m_tableServiceClient->GetServiceProperties(getOptions);
auto response = m_tableServiceClient->GetServiceProperties();

Azure::Data::Tables::Models::SetServicePropertiesOptions setOptions;
setOptions.ServiceProperties = std::move(response.Value);
Expand All @@ -254,9 +249,7 @@ namespace Azure { namespace Data { namespace Test {

TEST_P(TablesClientTest, ServiceClientStatistics_LIVEONLY_)
{
Azure::Data::Tables::Models::GetServiceStatisticsOptions statsOptions;

auto response = m_tableServiceClient->GetStatistics(statsOptions);
auto response = m_tableServiceClient->GetStatistics();

EXPECT_EQ(response.RawResponse->GetStatusCode(), Azure::Core::Http::HttpStatusCode::Ok);
EXPECT_EQ(response.Value.GeoReplication.Status.ToString(), "live");
Expand Down
4 changes: 2 additions & 2 deletions sdk/tables/azure-data-tables/test/ut/table_client_test.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ namespace Azure { namespace Data { namespace Test {

std::string GetAccountName()
{
return Azure::Data::Tables::Credentials::_internal::ParseConnectionString(
return Azure::Data::Tables::Credentials::_detail::ParseConnectionString(
GetConnectionString())
.AccountName;
}

std::string GetAccountKey()
{
return Azure::Data::Tables::Credentials::_internal::ParseConnectionString(
return Azure::Data::Tables::Credentials::_detail::ParseConnectionString(
GetConnectionString())
.AccountKey;
}
Expand Down