cleanup(generator): remove unused fields (#14506)

googleapis · Jul 19, 2024 · 3fed367 · 3fed367
1 parent 7603af8
commit 3fed367
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 34 deletions.
diff --git a/generator/internal/http_option_utils.cc b/generator/internal/http_option_utils.cc
@@ -414,30 +414,6 @@ ParseHttpExtension(google::protobuf::MethodDescriptor const& method) {
     out->append(absl::visit(SegmentAsStringVisitor{}, s->value));
   };
 
-  auto first_variable = std::find_if(
-      parsed_http_rule->segments.begin(), parsed_http_rule->segments.end(),
-      [](std::shared_ptr<PathTemplate::Segment> const& s) {
-        return absl::holds_alternative<PathTemplate::Variable>(s->value);
-      });
-  PathTemplate path_prefix;
-  path_prefix.segments = PathTemplate::Segments{
-      parsed_http_rule->segments.begin(), first_variable};
-  info.path_prefix = absl::StrCat(
-      "/", absl::StrJoin(path_prefix.segments, "/", segment_formatter), "/");
-
-  auto last_variable = std::find_if(
-      parsed_http_rule->segments.rbegin(), parsed_http_rule->segments.rend(),
-      [](std::shared_ptr<PathTemplate::Segment> const& s) {
-        return absl::holds_alternative<PathTemplate::Variable>(s->value);
-      });
-  PathTemplate path_suffix;
-  path_suffix.segments = PathTemplate::Segments{
-      parsed_http_rule->segments.rbegin(), last_variable};
-  if (!path_suffix.segments.empty()) {
-    info.path_suffix = absl::StrCat(
-        "/", absl::StrJoin(path_suffix.segments, "/", segment_formatter));
-  }
-
   auto rest_path_visitor = RestPathVisitor(*api_version, info.rest_path);
   for (auto const& s : parsed_http_rule->segments) {
     if (absl::holds_alternative<PathTemplate::Variable>(s->value)) {

diff --git a/generator/internal/http_option_utils.h b/generator/internal/http_option_utils.h
@@ -39,8 +39,6 @@ struct HttpExtensionInfo {
   std::string url_path;
   std::vector<std::pair<std::string, std::string>> field_substitutions;
   std::string body;
-  std::string path_prefix;
-  std::string path_suffix;
   std::vector<RestPathPiece> rest_path;
   std::string rest_path_verb;
 };

diff --git a/generator/internal/http_option_utils_test.cc b/generator/internal/http_option_utils_test.cc
@@ -445,8 +445,6 @@ TEST_F(HttpOptionUtilsTest, ParseHttpExtensionWithPrefixAndSuffix) {
               Eq("projects/*/instances/*"));
   EXPECT_THAT(extension_info.body, Eq("*"));
   EXPECT_THAT(extension_info.http_verb, Eq("Post"));
-  EXPECT_THAT(extension_info.path_prefix, Eq("/v1/"));
-  EXPECT_THAT(extension_info.path_suffix, Eq("/databases"));
 }
 
 TEST_F(HttpOptionUtilsTest,
@@ -464,8 +462,6 @@ TEST_F(HttpOptionUtilsTest,
   EXPECT_THAT(extension_info.field_substitutions[0].second, Eq("project"));
   EXPECT_THAT(extension_info.body, Eq("body"));
   EXPECT_THAT(extension_info.http_verb, Eq("Post"));
-  EXPECT_THAT(extension_info.path_prefix, Eq("/v1/projects/"));
-  EXPECT_THAT(extension_info.path_suffix, Eq("/databases"));
 }
 
 TEST_F(HttpOptionUtilsTest,
@@ -486,8 +482,6 @@ TEST_F(HttpOptionUtilsTest,
   EXPECT_THAT(extension_info.field_substitutions[1].second, Eq("instance"));
   EXPECT_THAT(extension_info.body, Eq("*"));
   EXPECT_THAT(extension_info.http_verb, Eq("Post"));
-  EXPECT_THAT(extension_info.path_prefix, Eq("/v1/projects/"));
-  EXPECT_THAT(extension_info.path_suffix, Eq("/databases"));
 }
 
 TEST_F(HttpOptionUtilsTest, ParseHttpExtensionWithOnlyPrefix) {
@@ -506,8 +500,6 @@ TEST_F(HttpOptionUtilsTest, ParseHttpExtensionWithOnlyPrefix) {
               Eq("projects/*/instances/*/backups/*"));
   EXPECT_THAT(extension_info.body, Eq(""));
   EXPECT_THAT(extension_info.http_verb, Eq("Delete"));
-  EXPECT_THAT(extension_info.path_prefix, Eq("/v1/"));
-  EXPECT_THAT(extension_info.path_suffix, Eq(""));
 }
 
 TEST_F(HttpOptionUtilsTest, ParseHttpExtensionSimpleInfo) {