Skip to content

Commit 4ffa82b

Browse files
esteveesteve
authored
build(behavior_path_external_request_lane_change_module): prefix package and namespace with autoware_ (#6636)
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent 3eed12c commit 4ffa82b

File tree

12 files changed

+49
-36
lines changed

12 files changed

+49
-36
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ perception/traffic_light_map_based_detector/** shunsuke.miura@tier4.jp tao.zhong
156156
perception/traffic_light_multi_camera_fusion/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
157157
perception/traffic_light_occlusion_predictor/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
158158
perception/traffic_light_visualization/** tao.zhong@tier4.jp yukihiro.saito@tier4.jp
159+
planning/autoware_behavior_path_external_request_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
159160
planning/autoware_planning_test_manager/** kyoichi.sugahara@tier4.jp takamasa.horibe@tier4.jp
160161
planning/autoware_remaining_distance_time_calculator/** ahmed.ebrahim@leodrive.ai
161162
planning/autoware_static_centerline_generator/** kosuke.takeuchi@tier4.jp takayuki.murooka@tier4.jp
162163
planning/behavior_path_avoidance_by_lane_change_module/** fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
163164
planning/behavior_path_avoidance_module/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
164165
planning/behavior_path_dynamic_avoidance_module/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp takayuki.murooka@tier4.jp yuki.takagi@tier4.jp
165-
planning/behavior_path_external_request_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
166166
planning/behavior_path_goal_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
167167
planning/behavior_path_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
168168
planning/behavior_path_planner/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp

‎launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@
8282
/>
8383
<let
8484
name="behavior_path_planner_launch_modules"
85-
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'behavior_path_planner::ExternalRequestLaneChangeRightModuleManager, '&quot;)"
85+
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager, '&quot;)"
8686
if="$(var launch_external_request_lane_change_right_module)"
8787
/>
8888
<let
8989
name="behavior_path_planner_launch_modules"
90-
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager, '&quot;)"
90+
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager, '&quot;)"
9191
if="$(var launch_external_request_lane_change_left_module)"
9292
/>
9393
<let

‎planning/behavior_path_external_request_lane_change_module/CMakeLists.txt ‎planning/autoware_behavior_path_external_request_lane_change_module/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(behavior_path_external_request_lane_change_module)
2+
project(autoware_behavior_path_external_request_lane_change_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

‎planning/behavior_path_external_request_lane_change_module/package.xml ‎planning/autoware_behavior_path_external_request_lane_change_module/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>behavior_path_external_request_lane_change_module</name>
4+
<name>autoware_behavior_path_external_request_lane_change_module</name>
55
<version>0.1.0</version>
6-
<description>The behavior_path_external_request_lane_change_module package</description>
6+
<description>The autoware_behavior_path_external_request_lane_change_module package</description>
77

88
<maintainer email="fumiya.watanabe@tier4.jp">Fumiya Watanabe</maintainer>
99
<maintainer email="zulfaqar.azmi@tier4.jp">Zulfaqar Azmi</maintainer>

‎planning/autoware_behavior_path_external_request_lane_change_module/plugins.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<library path="autoware_behavior_path_external_request_lane_change_module">
2+
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
3+
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
4+
</library>

‎planning/behavior_path_external_request_lane_change_module/src/manager.cpp ‎planning/autoware_behavior_path_external_request_lane_change_module/src/manager.cpp

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

15-
#include "behavior_path_external_request_lane_change_module/manager.hpp"
15+
#include "manager.hpp"
1616

17-
#include "behavior_path_external_request_lane_change_module/scene.hpp"
1817
#include "behavior_path_lane_change_module/interface.hpp"
18+
#include "scene.hpp"
1919

20-
namespace behavior_path_planner
20+
namespace autoware::behavior_path_planner
2121
{
22+
using ::behavior_path_planner::LaneChangeInterface;
2223

2324
std::unique_ptr<SceneModuleInterface>
2425
ExternalRequestLaneChangeRightModuleManager::createNewSceneModuleInstance()
@@ -38,12 +39,12 @@ ExternalRequestLaneChangeLeftModuleManager::createNewSceneModuleInstance()
3839
std::make_unique<ExternalRequestLaneChange>(parameters_, direction_));
3940
}
4041

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

4344
#include <pluginlib/class_list_macros.hpp>
4445
PLUGINLIB_EXPORT_CLASS(
45-
behavior_path_planner::ExternalRequestLaneChangeRightModuleManager,
46-
behavior_path_planner::SceneModuleManagerInterface)
46+
autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager,
47+
::behavior_path_planner::SceneModuleManagerInterface)
4748
PLUGINLIB_EXPORT_CLASS(
48-
behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager,
49-
behavior_path_planner::SceneModuleManagerInterface)
49+
autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager,
50+
::behavior_path_planner::SceneModuleManagerInterface)

‎planning/behavior_path_external_request_lane_change_module/include/behavior_path_external_request_lane_change_module/manager.hpp ‎planning/autoware_behavior_path_external_request_lane_change_module/src/manager.hpp

+9-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 BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__MANAGER_HPP_
16-
#define BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__MANAGER_HPP_
15+
#ifndef MANAGER_HPP_
16+
#define MANAGER_HPP_
1717

1818
#include "behavior_path_lane_change_module/manager.hpp"
1919
#include "route_handler/route_handler.hpp"
@@ -23,8 +23,12 @@
2323
#include <memory>
2424
#include <string>
2525

26-
namespace behavior_path_planner
26+
namespace autoware::behavior_path_planner
2727
{
28+
using ::behavior_path_planner::LaneChangeModuleManager;
29+
using ::behavior_path_planner::LaneChangeModuleType;
30+
using ::behavior_path_planner::SceneModuleInterface;
31+
2832
class ExternalRequestLaneChangeRightModuleManager : public LaneChangeModuleManager
2933
{
3034
public:
@@ -49,6 +53,6 @@ class ExternalRequestLaneChangeLeftModuleManager : public LaneChangeModuleManage
4953
}
5054
std::unique_ptr<SceneModuleInterface> createNewSceneModuleInstance() override;
5155
};
52-
} // namespace behavior_path_planner
56+
} // namespace autoware::behavior_path_planner
5357

54-
#endif // BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__MANAGER_HPP_
58+
#endif // MANAGER_HPP_

‎planning/behavior_path_external_request_lane_change_module/src/scene.cpp ‎planning/autoware_behavior_path_external_request_lane_change_module/src/scene.cpp

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

15-
#include "behavior_path_external_request_lane_change_module/scene.hpp"
15+
#include "scene.hpp"
1616

1717
#include <lanelet2_extension/utility/utilities.hpp>
1818

1919
#include <memory>
2020

21-
namespace behavior_path_planner
21+
namespace autoware::behavior_path_planner
2222
{
23+
using ::behavior_path_planner::LaneChangeModuleType;
24+
2325
ExternalRequestLaneChange::ExternalRequestLaneChange(
2426
const std::shared_ptr<LaneChangeParameters> & parameters, Direction direction)
2527
: NormalLaneChange(parameters, LaneChangeModuleType::EXTERNAL_REQUEST, direction)
2628
{
2729
}
28-
} // namespace behavior_path_planner
30+
} // namespace autoware::behavior_path_planner

‎planning/behavior_path_external_request_lane_change_module/include/behavior_path_external_request_lane_change_module/scene.hpp ‎planning/autoware_behavior_path_external_request_lane_change_module/src/scene.hpp

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

15-
#ifndef BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__SCENE_HPP_
16-
#define BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__SCENE_HPP_
15+
#ifndef SCENE_HPP_
16+
#define SCENE_HPP_
1717

1818
#include "behavior_path_lane_change_module/scene.hpp"
1919

2020
#include <memory>
2121

22-
namespace behavior_path_planner
22+
namespace autoware::behavior_path_planner
2323
{
24+
using ::behavior_path_planner::Direction;
25+
using ::behavior_path_planner::LaneChangeParameters;
26+
using ::behavior_path_planner::NormalLaneChange;
27+
2428
class ExternalRequestLaneChange : public NormalLaneChange
2529
{
2630
public:
@@ -33,6 +37,6 @@ class ExternalRequestLaneChange : public NormalLaneChange
3337
ExternalRequestLaneChange & operator=(ExternalRequestLaneChange &&) = delete;
3438
~ExternalRequestLaneChange() override = default;
3539
};
36-
} // namespace behavior_path_planner
40+
} // namespace autoware::behavior_path_planner
3741

38-
#endif // BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__SCENE_HPP_
42+
#endif // SCENE_HPP_

‎planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp ‎planning/autoware_behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <cmath>
2323
#include <vector>
2424

25-
using behavior_path_planner::BehaviorPathPlannerNode;
25+
using ::behavior_path_planner::BehaviorPathPlannerNode;
2626
using planning_test_utils::PlanningInterfaceTestManager;
2727

2828
std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()
@@ -51,8 +51,10 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
5151
ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
5252

5353
std::vector<std::string> module_names;
54-
module_names.emplace_back("behavior_path_planner::ExternalRequestLaneChangeRightModuleManager");
55-
module_names.emplace_back("behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager");
54+
module_names.emplace_back(
55+
"autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager");
56+
module_names.emplace_back(
57+
"autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager");
5658

5759
std::vector<rclcpp::Parameter> params;
5860
params.emplace_back("launch_modules", module_names);

‎planning/behavior_path_external_request_lane_change_module/plugins.xml

-4
This file was deleted.

‎planning/behavior_path_lane_change_module/plugins.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<library path="behavior_path_lane_change_module">
22
<class type="behavior_path_planner::LaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
33
<class type="behavior_path_planner::LaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
4-
<class type="behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
5-
<class type="behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
4+
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
5+
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
66
</library>

0 commit comments

Comments
 (0)