feat(autoware_ad_api_msgs): replace adapi message (autowarefoundation…

…#1897) Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp> Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
boyali · Oct 19, 2022 · a7b33f5 · a7b33f5
1 parent b25a3d5
commit a7b33f5
Show file tree

Hide file tree

Showing 29 changed files with 46 additions and 202 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,7 +12,6 @@ control/shift_decider/** takamasa.horibe@tier4.jp
 control/pure_pursuit/** takamasa.horibe@tier4.jp
 control/operation_mode_transition_manager/** takamasa.horibe@tier4.jp
 control/control_performance_analysis/** ali.boyali@tier4.jp berkay@leodrive.ai
-common/autoware_ad_api_msgs/** isamu.takagi@tier4.jp
 common/motion_common/** christopherj.ho@gmail.com
 common/component_interface_specs/** isamu.takagi@tier4.jp
 common/motion_testing/** christopherj.ho@gmail.com

diff --git a/common/autoware_ad_api_msgs/CMakeLists.txt b/common/autoware_ad_api_msgs/CMakeLists.txt
diff --git a/common/autoware_ad_api_msgs/README.md b/common/autoware_ad_api_msgs/README.md
diff --git a/common/autoware_ad_api_msgs/common/msg/ResponseStatus.msg b/common/autoware_ad_api_msgs/common/msg/ResponseStatus.msg
diff --git a/common/autoware_ad_api_msgs/interface/srv/InterfaceVersion.srv b/common/autoware_ad_api_msgs/interface/srv/InterfaceVersion.srv
diff --git a/common/autoware_ad_api_msgs/localization/msg/LocalizationInitializationState.msg b/common/autoware_ad_api_msgs/localization/msg/LocalizationInitializationState.msg
diff --git a/common/autoware_ad_api_msgs/localization/srv/InitializeLocalization.srv b/common/autoware_ad_api_msgs/localization/srv/InitializeLocalization.srv
diff --git a/common/autoware_ad_api_msgs/package.xml b/common/autoware_ad_api_msgs/package.xml
diff --git a/common/autoware_ad_api_msgs/routing/msg/Route.msg b/common/autoware_ad_api_msgs/routing/msg/Route.msg
diff --git a/common/autoware_ad_api_msgs/routing/msg/RouteData.msg b/common/autoware_ad_api_msgs/routing/msg/RouteData.msg
diff --git a/common/autoware_ad_api_msgs/routing/msg/RoutePrimitive.msg b/common/autoware_ad_api_msgs/routing/msg/RoutePrimitive.msg
diff --git a/common/autoware_ad_api_msgs/routing/msg/RouteSegment.msg b/common/autoware_ad_api_msgs/routing/msg/RouteSegment.msg
diff --git a/common/autoware_ad_api_msgs/routing/msg/RouteState.msg b/common/autoware_ad_api_msgs/routing/msg/RouteState.msg
diff --git a/common/autoware_ad_api_msgs/routing/srv/ClearRoute.srv b/common/autoware_ad_api_msgs/routing/srv/ClearRoute.srv
diff --git a/common/autoware_ad_api_msgs/routing/srv/SetRoute.srv b/common/autoware_ad_api_msgs/routing/srv/SetRoute.srv
diff --git a/common/autoware_ad_api_msgs/routing/srv/SetRoutePoints.srv b/common/autoware_ad_api_msgs/routing/srv/SetRoutePoints.srv
diff --git a/common/autoware_ad_api_specs/include/autoware_ad_api_specs/interface.hpp b/common/autoware_ad_api_specs/include/autoware_ad_api_specs/interface.hpp
@@ -15,14 +15,14 @@
 #ifndef AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
 #define AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
 
-#include <autoware_ad_api_msgs/srv/interface_version.hpp>
+#include <autoware_adapi_version_msgs/srv/interface_version.hpp>
 
 namespace autoware_ad_api::interface
 {
 
 struct Version
 {
-  using Service = autoware_ad_api_msgs::srv::InterfaceVersion;
+  using Service = autoware_adapi_version_msgs::srv::InterfaceVersion;
   static constexpr char name[] = "/api/interface/version";
 };
 

diff --git a/common/autoware_ad_api_specs/include/autoware_ad_api_specs/localization.hpp b/common/autoware_ad_api_specs/include/autoware_ad_api_specs/localization.hpp
@@ -17,21 +17,21 @@
 
 #include <rclcpp/qos.hpp>
 
-#include <autoware_ad_api_msgs/msg/localization_initialization_state.hpp>
-#include <autoware_ad_api_msgs/srv/initialize_localization.hpp>
+#include <autoware_adapi_v1_msgs/msg/localization_initialization_state.hpp>
+#include <autoware_adapi_v1_msgs/srv/initialize_localization.hpp>
 
 namespace autoware_ad_api::localization
 {
 
 struct Initialize
 {
-  using Service = autoware_ad_api_msgs::srv::InitializeLocalization;
+  using Service = autoware_adapi_v1_msgs::srv::InitializeLocalization;
   static constexpr char name[] = "/api/localization/initialize";
 };
 
 struct InitializationState
 {
-  using Message = autoware_ad_api_msgs::msg::LocalizationInitializationState;
+  using Message = autoware_adapi_v1_msgs::msg::LocalizationInitializationState;
   static constexpr char name[] = "/api/localization/initialization_state";
   static constexpr size_t depth = 3;
   static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;

diff --git a/common/autoware_ad_api_specs/include/autoware_ad_api_specs/routing.hpp b/common/autoware_ad_api_specs/include/autoware_ad_api_specs/routing.hpp
@@ -17,36 +17,36 @@
 
 #include <rclcpp/qos.hpp>
 
-#include <autoware_ad_api_msgs/msg/route.hpp>
-#include <autoware_ad_api_msgs/msg/route_state.hpp>
-#include <autoware_ad_api_msgs/srv/clear_route.hpp>
-#include <autoware_ad_api_msgs/srv/set_route.hpp>
-#include <autoware_ad_api_msgs/srv/set_route_points.hpp>
+#include <autoware_adapi_v1_msgs/msg/route.hpp>
+#include <autoware_adapi_v1_msgs/msg/route_state.hpp>
+#include <autoware_adapi_v1_msgs/srv/clear_route.hpp>
+#include <autoware_adapi_v1_msgs/srv/set_route.hpp>
+#include <autoware_adapi_v1_msgs/srv/set_route_points.hpp>
 
 namespace autoware_ad_api::routing
 {
 
 struct SetRoutePoints
 {
-  using Service = autoware_ad_api_msgs::srv::SetRoutePoints;
+  using Service = autoware_adapi_v1_msgs::srv::SetRoutePoints;
   static constexpr char name[] = "/api/routing/set_route_points";
 };
 
 struct SetRoute
 {
-  using Service = autoware_ad_api_msgs::srv::SetRoute;
+  using Service = autoware_adapi_v1_msgs::srv::SetRoute;
   static constexpr char name[] = "/api/routing/set_route";
 };
 
 struct ClearRoute
 {
-  using Service = autoware_ad_api_msgs::srv::ClearRoute;
+  using Service = autoware_adapi_v1_msgs::srv::ClearRoute;
   static constexpr char name[] = "/api/routing/clear_route";
 };
 
 struct RouteState
 {
-  using Message = autoware_ad_api_msgs::msg::RouteState;
+  using Message = autoware_adapi_v1_msgs::msg::RouteState;
   static constexpr char name[] = "/api/routing/state";
   static constexpr size_t depth = 3;
   static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;
@@ -55,7 +55,7 @@ struct RouteState
 
 struct Route
 {
-  using Message = autoware_ad_api_msgs::msg::Route;
+  using Message = autoware_adapi_v1_msgs::msg::Route;
   static constexpr char name[] = "/api/routing/route";
   static constexpr size_t depth = 1;
   static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;

diff --git a/common/component_interface_specs/include/component_interface_specs/localization.hpp b/common/component_interface_specs/include/component_interface_specs/localization.hpp
@@ -17,21 +17,21 @@
 
 #include <rclcpp/qos.hpp>
 
-#include <autoware_ad_api_msgs/msg/localization_initialization_state.hpp>
-#include <autoware_ad_api_msgs/srv/initialize_localization.hpp>
+#include <autoware_adapi_v1_msgs/msg/localization_initialization_state.hpp>
+#include <autoware_adapi_v1_msgs/srv/initialize_localization.hpp>
 
 namespace localization_interface
 {
 
 struct Initialize
 {
-  using Service = autoware_ad_api_msgs::srv::InitializeLocalization;
+  using Service = autoware_adapi_v1_msgs::srv::InitializeLocalization;
   static constexpr char name[] = "/localization/initialize";
 };
 
 struct InitializationState
 {
-  using Message = autoware_ad_api_msgs::msg::LocalizationInitializationState;
+  using Message = autoware_adapi_v1_msgs::msg::LocalizationInitializationState;
   static constexpr char name[] = "/localization/initialization_state";
   static constexpr size_t depth = 3;
   static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;

diff --git a/common/component_interface_specs/include/component_interface_specs/planning.hpp b/common/component_interface_specs/include/component_interface_specs/planning.hpp
@@ -17,36 +17,36 @@
 
 #include <rclcpp/qos.hpp>
 
-#include <autoware_ad_api_msgs/msg/route.hpp>
-#include <autoware_ad_api_msgs/msg/route_state.hpp>
-#include <autoware_ad_api_msgs/srv/clear_route.hpp>
-#include <autoware_ad_api_msgs/srv/set_route.hpp>
-#include <autoware_ad_api_msgs/srv/set_route_points.hpp>
+#include <autoware_adapi_v1_msgs/msg/route.hpp>
+#include <autoware_adapi_v1_msgs/msg/route_state.hpp>
+#include <autoware_adapi_v1_msgs/srv/clear_route.hpp>
+#include <autoware_adapi_v1_msgs/srv/set_route.hpp>
+#include <autoware_adapi_v1_msgs/srv/set_route_points.hpp>
 
 namespace planning_interface
 {
 
 struct SetRoutePoints
 {
-  using Service = autoware_ad_api_msgs::srv::SetRoutePoints;
+  using Service = autoware_adapi_v1_msgs::srv::SetRoutePoints;
   static constexpr char name[] = "/planning/mission_planning/set_route_points";
 };
 
 struct SetRoute
 {
-  using Service = autoware_ad_api_msgs::srv::SetRoute;
+  using Service = autoware_adapi_v1_msgs::srv::SetRoute;
   static constexpr char name[] = "/planning/mission_planning/set_route";
 };
 
 struct ClearRoute
 {
-  using Service = autoware_ad_api_msgs::srv::ClearRoute;
+  using Service = autoware_adapi_v1_msgs::srv::ClearRoute;
   static constexpr char name[] = "/planning/mission_planning/clear_route";
 };
 
 struct RouteState
 {
-  using Message = autoware_ad_api_msgs::msg::RouteState;
+  using Message = autoware_adapi_v1_msgs::msg::RouteState;
   static constexpr char name[] = "/planning/mission_planning/route_state";
   static constexpr size_t depth = 3;
   static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;
@@ -55,7 +55,7 @@ struct RouteState
 
 struct Route
 {
-  using Message = autoware_ad_api_msgs::msg::Route;
+  using Message = autoware_adapi_v1_msgs::msg::Route;
   static constexpr char name[] = "/planning/mission_planning/route";
   static constexpr size_t depth = 1;
   static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;

diff --git a/common/component_interface_utils/include/component_interface_utils/rclcpp/exceptions.hpp b/common/component_interface_utils/include/component_interface_utils/rclcpp/exceptions.hpp
@@ -15,7 +15,7 @@
 #ifndef COMPONENT_INTERFACE_UTILS__RCLCPP__EXCEPTIONS_HPP_
 #define COMPONENT_INTERFACE_UTILS__RCLCPP__EXCEPTIONS_HPP_
 
-#include <autoware_ad_api_msgs/msg/response_status.hpp>
+#include <autoware_adapi_v1_msgs/msg/response_status.hpp>
 
 #include <stdexcept>
 #include <string>
@@ -26,7 +26,7 @@ namespace component_interface_utils
 class ServiceException : public std::runtime_error
 {
 public:
-  using ResponseStatus = autoware_ad_api_msgs::msg::ResponseStatus;
+  using ResponseStatus = autoware_adapi_v1_msgs::msg::ResponseStatus;
   using ResponseStatusCode = ResponseStatus::_code_type;
 
   ServiceException(ResponseStatusCode code, const std::string & message)

diff --git a/common/component_interface_utils/package.xml b/common/component_interface_utils/package.xml
@@ -11,7 +11,7 @@
 
   <build_depend>autoware_cmake</build_depend>
 
-  <depend>autoware_ad_api_msgs</depend>
+  <depend>autoware_adapi_v1_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>