From 56f29fea5f9090ed33fb9fe20ca4c7ec2bcf3863 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 17:22:43 +0900 Subject: [PATCH] feat: apply `autoware_` prefix for `duplicated_node_checker` (#9970) * feat(duplicated_node_checker): apply `autoware_` prefix (see below): Note: * In this commit, I did not organize a folder structure. The folder structure will be organized in the next some commits. * The changes will follow the Autoware's guideline as below: - https://autowarefoundation.github.io/autoware-documentation/main/contributing/coding-guidelines/ros-nodes/directory-structure/#package-folder Signed-off-by: Junya Sasaki * rename(duplicated_node_checker): move a header under `include/autoware`: * Fixes due to this changes for .hpp/.cpp files will be applied in the next commit Signed-off-by: Junya Sasaki * fix(duplicated_node_checker): fix include header path * To follow the previous commit Signed-off-by: Junya Sasaki * rename: `duplicated_node_checker` => `autoware_duplicated_node_checker` Signed-off-by: Junya Sasaki * style(pre-commit): autofix * bug(autoware_duplicated_node_checker): revert wrongly updated copyrights Signed-off-by: Junya Sasaki * update(autoware_duplicated_node_checker): `README.md` Signed-off-by: Junya Sasaki * update: `CODEOWNERS` Signed-off-by: Junya Sasaki --------- Signed-off-by: Junya Sasaki Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- .../CHANGELOG.rst | 0 .../CMakeLists.txt | 6 +++--- .../README.md | 4 ++-- .../config/duplicated_node_checker.param.yaml | 0 .../duplicated_node_checker_core.hpp | 10 +++++----- .../launch/duplicated_node_checker.launch.xml | 7 +++++++ .../package.xml | 3 ++- .../schema/duplicated_node_checker.schema.json | 0 .../src/duplicated_node_checker_core.cpp | 8 ++++---- .../launch/duplicated_node_checker.launch.xml | 7 ------- 11 files changed, 24 insertions(+), 23 deletions(-) rename system/{duplicated_node_checker => autoware_duplicated_node_checker}/CHANGELOG.rst (100%) rename system/{duplicated_node_checker => autoware_duplicated_node_checker}/CMakeLists.txt (69%) rename system/{duplicated_node_checker => autoware_duplicated_node_checker}/README.md (83%) rename system/{duplicated_node_checker => autoware_duplicated_node_checker}/config/duplicated_node_checker.param.yaml (100%) rename system/{duplicated_node_checker/include => autoware_duplicated_node_checker/include/autoware}/duplicated_node_checker/duplicated_node_checker_core.hpp (83%) create mode 100644 system/autoware_duplicated_node_checker/launch/duplicated_node_checker.launch.xml rename system/{duplicated_node_checker => autoware_duplicated_node_checker}/package.xml (88%) rename system/{duplicated_node_checker => autoware_duplicated_node_checker}/schema/duplicated_node_checker.schema.json (100%) rename system/{duplicated_node_checker => autoware_duplicated_node_checker}/src/duplicated_node_checker_core.cpp (91%) delete mode 100644 system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 26d86e98018c3..3d92cd900e3b2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -219,7 +219,7 @@ system/diagnostic_graph_aggregator/** isamu.takagi@tier4.jp system/diagnostic_graph_utils/** isamu.takagi@tier4.jp system/autoware_dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp system/dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp -system/duplicated_node_checker/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp uken.ryu@tier4.jp +system/autoware_duplicated_node_checker/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp uken.ryu@tier4.jp junya.sasaki@tier4.jp system/hazard_status_converter/** isamu.takagi@tier4.jp system/mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp system/mrm_emergency_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp diff --git a/system/duplicated_node_checker/CHANGELOG.rst b/system/autoware_duplicated_node_checker/CHANGELOG.rst similarity index 100% rename from system/duplicated_node_checker/CHANGELOG.rst rename to system/autoware_duplicated_node_checker/CHANGELOG.rst diff --git a/system/duplicated_node_checker/CMakeLists.txt b/system/autoware_duplicated_node_checker/CMakeLists.txt similarity index 69% rename from system/duplicated_node_checker/CMakeLists.txt rename to system/autoware_duplicated_node_checker/CMakeLists.txt index 6a8089fa85c96..25f7e8bd16d92 100644 --- a/system/duplicated_node_checker/CMakeLists.txt +++ b/system/autoware_duplicated_node_checker/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(duplicated_node_checker) +project(autoware_duplicated_node_checker) find_package(autoware_cmake REQUIRED) autoware_package() @@ -10,8 +10,8 @@ ament_auto_add_library(${PROJECT_NAME} SHARED ) rclcpp_components_register_node(${PROJECT_NAME} - PLUGIN "duplicated_node_checker::DuplicatedNodeChecker" - EXECUTABLE duplicated_node_checker_node + PLUGIN "autoware::duplicated_node_checker::DuplicatedNodeChecker" + EXECUTABLE ${PROJECT_NAME}_node ) ament_auto_package(INSTALL_TO_SHARE diff --git a/system/duplicated_node_checker/README.md b/system/autoware_duplicated_node_checker/README.md similarity index 83% rename from system/duplicated_node_checker/README.md rename to system/autoware_duplicated_node_checker/README.md index 81b53e36c9f6d..42cbf8f7633ac 100644 --- a/system/duplicated_node_checker/README.md +++ b/system/autoware_duplicated_node_checker/README.md @@ -8,7 +8,7 @@ The result is published as diagnostics. ### Standalone Startup ```bash -ros2 launch duplicated_node_checker duplicated_node_checker.launch.xml +ros2 launch autoware_duplicated_node_checker duplicated_node_checker.launch.xml ``` ## Inner-workings / Algorithms @@ -30,7 +30,7 @@ The types of topic status and corresponding diagnostic status are following. ## Parameters -{{ json_to_markdown("system/duplicated_node_checker/schema/duplicated_node_checker.schema.json") }} +{{ json_to_markdown("system/autoware_duplicated_node_checker/schema/duplicated_node_checker.schema.json") }} ## Assumptions / Known limits diff --git a/system/duplicated_node_checker/config/duplicated_node_checker.param.yaml b/system/autoware_duplicated_node_checker/config/duplicated_node_checker.param.yaml similarity index 100% rename from system/duplicated_node_checker/config/duplicated_node_checker.param.yaml rename to system/autoware_duplicated_node_checker/config/duplicated_node_checker.param.yaml diff --git a/system/duplicated_node_checker/include/duplicated_node_checker/duplicated_node_checker_core.hpp b/system/autoware_duplicated_node_checker/include/autoware/duplicated_node_checker/duplicated_node_checker_core.hpp similarity index 83% rename from system/duplicated_node_checker/include/duplicated_node_checker/duplicated_node_checker_core.hpp rename to system/autoware_duplicated_node_checker/include/autoware/duplicated_node_checker/duplicated_node_checker_core.hpp index 66e125de666b7..91683ff46c265 100644 --- a/system/duplicated_node_checker/include/duplicated_node_checker/duplicated_node_checker_core.hpp +++ b/system/autoware_duplicated_node_checker/include/autoware/duplicated_node_checker/duplicated_node_checker_core.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DUPLICATED_NODE_CHECKER__DUPLICATED_NODE_CHECKER_CORE_HPP_ -#define DUPLICATED_NODE_CHECKER__DUPLICATED_NODE_CHECKER_CORE_HPP_ +#ifndef AUTOWARE__DUPLICATED_NODE_CHECKER__DUPLICATED_NODE_CHECKER_CORE_HPP_ +#define AUTOWARE__DUPLICATED_NODE_CHECKER__DUPLICATED_NODE_CHECKER_CORE_HPP_ #include #include @@ -22,7 +22,7 @@ #include #include -namespace duplicated_node_checker +namespace autoware::duplicated_node_checker { class DuplicatedNodeChecker : public rclcpp::Node { @@ -54,6 +54,6 @@ class DuplicatedNodeChecker : public rclcpp::Node bool add_duplicated_node_names_to_msg_; std::unordered_set nodes_to_ignore_; }; -} // namespace duplicated_node_checker +} // namespace autoware::duplicated_node_checker -#endif // DUPLICATED_NODE_CHECKER__DUPLICATED_NODE_CHECKER_CORE_HPP_ +#endif // AUTOWARE__DUPLICATED_NODE_CHECKER__DUPLICATED_NODE_CHECKER_CORE_HPP_ diff --git a/system/autoware_duplicated_node_checker/launch/duplicated_node_checker.launch.xml b/system/autoware_duplicated_node_checker/launch/duplicated_node_checker.launch.xml new file mode 100644 index 0000000000000..ec7c417f671c1 --- /dev/null +++ b/system/autoware_duplicated_node_checker/launch/duplicated_node_checker.launch.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/system/duplicated_node_checker/package.xml b/system/autoware_duplicated_node_checker/package.xml similarity index 88% rename from system/duplicated_node_checker/package.xml rename to system/autoware_duplicated_node_checker/package.xml index ee2f938cfb442..c49d8304f1968 100644 --- a/system/duplicated_node_checker/package.xml +++ b/system/autoware_duplicated_node_checker/package.xml @@ -1,12 +1,13 @@ - duplicated_node_checker + autoware_duplicated_node_checker 0.40.0 A package to find out nodes with common names Shumpei Wakabayashi yliuhb Mamoru Sobue + Junya Sasaki Apache 2.0 ament_cmake diff --git a/system/duplicated_node_checker/schema/duplicated_node_checker.schema.json b/system/autoware_duplicated_node_checker/schema/duplicated_node_checker.schema.json similarity index 100% rename from system/duplicated_node_checker/schema/duplicated_node_checker.schema.json rename to system/autoware_duplicated_node_checker/schema/duplicated_node_checker.schema.json diff --git a/system/duplicated_node_checker/src/duplicated_node_checker_core.cpp b/system/autoware_duplicated_node_checker/src/duplicated_node_checker_core.cpp similarity index 91% rename from system/duplicated_node_checker/src/duplicated_node_checker_core.cpp rename to system/autoware_duplicated_node_checker/src/duplicated_node_checker_core.cpp index 40ced8f886005..d68b893b075c1 100644 --- a/system/duplicated_node_checker/src/duplicated_node_checker_core.cpp +++ b/system/autoware_duplicated_node_checker/src/duplicated_node_checker_core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "duplicated_node_checker/duplicated_node_checker_core.hpp" +#include "autoware/duplicated_node_checker/duplicated_node_checker_core.hpp" #include #include @@ -22,7 +22,7 @@ #include #include -namespace duplicated_node_checker +namespace autoware::duplicated_node_checker { DuplicatedNodeChecker::DuplicatedNodeChecker(const rclcpp::NodeOptions & node_options) @@ -77,7 +77,7 @@ void DuplicatedNodeChecker::produceDiagnostics(diagnostic_updater::DiagnosticSta stat.summary(level, msg); } -} // namespace duplicated_node_checker +} // namespace autoware::duplicated_node_checker #include -RCLCPP_COMPONENTS_REGISTER_NODE(duplicated_node_checker::DuplicatedNodeChecker) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::duplicated_node_checker::DuplicatedNodeChecker) diff --git a/system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml b/system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml deleted file mode 100644 index 87f41f045545d..0000000000000 --- a/system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -