From 8378c8c804a83f3bd86b42c21511afc377d5fbd2 Mon Sep 17 00:00:00 2001
From: Taekjin LEE <taekjin.lee@tier4.jp>
Date: Thu, 4 Jul 2024 09:21:11 +0900
Subject: [PATCH] refactor(cluster_merger)!: fix namespace and directory
 structure (#7738)

feat(cluster_merger): refactor cluster merger node component

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
---
 perception/cluster_merger/CMakeLists.txt               |  8 ++++----
 .../node.cpp => cluster_merger_node.cpp}               |  9 +++++----
 .../node.hpp => src/cluster_merger_node.hpp}           | 10 +++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)
 rename perception/cluster_merger/src/{cluster_merger/node.cpp => cluster_merger_node.cpp} (93%)
 rename perception/cluster_merger/{include/cluster_merger/node.hpp => src/cluster_merger_node.hpp} (92%)

diff --git a/perception/cluster_merger/CMakeLists.txt b/perception/cluster_merger/CMakeLists.txt
index 5ad0de572b44f..773cea6383f41 100644
--- a/perception/cluster_merger/CMakeLists.txt
+++ b/perception/cluster_merger/CMakeLists.txt
@@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED)
 autoware_package()
 
 # Targets
-ament_auto_add_library(cluster_merger_node_component SHARED
-  src/cluster_merger/node.cpp
+ament_auto_add_library(${PROJECT_NAME} SHARED
+  src/cluster_merger_node.cpp
 )
 
-rclcpp_components_register_node(cluster_merger_node_component
-  PLUGIN "cluster_merger::ClusterMergerNode"
+rclcpp_components_register_node(${PROJECT_NAME}
+  PLUGIN "autoware::cluster_merger::ClusterMergerNode"
   EXECUTABLE cluster_merger_node)
 
 
diff --git a/perception/cluster_merger/src/cluster_merger/node.cpp b/perception/cluster_merger/src/cluster_merger_node.cpp
similarity index 93%
rename from perception/cluster_merger/src/cluster_merger/node.cpp
rename to perception/cluster_merger/src/cluster_merger_node.cpp
index 48bf953027510..ada95b905d320 100644
--- a/perception/cluster_merger/src/cluster_merger/node.cpp
+++ b/perception/cluster_merger/src/cluster_merger_node.cpp
@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cluster_merger/node.hpp"
+#include "cluster_merger_node.hpp"
 
 #include "object_recognition_utils/object_recognition_utils.hpp"
 
 #include <memory>
 #include <string>
 #include <vector>
-namespace cluster_merger
+
+namespace autoware::cluster_merger
 {
 
 ClusterMergerNode::ClusterMergerNode(const rclcpp::NodeOptions & node_options)
@@ -67,7 +68,7 @@ void ClusterMergerNode::objectsCallback(
     transformed_objects1.feature_objects.end());
   pub_objects_->publish(output_objects);
 }
-}  // namespace cluster_merger
+}  // namespace autoware::cluster_merger
 
 #include "rclcpp_components/register_node_macro.hpp"
-RCLCPP_COMPONENTS_REGISTER_NODE(cluster_merger::ClusterMergerNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::cluster_merger::ClusterMergerNode)
diff --git a/perception/cluster_merger/include/cluster_merger/node.hpp b/perception/cluster_merger/src/cluster_merger_node.hpp
similarity index 92%
rename from perception/cluster_merger/include/cluster_merger/node.hpp
rename to perception/cluster_merger/src/cluster_merger_node.hpp
index a60a76f1c2ef0..2213d413d7031 100644
--- a/perception/cluster_merger/include/cluster_merger/node.hpp
+++ b/perception/cluster_merger/src/cluster_merger_node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CLUSTER_MERGER__NODE_HPP_
-#define CLUSTER_MERGER__NODE_HPP_
+#ifndef CLUSTER_MERGER_NODE_HPP_
+#define CLUSTER_MERGER_NODE_HPP_
 
 #include "autoware/universe_utils/ros/transform_listener.hpp"
 #include "message_filters/subscriber.h"
@@ -31,7 +31,7 @@
 #include <string>
 #include <vector>
 
-namespace cluster_merger
+namespace autoware::cluster_merger
 {
 using tier4_perception_msgs::msg::DetectedObjectsWithFeature;
 using tier4_perception_msgs::msg::DetectedObjectWithFeature;
@@ -68,6 +68,6 @@ class ClusterMergerNode : public rclcpp::Node
   rclcpp::Publisher<DetectedObjectsWithFeature>::SharedPtr pub_objects_;
 };
 
-}  // namespace cluster_merger
+}  // namespace autoware::cluster_merger
 
-#endif  // CLUSTER_MERGER__NODE_HPP_
+#endif  // CLUSTER_MERGER_NODE_HPP_