cleanup: use common's PaginationRange (googleapis/google-cloud-cpp-sp…

…anner#1278) Deletes our own internal/range_from_pagination.h Fixes: googleapis/google-cloud-cpp-spanner#1256
devjgm · Feb 21, 2020 · 0f8ef35 · 0f8ef35
1 parent 562b1af
commit 0f8ef35
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 201 deletions.
diff --git a/google/cloud/spanner/CMakeLists.txt b/google/cloud/spanner/CMakeLists.txt
@@ -160,7 +160,6 @@ add_library(
     internal/partial_result_set_source.cc
     internal/partial_result_set_source.h
     internal/polling_loop.h
-    internal/range_from_pagination.h
     internal/retry_loop.cc
     internal/retry_loop.h
     internal/session.cc

diff --git a/google/cloud/spanner/database_admin_connection.h b/google/cloud/spanner/database_admin_connection.h
@@ -19,9 +19,9 @@
 #include "google/cloud/spanner/database.h"
 #include "google/cloud/spanner/instance.h"
 #include "google/cloud/spanner/internal/database_admin_stub.h"
-#include "google/cloud/spanner/internal/range_from_pagination.h"
 #include "google/cloud/spanner/polling_policy.h"
 #include "google/cloud/spanner/retry_policy.h"
+#include "google/cloud/internal/pagination_range.h"
 #include <google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h>
 #include <string>
 #include <vector>
@@ -40,7 +40,7 @@ inline namespace SPANNER_CLIENT_NS {
  *
  * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range
  */
-using ListDatabaseRange = internal::PaginationRange<
+using ListDatabaseRange = google::cloud::internal::PaginationRange<
     google::spanner::admin::database::v1::Database,
     google::spanner::admin::database::v1::ListDatabasesRequest,
     google::spanner::admin::database::v1::ListDatabasesResponse>;

diff --git a/google/cloud/spanner/instance_admin_connection.h b/google/cloud/spanner/instance_admin_connection.h
@@ -17,9 +17,9 @@
 
 #include "google/cloud/spanner/backoff_policy.h"
 #include "google/cloud/spanner/internal/instance_admin_stub.h"
-#include "google/cloud/spanner/internal/range_from_pagination.h"
 #include "google/cloud/spanner/polling_policy.h"
 #include "google/cloud/spanner/retry_policy.h"
+#include "google/cloud/internal/pagination_range.h"
 #include <google/spanner/admin/instance/v1/spanner_instance_admin.grpc.pb.h>
 #include <map>
 
@@ -37,7 +37,7 @@ inline namespace SPANNER_CLIENT_NS {
  *
  * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range
  */
-using ListInstancesRange = internal::PaginationRange<
+using ListInstancesRange = google::cloud::internal::PaginationRange<
     google::spanner::admin::instance::v1::Instance,
     google::spanner::admin::instance::v1::ListInstancesRequest,
     google::spanner::admin::instance::v1::ListInstancesResponse>;
@@ -51,7 +51,7 @@ using ListInstancesRange = internal::PaginationRange<
  *
  * [cppref-input-range]: https://en.cppreference.com/w/cpp/ranges/input_range
  */
-using ListInstanceConfigsRange = internal::PaginationRange<
+using ListInstanceConfigsRange = google::cloud::internal::PaginationRange<
     google::spanner::admin::instance::v1::InstanceConfig,
     google::spanner::admin::instance::v1::ListInstanceConfigsRequest,
     google::spanner::admin::instance::v1::ListInstanceConfigsResponse>;

diff --git a/google/cloud/spanner/internal/range_from_pagination.h b/google/cloud/spanner/internal/range_from_pagination.h
diff --git a/google/cloud/spanner/spanner_client.bzl b/google/cloud/spanner/spanner_client.bzl
@@ -53,7 +53,6 @@ spanner_client_hdrs = [
     "internal/partial_result_set_resume.h",
     "internal/partial_result_set_source.h",
     "internal/polling_loop.h",
-    "internal/range_from_pagination.h",
     "internal/retry_loop.h",
     "internal/session.h",
     "internal/session_pool.h",