From 4522419a3e45a0d16d34b307afc3bdf9e1507df3 Mon Sep 17 00:00:00 2001
From: Taekjin LEE <taekjin.lee@tier4.jp>
Date: Tue, 2 Jul 2024 18:27:02 +0900
Subject: [PATCH] refactor: namespace fix, move header to src

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
---
 .../raindrop_cluster_filter/CMakeLists.txt    |  4 ++--
 ... => low_intensity_cluster_filter_node.cpp} | 12 +++++++-----
 .../low_intensity_cluster_filter_node.hpp}    | 19 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)
 rename perception/raindrop_cluster_filter/src/{low_intensity_cluster_filter.cpp => low_intensity_cluster_filter_node.cpp} (95%)
 rename perception/raindrop_cluster_filter/{include/raindrop_cluster_filter/low_intensity_cluster_filter/low_intensity_cluster_filter.hpp => src/low_intensity_cluster_filter_node.hpp} (78%)

diff --git a/perception/raindrop_cluster_filter/CMakeLists.txt b/perception/raindrop_cluster_filter/CMakeLists.txt
index a867bc740317..17eef97cc2f5 100644
--- a/perception/raindrop_cluster_filter/CMakeLists.txt
+++ b/perception/raindrop_cluster_filter/CMakeLists.txt
@@ -10,11 +10,11 @@ autoware_package()
 
 # Targets
 ament_auto_add_library(low_intensity_cluster_filter SHARED
-  src/low_intensity_cluster_filter.cpp
+  src/low_intensity_cluster_filter_node.cpp
 )
 
 rclcpp_components_register_node(low_intensity_cluster_filter
-  PLUGIN "low_intensity_cluster_filter::LowIntensityClusterFilter"
+  PLUGIN "autoware::low_intensity_cluster_filter::LowIntensityClusterFilter"
   EXECUTABLE low_intensity_cluster_filter_node)
 
 
diff --git a/perception/raindrop_cluster_filter/src/low_intensity_cluster_filter.cpp b/perception/raindrop_cluster_filter/src/low_intensity_cluster_filter_node.cpp
similarity index 95%
rename from perception/raindrop_cluster_filter/src/low_intensity_cluster_filter.cpp
rename to perception/raindrop_cluster_filter/src/low_intensity_cluster_filter_node.cpp
index 4772c355ec0b..105fc98722a2 100644
--- a/perception/raindrop_cluster_filter/src/low_intensity_cluster_filter.cpp
+++ b/perception/raindrop_cluster_filter/src/low_intensity_cluster_filter_node.cpp
@@ -12,15 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "raindrop_cluster_filter/low_intensity_cluster_filter/low_intensity_cluster_filter.hpp"
+#include "low_intensity_cluster_filter_node.hpp"
+
+#include "autoware/universe_utils/geometry/geometry.hpp"
 
-#include <autoware/universe_utils/geometry/geometry.hpp>
 #include <pcl_ros/transforms.hpp>
 
 #include <sensor_msgs/point_cloud2_iterator.hpp>
 
 #include <pcl_conversions/pcl_conversions.h>
-namespace low_intensity_cluster_filter
+
+namespace autoware::low_intensity_cluster_filter
 {
 LowIntensityClusterFilter::LowIntensityClusterFilter(const rclcpp::NodeOptions & node_options)
 : Node("low_intensity_cluster_filter_node", node_options),
@@ -135,7 +137,7 @@ bool LowIntensityClusterFilter::isValidatedCluster(const sensor_msgs::msg::Point
   return false;
 }
 
-}  // namespace low_intensity_cluster_filter
+}  // namespace autoware::low_intensity_cluster_filter
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(low_intensity_cluster_filter::LowIntensityClusterFilter)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::low_intensity_cluster_filter::LowIntensityClusterFilter)
diff --git a/perception/raindrop_cluster_filter/include/raindrop_cluster_filter/low_intensity_cluster_filter/low_intensity_cluster_filter.hpp b/perception/raindrop_cluster_filter/src/low_intensity_cluster_filter_node.hpp
similarity index 78%
rename from perception/raindrop_cluster_filter/include/raindrop_cluster_filter/low_intensity_cluster_filter/low_intensity_cluster_filter.hpp
rename to perception/raindrop_cluster_filter/src/low_intensity_cluster_filter_node.hpp
index b3ebc4d91694..8e21306218ab 100644
--- a/perception/raindrop_cluster_filter/include/raindrop_cluster_filter/low_intensity_cluster_filter/low_intensity_cluster_filter.hpp
+++ b/perception/raindrop_cluster_filter/src/low_intensity_cluster_filter_node.hpp
@@ -12,26 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RAINDROP_CLUSTER_FILTER__LOW_INTENSITY_CLUSTER_FILTER__LOW_INTENSITY_CLUSTER_FILTER_HPP_
-#define RAINDROP_CLUSTER_FILTER__LOW_INTENSITY_CLUSTER_FILTER__LOW_INTENSITY_CLUSTER_FILTER_HPP_
+#ifndef LOW_INTENSITY_CLUSTER_FILTER_NODE_HPP_
+#define LOW_INTENSITY_CLUSTER_FILTER_NODE_HPP_
 
+#include "autoware/universe_utils/ros/debug_publisher.hpp"
+#include "autoware/universe_utils/system/stop_watch.hpp"
 #include "detected_object_validation/utils/utils.hpp"
 
-#include <autoware/universe_utils/ros/debug_publisher.hpp>
-#include <autoware/universe_utils/system/stop_watch.hpp>
+#include <Eigen/Eigen>
 #include <rclcpp/rclcpp.hpp>
 
-#include <tier4_perception_msgs/msg/detected_objects_with_feature.hpp>
+#include "tier4_perception_msgs/msg/detected_objects_with_feature.hpp"
 
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
-// #include <tf2_eigen/tf2_eigen.hpp>
-#include <Eigen/Eigen>
 
 #include <memory>
 #include <string>
 
-namespace low_intensity_cluster_filter
+namespace autoware::low_intensity_cluster_filter
 {
 
 class LowIntensityClusterFilter : public rclcpp::Node
@@ -73,6 +72,6 @@ class LowIntensityClusterFilter : public rclcpp::Node
   std::unique_ptr<autoware::universe_utils::DebugPublisher> debug_publisher_ptr_{nullptr};
 };
 
-}  // namespace low_intensity_cluster_filter
+}  // namespace autoware::low_intensity_cluster_filter
 
-#endif  // RAINDROP_CLUSTER_FILTER__LOW_INTENSITY_CLUSTER_FILTER__LOW_INTENSITY_CLUSTER_FILTER_HPP_
+#endif  // LOW_INTENSITY_CLUSTER_FILTER_NODE_HPP_