From 8f45356ed9379393d049b408fd66db9a725a0430 Mon Sep 17 00:00:00 2001
From: satoshi-ota <satoshi.ota928@gmail.com>
Date: Tue, 12 Nov 2024 12:38:18 +0900
Subject: [PATCH 1/4] fix(external): fix old package name
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
---
autoware_iv_external_api_adaptor/package.xml | 2 +-
autoware_iv_external_api_adaptor/src/route.cpp | 6 +++---
autoware_iv_external_api_adaptor/src/route.hpp | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/autoware_iv_external_api_adaptor/package.xml b/autoware_iv_external_api_adaptor/package.xml
index 9d87f46..631b766 100644
--- a/autoware_iv_external_api_adaptor/package.xml
+++ b/autoware_iv_external_api_adaptor/package.xml
@@ -10,7 +10,7 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>
- <depend>autoware_ad_api_specs</depend>
+ <depend>autoware_adapi_spec</depend>
<depend>autoware_component_interface_specs</depend>
<depend>autoware_component_interface_utils</depend>
<depend>autoware_control_msgs</depend>
diff --git a/autoware_iv_external_api_adaptor/src/route.cpp b/autoware_iv_external_api_adaptor/src/route.cpp
index 9dac0fc..ae0f6d9 100644
--- a/autoware_iv_external_api_adaptor/src/route.cpp
+++ b/autoware_iv_external_api_adaptor/src/route.cpp
@@ -62,7 +62,7 @@ void Route::setRoute(
}
try {
- const auto req = std::make_shared<autoware_ad_api::routing::SetRoute::Service::Request>();
+ const auto req = std::make_shared<autoware_adapi::routing::SetRoute::Service::Request>();
*req = converter::convert(*request);
const auto res = cli_set_route_->call(req);
response->status = converter::convert(res->status);
@@ -76,7 +76,7 @@ void Route::clearRoute(
const tier4_external_api_msgs::srv::ClearRoute::Response::SharedPtr response)
{
try {
- const auto req = std::make_shared<autoware_ad_api::routing::ClearRoute::Service::Request>();
+ const auto req = std::make_shared<autoware_adapi::routing::ClearRoute::Service::Request>();
const auto res = cli_clear_route_->call(req);
response->status = converter::convert(res->status);
} catch (const autoware::component_interface_utils::ServiceException & error) {
@@ -84,7 +84,7 @@ void Route::clearRoute(
}
}
-void Route::onRoute(const autoware_ad_api::routing::Route::Message::ConstSharedPtr message)
+void Route::onRoute(const autoware_adapi::routing::Route::Message::ConstSharedPtr message)
{
if (!message->data.empty()) {
pub_get_route_->publish(converter::convert(*message));
diff --git a/autoware_iv_external_api_adaptor/src/route.hpp b/autoware_iv_external_api_adaptor/src/route.hpp
index dade0f5..c21e1fc 100644
--- a/autoware_iv_external_api_adaptor/src/route.hpp
+++ b/autoware_iv_external_api_adaptor/src/route.hpp
@@ -16,7 +16,7 @@
#define ROUTE_HPP_
#include "autoware/component_interface_utils/rclcpp.hpp"
-#include "autoware_ad_api_specs/routing.hpp"
+#include "autoware_adapi_spec/routing.hpp"
#include "rclcpp/rclcpp.hpp"
#include "tier4_api_utils/tier4_api_utils.hpp"
@@ -44,11 +44,11 @@ class Route : public rclcpp::Node
tier4_api_utils::Service<SetRoute>::SharedPtr srv_set_route_;
tier4_api_utils::Service<ClearRoute>::SharedPtr srv_clear_route_;
rclcpp::Publisher<RouteMsg>::SharedPtr pub_get_route_;
- autoware::component_interface_utils::Client<autoware_ad_api::routing::ClearRoute>::SharedPtr
+ autoware::component_interface_utils::Client<autoware_adapi::routing::ClearRoute>::SharedPtr
cli_clear_route_;
- autoware::component_interface_utils::Client<autoware_ad_api::routing::SetRoute>::SharedPtr
+ autoware::component_interface_utils::Client<autoware_adapi::routing::SetRoute>::SharedPtr
cli_set_route_;
- autoware::component_interface_utils::Subscription<autoware_ad_api::routing::Route>::SharedPtr
+ autoware::component_interface_utils::Subscription<autoware_adapi::routing::Route>::SharedPtr
sub_get_route_;
// ros callback
@@ -58,7 +58,7 @@ class Route : public rclcpp::Node
void clearRoute(
const tier4_external_api_msgs::srv::ClearRoute::Request::SharedPtr request,
const tier4_external_api_msgs::srv::ClearRoute::Response::SharedPtr response);
- void onRoute(const autoware_ad_api::routing::Route::Message::ConstSharedPtr message);
+ void onRoute(const autoware_adapi::routing::Route::Message::ConstSharedPtr message);
};
} // namespace external_api
From c01b97d77f59b7f1f734de6fd9e91ba2bd6295ad Mon Sep 17 00:00:00 2001
From: satoshi-ota <satoshi.ota928@gmail.com>
Date: Tue, 12 Nov 2024 12:45:14 +0900
Subject: [PATCH 2/4] fix: typo
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
---
autoware_iv_external_api_adaptor/package.xml | 2 +-
autoware_iv_external_api_adaptor/src/route.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/autoware_iv_external_api_adaptor/package.xml b/autoware_iv_external_api_adaptor/package.xml
index 631b766..23a83de 100644
--- a/autoware_iv_external_api_adaptor/package.xml
+++ b/autoware_iv_external_api_adaptor/package.xml
@@ -10,7 +10,7 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>
- <depend>autoware_adapi_spec</depend>
+ <depend>autoware_adapi_specs</depend>
<depend>autoware_component_interface_specs</depend>
<depend>autoware_component_interface_utils</depend>
<depend>autoware_control_msgs</depend>
diff --git a/autoware_iv_external_api_adaptor/src/route.hpp b/autoware_iv_external_api_adaptor/src/route.hpp
index c21e1fc..06ed9ec 100644
--- a/autoware_iv_external_api_adaptor/src/route.hpp
+++ b/autoware_iv_external_api_adaptor/src/route.hpp
@@ -16,7 +16,7 @@
#define ROUTE_HPP_
#include "autoware/component_interface_utils/rclcpp.hpp"
-#include "autoware_adapi_spec/routing.hpp"
+#include "autoware_adapi_specs/routing.hpp"
#include "rclcpp/rclcpp.hpp"
#include "tier4_api_utils/tier4_api_utils.hpp"
From b26daa21b2ae3049da2d2e4192ef5102639a976c Mon Sep 17 00:00:00 2001
From: satoshi-ota <satoshi.ota928@gmail.com>
Date: Tue, 12 Nov 2024 13:13:05 +0900
Subject: [PATCH 3/4] fix: directory
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
---
autoware_iv_external_api_adaptor/src/route.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autoware_iv_external_api_adaptor/src/route.hpp b/autoware_iv_external_api_adaptor/src/route.hpp
index 06ed9ec..fdeb4a9 100644
--- a/autoware_iv_external_api_adaptor/src/route.hpp
+++ b/autoware_iv_external_api_adaptor/src/route.hpp
@@ -15,8 +15,8 @@
#ifndef ROUTE_HPP_
#define ROUTE_HPP_
+#include "autoware/adapi_specs/routing.hpp"
#include "autoware/component_interface_utils/rclcpp.hpp"
-#include "autoware_adapi_specs/routing.hpp"
#include "rclcpp/rclcpp.hpp"
#include "tier4_api_utils/tier4_api_utils.hpp"
From d130eabba59df550831324fd6da9c5b0d04006b2 Mon Sep 17 00:00:00 2001
From: satoshi-ota <satoshi.ota928@gmail.com>
Date: Tue, 12 Nov 2024 13:22:36 +0900
Subject: [PATCH 4/4] fix: namespace
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
---
autoware_iv_external_api_adaptor/src/route.cpp | 7 ++++---
autoware_iv_external_api_adaptor/src/route.hpp | 10 +++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/autoware_iv_external_api_adaptor/src/route.cpp b/autoware_iv_external_api_adaptor/src/route.cpp
index ae0f6d9..d001bd4 100644
--- a/autoware_iv_external_api_adaptor/src/route.cpp
+++ b/autoware_iv_external_api_adaptor/src/route.cpp
@@ -62,7 +62,7 @@ void Route::setRoute(
}
try {
- const auto req = std::make_shared<autoware_adapi::routing::SetRoute::Service::Request>();
+ const auto req = std::make_shared<autoware::adapi_specs::routing::SetRoute::Service::Request>();
*req = converter::convert(*request);
const auto res = cli_set_route_->call(req);
response->status = converter::convert(res->status);
@@ -76,7 +76,8 @@ void Route::clearRoute(
const tier4_external_api_msgs::srv::ClearRoute::Response::SharedPtr response)
{
try {
- const auto req = std::make_shared<autoware_adapi::routing::ClearRoute::Service::Request>();
+ const auto req =
+ std::make_shared<autoware::adapi_specs::routing::ClearRoute::Service::Request>();
const auto res = cli_clear_route_->call(req);
response->status = converter::convert(res->status);
} catch (const autoware::component_interface_utils::ServiceException & error) {
@@ -84,7 +85,7 @@ void Route::clearRoute(
}
}
-void Route::onRoute(const autoware_adapi::routing::Route::Message::ConstSharedPtr message)
+void Route::onRoute(const autoware::adapi_specs::routing::Route::Message::ConstSharedPtr message)
{
if (!message->data.empty()) {
pub_get_route_->publish(converter::convert(*message));
diff --git a/autoware_iv_external_api_adaptor/src/route.hpp b/autoware_iv_external_api_adaptor/src/route.hpp
index fdeb4a9..392f624 100644
--- a/autoware_iv_external_api_adaptor/src/route.hpp
+++ b/autoware_iv_external_api_adaptor/src/route.hpp
@@ -44,12 +44,12 @@ class Route : public rclcpp::Node
tier4_api_utils::Service<SetRoute>::SharedPtr srv_set_route_;
tier4_api_utils::Service<ClearRoute>::SharedPtr srv_clear_route_;
rclcpp::Publisher<RouteMsg>::SharedPtr pub_get_route_;
- autoware::component_interface_utils::Client<autoware_adapi::routing::ClearRoute>::SharedPtr
+ autoware::component_interface_utils::Client<autoware::adapi_specs::routing::ClearRoute>::SharedPtr
cli_clear_route_;
- autoware::component_interface_utils::Client<autoware_adapi::routing::SetRoute>::SharedPtr
+ autoware::component_interface_utils::Client<autoware::adapi_specs::routing::SetRoute>::SharedPtr
cli_set_route_;
- autoware::component_interface_utils::Subscription<autoware_adapi::routing::Route>::SharedPtr
- sub_get_route_;
+ autoware::component_interface_utils::Subscription<
+ autoware::adapi_specs::routing::Route>::SharedPtr sub_get_route_;
// ros callback
void setRoute(
@@ -58,7 +58,7 @@ class Route : public rclcpp::Node
void clearRoute(
const tier4_external_api_msgs::srv::ClearRoute::Request::SharedPtr request,
const tier4_external_api_msgs::srv::ClearRoute::Response::SharedPtr response);
- void onRoute(const autoware_adapi::routing::Route::Message::ConstSharedPtr message);
+ void onRoute(const autoware::adapi_specs::routing::Route::Message::ConstSharedPtr message);
};
} // namespace external_api