Standardize on fully qualified using declarations (#2028)

* fixed all usings in storage/ fixed formatting modified: ../storage/bucket_metadata_test.cc modified: ../storage/bucket_test.cc modified: ../storage/client_bucket_acl_test.cc modified: ../storage/client_default_object_acl_test.cc modified: ../storage/client_notifications_test.cc modified: ../storage/client_object_acl_test.cc modified: ../storage/client_object_copy_test.cc modified: ../storage/client_service_account_test.cc modified: ../storage/client_sign_url_test.cc modified: ../storage/client_test.cc modified: ../storage/client_write_object_test.cc modified: ../storage/doc/storage-main.dox modified: ../storage/examples/storage_bucket_acl_samples.cc modified: ../storage/examples/storage_bucket_iam_samples.cc modified: ../storage/examples/storage_bucket_samples.cc modified: ../storage/examples/storage_default_object_acl_samples.cc modified: ../storage/examples/storage_notification_samples.cc modified: ../storage/examples/storage_object_acl_samples.cc modified: ../storage/examples/storage_object_samples.cc modified: ../storage/internal/bucket_acl_requests_test.cc modified: ../storage/internal/bucket_requests.cc modified: ../storage/internal/bucket_requests_test.cc modified: ../storage/internal/compute_engine_util_test.cc modified: ../storage/internal/curl_client_test.cc modified: ../storage/internal/curl_handle.cc modified: ../storage/internal/curl_resumable_upload_session_test.cc modified: ../storage/internal/default_object_acl_requests_test.cc modified: ../storage/internal/format_rfc3339_test.cc modified: ../storage/internal/generate_message_boundary_test.cc modified: ../storage/internal/hash_validator_test.cc modified: ../storage/internal/http_response_test.cc modified: ../storage/internal/logging_client.cc modified: ../storage/internal/logging_client_test.cc modified: ../storage/internal/logging_resumable_upload_session_test.cc modified: ../storage/internal/notification_requests_test.cc modified: ../storage/internal/object_acl_requests_test.cc modified: ../storage/internal/object_requests.cc modified: ../storage/internal/object_requests_test.cc modified: ../storage/internal/openssl_util.h modified: ../storage/internal/parse_rfc3339_test.cc modified: ../storage/internal/retry_client.cc modified: ../storage/internal/retry_client_test.cc modified: ../storage/internal/retry_resumable_upload_session_test.cc modified: ../storage/internal/service_account_requests_test.cc modified: ../storage/internal/signed_url_requests_test.cc modified: ../storage/list_buckets_reader_test.cc modified: ../storage/list_objects_reader_test.cc modified: ../storage/notification_metadata_test.cc modified: ../storage/oauth2/authorized_user_credentials_test.cc modified: ../storage/oauth2/compute_engine_credentials_test.cc modified: ../storage/oauth2/google_application_default_credentials_file_test.cc modified: ../storage/oauth2/google_credentials_test.cc modified: ../storage/oauth2/service_account_credentials.h modified: ../storage/oauth2/service_account_credentials_test.cc modified: ../storage/object_test.cc modified: ../storage/service_account_test.cc modified: ../storage/storage_version_test.cc modified: ../storage/tests/bucket_integration_test.cc modified: ../storage/tests/curl_download_request_integration_test.cc modified: ../storage/tests/curl_request_integration_test.cc modified: ../storage/tests/curl_resumable_streambuf_integration_test.cc modified: ../storage/tests/curl_resumable_upload_session_integration_test.cc modified: ../storage/tests/curl_streambuf_integration_test.cc modified: ../storage/tests/curl_upload_request_integration_test.cc modified: ../storage/tests/object_checksum_integration_test.cc modified: ../storage/tests/object_hash_integration_test.cc modified: ../storage/tests/object_insert_integration_test.cc modified: ../storage/tests/object_integration_test.cc modified: ../storage/tests/object_media_integration_test.cc modified: ../storage/tests/object_resumable_write_integration_test.cc modified: ../storage/tests/object_rewrite_integration_test.cc modified: ../storage/tests/service_account_integration_test.cc modified: ../storage/well_known_headers_test.cc Changes not staged for commit: modified: ../storage/bucket_test.cc modified: ../storage/client_bucket_acl_test.cc modified: ../storage/client_default_object_acl_test.cc modified: ../storage/client_notifications_test.cc modified: ../storage/client_object_acl_test.cc modified: ../storage/client_object_copy_test.cc modified: ../storage/client_service_account_test.cc modified: ../storage/client_test.cc modified: ../storage/client_write_object_test.cc modified: ../storage/internal/curl_resumable_upload_session_test.cc modified: ../storage/internal/logging_client.cc modified: ../storage/internal/logging_client_test.cc modified: ../storage/internal/logging_resumable_upload_session_test.cc modified: ../storage/internal/retry_client_test.cc modified: ../storage/internal/retry_resumable_upload_session_test.cc modified: ../storage/list_buckets_reader_test.cc modified: ../storage/list_objects_reader_test.cc modified: ../storage/oauth2/authorized_user_credentials_test.cc modified: ../storage/oauth2/compute_engine_credentials_test.cc modified: ../storage/oauth2/service_account_credentials_test.cc modified: ../storage/object_test.cc modified: ../storage/storage_version_test.cc modified: ../storage/bucket_metadata_test.cc modified: ../storage/bucket_test.cc modified: ../storage/client_bucket_acl_test.cc modified: ../storage/client_default_object_acl_test.cc modified: ../storage/client_notifications_test.cc modified: ../storage/client_object_acl_test.cc modified: ../storage/client_object_copy_test.cc modified: ../storage/client_service_account_test.cc modified: ../storage/client_sign_url_test.cc modified: ../storage/client_test.cc modified: ../storage/client_write_object_test.cc modified: ../storage/doc/storage-main.dox modified: ../storage/examples/storage_bucket_acl_samples.cc modified: ../storage/examples/storage_bucket_iam_samples.cc modified: ../storage/examples/storage_bucket_samples.cc modified: ../storage/examples/storage_default_object_acl_samples.cc modified: ../storage/examples/storage_notification_samples.cc modified: ../storage/examples/storage_object_acl_samples.cc modified: ../storage/examples/storage_object_samples.cc modified: ../storage/internal/bucket_acl_requests_test.cc modified: ../storage/internal/bucket_requests.cc modified: ../storage/internal/bucket_requests_test.cc modified: ../storage/internal/compute_engine_util_test.cc modified: ../storage/internal/curl_client_test.cc modified: ../storage/internal/curl_handle.cc modified: ../storage/internal/curl_resumable_upload_session_test.cc modified: ../storage/internal/default_object_acl_requests_test.cc modified: ../storage/internal/format_rfc3339_test.cc modified: ../storage/internal/generate_message_boundary_test.cc modified: ../storage/internal/hash_validator_test.cc modified: ../storage/internal/http_response_test.cc modified: ../storage/internal/logging_client.cc modified: ../storage/internal/logging_client_test.cc modified: ../storage/internal/logging_resumable_upload_session_test.cc modified: ../storage/internal/notification_requests_test.cc modified: ../storage/internal/object_acl_requests_test.cc modified: ../storage/internal/object_requests.cc modified: ../storage/internal/object_requests_test.cc modified: ../storage/internal/openssl_util.h modified: ../storage/internal/parse_rfc3339_test.cc modified: ../storage/internal/retry_client.cc modified: ../storage/internal/retry_client_test.cc modified: ../storage/internal/retry_resumable_upload_session_test.cc modified: ../storage/internal/service_account_requests_test.cc modified: ../storage/internal/signed_url_requests_test.cc modified: ../storage/list_buckets_reader_test.cc modified: ../storage/list_objects_reader_test.cc modified: ../storage/notification_metadata_test.cc modified: ../storage/oauth2/authorized_user_credentials_test.cc modified: ../storage/oauth2/compute_engine_credentials_test.cc modified: ../storage/oauth2/google_application_default_credentials_file_test.cc modified: ../storage/oauth2/google_credentials_test.cc modified: ../storage/oauth2/service_account_credentials.h modified: ../storage/oauth2/service_account_credentials_test.cc modified: ../storage/object_test.cc modified: ../storage/service_account_test.cc modified: ../storage/storage_version_test.cc modified: ../storage/tests/bucket_integration_test.cc modified: ../storage/tests/curl_download_request_integration_test.cc modified: ../storage/tests/curl_request_integration_test.cc modified: ../storage/tests/curl_resumable_streambuf_integration_test.cc modified: ../storage/tests/curl_resumable_upload_session_integration_test.cc modified: ../storage/tests/curl_streambuf_integration_test.cc modified: ../storage/tests/curl_upload_request_integration_test.cc modified: ../storage/tests/object_checksum_integration_test.cc modified: ../storage/tests/object_hash_integration_test.cc modified: ../storage/tests/object_insert_integration_test.cc modified: ../storage/tests/object_integration_test.cc modified: ../storage/tests/object_media_integration_test.cc modified: ../storage/tests/object_resumable_write_integration_test.cc modified: ../storage/tests/object_rewrite_integration_test.cc modified: ../storage/tests/service_account_integration_test.cc modified: ../storage/well_known_headers_test.cc Changes not staged for commit: modified: ../storage/bucket_test.cc modified: ../storage/client_bucket_acl_test.cc modified: ../storage/client_default_object_acl_test.cc modified: ../storage/client_notifications_test.cc modified: ../storage/client_object_acl_test.cc modified: ../storage/client_object_copy_test.cc modified: ../storage/client_service_account_test.cc modified: ../storage/client_test.cc modified: ../storage/client_write_object_test.cc modified: ../storage/internal/curl_resumable_upload_session_test.cc modified: ../storage/internal/logging_client.cc modified: ../storage/internal/logging_client_test.cc modified: ../storage/internal/logging_resumable_upload_session_test.cc modified: ../storage/internal/retry_client_test.cc modified: ../storage/internal/retry_resumable_upload_session_test.cc modified: ../storage/list_buckets_reader_test.cc modified: ../storage/list_objects_reader_test.cc modified: ../storage/oauth2/authorized_user_credentials_test.cc modified: ../storage/oauth2/compute_engine_credentials_test.cc modified: ../storage/oauth2/service_account_credentials_test.cc modified: ../storage/object_test.cc modified: ../storage/storage_version_test.cc * fixed formatting * cleaned up a few more; fixed some anon namespaces * fixed build break on gcc 4.8
googleapis · Feb 18, 2019 · 88ad9ea · 88ad9ea
1 parent 67e0ef2
commit 88ad9ea
Show file tree

Hide file tree

Showing 74 changed files with 225 additions and 161 deletions.
diff --git a/google/cloud/storage/bucket_metadata_test.cc b/google/cloud/storage/bucket_metadata_test.cc
@@ -25,8 +25,9 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
-using google::cloud::make_optional;
-using google::cloud::optional;
+
+using ::google::cloud::make_optional;
+using ::google::cloud::optional;
 using ::testing::HasSubstr;
 using ::testing::Not;
 

diff --git a/google/cloud/storage/bucket_test.cc b/google/cloud/storage/bucket_test.cc
@@ -26,14 +26,15 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::ElementsAre;
 using ::testing::ElementsAreArray;
 using ::testing::HasSubstr;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
-using testing::canonical_errors::TransientError;
 
 /**
  * Test the functions in Storage::Client related to 'Buckets: *'.

diff --git a/google/cloud/storage/client_bucket_acl_test.cc b/google/cloud/storage/client_bucket_acl_test.cc
@@ -26,12 +26,13 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ms = std::chrono::milliseconds;
-using testing::canonical_errors::TransientError;
 
 /**
  * Test the BucketAccessControls-related functions in storage::Client.

diff --git a/google/cloud/storage/client_default_object_acl_test.cc b/google/cloud/storage/client_default_object_acl_test.cc
@@ -26,12 +26,13 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ms = std::chrono::milliseconds;
-using testing::canonical_errors::TransientError;
 
 /**
  * Test the BucketAccessControls-related functions in storage::Client.

diff --git a/google/cloud/storage/client_notifications_test.cc b/google/cloud/storage/client_notifications_test.cc
@@ -28,13 +28,14 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::HasSubstr;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ms = std::chrono::milliseconds;
-using testing::canonical_errors::TransientError;
 
 /**
  * Test the BucketAccessControls-related functions in storage::Client.

diff --git a/google/cloud/storage/client_object_acl_test.cc b/google/cloud/storage/client_object_acl_test.cc
@@ -25,12 +25,13 @@ namespace google {
 namespace cloud {
 namespace storage {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ms = std::chrono::milliseconds;
-using testing::canonical_errors::TransientError;
 
 /**
  * Test the ObjectAccessControls-related functions in storage::Client.

diff --git a/google/cloud/storage/client_object_copy_test.cc b/google/cloud/storage/client_object_copy_test.cc
@@ -26,13 +26,14 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::HasSubstr;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ms = std::chrono::milliseconds;
-using testing::canonical_errors::TransientError;
 
 /**
  * Test the functions in Storage::Client related to 'Objects: {copy,rewrite}'.

diff --git a/google/cloud/storage/client_service_account_test.cc b/google/cloud/storage/client_service_account_test.cc
@@ -26,13 +26,14 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
-using storage::oauth2::CreateAnonymousCredentials;
+
+using ::google::cloud::storage::oauth2::CreateAnonymousCredentials;
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ms = std::chrono::milliseconds;
-using testing::canonical_errors::TransientError;
 
 /**
  * Test the Projects.serviceAccount-related functions in storage::Client.

diff --git a/google/cloud/storage/client_sign_url_test.cc b/google/cloud/storage/client_sign_url_test.cc
@@ -26,6 +26,7 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
 using ::testing::HasSubstr;
 
 constexpr char kJsonKeyfileContents[] = R"""({

diff --git a/google/cloud/storage/client_test.cc b/google/cloud/storage/client_test.cc
@@ -25,9 +25,10 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::Return;
-using testing::canonical_errors::TransientError;
 
 class ObservableRetryPolicy : public LimitedErrorCountRetryPolicy {
  public:

diff --git a/google/cloud/storage/client_write_object_test.cc b/google/cloud/storage/client_write_object_test.cc
@@ -24,13 +24,14 @@ namespace cloud {
 namespace storage {
 inline namespace STORAGE_CLIENT_NS {
 namespace {
+
+using ::google::cloud::storage::testing::canonical_errors::PermanentError;
+using ::google::cloud::storage::testing::canonical_errors::TransientError;
 using ::testing::_;
 using ::testing::HasSubstr;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
-using testing::canonical_errors::PermanentError;
-using testing::canonical_errors::TransientError;
 using ms = std::chrono::milliseconds;
 
 /**

diff --git a/google/cloud/storage/doc/storage-main.dox b/google/cloud/storage/doc/storage-main.dox
@@ -223,10 +223,10 @@ using the `.status()` member function (and trying to access the value produces
 undefined behavior).
 
 @code {.cpp}
-using namespace google::cloud;
-[](storage::Client client) {
-  StatusOr<storage::BucketMetadata> metadata = client.GetBucketMetadata(
-      "my-bucket");
+using gcs = google::cloud::storage;
+[](gcs::Client client) {
+  google::cloud::StatusOr<gcs::BucketMetadata> metadata =
+    client.GetBucketMetadata("my-bucket");
 
   if (!metadata) {
     std::cerr << "GetBucketMetadata: " << metadata.status() << "\n";
@@ -246,10 +246,10 @@ the `StatusOr<T>` object. This will return a `T` if the `StatusOr<T>` object
 contains a value, and will otherwise throw an exception.
 
 @code {.cpp}
-using namespace google::cloud;
-[](storage::Client client) {
-  storage::BucketMetadata metadata = client.GetBucketMetadata(
-        "my-bucket").value(); // throws on error
+using gcs = google::cloud::storage;
+[](gcs::Client client) {
+  gcs::BucketMetadata metadata = client.GetBucketMetadata(
+        "my-bucket").value();  // throws on error
   std::cout << "The metadata for bucket " << metadata.name()
             << " is " << metadata << "\n";
 }

diff --git a/google/cloud/storage/examples/storage_bucket_acl_samples.cc b/google/cloud/storage/examples/storage_bucket_acl_samples.cc
@@ -52,7 +52,7 @@ void ListBucketAcl(google::cloud::storage::Client client, int& argc,
   auto bucket_name = ConsumeArg(argc, argv);
   //! [list bucket acl] [START storage_print_bucket_acl]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name) {
     StatusOr<std::vector<gcs::BucketAccessControl>> items =
         client.ListBucketAcl(bucket_name);
@@ -80,7 +80,7 @@ void CreateBucketAcl(google::cloud::storage::Client client, int& argc,
   auto role = ConsumeArg(argc, argv);
   //! [create bucket acl] [START storage_create_bucket_acl]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name, std::string entity,
      std::string role) {
     StatusOr<gcs::BucketAccessControl> bucket_acl =
@@ -131,7 +131,7 @@ void GetBucketAcl(google::cloud::storage::Client client, int& argc,
   auto entity = ConsumeArg(argc, argv);
   //! [get bucket acl] [START storage_print_bucket_acl_for_user]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name, std::string entity) {
     StatusOr<gcs::BucketAccessControl> acl =
         client.GetBucketAcl(bucket_name, entity);
@@ -157,7 +157,7 @@ void UpdateBucketAcl(google::cloud::storage::Client client, int& argc,
   auto role = ConsumeArg(argc, argv);
   //! [update bucket acl]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name, std::string entity,
      std::string role) {
     gcs::BucketAccessControl desired_acl =
@@ -188,7 +188,7 @@ void PatchBucketAcl(google::cloud::storage::Client client, int& argc,
   auto role = ConsumeArg(argc, argv);
   //! [patch bucket acl]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name, std::string entity,
      std::string role) {
     StatusOr<gcs::BucketAccessControl> original_acl =
@@ -225,7 +225,7 @@ void PatchBucketAclNoRead(google::cloud::storage::Client client, int& argc,
   auto role = ConsumeArg(argc, argv);
   //! [patch bucket acl no-read]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name, std::string entity,
      std::string role) {
     StatusOr<gcs::BucketAccessControl> patched_acl = client.PatchBucketAcl(

diff --git a/google/cloud/storage/examples/storage_bucket_iam_samples.cc b/google/cloud/storage/examples/storage_bucket_iam_samples.cc
@@ -52,7 +52,7 @@ void GetBucketIamPolicy(google::cloud::storage::Client client, int& argc,
   auto bucket_name = ConsumeArg(argc, argv);
   //! [get bucket iam policy] [START storage_view_bucket_iam_members]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name) {
     StatusOr<google::cloud::IamPolicy> policy =
         client.GetBucketIamPolicy(bucket_name);
@@ -78,7 +78,7 @@ void AddBucketIamMember(google::cloud::storage::Client client, int& argc,
   auto member = ConsumeArg(argc, argv);
   //! [add bucket iam member] [START storage_add_bucket_iam_member]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name, std::string role,
      std::string member) {
     StatusOr<google::cloud::IamPolicy> policy =
@@ -114,7 +114,7 @@ void RemoveBucketIamMember(google::cloud::storage::Client client, int& argc,
   auto member = ConsumeArg(argc, argv);
   //! [remove bucket iam member] [START storage_remove_bucket_iam_member]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name, std::string role,
      std::string member) {
     StatusOr<google::cloud::IamPolicy> policy =
@@ -153,7 +153,7 @@ void TestBucketIamPermissions(google::cloud::storage::Client client, int& argc,
   }
   //! [test bucket iam permissions]
   namespace gcs = google::cloud::storage;
-  using google::cloud::StatusOr;
+  using ::google::cloud::StatusOr;
   [](gcs::Client client, std::string bucket_name,
      std::vector<std::string> permissions) {
     StatusOr<std::vector<std::string>> actual_permissions =