From 0f84aabd5901bb49522ab5ae391687ecea6ce2f0 Mon Sep 17 00:00:00 2001
From: Takayuki Murooka <takayuki5168@gmail.com>
Date: Thu, 26 Dec 2024 00:28:40 +0900
Subject: [PATCH] fix

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
---
 .../CMakeLists.txt                              |  2 +-
 .../CMakeLists.txt                              | 17 -----------------
 .../autoware/behavior_velocity_planner/node.hpp | 16 +++++++---------
 .../package.xml                                 |  7 +------
 .../src/node.cpp                                | 16 ++++++++--------
 .../srv/LoadPlugin.srv                          |  3 ---
 .../srv/UnloadPlugin.srv                        |  3 ---
 7 files changed, 17 insertions(+), 47 deletions(-)
 delete mode 100644 planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/LoadPlugin.srv
 delete mode 100644 planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/UnloadPlugin.srv

diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_crosswalk_module/CMakeLists.txt b/planning/behavior_velocity_planner/autoware_behavior_velocity_crosswalk_module/CMakeLists.txt
index 52ec6203b6343..3a429008c1b8e 100644
--- a/planning/behavior_velocity_planner/autoware_behavior_velocity_crosswalk_module/CMakeLists.txt
+++ b/planning/behavior_velocity_planner/autoware_behavior_velocity_crosswalk_module/CMakeLists.txt
@@ -14,7 +14,7 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
   ament_add_ros_isolated_gtest(test_${PROJECT_NAME}
-    # test/test_crosswalk.cpp
+    test/test_crosswalk.cpp
     test/test_node_interface.cpp
   )
   target_link_libraries(test_${PROJECT_NAME} ${PROJECT_NAME})
diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/CMakeLists.txt b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/CMakeLists.txt
index 31900a23d00e5..a520b02a43c05 100644
--- a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/CMakeLists.txt
+++ b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/CMakeLists.txt
@@ -2,14 +2,6 @@ cmake_minimum_required(VERSION 3.14)
 project(autoware_behavior_velocity_planner)
 
 find_package(autoware_cmake REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
-
-rosidl_generate_interfaces(
-  ${PROJECT_NAME}
-  "srv/LoadPlugin.srv"
-  "srv/UnloadPlugin.srv"
-  DEPENDENCIES
-)
 
 autoware_package()
 
@@ -24,15 +16,6 @@ rclcpp_components_register_node(${PROJECT_NAME}_lib
   EXECUTABLE ${PROJECT_NAME}_node
 )
 
-if(${rosidl_cmake_VERSION} VERSION_LESS 2.5.0)
-    rosidl_target_interfaces(${PROJECT_NAME}_lib
-    ${PROJECT_NAME} "rosidl_typesupport_cpp")
-else()
-    rosidl_get_typesupport_target(
-            cpp_typesupport_target ${PROJECT_NAME} "rosidl_typesupport_cpp")
-    target_link_libraries(${PROJECT_NAME}_lib "${cpp_typesupport_target}")
-endif()
-
 if(BUILD_TESTING)
   ament_add_ros_isolated_gtest(test_${PROJECT_NAME}
     test/test_node_interface.cpp
diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/include/autoware/behavior_velocity_planner/node.hpp b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/include/autoware/behavior_velocity_planner/node.hpp
index 4c1f10c355226..8a52ae70231d0 100644
--- a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/include/autoware/behavior_velocity_planner/node.hpp
+++ b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/include/autoware/behavior_velocity_planner/node.hpp
@@ -21,10 +21,9 @@
 
 #include <autoware/behavior_velocity_planner_common/planner_data.hpp>
 #include <autoware/universe_utils/ros/published_time_publisher.hpp>
-#include <autoware_behavior_velocity_planner/srv/load_plugin.hpp>
-#include <autoware_behavior_velocity_planner/srv/unload_plugin.hpp>
 #include <rclcpp/rclcpp.hpp>
 
+#include <autoware_internal_debug_msgs/srv/string.hpp>
 #include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
 #include <autoware_perception_msgs/msg/predicted_objects.hpp>
 #include <autoware_planning_msgs/msg/path.hpp>
@@ -45,8 +44,6 @@
 
 namespace autoware::behavior_velocity_planner
 {
-using autoware_behavior_velocity_planner::srv::LoadPlugin;
-using autoware_behavior_velocity_planner::srv::UnloadPlugin;
 using autoware_map_msgs::msg::LaneletMapBin;
 using tier4_planning_msgs::msg::VelocityLimit;
 
@@ -125,13 +122,14 @@ class BehaviorVelocityPlannerNode : public rclcpp::Node
   BehaviorVelocityPlannerManager planner_manager_;
   bool is_driving_forward_{true};
 
-  rclcpp::Service<LoadPlugin>::SharedPtr srv_load_plugin_;
-  rclcpp::Service<UnloadPlugin>::SharedPtr srv_unload_plugin_;
+  rclcpp::Service<autoware_internal_debug_msgs::srv::String>::SharedPtr srv_load_plugin_;
+  rclcpp::Service<autoware_internal_debug_msgs::srv::String>::SharedPtr srv_unload_plugin_;
   void onUnloadPlugin(
-    const UnloadPlugin::Request::SharedPtr request,
-    const UnloadPlugin::Response::SharedPtr response);
+    const autoware_internal_debug_msgs::srv::String::Request::SharedPtr request,
+    const autoware_internal_debug_msgs::srv::String::Response::SharedPtr response);
   void onLoadPlugin(
-    const LoadPlugin::Request::SharedPtr request, const LoadPlugin::Response::SharedPtr response);
+    const autoware_internal_debug_msgs::srv::String::Request::SharedPtr request,
+    const autoware_internal_debug_msgs::srv::String::Response::SharedPtr response);
 
   // mutex for planner_data_
   std::mutex mutex_;
diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/package.xml b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/package.xml
index 04b4cf0328fd1..eca49a09c8a56 100644
--- a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/package.xml
+++ b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/package.xml
@@ -32,9 +32,8 @@
   <buildtool_depend>autoware_cmake</buildtool_depend>
   <buildtool_depend>eigen3_cmake_module</buildtool_depend>
 
-  <build_depend>rosidl_default_generators</build_depend>
-
   <depend>autoware_behavior_velocity_planner_common</depend>
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_lanelet2_extension</depend>
   <depend>autoware_map_msgs</depend>
   <depend>autoware_motion_utils</depend>
@@ -60,15 +59,11 @@
   <depend>tier4_v2x_msgs</depend>
   <depend>visualization_msgs</depend>
 
-  <exec_depend>rosidl_default_runtime</exec_depend>
-
   <test_depend>ament_cmake_ros</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>
   <!--<test_depend>autoware_behavior_velocity_template_module</test_depend>-->
 
-  <member_of_group>rosidl_interface_packages</member_of_group>
-
   <export>
     <build_type>ament_cmake</build_type>
   </export>
diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/src/node.cpp b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/src/node.cpp
index 5f78e4c670b49..1e3e691076b8a 100644
--- a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/src/node.cpp
+++ b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/src/node.cpp
@@ -70,9 +70,9 @@ BehaviorVelocityPlannerNode::BehaviorVelocityPlannerNode(const rclcpp::NodeOptio
     this->create_subscription<tier4_planning_msgs::msg::PathWithLaneId>(
       "~/input/path_with_lane_id", 1, std::bind(&BehaviorVelocityPlannerNode::onTrigger, this, _1));
 
-  srv_load_plugin_ = create_service<LoadPlugin>(
+  srv_load_plugin_ = create_service<autoware_internal_debug_msgs::srv::String>(
     "~/service/load_plugin", std::bind(&BehaviorVelocityPlannerNode::onLoadPlugin, this, _1, _2));
-  srv_unload_plugin_ = create_service<UnloadPlugin>(
+  srv_unload_plugin_ = create_service<autoware_internal_debug_msgs::srv::String>(
     "~/service/unload_plugin",
     std::bind(&BehaviorVelocityPlannerNode::onUnloadPlugin, this, _1, _2));
 
@@ -112,19 +112,19 @@ BehaviorVelocityPlannerNode::BehaviorVelocityPlannerNode(const rclcpp::NodeOptio
 }
 
 void BehaviorVelocityPlannerNode::onLoadPlugin(
-  const LoadPlugin::Request::SharedPtr request,
-  [[maybe_unused]] const LoadPlugin::Response::SharedPtr response)
+  const autoware_internal_debug_msgs::srv::String::Request::SharedPtr request,
+  [[maybe_unused]] const autoware_internal_debug_msgs::srv::String::Response::SharedPtr response)
 {
   std::unique_lock<std::mutex> lk(mutex_);
-  planner_manager_.launchScenePlugin(*this, request->plugin_name);
+  planner_manager_.launchScenePlugin(*this, request->data);
 }
 
 void BehaviorVelocityPlannerNode::onUnloadPlugin(
-  const UnloadPlugin::Request::SharedPtr request,
-  [[maybe_unused]] const UnloadPlugin::Response::SharedPtr response)
+  const autoware_internal_debug_msgs::srv::String::Request::SharedPtr request,
+  [[maybe_unused]] const autoware_internal_debug_msgs::srv::String::Response::SharedPtr response)
 {
   std::unique_lock<std::mutex> lk(mutex_);
-  planner_manager_.removeScenePlugin(*this, request->plugin_name);
+  planner_manager_.removeScenePlugin(*this, request->data);
 }
 
 void BehaviorVelocityPlannerNode::onParam()
diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/LoadPlugin.srv b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/LoadPlugin.srv
deleted file mode 100644
index 7b9f08ab0ded8..0000000000000
--- a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/LoadPlugin.srv
+++ /dev/null
@@ -1,3 +0,0 @@
-string plugin_name
----
-bool success
diff --git a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/UnloadPlugin.srv b/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/UnloadPlugin.srv
deleted file mode 100644
index 7b9f08ab0ded8..0000000000000
--- a/planning/behavior_velocity_planner/autoware_behavior_velocity_planner/srv/UnloadPlugin.srv
+++ /dev/null
@@ -1,3 +0,0 @@
-string plugin_name
----
-bool success