From ae8413fd5a9882582e40e967258bbea5a85fde72 Mon Sep 17 00:00:00 2001
From: gearama <50641385+gearama@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:00:42 -0800
Subject: [PATCH] Remove redundant struct (#6326)

* remove reduntant struct

* clang
---
 .../inc/azure/data/tables/models.hpp                | 13 -------------
 .../inc/azure/data/tables/table_client.hpp          |  4 ++--
 sdk/tables/azure-data-tables/src/table_clients.cpp  |  4 ++--
 .../azure-data-tables/test/ut/table_client_test.cpp |  5 -----
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
index afb4c3069..056a97d08 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
@@ -556,19 +556,6 @@ namespace Azure { namespace Data { namespace Tables {
       Merge,
     };
 
-    /**
-     * @brief Upsert Entity options.
-     *
-     */
-    struct UpsertEntityOptions
-    {
-      /**
-       * @brief Upsert type.
-       *
-       */
-      UpsertKind UpsertType = UpsertKind::Update;
-    };
-
     /**
      * @brief Add Entity result.
      *
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/table_client.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/table_client.hpp
index 1509ba7df..3756b2148 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/table_client.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/table_client.hpp
@@ -134,13 +134,13 @@ namespace Azure { namespace Data { namespace Tables {
      * @brief Upsert specified entity in a table.
      *
      * @param tableEntity The TableEntity to upsert.
-     * @param options Optional parameters to execute this function.
+     * @param upsertKind Upsert kind(update/merge), default update.
      * @param context for canceling long running operations.
      * @return Upsert entity result.
      */
     Response<Models::UpsertEntityResult> UpsertEntity(
         Models::TableEntity const& tableEntity,
-        Models::UpsertEntityOptions const& options = {},
+        Models::UpsertKind upsertKind = Models::UpsertKind::Update,
         Core::Context const& context = {});
 
     /**
diff --git a/sdk/tables/azure-data-tables/src/table_clients.cpp b/sdk/tables/azure-data-tables/src/table_clients.cpp
index a501945a3..0551634eb 100644
--- a/sdk/tables/azure-data-tables/src/table_clients.cpp
+++ b/sdk/tables/azure-data-tables/src/table_clients.cpp
@@ -569,12 +569,12 @@ Azure::Response<Models::DeleteEntityResult> TableClient::DeleteEntity(
 
 Azure::Response<Models::UpsertEntityResult> TableClient::UpsertEntity(
     Models::TableEntity const& tableEntity,
-    Models::UpsertEntityOptions const& options,
+    Models::UpsertKind upsertKind,
     Core::Context const& context)
 {
   try
   {
-    switch (options.UpsertType)
+    switch (upsertKind)
     {
       case Models::UpsertKind::Merge: {
         auto response = MergeEntity(tableEntity, context);
diff --git a/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp b/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
index 1afbbf316..14c051928 100644
--- a/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
+++ b/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
@@ -344,9 +344,6 @@ namespace Azure { namespace Data { namespace Test {
     EXPECT_EQ(response.RawResponse->GetStatusCode(), Azure::Core::Http::HttpStatusCode::NoContent);
     EXPECT_FALSE(response.Value.ETag.empty());
 
-    Azure::Data::Tables::Models::UpsertEntityOptions options;
-    options.UpsertType = Azure::Data::Tables::Models::UpsertKind::Update;
-
     entity.Properties["Product"] = TableEntityProperty("Tables2");
     auto updateResponse = m_tableClient->MergeEntity(entity);
 
@@ -354,8 +351,6 @@ namespace Azure { namespace Data { namespace Test {
         updateResponse.RawResponse->GetStatusCode(), Azure::Core::Http::HttpStatusCode::NoContent);
     EXPECT_FALSE(updateResponse.Value.ETag.empty());
 
-    Azure::Data::Tables::Models::UpsertEntityOptions options2;
-    options2.UpsertType = Azure::Data::Tables::Models::UpsertKind::Merge;
     entity.Properties["Product3"] = TableEntityProperty("Tables3");
     entity.SetETag(updateResponse.Value.ETag);
     auto updateResponse2 = m_tableClient->MergeEntity(entity);