Refactor BuildInfo.

PiperOrigin-RevId: 446175132
echoOfqi · May 3, 2022 · 0714a16 · 0714a16
1 parent 5a6b1a8
commit 0714a16
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 102 deletions.
diff --git a/tools/cpp/bazel_build_info_translation_helper.cc b/tools/cpp/bazel_build_info_translation_helper.cc
diff --git a/tools/cpp/bazel_build_info_translation_helper.h b/tools/cpp/bazel_build_info_translation_helper.h
diff --git a/tools/cpp/build_info_entry_set.h b/tools/cpp/build_info_entry_set.h
@@ -0,0 +1,18 @@
+// Copyright 2022 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef BAZEL_TOOLS_CPP_BUILD_INFO_ENTRY_SET_H_
+#define BAZEL_TOOLS_CPP_BUILD_INFO_ENTRY_SET_H_
+
+#endif  // BAZEL_TOOLS_CPP_BUILD_INFO_ENTRY_SET_H_
diff --git a/tools/cpp/build_info_translation_helper.cc b/tools/cpp/build_info_translation_helper.cc
@@ -66,8 +66,6 @@ absl::Status BuildInfoTranslationHelper::ParseVersionFile(
   return BuildInfoTranslationHelper::ParseFile(version_file_path_, file_map);
 }
 
-BuildInfoTranslationHelper::~BuildInfoTranslationHelper() {}
-
 }  // namespace cpp
 }  // namespace tools
 }  // namespace bazel
diff --git a/tools/cpp/build_info_translation_helper.h b/tools/cpp/build_info_translation_helper.h
@@ -35,19 +35,6 @@ class BuildInfoTranslationHelper {
   absl::Status ParseVersionFile(
       std::unordered_map<std::string, std::string>& file_map);
 
-  enum KeyType {
-    STRING = 0,
-    INTEGER = 1,
-  };
-
-  using KeyMap = std::unordered_map<
-      std::string, std::pair<KeyType, std::pair<std::string, std::string> > >;
-
-  virtual KeyMap getStableKeys() = 0;
-  virtual KeyMap getVolatileKeys() = 0;
-
-  virtual ~BuildInfoTranslationHelper() = 0;
-
  private:
   std::string info_file_path_;
   std::string version_file_path_;

diff --git a/...zel_build_info_translation_helper_test.cc → ...cpp/build_info_translation_helper_test.cc b/...zel_build_info_translation_helper_test.cc → ...cpp/build_info_translation_helper_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tools/cpp/bazel_build_info_translation_helper.h"
+#include "tools/cpp/build_info_translation_helper.h"
 
 #include "googletest/include/gtest/gtest.h"
 
@@ -25,7 +25,7 @@ static const char kTestFilePrefix[] = "";
 class BuildInfoTranslationHelperTest : public testing::Test {};
 
 TEST_F(BuildInfoTranslationHelperTest, CorrectFileFormat) {
-  BazelBuildInfoTranslationHelper helper = BazelBuildInfoTranslationHelper(
+  BuildInfoTranslationHelper helper = BuildInfoTranslationHelper(
       absl::StrCat(kTestFilePrefix,
                    "bazel/tools/cpp/test_data/correct_file_format.txt"),
       "");
@@ -43,7 +43,7 @@ TEST_F(BuildInfoTranslationHelperTest, CorrectFileFormat) {
 }
 
 TEST_F(BuildInfoTranslationHelperTest, NonExistingFile) {
-  BazelBuildInfoTranslationHelper helper = BazelBuildInfoTranslationHelper(
+  BuildInfoTranslationHelper helper = BuildInfoTranslationHelper(
       "",
       absl::StrCat(kTestFilePrefix,
                    "bazel/tools/cpp/test_data/this_file_does_not_exist.txt"));
@@ -60,7 +60,7 @@ TEST_F(BuildInfoTranslationHelperTest, NonExistingFile) {
 }
 
 TEST_F(BuildInfoTranslationHelperTest, DuplicatedKey) {
-  BazelBuildInfoTranslationHelper helper = BazelBuildInfoTranslationHelper(
+  BuildInfoTranslationHelper helper = BuildInfoTranslationHelper(
       absl::StrCat(kTestFilePrefix,
                    "bazel/tools/cpp/test_data/duplicated_key.txt"),
       "");
@@ -75,7 +75,7 @@ TEST_F(BuildInfoTranslationHelperTest, DuplicatedKey) {
 }
 
 TEST_F(BuildInfoTranslationHelperTest, MissingSeparator) {
-  BazelBuildInfoTranslationHelper helper = BazelBuildInfoTranslationHelper(
+  BuildInfoTranslationHelper helper = BuildInfoTranslationHelper(
       "", absl::StrCat(kTestFilePrefix,
                        "bazel/tools/cpp/test_data/no_separator.txt"));
   absl::Status expected_version_status =