update generator to use absl str_cat and str_join

scotthart · scotthart · commit f8e88d6352b4 · 2026-01-21T18:46:04.000-05:00
diff --git a/generator/generator.cc b/generator/generator.cc
@@ -17,10 +17,10 @@
 #include "generator/internal/descriptor_utils.h"
 #include "generator/internal/generator_interface.h"
 #include "generator/internal/make_generators.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/filesystem.h"
 #include "google/cloud/status_or.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "google/api/client.pb.h"
 #include <future>
diff --git a/generator/internal/client_generator.cc b/generator/internal/client_generator.cc
@@ -20,7 +20,7 @@
 #include "generator/internal/pagination.h"
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
+#include "absl/strings/str_cat.h"
 #include "google/api/client.pb.h"
 #include <google/protobuf/descriptor.h>
 
diff --git a/generator/internal/codegen_utils.cc b/generator/internal/codegen_utils.cc
@@ -14,12 +14,12 @@
 
 #include "generator/internal/codegen_utils.h"
 #include "generator/internal/scaffold_generator.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/log.h"
 #include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
diff --git a/generator/internal/codegen_utils_test.cc b/generator/internal/codegen_utils_test.cc
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/testing_util/status_matchers.h"
+#include "absl/strings/str_cat.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include <gmock/gmock.h>
diff --git a/generator/internal/connection_impl_generator.cc b/generator/internal/connection_impl_generator.cc
@@ -18,7 +18,7 @@
 #include "generator/internal/pagination.h"
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
+#include "absl/strings/str_cat.h"
 #include <google/protobuf/descriptor.h>
 
 namespace google {
diff --git a/generator/internal/connection_impl_rest_generator.cc b/generator/internal/connection_impl_rest_generator.cc
@@ -19,7 +19,7 @@
 #include "generator/internal/pagination.h"
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
+#include "absl/strings/str_cat.h"
 #include <google/protobuf/descriptor.h>
 
 namespace google {
diff --git a/generator/internal/descriptor_utils.cc b/generator/internal/descriptor_utils.cc
@@ -26,12 +26,12 @@
 #include "generator/internal/resolve_method_return.h"
 #include "generator/internal/routing.h"
 #include "generator/internal/scaffold_generator.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/strip.h"
 #include "absl/types/variant.h"
diff --git a/generator/internal/descriptor_utils_test.cc b/generator/internal/descriptor_utils_test.cc
@@ -17,8 +17,8 @@
 #include "generator/testing/error_collectors.h"
 #include "generator/testing/fake_source_tree.h"
 #include "generator/testing/printer_mocks.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/testing_util/status_matchers.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "google/protobuf/descriptor.pb.h"
 #include <google/protobuf/compiler/importer.h>
diff --git a/generator/internal/discovery_file.cc b/generator/internal/discovery_file.cc
@@ -14,8 +14,8 @@
 
 #include "generator/internal/discovery_file.h"
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
 #include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <fstream>
diff --git a/generator/internal/discovery_file_test.cc b/generator/internal/discovery_file_test.cc
@@ -15,8 +15,8 @@
 #include "generator/internal/discovery_file.h"
 #include "generator/internal/codegen_utils.h"
 #include "generator/testing/descriptor_pool_fixture.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/testing_util/status_matchers.h"
+#include "absl/strings/str_cat.h"
 #include <gmock/gmock.h>
 
 namespace google {
diff --git a/generator/internal/discovery_proto_export_file.cc b/generator/internal/discovery_proto_export_file.cc
@@ -14,8 +14,8 @@
 
 #include "generator/internal/discovery_proto_export_file.h"
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_replace.h"
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <fstream>
diff --git a/generator/internal/discovery_proto_export_file_test.cc b/generator/internal/discovery_proto_export_file_test.cc
@@ -14,8 +14,8 @@
 
 #include "generator/internal/discovery_proto_export_file.h"
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/testing_util/status_matchers.h"
+#include "absl/strings/str_replace.h"
 #include <gmock/gmock.h>
 
 namespace google {
diff --git a/generator/internal/discovery_resource.cc b/generator/internal/discovery_resource.cc
@@ -14,13 +14,13 @@
 
 #include "generator/internal/discovery_resource.h"
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/make_status.h"
 #include "absl/strings/ascii.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
 #include <iostream>
 
diff --git a/generator/internal/discovery_to_proto.cc b/generator/internal/discovery_to_proto.cc
@@ -17,15 +17,15 @@
 #include "generator/internal/discovery_proto_export_file.h"
 #include "generator/internal/discovery_resource.h"
 #include "generator/internal/discovery_type_vertex.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/internal/rest_client.h"
 #include "google/cloud/log.h"
 #include "google/cloud/status_or.h"
 #include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include <google/protobuf/compiler/importer.h>
 #include <google/protobuf/descriptor.h>
diff --git a/generator/internal/discovery_type_vertex.cc b/generator/internal/discovery_type_vertex.cc
@@ -14,12 +14,12 @@
 
 #include "generator/internal/discovery_type_vertex.h"
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/log.h"
 #include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
 #include "absl/types/optional.h"
 #include "google/protobuf/descriptor.pb.h"
diff --git a/generator/internal/doxygen.cc b/generator/internal/doxygen.cc
@@ -14,7 +14,7 @@
 
 #include "generator/internal/doxygen.h"
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
+#include "absl/strings/str_cat.h"
 
 namespace google {
 namespace cloud {
diff --git a/generator/internal/format_class_comments.cc b/generator/internal/format_class_comments.cc
@@ -14,9 +14,9 @@
 
 #include "generator/internal/format_class_comments.h"
 #include "generator/internal/resolve_comment_references.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/strip.h"
 
 namespace google {
diff --git a/generator/internal/format_method_comments.cc b/generator/internal/format_method_comments.cc
@@ -20,9 +20,9 @@
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/resolve_comment_references.h"
 #include "generator/internal/resolve_method_return.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "google/longrunning/operations.pb.h"
 #include <google/protobuf/descriptor.h>
diff --git a/generator/internal/http_annotation_parser.cc b/generator/internal/http_annotation_parser.cc
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 #include "generator/internal/http_annotation_parser.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/log.h"
 #include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
 #include <cassert>
 #include <functional>
 
diff --git a/generator/internal/http_option_utils.cc b/generator/internal/http_option_utils.cc
@@ -17,13 +17,13 @@
 #include "generator/internal/longrunning.h"
 #include "generator/internal/mixin_utils.h"
 #include "generator/internal/printer.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/internal/url_encode.h"
 #include "google/cloud/log.h"
 #include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
 #include "absl/types/optional.h"
 #include "google/api/annotations.pb.h"
diff --git a/generator/internal/idempotency_policy_generator.cc b/generator/internal/idempotency_policy_generator.cc
@@ -19,7 +19,7 @@
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
 #include "generator/internal/request_id.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
+#include "absl/strings/str_cat.h"
 #include <google/protobuf/descriptor.h>
 
 namespace google {
diff --git a/generator/internal/logging_decorator_generator.cc b/generator/internal/logging_decorator_generator.cc
@@ -18,7 +18,7 @@
 #include "generator/internal/longrunning.h"
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include <google/protobuf/descriptor.h>
 
diff --git a/generator/internal/longrunning.cc b/generator/internal/longrunning.cc
@@ -17,8 +17,8 @@
 #include "generator/internal/doxygen.h"
 #include "generator/internal/http_option_utils.h"
 #include "google/cloud/extended_operations.pb.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/log.h"
+#include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
 #include "google/longrunning/operations.pb.h"
 #include <string>
diff --git a/generator/internal/longrunning_test.cc b/generator/internal/longrunning_test.cc
@@ -15,7 +15,7 @@
 #include "generator/internal/longrunning.h"
 #include "generator/testing/error_collectors.h"
 #include "generator/testing/fake_source_tree.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
+#include "absl/strings/str_cat.h"
 #include "google/protobuf/descriptor.pb.h"
 #include <google/protobuf/text_format.h>
 #include <gmock/gmock.h>
diff --git a/generator/internal/metadata_decorator_generator.cc b/generator/internal/metadata_decorator_generator.cc
@@ -19,8 +19,8 @@
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
 #include "generator/internal/routing.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/url_encode.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include <google/protobuf/descriptor.h>
@@ -181,12 +181,8 @@ Status MetadataDecoratorGenerator::GenerateCc() {
   // includes
   CcPrint("\n");
   CcLocalIncludes(
-      {vars("metadata_header_path"),
-       "google/cloud/internal/absl_str_cat_quiet.h",
-       HasExplicitRoutingMethod()
-           ? "google/cloud/internal/absl_str_join_quiet.h"
-           : "",
-       "google/cloud/internal/api_client_header.h",
+      {vars("metadata_header_path"), "absl/strings/str_cat.h",
+       "absl/strings/str_join.h", "google/cloud/internal/api_client_header.h",
        "google/cloud/grpc_options.h",
        HasExplicitRoutingMethod() ? "google/cloud/internal/routing_matcher.h"
                                   : "",
diff --git a/generator/internal/metadata_decorator_rest_generator.cc b/generator/internal/metadata_decorator_rest_generator.cc
@@ -19,8 +19,8 @@
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
 #include "generator/internal/routing.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/url_encode.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include <google/protobuf/descriptor.h>
 #include <algorithm>
@@ -219,14 +219,14 @@ Status MetadataDecoratorRestGenerator::GenerateCc() {
 
   // includes
   CcPrint("\n");
-  CcLocalIncludes(
-      {vars("metadata_rest_header_path"),
-       "google/cloud/internal/api_client_header.h",
-       HasExplicitRoutingMethod() ? "google/cloud/internal/routing_matcher.h"
-                                  : "",
-       "google/cloud/status_or.h", "google/cloud/internal/absl_str_cat_quiet.h",
-       "google/cloud/internal/rest_set_metadata.h",
-       "absl/strings/str_format.h"});
+  CcLocalIncludes({vars("metadata_rest_header_path"),
+                   "google/cloud/internal/api_client_header.h",
+                   HasExplicitRoutingMethod()
+                       ? "google/cloud/internal/routing_matcher.h"
+                       : "",
+                   "google/cloud/status_or.h", "absl/strings/str_cat.h",
+                   "google/cloud/internal/rest_set_metadata.h",
+                   "absl/strings/str_format.h"});
   CcSystemIncludes({"memory", "utility"});
 
   auto result = CcOpenNamespaces(NamespaceType::kInternal);
diff --git a/generator/internal/mixin_utils.cc b/generator/internal/mixin_utils.cc
@@ -14,10 +14,10 @@
 
 #include "generator/internal/mixin_utils.h"
 #include "generator/internal/codegen_utils.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
 #include "google/cloud/log.h"
 #include "absl/base/no_destructor.h"
 #include "absl/strings/ascii.h"
+#include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
 #include <google/protobuf/compiler/code_generator.h>
 #include <yaml-cpp/yaml.h>
diff --git a/generator/internal/option_defaults_generator.cc b/generator/internal/option_defaults_generator.cc
@@ -100,7 +100,7 @@ Status OptionDefaultsGenerator::GenerateCc() {
     case ServiceConfiguration::LOCATION_DEPENDENT:
     case ServiceConfiguration::LOCATION_DEPENDENT_COMPAT:
     case ServiceConfiguration::LOCATION_OPTIONALLY_DEPENDENT:
-      CcLocalIncludes({"google/cloud/internal/absl_str_cat_quiet.h"});
+      CcLocalIncludes({"absl/strings/str_cat.h"});
       break;
     default:
       break;
diff --git a/generator/internal/pagination.cc b/generator/internal/pagination.cc
@@ -16,9 +16,9 @@
 #include "generator/internal/codegen_utils.h"
 #include "generator/internal/descriptor_utils.h"
 #include "generator/internal/doxygen.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/log.h"
 #include "google/cloud/optional.h"
+#include "absl/strings/str_cat.h"
 
 namespace google {
 namespace cloud {
diff --git a/generator/internal/pagination_test.cc b/generator/internal/pagination_test.cc
@@ -16,7 +16,7 @@
 #include "generator/testing/descriptor_pool_fixture.h"
 #include "generator/testing/error_collectors.h"
 #include "generator/testing/fake_source_tree.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
+#include "absl/strings/str_replace.h"
 #include "google/protobuf/descriptor.pb.h"
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/text_format.h>
diff --git a/generator/internal/resolve_comment_references.cc b/generator/internal/resolve_comment_references.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "generator/internal/resolve_comment_references.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
+#include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "absl/types/optional.h"
 #include <regex>
diff --git a/generator/internal/routing.cc b/generator/internal/routing.cc
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include "generator/internal/routing.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
-#include "google/cloud/internal/absl_str_replace_quiet.h"
 #include "google/cloud/log.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
 #include "google/api/routing.pb.h"
 #include <google/protobuf/compiler/cpp/names.h>
diff --git a/generator/internal/scaffold_generator.cc b/generator/internal/scaffold_generator.cc
diff --git a/generator/internal/service_code_generator.cc b/generator/internal/service_code_generator.cc
diff --git a/generator/internal/stub_generator.cc b/generator/internal/stub_generator.cc
diff --git a/generator/internal/stub_rest_generator.cc b/generator/internal/stub_rest_generator.cc
diff --git a/generator/internal/tracing_connection_generator.cc b/generator/internal/tracing_connection_generator.cc
diff --git a/generator/standalone_main.cc b/generator/standalone_main.cc
