impl(spanner): remove deprecated ClientOptions

Author: mpeddada1

google/cloud/spanner/CMakeLists.txt

@@ -97,7 +97,6 @@ add_library(
     bytes.h
     client.cc
     client.h
-    client_options.h
     commit_options.cc
     commit_options.h
     commit_result.h
@@ -456,7 +455,6 @@ function (spanner_client_define_tests)
         # cmake-format: sort
         backup_test.cc
         bytes_test.cc
-        client_options_test.cc
         client_test.cc
         commit_options_test.cc
         connection_options_test.cc

google/cloud/spanner/client.h

@@ -16,7 +16,6 @@
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_H
 
 #include "google/cloud/spanner/batch_dml_result.h"
-#include "google/cloud/spanner/client_options.h"
 #include "google/cloud/spanner/commit_options.h"
 #include "google/cloud/spanner/commit_result.h"
 #include "google/cloud/spanner/connection.h"
@@ -717,14 +716,9 @@ class Client {
   StatusOr<PartitionedDmlResult> ExecutePartitionedDml(SqlStatement statement,
                                                        Options opts = {});
 
-  ///@{
-  /// @name Backwards compatibility for ClientOptions.
-  explicit Client(std::shared_ptr<Connection> conn, ClientOptions const& opts)
-      : Client(std::move(conn), Options(opts)) {}
   explicit Client(std::shared_ptr<Connection> conn,
                   std::initializer_list<internal::NonConstructible>)
       : Client(std::move(conn)) {}
-  ///@}
 
   ///@{
   /// @name Backwards compatibility for ReadOptions.

google/cloud/spanner/client_options.cc

@@ -1313,26 +1313,6 @@ TEST(ClientTest, UsesConnectionOptions) {
   EXPECT_STATUS_OK(rollback);
 }
 
-TEST(ClientTest, UsesClientOptions) {
-  auto conn = std::make_shared<MockConnection>();
-  auto txn = MakeReadWriteTransaction();
-
-  EXPECT_CALL(*conn, options).WillOnce([] {
-    return Options{}.set<StringOption>("connection");
-  });
-  EXPECT_CALL(*conn, Rollback)
-      .WillOnce([txn](Connection::RollbackParams const& params) {
-        auto const& options = internal::CurrentOptions();
-        EXPECT_THAT(options.get<StringOption>(), Eq("client"));
-        EXPECT_THAT(params.transaction, Eq(txn));
-        return Status();
-      });
-
-  Client client(conn, Options{}.set<StringOption>("client"));
-  auto rollback = client.Rollback(txn, Options{});
-  EXPECT_STATUS_OK(rollback);
-}
-
 TEST(ClientTest, UsesOperationOptions) {
   auto conn = std::make_shared<MockConnection>();
   auto txn = MakeReadWriteTransaction();

google/cloud/spanner/client_options.h

@@ -51,7 +51,6 @@ google_cloud_cpp_spanner_hdrs = [
     "batch_dml_result.h",
     "bytes.h",
     "client.h",
-    "client_options.h",
     "commit_options.h",
     "commit_result.h",
     "connection.h",

google/cloud/spanner/client_options_test.cc

@@ -19,7 +19,6 @@
 spanner_client_unit_tests = [
     "backup_test.cc",
     "bytes_test.cc",
-    "client_options_test.cc",
     "client_test.cc",
     "commit_options_test.cc",
     "connection_options_test.cc",