Skip to content

Commit 191465d

Browse files
committed
build: prefix all plugins and behavior_velocity_planner_common
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent eae2aaa commit 191465d

File tree

37 files changed

+44
-44
lines changed

37 files changed

+44
-44
lines changed

planning/autoware_behavior_velocity_planner/src/planner_manager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ diagnostic_msgs::msg::DiagnosticStatus makeStopReasonDiag(
5151

5252
BehaviorVelocityPlannerManager::BehaviorVelocityPlannerManager()
5353
: plugin_loader_(
54-
"autoware_behavior_velocity_planner", "behavior_velocity_planner::PluginInterface")
54+
"autoware_behavior_velocity_planner", "autoware::behavior_velocity_planner::PluginInterface")
5555
{
5656
}
5757

@@ -83,7 +83,7 @@ void BehaviorVelocityPlannerManager::removeScenePlugin(
8383
{
8484
auto it = std::remove_if(
8585
scene_manager_plugins_.begin(), scene_manager_plugins_.end(),
86-
[&](const std::shared_ptr<behavior_velocity_planner::PluginInterface> plugin) {
86+
[&](const std::shared_ptr<autoware::behavior_velocity_planner::PluginInterface> plugin) {
8787
return plugin->getModuleName() == name;
8888
});
8989

planning/autoware_behavior_velocity_planner/src/planner_manager.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
namespace autoware::behavior_velocity_planner
4040
{
4141
using ::behavior_velocity_planner::PlannerData;
42-
using ::behavior_velocity_planner::PluginInterface;
4342

4443
class BehaviorVelocityPlannerManager
4544
{
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<library path="behavior_velocity_blind_spot_module">
2-
<class type="behavior_velocity_planner::BlindSpotModulePlugin" base_class_type="behavior_velocity_planner::PluginInterface"/>
2+
<class type="behavior_velocity_planner::BlindSpotModulePlugin" base_class_type="autoware::behavior_velocity_planner::PluginInterface"/>
33
</library>

planning/behavior_velocity_blind_spot_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ BlindSpotModuleManager::getModuleExpiredFunction(
9494

9595
#include <pluginlib/class_list_macros.hpp>
9696
PLUGINLIB_EXPORT_CLASS(
97-
behavior_velocity_planner::BlindSpotModulePlugin, behavior_velocity_planner::PluginInterface)
97+
behavior_velocity_planner::BlindSpotModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_blind_spot_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class BlindSpotModuleManager : public SceneModuleManagerInterfaceWithRTC
4545
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
4646
};
4747

48-
class BlindSpotModulePlugin : public PluginWrapper<BlindSpotModuleManager>
48+
class BlindSpotModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<BlindSpotModuleManager>
4949
{
5050
};
5151

planning/behavior_velocity_crosswalk_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,4 @@ CrosswalkModuleManager::getModuleExpiredFunction(const PathWithLaneId & path)
235235

236236
#include <pluginlib/class_list_macros.hpp>
237237
PLUGINLIB_EXPORT_CLASS(
238-
behavior_velocity_planner::CrosswalkModulePlugin, behavior_velocity_planner::PluginInterface)
238+
behavior_velocity_planner::CrosswalkModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_crosswalk_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class CrosswalkModuleManager : public SceneModuleManagerInterfaceWithRTC
5353
const PathWithLaneId & path) override;
5454
};
5555

56-
class CrosswalkModulePlugin : public PluginWrapper<CrosswalkModuleManager>
56+
class CrosswalkModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<CrosswalkModuleManager>
5757
{
5858
};
5959
} // namespace behavior_velocity_planner

planning/behavior_velocity_detection_area_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ DetectionAreaModuleManager::getModuleExpiredFunction(
8888

8989
#include <pluginlib/class_list_macros.hpp>
9090
PLUGINLIB_EXPORT_CLASS(
91-
behavior_velocity_planner::DetectionAreaModulePlugin, behavior_velocity_planner::PluginInterface)
91+
behavior_velocity_planner::DetectionAreaModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_detection_area_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class DetectionAreaModuleManager : public SceneModuleManagerInterfaceWithRTC
4545
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
4646
};
4747

48-
class DetectionAreaModulePlugin : public PluginWrapper<DetectionAreaModuleManager>
48+
class DetectionAreaModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<DetectionAreaModuleManager>
4949
{
5050
};
5151

planning/behavior_velocity_dynamic_obstacle_stop_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ DynamicObstacleStopModuleManager::getModuleExpiredFunction(
7373
#include <pluginlib/class_list_macros.hpp>
7474
PLUGINLIB_EXPORT_CLASS(
7575
behavior_velocity_planner::DynamicObstacleStopModulePlugin,
76-
behavior_velocity_planner::PluginInterface)
76+
autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_dynamic_obstacle_stop_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class DynamicObstacleStopModuleManager : public SceneModuleManagerInterface
4949
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
5050
};
5151

52-
class DynamicObstacleStopModulePlugin : public PluginWrapper<DynamicObstacleStopModuleManager>
52+
class DynamicObstacleStopModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<DynamicObstacleStopModuleManager>
5353
{
5454
};
5555

planning/behavior_velocity_intersection_module/src/manager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ bool MergeFromPrivateModuleManager::hasSameParentLaneletAndTurnDirectionWithRegi
593593

594594
#include <pluginlib/class_list_macros.hpp>
595595
PLUGINLIB_EXPORT_CLASS(
596-
behavior_velocity_planner::IntersectionModulePlugin, behavior_velocity_planner::PluginInterface)
596+
behavior_velocity_planner::IntersectionModulePlugin, autoware::behavior_velocity_planner::PluginInterface)
597597
PLUGINLIB_EXPORT_CLASS(
598598
behavior_velocity_planner::MergeFromPrivateModulePlugin,
599-
behavior_velocity_planner::PluginInterface)
599+
autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_intersection_module/src/manager.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ class MergeFromPrivateModuleManager : public SceneModuleManagerInterface
8181
bool hasSameParentLaneletAndTurnDirectionWithRegistered(const lanelet::ConstLanelet & lane) const;
8282
};
8383

84-
class IntersectionModulePlugin : public PluginWrapper<IntersectionModuleManager>
84+
class IntersectionModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<IntersectionModuleManager>
8585
{
8686
};
8787

88-
class MergeFromPrivateModulePlugin : public PluginWrapper<MergeFromPrivateModuleManager>
88+
class MergeFromPrivateModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<MergeFromPrivateModuleManager>
8989
{
9090
};
9191

planning/behavior_velocity_no_drivable_lane_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ NoDrivableLaneModuleManager::getModuleExpiredFunction(
7070

7171
#include <pluginlib/class_list_macros.hpp>
7272
PLUGINLIB_EXPORT_CLASS(
73-
behavior_velocity_planner::NoDrivableLaneModulePlugin, behavior_velocity_planner::PluginInterface)
73+
behavior_velocity_planner::NoDrivableLaneModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_no_drivable_lane_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class NoDrivableLaneModuleManager : public SceneModuleManagerInterface
4545
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
4646
};
4747

48-
class NoDrivableLaneModulePlugin : public PluginWrapper<NoDrivableLaneModuleManager>
48+
class NoDrivableLaneModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<NoDrivableLaneModuleManager>
4949
{
5050
};
5151

planning/behavior_velocity_no_stopping_area_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ NoStoppingAreaModuleManager::getModuleExpiredFunction(
9090

9191
#include <pluginlib/class_list_macros.hpp>
9292
PLUGINLIB_EXPORT_CLASS(
93-
behavior_velocity_planner::NoStoppingAreaModulePlugin, behavior_velocity_planner::PluginInterface)
93+
behavior_velocity_planner::NoStoppingAreaModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_no_stopping_area_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class NoStoppingAreaModuleManager : public SceneModuleManagerInterfaceWithRTC
4545
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
4646
};
4747

48-
class NoStoppingAreaModulePlugin : public PluginWrapper<NoStoppingAreaModuleManager>
48+
class NoStoppingAreaModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<NoStoppingAreaModuleManager>
4949
{
5050
};
5151

planning/behavior_velocity_occlusion_spot_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ OcclusionSpotModuleManager::getModuleExpiredFunction(
140140

141141
#include <pluginlib/class_list_macros.hpp>
142142
PLUGINLIB_EXPORT_CLASS(
143-
behavior_velocity_planner::OcclusionSpotModulePlugin, behavior_velocity_planner::PluginInterface)
143+
behavior_velocity_planner::OcclusionSpotModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_occlusion_spot_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class OcclusionSpotModuleManager : public SceneModuleManagerInterface
5959
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
6060
};
6161

62-
class OcclusionSpotModulePlugin : public PluginWrapper<OcclusionSpotModuleManager>
62+
class OcclusionSpotModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<OcclusionSpotModuleManager>
6363
{
6464
};
6565

planning/behavior_velocity_out_of_lane_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ OutOfLaneModuleManager::getModuleExpiredFunction(
105105

106106
#include <pluginlib/class_list_macros.hpp>
107107
PLUGINLIB_EXPORT_CLASS(
108-
behavior_velocity_planner::OutOfLaneModulePlugin, behavior_velocity_planner::PluginInterface)
108+
behavior_velocity_planner::OutOfLaneModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_out_of_lane_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class OutOfLaneModuleManager : public SceneModuleManagerInterface
5757
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
5858
};
5959

60-
class OutOfLaneModulePlugin : public PluginWrapper<OutOfLaneModuleManager>
60+
class OutOfLaneModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<OutOfLaneModuleManager>
6161
{
6262
};
6363

planning/behavior_velocity_planner_common/include/behavior_velocity_planner_common/plugin_interface.hpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,23 @@
2222

2323
#include <memory>
2424

25-
namespace behavior_velocity_planner
25+
namespace autoware::behavior_velocity_planner
2626
{
2727

2828
class PluginInterface
2929
{
30+
3031
public:
3132
virtual ~PluginInterface() = default;
3233
virtual void init(rclcpp::Node & node) = 0;
3334
virtual void plan(autoware_auto_planning_msgs::msg::PathWithLaneId * path) = 0;
3435
virtual void updateSceneModuleInstances(
35-
const std::shared_ptr<const PlannerData> & planner_data,
36+
const std::shared_ptr<const ::behavior_velocity_planner::PlannerData> & planner_data,
3637
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) = 0;
3738
virtual std::optional<int> getFirstStopPathPointIndex() = 0;
3839
virtual const char * getModuleName() = 0;
3940
};
4041

41-
} // namespace behavior_velocity_planner
42+
} // namespace autoware::behavior_velocity_planner
4243

4344
#endif // BEHAVIOR_VELOCITY_PLANNER_COMMON__PLUGIN_INTERFACE_HPP_

planning/behavior_velocity_planner_common/include/behavior_velocity_planner_common/plugin_wrapper.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <memory>
2121
#include <optional>
2222

23-
namespace behavior_velocity_planner
23+
namespace autoware::behavior_velocity_planner
2424
{
2525

2626
template <class T>
@@ -33,7 +33,7 @@ class PluginWrapper : public PluginInterface
3333
scene_manager_->plan(path);
3434
};
3535
void updateSceneModuleInstances(
36-
const std::shared_ptr<const PlannerData> & planner_data,
36+
const std::shared_ptr<const ::behavior_velocity_planner::PlannerData> & planner_data,
3737
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override
3838
{
3939
scene_manager_->updateSceneModuleInstances(planner_data, path);
@@ -48,6 +48,6 @@ class PluginWrapper : public PluginInterface
4848
std::unique_ptr<T> scene_manager_;
4949
};
5050

51-
} // namespace behavior_velocity_planner
51+
} // namespace autoware::behavior_velocity_planner
5252

5353
#endif // BEHAVIOR_VELOCITY_PLANNER_COMMON__PLUGIN_WRAPPER_HPP_

planning/behavior_velocity_run_out_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,4 @@ void RunOutModuleManager::setDynamicObstacleCreator(
204204

205205
#include <pluginlib/class_list_macros.hpp>
206206
PLUGINLIB_EXPORT_CLASS(
207-
behavior_velocity_planner::RunOutModulePlugin, behavior_velocity_planner::PluginInterface)
207+
behavior_velocity_planner::RunOutModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_run_out_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class RunOutModuleManager : public SceneModuleManagerInterface
4545
void setDynamicObstacleCreator(rclcpp::Node & node, std::shared_ptr<RunOutDebug> & debug_ptr);
4646
};
4747

48-
class RunOutModulePlugin : public PluginWrapper<RunOutModuleManager>
48+
class RunOutModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<RunOutModuleManager>
4949
{
5050
};
5151

planning/behavior_velocity_speed_bump_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ SpeedBumpModuleManager::getModuleExpiredFunction(
8585

8686
#include <pluginlib/class_list_macros.hpp>
8787
PLUGINLIB_EXPORT_CLASS(
88-
behavior_velocity_planner::SpeedBumpModulePlugin, behavior_velocity_planner::PluginInterface)
88+
behavior_velocity_planner::SpeedBumpModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_speed_bump_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SpeedBumpModuleManager : public SceneModuleManagerInterface
4545
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
4646
};
4747

48-
class SpeedBumpModulePlugin : public PluginWrapper<SpeedBumpModuleManager>
48+
class SpeedBumpModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<SpeedBumpModuleManager>
4949
{
5050
};
5151

planning/behavior_velocity_stop_line_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ StopLineModuleManager::getModuleExpiredFunction(
109109

110110
#include <pluginlib/class_list_macros.hpp>
111111
PLUGINLIB_EXPORT_CLASS(
112-
behavior_velocity_planner::StopLineModulePlugin, behavior_velocity_planner::PluginInterface)
112+
behavior_velocity_planner::StopLineModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_stop_line_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class StopLineModuleManager : public SceneModuleManagerInterface
5858
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
5959
};
6060

61-
class StopLineModulePlugin : public PluginWrapper<StopLineModuleManager>
61+
class StopLineModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<StopLineModuleManager>
6262
{
6363
};
6464

planning/behavior_velocity_template_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ TemplateModuleManager::getModuleExpiredFunction(
6060

6161
#include <pluginlib/class_list_macros.hpp>
6262
PLUGINLIB_EXPORT_CLASS(
63-
behavior_velocity_planner::TemplateModulePlugin, behavior_velocity_planner::PluginInterface)
63+
behavior_velocity_planner::TemplateModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_template_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class TemplateModuleManager : public SceneModuleManagerInterface
8484
* The TemplateModulePlugin class is used to integrate the TemplateModuleManager into the Behavior
8585
* Velocity Planner.
8686
*/
87-
class TemplateModulePlugin : public PluginWrapper<TemplateModuleManager>
87+
class TemplateModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<TemplateModuleManager>
8888
{
8989
};
9090

planning/behavior_velocity_traffic_light_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ bool TrafficLightModuleManager::hasSameTrafficLight(
210210

211211
#include <pluginlib/class_list_macros.hpp>
212212
PLUGINLIB_EXPORT_CLASS(
213-
behavior_velocity_planner::TrafficLightModulePlugin, behavior_velocity_planner::PluginInterface)
213+
behavior_velocity_planner::TrafficLightModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_traffic_light_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class TrafficLightModuleManager : public SceneModuleManagerInterfaceWithRTC
6161
std::optional<int> first_ref_stop_path_point_index_;
6262
};
6363

64-
class TrafficLightModulePlugin : public PluginWrapper<TrafficLightModuleManager>
64+
class TrafficLightModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<TrafficLightModuleManager>
6565
{
6666
};
6767

planning/behavior_velocity_virtual_traffic_light_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ VirtualTrafficLightModuleManager::getModuleExpiredFunction(
8181
#include <pluginlib/class_list_macros.hpp>
8282
PLUGINLIB_EXPORT_CLASS(
8383
behavior_velocity_planner::VirtualTrafficLightModulePlugin,
84-
behavior_velocity_planner::PluginInterface)
84+
autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_virtual_traffic_light_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class VirtualTrafficLightModuleManager : public SceneModuleManagerInterface
4444
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override;
4545
};
4646

47-
class VirtualTrafficLightModulePlugin : public PluginWrapper<VirtualTrafficLightModuleManager>
47+
class VirtualTrafficLightModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<VirtualTrafficLightModuleManager>
4848
{
4949
};
5050

planning/behavior_velocity_walkway_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ WalkwayModuleManager::getModuleExpiredFunction(const PathWithLaneId & path)
104104

105105
#include <pluginlib/class_list_macros.hpp>
106106
PLUGINLIB_EXPORT_CLASS(
107-
behavior_velocity_planner::WalkwayModulePlugin, behavior_velocity_planner::PluginInterface)
107+
behavior_velocity_planner::WalkwayModulePlugin, autoware::behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_walkway_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class WalkwayModuleManager : public SceneModuleManagerInterface
5252
const PathWithLaneId & path) override;
5353
};
5454

55-
class WalkwayModulePlugin : public PluginWrapper<WalkwayModuleManager>
55+
class WalkwayModulePlugin : public autoware::behavior_velocity_planner::PluginWrapper<WalkwayModuleManager>
5656
{
5757
};
5858

0 commit comments

Comments
 (0)