Revert "remove node namespace"

This reverts commit 7cbb780. Signed-off-by: M. Fatih Cırıt <[email protected]>
autowarefoundation · Dec 10, 2024 · ea6f047 · ea6f047
1 parent 7cbb780
commit ea6f047
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/common/autoware_node/include/autoware/node/node.hpp b/common/autoware_node/include/autoware/node/node.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-namespace autoware
+namespace autoware::node
 {
 using CallbackReturn = rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn;
 
@@ -36,6 +36,6 @@ class Node : public rclcpp_lifecycle::LifecycleNode
 protected:
   CallbackReturn on_shutdown(const rclcpp_lifecycle::State & state) override;
 };
-}  // namespace autoware
+}  // namespace autoware::node
 
 #endif  // AUTOWARE__NODE__NODE_HPP_
diff --git a/common/autoware_node/src/node.cpp b/common/autoware_node/src/node.cpp
@@ -17,7 +17,7 @@
 
 #include <string>
 
-namespace autoware
+namespace autoware::node
 {
 Node::Node(
   const std::string & node_name, const std::string & ns, const rclcpp::NodeOptions & options)
@@ -35,4 +35,4 @@ CallbackReturn Node::on_shutdown(const rclcpp_lifecycle::State & state)
     get_node_base_interface()->get_fully_qualified_name(), state.label().c_str());
   return CallbackReturn::SUCCESS;
 }
-}  // namespace autoware
+}  // namespace autoware::node
diff --git a/common/autoware_node/test/test_an_init_shutdown.cpp b/common/autoware_node/test/test_an_init_shutdown.cpp
@@ -36,8 +36,8 @@ TEST_F(AutowareNodeInitShutdown, NodeInitShutdown)
   std::shared_ptr<rclcpp::executors::SingleThreadedExecutor> executor;
   executor = std::make_shared<rclcpp::executors::SingleThreadedExecutor>();
 
-  autoware::Node::SharedPtr autoware_node =
-    std::make_shared<autoware::Node>("test_node", "test_ns", node_options_an_);
+  autoware::node::Node::SharedPtr autoware_node =
+    std::make_shared<autoware::node::Node>("test_node", "test_ns", node_options_an_);
 
   executor->add_node(autoware_node->get_node_base_interface());
 

diff --git a/demos/autoware_test_node/src/include/test_node.hpp b/demos/autoware_test_node/src/include/test_node.hpp
@@ -21,7 +21,7 @@
 namespace autoware::test_node
 {
 
-class TestNode : public autoware::Node
+class TestNode : public autoware::node::Node
 {
 public:
   explicit TestNode(const rclcpp::NodeOptions & options = rclcpp::NodeOptions());

diff --git a/demos/autoware_test_node/src/test_node.cpp b/demos/autoware_test_node/src/test_node.cpp
@@ -18,7 +18,8 @@
 
 namespace autoware::test_node
 {
-TestNode::TestNode(const rclcpp::NodeOptions & options) : autoware::Node("test_node", "", options)
+TestNode::TestNode(const rclcpp::NodeOptions & options)
+: autoware::node::Node("test_node", "", options)
 {
   RCLCPP_DEBUG(
     get_logger(), "TestNode %s constructor was called.",