refactor(simple_object_merger)!: fix namespace and directory structure (

autowarefoundation#7700) * refactor(simple_object_merger): refactor library and node names Refactor the library and node names in the simple_object_merger package to follow the autoware namespace convention. This includes renaming the library from simple_object_merger_node_component to autoware_simple_object_merger and the node from simple_object_merger_node to autoware_simple_object_merger_node. Signed-off-by: Taekjin LEE <[email protected]> * refactor: fix the node name Signed-off-by: Taekjin LEE <[email protected]> * refactor: rename simple_object_merger library and node to follow autoware namespace convention Signed-off-by: Taekjin LEE <[email protected]> * refactor: move node header to src Signed-off-by: Taekjin LEE <[email protected]> --------- Signed-off-by: Taekjin LEE <[email protected]>
mitukou1109 · Jul 2, 2024 · 57e3155 · 57e3155
1 parent 72c1409
commit 57e3155
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/perception/simple_object_merger/CMakeLists.txt b/perception/simple_object_merger/CMakeLists.txt
@@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED)
 autoware_package()
 
 # Targets
-ament_auto_add_library(simple_object_merger_node_component SHARED
-  src/simple_object_merger_node/simple_object_merger_node.cpp
+ament_auto_add_library(${PROJECT_NAME} SHARED
+  src/simple_object_merger_node.cpp
 )
 
-rclcpp_components_register_node(simple_object_merger_node_component
-  PLUGIN "simple_object_merger::SimpleObjectMergerNode"
+rclcpp_components_register_node(${PROJECT_NAME}
+  PLUGIN "autoware::simple_object_merger::SimpleObjectMergerNode"
   EXECUTABLE simple_object_merger_node
 )
 

diff --git a/...merger_node/simple_object_merger_node.cpp → ..._merger/src/simple_object_merger_node.cpp b/...merger_node/simple_object_merger_node.cpp → ..._merger/src/simple_object_merger_node.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "simple_object_merger/simple_object_merger_node.hpp"
+#include "simple_object_merger_node.hpp"
 
 #include <geometry_msgs/msg/pose_stamped.hpp>
 
@@ -65,7 +65,7 @@ autoware_perception_msgs::msg::DetectedObjects::SharedPtr getTransformedObjects(
 
 }  // namespace
 
-namespace simple_object_merger
+namespace autoware::simple_object_merger
 {
 using namespace std::literals;
 using std::chrono::duration;
@@ -193,7 +193,7 @@ void SimpleObjectMergerNode::onTimer()
   pub_objects_->publish(output_objects);
 }
 
-}  // namespace simple_object_merger
+}  // namespace autoware::simple_object_merger
 
 #include "rclcpp_components/register_node_macro.hpp"
-RCLCPP_COMPONENTS_REGISTER_NODE(simple_object_merger::SimpleObjectMergerNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::simple_object_merger::SimpleObjectMergerNode)
diff --git a/...ject_merger/simple_object_merger_node.hpp → ..._merger/src/simple_object_merger_node.hpp b/...ject_merger/simple_object_merger_node.hpp → ..._merger/src/simple_object_merger_node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SIMPLE_OBJECT_MERGER__SIMPLE_OBJECT_MERGER_NODE_HPP_
-#define SIMPLE_OBJECT_MERGER__SIMPLE_OBJECT_MERGER_NODE_HPP_
+#ifndef SIMPLE_OBJECT_MERGER_NODE_HPP_
+#define SIMPLE_OBJECT_MERGER_NODE_HPP_
 
 #include "autoware/universe_utils/ros/transform_listener.hpp"
 #include "rclcpp/rclcpp.hpp"
@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-namespace simple_object_merger
+namespace autoware::simple_object_merger
 {
 using autoware_perception_msgs::msg::DetectedObject;
 using autoware_perception_msgs::msg::DetectedObjects;
@@ -76,6 +76,6 @@ class SimpleObjectMergerNode : public rclcpp::Node
   size_t input_topic_size;
 };
 
-}  // namespace simple_object_merger
+}  // namespace autoware::simple_object_merger
 
-#endif  // SIMPLE_OBJECT_MERGER__SIMPLE_OBJECT_MERGER_NODE_HPP_
+#endif  // SIMPLE_OBJECT_MERGER_NODE_HPP_