From 1bbb4f5fd9b34e9734cae3f6d9e36ecad9319963 Mon Sep 17 00:00:00 2001 From: Ambroise Vincent Date: Tue, 28 Nov 2023 15:38:24 +0000 Subject: [PATCH] refactor(json-schema): align schema and config file names The schema files need to follow a NODE_NAME.schema.json naming convention and the configuration files need to follow a NODE_NAME*.param.yaml naming convention. It allows to have one schema file per node in a package. Rename files that didn't match this pattern. Signed-off-by: Ambroise Vincent --- ...=> radar_object_fusion_to_detected_object.schema.json} | 4 ++-- ...nner_nodes.schema.json => mission_planner.schema.json} | 4 ++-- system/autoware_auto_msgs_adapter/README.md | 4 ++-- ...yaml => autoware_auto_msgs_adapter_control.param.yaml} | 0 ...ram.yaml => autoware_auto_msgs_adapter_map.param.yaml} | 0 ...l => autoware_auto_msgs_adapter_perception.param.yaml} | 0 ...aml => autoware_auto_msgs_adapter_planning.param.yaml} | 0 .../launch/autoware_auto_msgs_adapter.launch.xml | 8 ++++---- 8 files changed, 10 insertions(+), 10 deletions(-) rename perception/radar_fusion_to_detected_object/schema/{radar_fusion_to_detected_object.schema.json => radar_object_fusion_to_detected_object.schema.json} (97%) rename planning/mission_planner/schema/{mission_planner_nodes.schema.json => mission_planner.schema.json} (96%) rename system/autoware_auto_msgs_adapter/config/{adapter_control.param.yaml => autoware_auto_msgs_adapter_control.param.yaml} (100%) rename system/autoware_auto_msgs_adapter/config/{adapter_map.param.yaml => autoware_auto_msgs_adapter_map.param.yaml} (100%) rename system/autoware_auto_msgs_adapter/config/{adapter_perception.param.yaml => autoware_auto_msgs_adapter_perception.param.yaml} (100%) rename system/autoware_auto_msgs_adapter/config/{adapter_planning.param.yaml => autoware_auto_msgs_adapter_planning.param.yaml} (100%) diff --git a/perception/radar_fusion_to_detected_object/schema/radar_fusion_to_detected_object.schema.json b/perception/radar_fusion_to_detected_object/schema/radar_object_fusion_to_detected_object.schema.json similarity index 97% rename from perception/radar_fusion_to_detected_object/schema/radar_fusion_to_detected_object.schema.json rename to perception/radar_fusion_to_detected_object/schema/radar_object_fusion_to_detected_object.schema.json index 688414df56c1e..69c83503a2220 100644 --- a/perception/radar_fusion_to_detected_object/schema/radar_fusion_to_detected_object.schema.json +++ b/perception/radar_fusion_to_detected_object/schema/radar_object_fusion_to_detected_object.schema.json @@ -3,7 +3,7 @@ "title": "Parameters for Radar Fusion to Detected Object Node", "type": "object", "definitions": { - "radar_fusion_to_detected_object": { + "radar_object_fusion_to_detected_object": { "type": "object", "properties": { "node_params": { @@ -104,7 +104,7 @@ "type": "object", "properties": { "ros__parameters": { - "$ref": "#/definitions/radar_fusion_to_detected_object" + "$ref": "#/definitions/radar_object_fusion_to_detected_object" } }, "required": ["ros__parameters"] diff --git a/planning/mission_planner/schema/mission_planner_nodes.schema.json b/planning/mission_planner/schema/mission_planner.schema.json similarity index 96% rename from planning/mission_planner/schema/mission_planner_nodes.schema.json rename to planning/mission_planner/schema/mission_planner.schema.json index 3d0bdc41c5c34..4e302b703586d 100644 --- a/planning/mission_planner/schema/mission_planner_nodes.schema.json +++ b/planning/mission_planner/schema/mission_planner.schema.json @@ -3,7 +3,7 @@ "title": "Parameters for Mission Planner nodes", "type": "object", "definitions": { - "mission_planner_nodes": { + "mission_planner": { "type": "object", "properties": { "map_frame": { @@ -73,7 +73,7 @@ "type": "object", "properties": { "ros__parameters": { - "$ref": "#/definitions/mission_planner_nodes" + "$ref": "#/definitions/mission_planner" } }, "required": ["ros__parameters"] diff --git a/system/autoware_auto_msgs_adapter/README.md b/system/autoware_auto_msgs_adapter/README.md index 85c2797074f1f..67fabaaa46c9a 100644 --- a/system/autoware_auto_msgs_adapter/README.md +++ b/system/autoware_auto_msgs_adapter/README.md @@ -21,7 +21,7 @@ The `autoware_auto_msgs_adapter` package provides the following capabilities: ## Usage -Customize the adapter configuration by replicating and editing the `adapter_control.param.yaml` file located +Customize the adapter configuration by replicating and editing the `autoware_auto_msgs_adapter_control.param.yaml` file located in the `autoware_auto_msgs_adapter/config` directory. Example configuration: ```yaml @@ -90,7 +90,7 @@ To add a new message pair, - Add a new entry to the [schema/autoware_auto_msgs_adapter.schema.json](schema/autoware_auto_msgs_adapter.schema.json) file in the `definitions:autoware_auto_msgs_adapter:properties:msg_type_target:enum` section. - Learn more about JSON schema usage in [here](https://autowarefoundation.github.io/autoware-documentation/main/contributing/coding-guidelines/ros-nodes/parameters/#json-schema). - Create a new config file by replicating and editing: - - [adapter_control.param.yaml](config/adapter_control.param.yaml) + - [autoware_auto_msgs_adapter_control.param.yaml](config/autoware_auto_msgs_adapter_control.param.yaml) - Add a new test file by replicating and editing: - [test_msg_ackermann_control_command.cpp](test/test_msg_ackermann_control_command.cpp) - No need to edit the `CMakeLists.txt` file as it will automatically detect the new test file. diff --git a/system/autoware_auto_msgs_adapter/config/adapter_control.param.yaml b/system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_control.param.yaml similarity index 100% rename from system/autoware_auto_msgs_adapter/config/adapter_control.param.yaml rename to system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_control.param.yaml diff --git a/system/autoware_auto_msgs_adapter/config/adapter_map.param.yaml b/system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_map.param.yaml similarity index 100% rename from system/autoware_auto_msgs_adapter/config/adapter_map.param.yaml rename to system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_map.param.yaml diff --git a/system/autoware_auto_msgs_adapter/config/adapter_perception.param.yaml b/system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_perception.param.yaml similarity index 100% rename from system/autoware_auto_msgs_adapter/config/adapter_perception.param.yaml rename to system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_perception.param.yaml diff --git a/system/autoware_auto_msgs_adapter/config/adapter_planning.param.yaml b/system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_planning.param.yaml similarity index 100% rename from system/autoware_auto_msgs_adapter/config/adapter_planning.param.yaml rename to system/autoware_auto_msgs_adapter/config/autoware_auto_msgs_adapter_planning.param.yaml diff --git a/system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml b/system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml index a15c25f38ef3d..58f2fb4e06238 100755 --- a/system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml +++ b/system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml @@ -1,9 +1,9 @@ - - - - + + + +