Prediction: Migrate StrCat to absl::StrCat.

modules/prediction/common/feature_output.cc

@@ -18,15 +18,14 @@
 
 #include <vector>
 
+#include "absl/strings/str_cat.h"
 #include "cyber/common/file.h"
-#include "modules/common/util/string_util.h"
 #include "modules/prediction/common/prediction_system_gflags.h"
 
 namespace apollo {
 namespace prediction {
 
 using apollo::common::TrajectoryPoint;
-using apollo::common::util::StrCat;
 
 Features FeatureOutput::features_;
 ListDataForLearning FeatureOutput::list_data_for_learning_;
@@ -162,8 +161,8 @@ void FeatureOutput::WriteFeatureProto() {
   if (features_.feature().empty()) {
     ADEBUG << "Skip writing empty feature.";
   } else {
-    const std::string file_name =
-        StrCat(FLAGS_prediction_data_dir, "/feature.", idx_feature_, ".bin");
+    const std::string file_name = absl::StrCat(
+        FLAGS_prediction_data_dir, "/feature.", idx_feature_, ".bin");
     cyber::common::SetProtoToBinaryFile(features_, file_name);
     features_.Clear();
     ++idx_feature_;
@@ -174,8 +173,8 @@ void FeatureOutput::WriteDataForLearning() {
   if (list_data_for_learning_.data_for_learning().empty()) {
     ADEBUG << "Skip writing empty data_for_learning.";
   } else {
-    const std::string file_name =
-        StrCat(FLAGS_prediction_data_dir, "/datalearn.", idx_learning_, ".bin");
+    const std::string file_name = absl::StrCat(
+        FLAGS_prediction_data_dir, "/datalearn.", idx_learning_, ".bin");
     cyber::common::SetProtoToBinaryFile(list_data_for_learning_, file_name);
     list_data_for_learning_.Clear();
     ++idx_learning_;
@@ -187,8 +186,8 @@ void FeatureOutput::WritePredictionResult() {
     ADEBUG << "Skip writing empty prediction_result.";
   } else {
     const std::string file_name =
-        StrCat(FLAGS_prediction_data_dir, "/prediction_result.",
-               idx_prediction_result_, ".bin");
+        absl::StrCat(FLAGS_prediction_data_dir, "/prediction_result.",
+                     idx_prediction_result_, ".bin");
     cyber::common::SetProtoToBinaryFile(list_prediction_result_, file_name);
     list_prediction_result_.Clear();
     ++idx_prediction_result_;
@@ -199,8 +198,8 @@ void FeatureOutput::WriteFrameEnv() {
   if (list_frame_env_.frame_env().empty()) {
     ADEBUG << "Skip writing empty prediction_result.";
   } else {
-    const std::string file_name = StrCat(FLAGS_prediction_data_dir,
-                                         "/frame_env.", idx_frame_env_, ".bin");
+    const std::string file_name = absl::StrCat(
+        FLAGS_prediction_data_dir, "/frame_env.", idx_frame_env_, ".bin");
     cyber::common::SetProtoToBinaryFile(list_frame_env_, file_name);
     list_frame_env_.Clear();
     ++idx_frame_env_;
@@ -212,8 +211,8 @@ void FeatureOutput::WriteDataForTuning() {
     ADEBUG << "Skip writing empty data_for_tuning.";
     return;
   }
-  const std::string file_name =
-      StrCat(FLAGS_prediction_data_dir, "/datatuning.", idx_tuning_, ".bin");
+  const std::string file_name = absl::StrCat(
+      FLAGS_prediction_data_dir, "/datatuning.", idx_tuning_, ".bin");
   cyber::common::SetProtoToBinaryFile(list_data_for_tuning_, file_name);
   list_data_for_tuning_.Clear();
   ++idx_tuning_;

modules/prediction/common/road_graph.cc

@@ -94,7 +94,7 @@ RoadGraph::RoadGraph(const double start_s, const double length,
 Status RoadGraph::BuildLaneGraph(LaneGraph* const lane_graph_ptr) {
   // Sanity checks.
   if (length_ < 0.0 || lane_info_ptr_ == nullptr) {
-    const auto error_msg = common::util::StrCat(
+    const auto error_msg = absl::StrCat(
         "Invalid road graph settings. Road graph length = ", length_);
     AERROR << error_msg;
     return Status(ErrorCode::PREDICTION_ERROR, error_msg);
@@ -118,7 +118,7 @@ Status RoadGraph::BuildLaneGraph(LaneGraph* const lane_graph_ptr) {
 Status RoadGraph::BuildLaneGraphBidirection(LaneGraph* const lane_graph_ptr) {
   // Sanity checks.
   if (length_ < 0.0 || lane_info_ptr_ == nullptr) {
-    const auto error_msg = common::util::StrCat(
+    const auto error_msg = absl::StrCat(
         "Invalid road graph settings. Road graph length = ", length_);
     AERROR << error_msg;
     return Status(ErrorCode::PREDICTION_ERROR, error_msg);

modules/prediction/container/obstacles/obstacle_test.cc

@@ -14,8 +14,8 @@
  * limitations under the License.
  *****************************************************************************/
 
+#include "absl/strings/str_cat.h"
 #include "cyber/common/file.h"
-#include "modules/common/util/string_util.h"
 #include "modules/prediction/common/kml_map_based_test.h"
 #include "modules/prediction/common/prediction_gflags.h"
 #include "modules/prediction/container/obstacles/obstacles_container.h"
@@ -36,7 +36,7 @@ class ObstacleTest : public KMLMapBasedTest {
 
     int num_frame = 3;
     for (int i = 1; i <= num_frame; ++i) {
-      const auto filename = common::util::StrCat(
+      const auto filename = absl::StrCat(
           "modules/prediction/testdata/frame_sequence/frame_", i, ".pb.txt");
       perception::PerceptionObstacles perception_obstacles;
       cyber::common::GetProtoFromFile(filename, &perception_obstacles);

modules/tools/manual_traffic_light/manual_traffic_light.cc

@@ -22,6 +22,7 @@
 #include "modules/common/adapters/adapter_gflags.h"
 #include "modules/common/util/color.h"
 #include "modules/common/util/message_util.h"
+#include "modules/common/util/string_util.h"
 #include "modules/map/hdmap/adapter/opendrive_adapter.h"
 #include "modules/map/hdmap/hdmap_util.h"
 #include "modules/perception/proto/traffic_light_detection.pb.h"