impl(storage): remove deprecated ClientOptions class

Author: mpeddada1

google/cloud/storage/client.cc

@@ -60,8 +60,6 @@ Client::Client(InternalOnly, Options const& opts)
     : Client(InternalOnlyNoDecorations{},
              storage_internal::MakeStorageConnection(opts)) {}
 
-StatusOr<Client> Client::CreateDefaultClient() { return Client(Options{}); }
-
 ObjectReadStream Client::ReadObjectImpl(
     internal::ReadObjectRangeRequest const& request) {
   auto source = connection_->ReadObject(request);
@@ -235,12 +233,12 @@ std::string Client::SigningEmail(SigningAccount const& signing_account) const {
   if (signing_account.has_value()) {
     return signing_account.value();
   }
-  return connection_->client_options().credentials()->AccountEmail();
+  return connection_->options().get<Oauth2CredentialsOption>()->AccountEmail();
 }
 
 StatusOr<Client::SignBlobResponseRaw> Client::SignBlobImpl(
     SigningAccount const& signing_account, std::string const& string_to_sign) {
-  auto credentials = connection_->client_options().credentials();
+  auto credentials = connection_->options().get<Oauth2CredentialsOption>();
 
   // First try to sign locally.
   auto signed_blob = credentials->SignBlob(signing_account, string_to_sign);

google/cloud/storage/client.h

@@ -15,6 +15,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_CLIENT_H
 
+#include "google/cloud/storage/client_options.h"
 #include "google/cloud/storage/hmac_key_metadata.h"
 #include "google/cloud/storage/internal/policy_document_request.h"
 #include "google/cloud/storage/internal/request_project_id.h"
@@ -3421,79 +3422,6 @@ class Client {
   }
   ///@}
 
-  /**
-   * Creates the default client type given the options.
-   *
-   * @param options the client options, these are used to control credentials,
-   *   buffer sizes, etc.
-   * @param policies the client policies, these control the behavior of the
-   *   client, for example, how to backoff when an operation needs to be
-   *   retried, or what operations cannot be retried because they are not
-   *   idempotent.
-   *
-   * @deprecated use the constructor from `google::cloud::Options` instead.
-   */
-  template <typename... Policies>
-  explicit Client(ClientOptions options, Policies&&... policies)
-      : Client(InternalOnly{}, internal::ApplyPolicies(
-                                   internal::MakeOptions(std::move(options)),
-                                   std::forward<Policies>(policies)...)) {}
-
-  /**
-   * Creates the default client type given the credentials and policies.
-   *
-   * @param credentials a set of credentials to initialize the `ClientOptions`.
-   * @param policies the client policies, these control the behavior of the
-   *   client, for example, how to backoff when an operation needs to be
-   *   retried, or what operations cannot be retried because they are not
-   *   idempotent.
-   *
-   * @deprecated use the constructor from `google::cloud::Options` instead.
-   */
-  template <typename... Policies>
-  explicit Client(std::shared_ptr<oauth2::Credentials> credentials,
-                  Policies&&... policies)
-      : Client(InternalOnly{},
-               internal::ApplyPolicies(
-                   internal::DefaultOptions(std::move(credentials), {}),
-                   std::forward<Policies>(policies)...)) {}
-
-  /**
-   * Create a Client using ClientOptions::CreateDefaultClientOptions().
-   *
-   * @deprecated use the constructor from `google::cloud::Options` instead.
-   */
-  static StatusOr<Client> CreateDefaultClient();
-
-  /// Builds a client and maybe override the retry, idempotency, and/or backoff
-  /// policies.
-  /// @deprecated This was intended only for test code, applications should not
-  /// use it.
-  template <typename... Policies>
-#if !defined(_MSC_VER) || _MSC_VER >= 1920
-  GOOGLE_CLOUD_CPP_DEPRECATED(
-      "applications should not need this."
-      " Please use the constructors from ClientOptions instead."
-      " For mocking, please use testing::ClientFromMock() instead."
-      " Please file a bug at https://github.com/googleapis/google-cloud-cpp"
-      " if you have a use-case not covered by these.")
-#endif  // _MSC_VER
-  // We cannot `std::move(connection)` because it is used twice in the delegated
-  // constructor parameters. And we cannot just use `StorageConnection const&`
-  // because we do hold on to the `std::shared_ptr<>`.
-  explicit Client(
-      std::shared_ptr<internal::StorageConnection> const& connection,
-      Policies&&... policies)
-      : Client(InternalOnly{},
-               internal::ApplyPolicies(
-                   internal::DefaultOptions(
-                       connection->client_options().credentials(), {}),
-                   std::forward<Policies>(policies)...),
-               // We cannot std::move() because it is also used in the previous
-               // parameter.
-               connection) {
-  }
-
   /// Define a tag to disable automatic decorations of the StorageConnection.
   struct NoDecorations {};
 
@@ -3675,8 +3603,20 @@ struct ClientImplDetails {
   // NOLINTNEXTLINE(performance-unnecessary-value-param)
   static Client CreateClient(std::shared_ptr<StorageConnection> c,
                              Policies&&... p) {
-    auto opts =
-        internal::ApplyPolicies(c->options(), std::forward<Policies>(p)...);
+    struct ApplyPoliciesHelper {
+      Options& opts;
+      void operator()(RetryPolicy const& p) {
+        opts.set<RetryPolicyOption>(p.clone());
+      }
+      void operator()(BackoffPolicy const& p) {
+        opts.set<BackoffPolicyOption>(p.clone());
+      }
+      void operator()(IdempotencyPolicy const& p) {
+        opts.set<IdempotencyPolicyOption>(p.clone());
+      }
+    };
+    auto opts = c->options();
+    (ApplyPoliciesHelper{opts}(std::forward<Policies>(p)), ...);
     return CreateWithDecorations(opts, std::move(c));
   }
 };

google/cloud/storage/client_bucket_test.cc

@@ -197,7 +197,6 @@ TEST_F(BucketTest, CreateBucket) {
 })""";
   auto expected = internal::BucketMetadataParser::FromString(text).value();
 
-  EXPECT_CALL(*mock_, client_options()).Times(0);
   EXPECT_CALL(*mock_, CreateBucket)
       .WillOnce(Return(StatusOr<BucketMetadata>(TransientError())))
       .WillOnce([&expected](internal::CreateBucketRequest const& r) {

google/cloud/storage/client_options.cc

@@ -51,13 +51,13 @@ absl::optional<std::string> GetEmulator() {
 }
 
 StatusOr<std::shared_ptr<oauth2::Credentials>> StorageDefaultCredentials(
-    ChannelOptions const& channel_options) {
+    Options const& options) {
   auto emulator = GetEmulator();
   if (emulator.has_value()) {
     return StatusOr<std::shared_ptr<oauth2::Credentials>>(
         oauth2::CreateAnonymousCredentials());
   }
-  return oauth2::GoogleDefaultCredentials(channel_options);
+  return oauth2::GoogleDefaultCredentials(options);
 }
 
 std::size_t DefaultConnectionPoolSize() {
@@ -146,18 +146,6 @@ std::string IamEndpoint(Options const& options) {
   return options.get<IamEndpointOption>();
 }
 
-Options MakeOptions(ClientOptions o) {
-  auto opts = std::move(o.opts_);
-  if (!o.channel_options().ssl_root_path().empty()) {
-    opts.set<CARootsFilePathOption>(o.channel_options().ssl_root_path());
-  }
-  return opts;
-}
-
-ClientOptions MakeBackwardsCompatibleClientOptions(Options opts) {
-  return ClientOptions(std::move(opts));
-}
-
 Options ApplyPolicy(Options opts, RetryPolicy const& p) {
   opts.set<RetryPolicyOption>(p.clone());
   return opts;
@@ -311,67 +299,6 @@ Options DefaultOptionsWithCredentials(Options opts) {
 
 }  // namespace internal
 
-StatusOr<ClientOptions> ClientOptions::CreateDefaultClientOptions() {
-  return CreateDefaultClientOptions(ChannelOptions{});
-}
-
-StatusOr<ClientOptions> ClientOptions::CreateDefaultClientOptions(
-    ChannelOptions const& channel_options) {
-  auto creds = StorageDefaultCredentials(channel_options);
-  if (!creds) return creds.status();
-  return ClientOptions(*creds, channel_options);
-}
-
-ClientOptions::ClientOptions(std::shared_ptr<oauth2::Credentials> credentials,
-                             ChannelOptions channel_options)
-    : opts_(internal::DefaultOptions(std::move(credentials), {})),
-      channel_options_(std::move(channel_options)) {}
-
-ClientOptions::ClientOptions(Options o)
-    : opts_(std::move(o)),
-      user_agent_prefix_(
-          absl::StrJoin(opts_.get<UserAgentProductsOption>(), " ")) {
-  channel_options_.set_ssl_root_path(opts_.get<CARootsFilePathOption>());
-}
-
-bool ClientOptions::enable_http_tracing() const {
-  return opts_.get<LoggingComponentsOption>().count("http") != 0;
-}
-
-ClientOptions& ClientOptions::set_enable_http_tracing(bool enable) {
-  if (enable) {
-    opts_.lookup<LoggingComponentsOption>().insert("http");
-  } else {
-    opts_.lookup<LoggingComponentsOption>().erase("http");
-  }
-  return *this;
-}
-
-bool ClientOptions::enable_raw_client_tracing() const {
-  return opts_.get<LoggingComponentsOption>().count("raw-client") != 0;
-}
-
-ClientOptions& ClientOptions::set_enable_raw_client_tracing(bool enable) {
-  if (enable) {
-    opts_.lookup<LoggingComponentsOption>().insert("raw-client");
-  } else {
-    opts_.lookup<LoggingComponentsOption>().erase("raw-client");
-  }
-  return *this;
-}
-
-ClientOptions& ClientOptions::SetDownloadBufferSize(std::size_t size) {
-  opts_.set<DownloadBufferSizeOption>(
-      size == 0 ? GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE : size);
-  return *this;
-}
-
-ClientOptions& ClientOptions::SetUploadBufferSize(std::size_t size) {
-  opts_.set<UploadBufferSizeOption>(
-      size == 0 ? GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE : size);
-  return *this;
-}
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage
 }  // namespace cloud