Skip to content

Commit 6af7d0b

Browse files
refactor(autoware_ad_api_specs): prefix package and namespace with autoware (#9250)
* refactor(autoware_ad_api_specs): prefix package and namespace with autoware Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * style(pre-commit): autofix * chore(autoware_adapi_specs): rename ad_api to adapi Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * style(pre-commit): autofix * chore(autoware_adapi_specs): rename ad_api to adapi Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * chore(autoware_adapi_specs): rename ad_api to adapi Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * chore(autoware_adapi_specs): rename ad_api_specs to adapi_specs Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> --------- Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent e8a4d87 commit 6af7d0b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+175
-175
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Automatically generated from package.xml ###
2-
common/autoware_ad_api_specs/** isamu.takagi@tier4.jp ryohsuke.mitsudome@tier4.jp
2+
common/autoware_adapi_specs/** isamu.takagi@tier4.jp ryohsuke.mitsudome@tier4.jp
33
common/autoware_auto_common/** opensource@apex.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
44
common/autoware_component_interface_specs/** isamu.takagi@tier4.jp yukihiro.saito@tier4.jp
55
common/autoware_component_interface_tools/** isamu.takagi@tier4.jp

common/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ nav:
4949
- 'Goal Distance Calculator': common/goal_distance_calculator/Readme
5050
- 'Path Distance Calculator': common/autoware_path_distance_calculator/Readme
5151
- 'Others':
52-
- 'autoware_ad_api_specs': common/autoware_ad_api_specs
52+
- 'autoware_adapi_specs': common/autoware_adapi_specs
5353
- 'component_interface_specs': common/component_interface_specs
5454
- 'component_interface_tools': common/component_interface_tools
5555
- 'component_interface_utils': common/component_interface_utils

common/autoware_ad_api_specs/CMakeLists.txt common/autoware_adapi_specs/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(autoware_ad_api_specs)
2+
project(autoware_adapi_specs)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
File renamed without changes.

common/autoware_ad_api_specs/include/autoware_ad_api_specs/fail_safe.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/fail_safe.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
16-
#define AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

2020
#include <autoware_adapi_v1_msgs/msg/mrm_state.hpp>
2121

22-
namespace autoware_ad_api::fail_safe
22+
namespace autoware::adapi_specs::fail_safe
2323
{
2424

2525
struct MrmState
@@ -31,6 +31,6 @@ struct MrmState
3131
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
3232
};
3333

34-
} // namespace autoware_ad_api::fail_safe
34+
} // namespace autoware::adapi_specs::fail_safe
3535

36-
#endif // AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
36+
#endif // AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/interface.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/interface.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
16-
#define AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_
1717

1818
#include <autoware_adapi_version_msgs/srv/interface_version.hpp>
1919

20-
namespace autoware_ad_api::interface
20+
namespace autoware::adapi_specs::interface
2121
{
2222

2323
struct Version
@@ -26,6 +26,6 @@ struct Version
2626
static constexpr char name[] = "/api/interface/version";
2727
};
2828

29-
} // namespace autoware_ad_api::interface
29+
} // namespace autoware::adapi_specs::interface
3030

31-
#endif // AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
31+
#endif // AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/localization.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/localization.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__LOCALIZATION_HPP_
16-
#define AUTOWARE_AD_API_SPECS__LOCALIZATION_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

2020
#include <autoware_adapi_v1_msgs/msg/localization_initialization_state.hpp>
2121
#include <autoware_adapi_v1_msgs/srv/initialize_localization.hpp>
2222

23-
namespace autoware_ad_api::localization
23+
namespace autoware::adapi_specs::localization
2424
{
2525

2626
struct Initialize
@@ -38,6 +38,6 @@ struct InitializationState
3838
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
3939
};
4040

41-
} // namespace autoware_ad_api::localization
41+
} // namespace autoware::adapi_specs::localization
4242

43-
#endif // AUTOWARE_AD_API_SPECS__LOCALIZATION_HPP_
43+
#endif // AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/motion.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/motion.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__MOTION_HPP_
16-
#define AUTOWARE_AD_API_SPECS__MOTION_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__MOTION_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__MOTION_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

2020
#include <autoware_adapi_v1_msgs/msg/motion_state.hpp>
2121
#include <autoware_adapi_v1_msgs/srv/accept_start.hpp>
2222

23-
namespace autoware_ad_api::motion
23+
namespace autoware::adapi_specs::motion
2424
{
2525

2626
struct AcceptStart
@@ -38,6 +38,6 @@ struct State
3838
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
3939
};
4040

41-
} // namespace autoware_ad_api::motion
41+
} // namespace autoware::adapi_specs::motion
4242

43-
#endif // AUTOWARE_AD_API_SPECS__MOTION_HPP_
43+
#endif // AUTOWARE__ADAPI_SPECS__MOTION_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/operation_mode.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/operation_mode.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__OPERATION_MODE_HPP_
16-
#define AUTOWARE_AD_API_SPECS__OPERATION_MODE_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

2020
#include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
2121
#include <autoware_adapi_v1_msgs/srv/change_operation_mode.hpp>
2222

23-
namespace autoware_ad_api::operation_mode
23+
namespace autoware::adapi_specs::operation_mode
2424
{
2525

2626
struct ChangeToStop
@@ -68,6 +68,6 @@ struct OperationModeState
6868
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
6969
};
7070

71-
} // namespace autoware_ad_api::operation_mode
71+
} // namespace autoware::adapi_specs::operation_mode
7272

73-
#endif // AUTOWARE_AD_API_SPECS__OPERATION_MODE_HPP_
73+
#endif // AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/perception.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/perception.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__PERCEPTION_HPP_
16-
#define AUTOWARE_AD_API_SPECS__PERCEPTION_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

2020
#include <autoware_adapi_v1_msgs/msg/dynamic_object_array.hpp>
2121

22-
namespace autoware_ad_api::perception
22+
namespace autoware::adapi_specs::perception
2323
{
2424

2525
struct DynamicObjectArray
@@ -31,6 +31,6 @@ struct DynamicObjectArray
3131
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_VOLATILE;
3232
};
3333

34-
} // namespace autoware_ad_api::perception
34+
} // namespace autoware::adapi_specs::perception
3535

36-
#endif // AUTOWARE_AD_API_SPECS__PERCEPTION_HPP_
36+
#endif // AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/planning.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/planning.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__PLANNING_HPP_
16-
#define AUTOWARE_AD_API_SPECS__PLANNING_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__PLANNING_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__PLANNING_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

2020
#include <autoware_adapi_v1_msgs/msg/steering_factor_array.hpp>
2121
#include <autoware_adapi_v1_msgs/msg/velocity_factor_array.hpp>
2222

23-
namespace autoware_ad_api::planning
23+
namespace autoware::adapi_specs::planning
2424
{
2525

2626
struct VelocityFactors
@@ -41,6 +41,6 @@ struct SteeringFactors
4141
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_VOLATILE;
4242
};
4343

44-
} // namespace autoware_ad_api::planning
44+
} // namespace autoware::adapi_specs::planning
4545

46-
#endif // AUTOWARE_AD_API_SPECS__PLANNING_HPP_
46+
#endif // AUTOWARE__ADAPI_SPECS__PLANNING_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/routing.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/routing.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__ROUTING_HPP_
16-
#define AUTOWARE_AD_API_SPECS__ROUTING_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__ROUTING_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__ROUTING_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

@@ -23,7 +23,7 @@
2323
#include <autoware_adapi_v1_msgs/srv/set_route.hpp>
2424
#include <autoware_adapi_v1_msgs/srv/set_route_points.hpp>
2525

26-
namespace autoware_ad_api::routing
26+
namespace autoware::adapi_specs::routing
2727
{
2828

2929
struct SetRoutePoints
@@ -74,6 +74,6 @@ struct Route
7474
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
7575
};
7676

77-
} // namespace autoware_ad_api::routing
77+
} // namespace autoware::adapi_specs::routing
7878

79-
#endif // AUTOWARE_AD_API_SPECS__ROUTING_HPP_
79+
#endif // AUTOWARE__ADAPI_SPECS__ROUTING_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/system.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/system.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__SYSTEM_HPP_
16-
#define AUTOWARE_AD_API_SPECS__SYSTEM_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

2020
#include <autoware_adapi_v1_msgs/msg/heartbeat.hpp>
2121

22-
namespace autoware_ad_api::system
22+
namespace autoware::adapi_specs::system
2323
{
2424

2525
struct Heartbeat
@@ -31,6 +31,6 @@ struct Heartbeat
3131
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_VOLATILE;
3232
};
3333

34-
} // namespace autoware_ad_api::system
34+
} // namespace autoware::adapi_specs::system
3535

36-
#endif // AUTOWARE_AD_API_SPECS__SYSTEM_HPP_
36+
#endif // AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_

common/autoware_ad_api_specs/include/autoware_ad_api_specs/vehicle.hpp common/autoware_adapi_specs/include/autoware/adapi_specs/vehicle.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_AD_API_SPECS__VEHICLE_HPP_
16-
#define AUTOWARE_AD_API_SPECS__VEHICLE_HPP_
15+
#ifndef AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_
16+
#define AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_
1717

1818
#include <rclcpp/qos.hpp>
1919

@@ -24,7 +24,7 @@
2424
#include <autoware_adapi_v1_msgs/srv/get_vehicle_dimensions.hpp>
2525
#include <autoware_adapi_v1_msgs/srv/set_door_command.hpp>
2626

27-
namespace autoware_ad_api::vehicle
27+
namespace autoware::adapi_specs::vehicle
2828
{
2929

3030
struct VehicleKinematics
@@ -72,6 +72,6 @@ struct DoorStatus
7272
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
7373
};
7474

75-
} // namespace autoware_ad_api::vehicle
75+
} // namespace autoware::adapi_specs::vehicle
7676

77-
#endif // AUTOWARE_AD_API_SPECS__VEHICLE_HPP_
77+
#endif // AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_

common/autoware_ad_api_specs/package.xml common/autoware_adapi_specs/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>autoware_ad_api_specs</name>
4+
<name>autoware_adapi_specs</name>
55
<version>0.38.0</version>
6-
<description>The autoware_ad_api_specs package</description>
6+
<description>The autoware_adapi_specs package</description>
77
<maintainer email="isamu.takagi@tier4.jp">Takagi, Isamu</maintainer>
88
<maintainer email="ryohsuke.mitsudome@tier4.jp">Ryohsuke Mitsudome</maintainer>
99
<license>Apache License 2.0</license>

common/tier4_adapi_rviz_plugin/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1313
<buildtool_depend>autoware_cmake</buildtool_depend>
1414

15-
<depend>autoware_ad_api_specs</depend>
15+
<depend>autoware_adapi_specs</depend>
1616
<depend>autoware_component_interface_utils</depend>
1717
<depend>autoware_vehicle_msgs</depend>
1818
<depend>geometry_msgs</depend>

common/tier4_adapi_rviz_plugin/src/door_panel.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <QGridLayout>
1919
#include <QLabel>
2020
#include <QPushButton>
21+
#include <autoware/adapi_specs/vehicle.hpp>
2122
#include <autoware/component_interface_utils/rclcpp.hpp>
22-
#include <autoware_ad_api_specs/vehicle.hpp>
2323
#include <rclcpp/rclcpp.hpp>
2424
#include <rviz_common/panel.hpp>
2525

@@ -31,9 +31,9 @@ namespace tier4_adapi_rviz_plugins
3131
class DoorPanel : public rviz_common::Panel
3232
{
3333
Q_OBJECT
34-
using DoorCommand = autoware_ad_api::vehicle::DoorCommand;
35-
using DoorLayout = autoware_ad_api::vehicle::DoorLayout;
36-
using DoorStatus = autoware_ad_api::vehicle::DoorStatus;
34+
using DoorCommand = autoware::adapi_specs::vehicle::DoorCommand;
35+
using DoorLayout = autoware::adapi_specs::vehicle::DoorLayout;
36+
using DoorStatus = autoware::adapi_specs::vehicle::DoorStatus;
3737

3838
public:
3939
explicit DoorPanel(QWidget * parent = nullptr);

common/tier4_adapi_rviz_plugin/src/route_panel.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include <QGroupBox>
2121
#include <QLabel>
2222
#include <QPushButton>
23+
#include <autoware/adapi_specs/routing.hpp>
2324
#include <autoware/component_interface_utils/rclcpp.hpp>
24-
#include <autoware_ad_api_specs/routing.hpp>
2525
#include <rclcpp/rclcpp.hpp>
2626
#include <rviz_common/panel.hpp>
2727

@@ -35,9 +35,9 @@ namespace tier4_adapi_rviz_plugins
3535
class RoutePanel : public rviz_common::Panel
3636
{
3737
Q_OBJECT
38-
using ClearRoute = autoware_ad_api::routing::ClearRoute;
39-
using SetRoutePoints = autoware_ad_api::routing::SetRoutePoints;
40-
using ChangeRoutePoints = autoware_ad_api::routing::ChangeRoutePoints;
38+
using ClearRoute = autoware::adapi_specs::routing::ClearRoute;
39+
using SetRoutePoints = autoware::adapi_specs::routing::SetRoutePoints;
40+
using ChangeRoutePoints = autoware::adapi_specs::routing::ChangeRoutePoints;
4141
using PoseStamped = geometry_msgs::msg::PoseStamped;
4242

4343
public:

common/tier4_camera_view_rviz_plugin/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1212
<buildtool_depend>autoware_cmake</buildtool_depend>
1313

14-
<depend>autoware_ad_api_specs</depend>
14+
<depend>autoware_adapi_specs</depend>
1515
<depend>autoware_component_interface_utils</depend>
1616
<depend>geometry_msgs</depend>
1717
<depend>libqt5-core</depend>

system/autoware_default_adapi/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1313
<buildtool_depend>autoware_cmake</buildtool_depend>
1414

15-
<depend>autoware_ad_api_specs</depend>
15+
<depend>autoware_adapi_specs</depend>
1616
<depend>autoware_adapi_v1_msgs</depend>
1717
<depend>autoware_adapi_version_msgs</depend>
1818
<depend>autoware_component_interface_specs</depend>

0 commit comments

Comments
 (0)