From 72f0328b7fec2cc7b1766a0095bba77a46f02981 Mon Sep 17 00:00:00 2001
From: Takayuki Murooka <takayuki5168@gmail.com>
Date: Tue, 24 Dec 2024 10:18:37 +0900
Subject: [PATCH 1/2] feat(behavior_path_planner): use autoware internal
 stamped messages

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
---
 .../autoware/behavior_path_planner/planner_manager.hpp      | 6 ++++--
 .../autoware_behavior_path_planner/package.xml              | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/planning/behavior_path_planner/autoware_behavior_path_planner/include/autoware/behavior_path_planner/planner_manager.hpp b/planning/behavior_path_planner/autoware_behavior_path_planner/include/autoware/behavior_path_planner/planner_manager.hpp
index 3bed1e6a88bd8..741202590779c 100644
--- a/planning/behavior_path_planner/autoware_behavior_path_planner/include/autoware/behavior_path_planner/planner_manager.hpp
+++ b/planning/behavior_path_planner/autoware_behavior_path_planner/include/autoware/behavior_path_planner/planner_manager.hpp
@@ -25,6 +25,8 @@
 #include <pluginlib/class_loader.hpp>
 #include <rclcpp/rclcpp.hpp>
 
+#include <autoware_internal_debug_msgs/msg/float64_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/string_stamped.hpp>
 #include <tier4_planning_msgs/msg/path_with_lane_id.hpp>
 
 #include <lanelet2_core/primitives/Lanelet.h>
@@ -44,8 +46,8 @@ using tier4_planning_msgs::msg::PathWithLaneId;
 using SceneModulePtr = std::shared_ptr<SceneModuleInterface>;
 using SceneModuleManagerPtr = std::shared_ptr<SceneModuleManagerInterface>;
 using DebugPublisher = autoware::universe_utils::DebugPublisher;
-using DebugDoubleMsg = tier4_debug_msgs::msg::Float64Stamped;
-using DebugStringMsg = tier4_debug_msgs::msg::StringStamped;
+using DebugDoubleMsg = autoware_internal_debug_msgs::msg::Float64Stamped;
+using DebugStringMsg = autoware_internal_debug_msgs::msg::StringStamped;
 
 struct SceneModuleUpdateInfo
 {
diff --git a/planning/behavior_path_planner/autoware_behavior_path_planner/package.xml b/planning/behavior_path_planner/autoware_behavior_path_planner/package.xml
index 6141480d1597a..7b7e2438a3fd6 100644
--- a/planning/behavior_path_planner/autoware_behavior_path_planner/package.xml
+++ b/planning/behavior_path_planner/autoware_behavior_path_planner/package.xml
@@ -40,6 +40,7 @@
   <depend>autoware_behavior_path_planner_common</depend>
   <depend>autoware_freespace_planning_algorithms</depend>
   <depend>autoware_frenet_planner</depend>
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_interpolation</depend>
   <depend>autoware_lane_departure_checker</depend>
   <depend>autoware_lanelet2_extension</depend>

From d82f9ad5b17942f87820bfb81916f032a2b75fb5 Mon Sep 17 00:00:00 2001
From: Takayuki Murooka <takayuki5168@gmail.com>
Date: Tue, 24 Dec 2024 10:57:22 +0900
Subject: [PATCH 2/2] fix universe_utils

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
---
 .../universe_utils/ros/debug_traits.hpp       | 62 +++++++++++++++++++
 common/autoware_universe_utils/package.xml    |  1 +
 2 files changed, 63 insertions(+)

diff --git a/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_traits.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_traits.hpp
index 8420f930e0ce9..5878641676d9f 100644
--- a/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_traits.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_traits.hpp
@@ -15,6 +15,16 @@
 #ifndef AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_TRAITS_HPP_
 #define AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_TRAITS_HPP_
 
+#include <autoware_internal_debug_msgs/msg/bool_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/float32_multi_array_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/float32_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/float64_multi_array_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/float64_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/int32_multi_array_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/int32_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/int64_multi_array_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/int64_stamped.hpp>
+#include <autoware_internal_debug_msgs/msg/string_stamped.hpp>
 #include <tier4_debug_msgs/msg/bool_stamped.hpp>
 #include <tier4_debug_msgs/msg/float32_multi_array_stamped.hpp>
 #include <tier4_debug_msgs/msg/float32_stamped.hpp>
@@ -84,6 +94,58 @@ template <>
 struct is_debug_message<tier4_debug_msgs::msg::StringStamped> : std::true_type
 {
 };
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::BoolStamped> : std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Float32MultiArrayStamped>
+: std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Float32Stamped> : std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Float64MultiArrayStamped>
+: std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Float64Stamped> : std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Int32MultiArrayStamped> : std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Int32Stamped> : std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Int64MultiArrayStamped> : std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::Int64Stamped> : std::true_type
+{
+};
+
+template <>
+struct is_debug_message<autoware_internal_debug_msgs::msg::StringStamped> : std::true_type
+{
+};
 }  // namespace autoware::universe_utils::debug_traits
 
 #endif  // AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_TRAITS_HPP_
diff --git a/common/autoware_universe_utils/package.xml b/common/autoware_universe_utils/package.xml
index d04e1a57e78ab..0e7b892a8c689 100644
--- a/common/autoware_universe_utils/package.xml
+++ b/common/autoware_universe_utils/package.xml
@@ -12,6 +12,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_internal_msgs</depend>
   <depend>autoware_perception_msgs</depend>
   <depend>autoware_planning_msgs</depend>