Fix style guide violations and extract GetChecksumAlgorithm

Author: v-pratap

google/cloud/storage/benchmarks/throughput_experiment.cc

@@ -63,6 +63,13 @@ std::string ExtractUploadId(std::string v) {
   return v.substr(pos + std::strlen(kRestField));
 }
 
+gcs::ChecksumAlgorithm GetChecksumAlgorithm(bool enable_crc32c,
+                                            bool enable_md5) {
+  if (enable_crc32c) return gcs::ChecksumAlgorithm::kCrc32c;
+  if (enable_md5) return gcs::ChecksumAlgorithm::kMD5;
+  return gcs::ChecksumAlgorithm::kNone;
+}
+
 class ResumableUpload : public ThroughputExperiment {
  public:
   explicit ResumableUpload(google::cloud::storage::Client client,
@@ -80,14 +87,10 @@ class ResumableUpload : public ThroughputExperiment {
 
     auto const start = std::chrono::system_clock::now();
     auto timer = Timer::PerThread();
-    auto writer =
-        client_.WriteObject(
+    auto writer = client_.WriteObject(
             bucket_name, object_name,
             google::cloud::Options{}.set<gcs::UploadChecksumValidationOption>(
-                config.enable_crc32c
-                    ? gcs::ChecksumAlgorithm::kCrc32c
-                    : (config.enable_md5 ? gcs::ChecksumAlgorithm::kMD5
-                                         : gcs::ChecksumAlgorithm::kNone)));
+                GetChecksumAlgorithm(config.enable_crc32c, config.enable_md5)));
     auto upload_id = ExtractUploadId(writer.resumable_session_id());
     for (std::int64_t offset = 0; offset < config.object_size;
          offset += config.app_buffer_size) {
@@ -159,10 +162,7 @@ class SimpleUpload : public ThroughputExperiment {
         client_.InsertObject(
             bucket_name, object_name, data,
             google::cloud::Options{}.set<gcs::UploadChecksumValidationOption>(
-                config.enable_crc32c
-                    ? gcs::ChecksumAlgorithm::kCrc32c
-                    : (config.enable_md5 ? gcs::ChecksumAlgorithm::kMD5
-                                         : gcs::ChecksumAlgorithm::kNone)));
+                GetChecksumAlgorithm(config.enable_crc32c, config.enable_md5)));
     auto const usage = timer.Sample();
     auto generation = object_metadata
                           ? std::to_string(object_metadata->generation())
@@ -221,10 +221,7 @@ class DownloadObject : public ThroughputExperiment {
         client_.ReadObject(
             bucket_name, object_name, read_range,
             google::cloud::Options{}.set<gcs::DownloadChecksumValidationOption>(
-                config.enable_crc32c
-                    ? gcs::ChecksumAlgorithm::kCrc32c
-                    : (config.enable_md5 ? gcs::ChecksumAlgorithm::kMD5
-                                         : gcs::ChecksumAlgorithm::kNone)));
+                GetChecksumAlgorithm(config.enable_crc32c, config.enable_md5)));
     std::int64_t transfer_size = 0;
     while (!reader.eof() && !reader.bad()) {
       reader.read(buffer.data(), buffer.size());

google/cloud/storage/client_object_test.cc

@@ -234,7 +234,6 @@ TEST_F(ObjectTest, ReadObject) {
   EXPECT_EQ(actual.gcount(), 1024);
 }
 
-
 TEST_F(ObjectTest, WriteObject) {
   EXPECT_CALL(*mock_, CreateResumableUpload)
       .WillOnce(Return(TransientError()))

google/cloud/storage/internal/checksum_helpers.h

@@ -40,7 +40,6 @@ inline HashDisabled GetDownloadChecksumSettings(Options const& options) {
     disable_crc32c = (algo != ChecksumAlgorithm::kCrc32c);
   }
 
-
   return {disable_md5, disable_crc32c};
 }
 
@@ -53,7 +52,6 @@ inline HashDisabled GetUploadChecksumSettings(Options const& options) {
     disable_crc32c = (algo != ChecksumAlgorithm::kCrc32c);
   }
 
-
   return {disable_md5, disable_crc32c};
 }
 

google/cloud/storage/internal/hash_function.cc

@@ -64,7 +64,8 @@ std::unique_ptr<HashFunction> CreateHashFunction(
     ReadObjectRangeRequest const& request) {
   if (request.RequiresRangeHeader()) return CreateNullHashFunction();
 
-  auto const settings = GetDownloadChecksumSettings(google::cloud::internal::CurrentOptions());
+  auto const settings = GetDownloadChecksumSettings(
+      google::cloud::internal::CurrentOptions());
   auto const disable_md5 = settings.md5;
   auto const disable_crc32c = settings.crc32c;
   if (disable_md5 && disable_crc32c) {
@@ -84,7 +85,8 @@ std::unique_ptr<HashFunction> CreateHashFunction(
     return CreateNullHashFunction();
   }
 
-  auto const settings = GetUploadChecksumSettings(google::cloud::internal::CurrentOptions());
+  auto const settings = GetUploadChecksumSettings(
+      google::cloud::internal::CurrentOptions());
   return CreateHashFunction(request.GetOption<Crc32cChecksumValue>(),
                             settings.crc32c, request.GetOption<MD5HashValue>(),
                             settings.md5);

google/cloud/storage/internal/object_requests_test.cc

@@ -1117,7 +1117,6 @@ TEST(DefaultCtorsWork, Trivial) {
   EXPECT_FALSE(ReadFromOffset().has_value());
   EXPECT_FALSE(ReadLast().has_value());
   EXPECT_FALSE(MD5HashValue().has_value());
-
   EXPECT_FALSE(Crc32cChecksumValue().has_value());
   EXPECT_FALSE(WithObjectMetadata().has_value());
   EXPECT_FALSE(UseResumableUploadSession().has_value());

google/cloud/storage/internal/object_write_streambuf_test.cc

@@ -688,7 +688,6 @@ TEST(ObjectWriteStreambufTest, FlushFinalWithHashes) {
   });
 
   ResumableUploadRequest request;
-
   ObjectWriteStreambuf streambuf(
       std::move(mock), request, "test-only-upload-id",
       /*committed_size=*/0, std::nullopt, /*max_buffer_size=*/quantum,