remove deprecated functions and update includes

scotthart · scotthart · commit 6a916372a369 · 2026-01-20T16:51:23.000-05:00
diff --git a/google/cloud/pubsub/benchmarks/throughput.cc b/google/cloud/pubsub/benchmarks/throughput.cc
@@ -14,6 +14,7 @@
 
 #include "google/cloud/pubsub/admin/subscription_admin_client.h"
 #include "google/cloud/pubsub/admin/topic_admin_client.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/publisher.h"
 #include "google/cloud/pubsub/subscriber.h"
 #include "google/cloud/pubsub/testing/random_names.h"
diff --git a/google/cloud/pubsub/integration_tests/subscriber_integration_test.cc b/google/cloud/pubsub/integration_tests/subscriber_integration_test.cc
@@ -21,6 +21,7 @@
 #include "google/cloud/pubsub/internal/noop_message_callback.h"
 #include "google/cloud/pubsub/internal/streaming_subscription_batch_source.h"
 #include "google/cloud/pubsub/internal/subscriber_stub_factory.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/publisher.h"
 #include "google/cloud/pubsub/subscriber.h"
 #include "google/cloud/pubsub/subscription.h"
diff --git a/google/cloud/pubsub/internal/batching_publisher_connection.cc b/google/cloud/pubsub/internal/batching_publisher_connection.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "google/cloud/pubsub/internal/batching_publisher_connection.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/internal/make_status.h"
 
 namespace google {
diff --git a/google/cloud/pubsub/internal/batching_publisher_connection_test.cc b/google/cloud/pubsub/internal/batching_publisher_connection_test.cc
@@ -14,6 +14,7 @@
 
 #include "google/cloud/pubsub/internal/batching_publisher_connection.h"
 #include "google/cloud/pubsub/internal/defaults.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/testing/mock_batch_sink.h"
 #include "google/cloud/future.h"
 #include "google/cloud/internal/random.h"
diff --git a/google/cloud/pubsub/internal/blocking_publisher_connection_impl.cc b/google/cloud/pubsub/internal/blocking_publisher_connection_impl.cc
@@ -14,6 +14,7 @@
 
 #include "google/cloud/pubsub/internal/blocking_publisher_connection_impl.h"
 #include "google/cloud/pubsub/internal/publisher_stub_factory.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/internal/retry_loop.h"
 
diff --git a/google/cloud/pubsub/internal/flow_controlled_publisher_connection.h b/google/cloud/pubsub/internal/flow_controlled_publisher_connection.h
@@ -15,6 +15,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_FLOW_CONTROLLED_PUBLISHER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_INTERNAL_FLOW_CONTROLLED_PUBLISHER_CONNECTION_H
 
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/publisher_connection.h"
 #include "google/cloud/pubsub/version.h"
 #include <condition_variable>
diff --git a/google/cloud/pubsub/internal/streaming_subscription_batch_source.cc b/google/cloud/pubsub/internal/streaming_subscription_batch_source.cc
@@ -15,6 +15,7 @@
 #include "google/cloud/pubsub/internal/streaming_subscription_batch_source.h"
 #include "google/cloud/pubsub/internal/exactly_once_policies.h"
 #include "google/cloud/pubsub/internal/extend_leases_with_retry.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/internal/async_retry_loop.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/internal/url_encode.h"
diff --git a/google/cloud/pubsub/internal/streaming_subscription_batch_source_test.cc b/google/cloud/pubsub/internal/streaming_subscription_batch_source_test.cc
@@ -14,6 +14,7 @@
 
 #include "google/cloud/pubsub/internal/streaming_subscription_batch_source.h"
 #include "google/cloud/pubsub/internal/defaults.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/subscription.h"
 #include "google/cloud/pubsub/testing/mock_batch_callback.h"
 #include "google/cloud/pubsub/testing/mock_subscriber_stub.h"
diff --git a/google/cloud/pubsub/internal/subscriber_connection_impl_test.cc b/google/cloud/pubsub/internal/subscriber_connection_impl_test.cc
@@ -16,6 +16,7 @@
 #include "google/cloud/pubsub/ack_handler.h"
 #include "google/cloud/pubsub/exactly_once_ack_handler.h"
 #include "google/cloud/pubsub/internal/defaults.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/testing/fake_streaming_pull.h"
 #include "google/cloud/pubsub/testing/mock_subscriber_stub.h"
 #include "google/cloud/pubsub/testing/test_retry_policies.h"
diff --git a/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc b/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc
@@ -20,6 +20,7 @@
 #include "google/cloud/pubsub/mocks/mock_exactly_once_ack_handler.h"
 #include "google/cloud/pubsub/mocks/mock_pull_ack_handler.h"
 #include "google/cloud/pubsub/mocks/mock_subscriber_connection.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/pull_ack_handler.h"
 #include "google/cloud/pubsub/subscriber_connection.h"
 #include "google/cloud/internal/make_status.h"
diff --git a/google/cloud/pubsub/internal/subscription_session.cc b/google/cloud/pubsub/internal/subscription_session.cc
@@ -24,6 +24,7 @@
 #include "google/cloud/pubsub/internal/subscription_lease_management.h"
 #include "google/cloud/pubsub/internal/subscription_message_queue.h"
 #include "google/cloud/pubsub/internal/tracing_message_callback.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/log.h"
 #include "google/cloud/opentelemetry_options.h"
 
diff --git a/google/cloud/pubsub/internal/subscription_session_test.cc b/google/cloud/pubsub/internal/subscription_session_test.cc
@@ -17,6 +17,7 @@
 #include "google/cloud/pubsub/application_callback.h"
 #include "google/cloud/pubsub/exactly_once_ack_handler.h"
 #include "google/cloud/pubsub/internal/defaults.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/subscriber_connection.h"
 #include "google/cloud/pubsub/testing/fake_streaming_pull.h"
 #include "google/cloud/pubsub/testing/mock_subscriber_stub.h"
diff --git a/google/cloud/pubsub/publisher.h b/google/cloud/pubsub/publisher.h
@@ -17,7 +17,6 @@
 
 #include "google/cloud/pubsub/connection_options.h"
 #include "google/cloud/pubsub/publisher_connection.h"
-#include "google/cloud/pubsub/publisher_options.h"
 #include "google/cloud/pubsub/version.h"
 #include <string>
 
@@ -185,13 +184,6 @@ class Publisher {
     connection_->ResumePublish({std::move(ordering_key)});
   }
 
-  /// @deprecated Use `Publisher(connection)` and provide any configuration
-  ///     options when initializing the @p connection object.
-  GOOGLE_CLOUD_CPP_DEPRECATED("use `Publisher(connection)` instead")
-  explicit Publisher(std::shared_ptr<PublisherConnection> connection,
-                     PublisherOptions const& /* options*/)
-      : Publisher(std::move(connection)) {}
-
  private:
   std::shared_ptr<PublisherConnection> connection_;
 };
diff --git a/google/cloud/pubsub/publisher_connection.cc b/google/cloud/pubsub/publisher_connection.cc
@@ -132,18 +132,6 @@ std::shared_ptr<PublisherConnection> MakePublisherConnection(Topic topic,
   return MakePublisherConnection("", std::move(topic), std::move(opts));
 }
 
-std::shared_ptr<PublisherConnection> MakePublisherConnection(
-    Topic topic, PublisherOptions options, ConnectionOptions connection_options,
-    std::unique_ptr<pubsub::RetryPolicy const> retry_policy,
-    std::unique_ptr<pubsub::BackoffPolicy const> backoff_policy) {
-  auto opts = internal::MergeOptions(
-      pubsub_internal::MakeOptions(std::move(options)),
-      internal::MakeOptions(std::move(connection_options)));
-  if (retry_policy) opts.set<RetryPolicyOption>(retry_policy->clone());
-  if (backoff_policy) opts.set<BackoffPolicyOption>(backoff_policy->clone());
-  return MakePublisherConnection(std::move(topic), std::move(opts));
-}
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace pubsub
 
diff --git a/google/cloud/pubsub/publisher_connection.h b/google/cloud/pubsub/publisher_connection.h
@@ -132,45 +132,6 @@ std::shared_ptr<PublisherConnection> MakePublisherConnection(
 std::shared_ptr<PublisherConnection> MakePublisherConnection(Topic topic,
                                                              Options opts = {});
 
-/**
- * Creates a new `PublisherConnection` object to work with `Publisher`.
- *
- * The `PublisherConnection` class is not intended for direct use in
- * applications, it is provided for applications wanting to mock the
- * `Publisher` behavior in their tests.
- *
- * @par Performance
- * Creating a new `PublisherConnection` is relatively expensive. This typically
- * initiate connections to the service, and therefore these objects should be
- * shared and reused when possible. Note that gRPC reuses existing OS resources
- * (sockets) whenever possible, so applications may experience better
- * performance on the second (and subsequent) calls to this function with the
- * identical values for @p options. However, this behavior is not guaranteed
- * and applications should not rely on it.
- *
- * @see `PublisherConnection`
- *
- * @param topic the Cloud Pub/Sub topic used by the returned
- *     `PublisherConnection`.
- * @param options configure the batching policy and other parameters in the
- *     returned connection.
- * @param connection_options (optional) general configuration for this
- *    connection, this type is also used to configure `pubsub::Subscriber`.
- * @param retry_policy (optional) configure the retry loop.
- * @param backoff_policy (optional) configure the backoff period between
- *    retries.
- *
- * @deprecated Please use the `MakePublisherConnection` method which accepts
- *     `google::cloud::Options` instead.
- */
-GOOGLE_CLOUD_CPP_DEPRECATED(
-    "use the overload consuming google::cloud::Options instead")
-std::shared_ptr<PublisherConnection> MakePublisherConnection(
-    Topic topic, PublisherOptions options,
-    ConnectionOptions connection_options = {},
-    std::unique_ptr<RetryPolicy const> retry_policy = {},
-    std::unique_ptr<BackoffPolicy const> backoff_policy = {});
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace pubsub
 
diff --git a/google/cloud/pubsub/samples/blocking_samples.cc b/google/cloud/pubsub/samples/blocking_samples.cc
@@ -14,6 +14,7 @@
 
 #include "google/cloud/pubsub/admin/topic_admin_client.h"
 #include "google/cloud/pubsub/blocking_publisher.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/samples/pubsub_samples_common.h"
 #include "google/cloud/internal/getenv.h"
 #include "google/cloud/internal/random.h"
diff --git a/google/cloud/pubsub/samples/iam_samples.cc b/google/cloud/pubsub/samples/iam_samples.cc
@@ -15,6 +15,7 @@
 #include "google/cloud/iam/iam_policy_client.h"
 #include "google/cloud/pubsub/admin/subscription_admin_client.h"
 #include "google/cloud/pubsub/admin/topic_admin_client.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/samples/pubsub_samples_common.h"
 #include "google/cloud/pubsub/subscription_builder.h"
 #include "google/cloud/internal/getenv.h"
diff --git a/google/cloud/pubsub/samples/samples.cc b/google/cloud/pubsub/samples/samples.cc
@@ -14,6 +14,7 @@
 
 #include "google/cloud/pubsub/admin/subscription_admin_client.h"
 #include "google/cloud/pubsub/admin/topic_admin_client.h"
+#include "google/cloud/pubsub/options.h"
 #include "google/cloud/pubsub/samples/pubsub_samples_common.h"
 #include "google/cloud/pubsub/samples/testdata/schema.pb.h"
 #include "google/cloud/pubsub/schema.h"
diff --git a/google/cloud/pubsub/subscriber_connection.cc b/google/cloud/pubsub/subscriber_connection.cc
@@ -101,19 +101,6 @@ std::shared_ptr<SubscriberConnection> MakeSubscriberConnection(
   return MakeSubscriberConnection("", std::move(subscription), std::move(opts));
 }
 
-std::shared_ptr<SubscriberConnection> MakeSubscriberConnection(
-    Subscription subscription, SubscriberOptions options,
-    ConnectionOptions connection_options,
-    std::unique_ptr<pubsub::RetryPolicy const> retry_policy,
-    std::unique_ptr<pubsub::BackoffPolicy const> backoff_policy) {
-  auto opts = internal::MergeOptions(
-      pubsub_internal::MakeOptions(std::move(options)),
-      internal::MakeOptions(std::move(connection_options)));
-  if (retry_policy) opts.set<RetryPolicyOption>(retry_policy->clone());
-  if (backoff_policy) opts.set<BackoffPolicyOption>(backoff_policy->clone());
-  return MakeSubscriberConnection(std::move(subscription), std::move(opts));
-}
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace pubsub
 
diff --git a/google/cloud/pubsub/subscriber_connection.h b/google/cloud/pubsub/subscriber_connection.h
@@ -144,49 +144,6 @@ std::shared_ptr<SubscriberConnection> MakeSubscriberConnection(
 std::shared_ptr<SubscriberConnection> MakeSubscriberConnection(
     Subscription subscription, Options opts = {});
 
-/**
- * Creates a new `SubscriberConnection` object to work with `Subscriber`.
- *
- * The `SubscriberConnection` class is not intended for direct use in
- * applications, it is provided for applications wanting to mock the
- * `Subscriber` behavior in their tests.
- *
- * @par Performance
- * Creating a new `SubscriberConnection` is relatively expensive. This typically
- * initiates connections to the service, and therefore these objects should be
- * shared and reused when possible. Note that gRPC reuses existing OS resources
- * (sockets) whenever possible, so applications may experience better
- * performance on the second (and subsequent) calls to this function with the
- * identical values for @p options. However, this behavior is not guaranteed
- * and applications should not rely on it.
- *
- * @see `SubscriberConnection`
- *
- * @par Changing Retry Parameters Example
- * @snippet samples.cc subscriber-retry-settings
- *
- * @param subscription the Cloud Pub/Sub subscription used by the returned
- *     connection.
- * @param options configure the flow control and other parameters in the
- *     returned connection.
- * @param connection_options (optional) general configuration for this
- *    connection, this type is also used to configure `pubsub::Publisher`.
- * @param retry_policy control for how long (or how many times) are retryable
- *     RPCs attempted.
- * @param backoff_policy controls the backoff behavior between retry attempts,
- *     typically some form of exponential backoff with jitter.
- *
- * @deprecated Please use the `MakeSubscriberConnection` function which accepts
- *     `google::cloud::Options` instead.
- */
-GOOGLE_CLOUD_CPP_DEPRECATED(
-    "use the overload consuming google::cloud::Options instead")
-std::shared_ptr<SubscriberConnection> MakeSubscriberConnection(
-    Subscription subscription, SubscriberOptions options,
-    ConnectionOptions connection_options = {},
-    std::unique_ptr<pubsub::RetryPolicy const> retry_policy = {},
-    std::unique_ptr<pubsub::BackoffPolicy const> backoff_policy = {});
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace pubsub
 
