Skip to content

Commit 0392de9

Browse files
committed
style(sovd_service_interface): fix clang-format lint failures
1 parent 83c229b commit 0392de9

3 files changed

Lines changed: 17 additions & 24 deletions

File tree

src/ros2_medkit_plugins/ros2_medkit_sovd_service_interface/src/sovd_service_interface.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#include <nlohmann/json.hpp>
1818

19-
#include "ros2_medkit_gateway/discovery/models/area.hpp"
2019
#include "ros2_medkit_gateway/discovery/models/app.hpp"
20+
#include "ros2_medkit_gateway/discovery/models/area.hpp"
2121
#include "ros2_medkit_gateway/discovery/models/component.hpp"
2222
#include "ros2_medkit_gateway/discovery/models/function.hpp"
2323

@@ -107,12 +107,11 @@ void SovdServiceInterface::handle_list_entities(
107107
info.fqn = fqn;
108108
info.capabilities = context_->get_entity_capabilities(id);
109109
if (info.capabilities.empty()) {
110-
info.capabilities = context_->get_type_capabilities(
111-
entity_type == "app" ? SovdEntityType::APP
112-
: entity_type == "component" ? SovdEntityType::COMPONENT
113-
: entity_type == "area" ? SovdEntityType::AREA
114-
: entity_type == "function" ? SovdEntityType::FUNCTION
115-
: SovdEntityType::UNKNOWN);
110+
info.capabilities = context_->get_type_capabilities(entity_type == "app" ? SovdEntityType::APP
111+
: entity_type == "component" ? SovdEntityType::COMPONENT
112+
: entity_type == "area" ? SovdEntityType::AREA
113+
: entity_type == "function" ? SovdEntityType::FUNCTION
114+
: SovdEntityType::UNKNOWN);
116115
}
117116
response->entities.push_back(std::move(info));
118117
};

src/ros2_medkit_plugins/ros2_medkit_sovd_service_interface/src/sovd_service_interface.hpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,17 @@ class SovdServiceInterface : public GatewayPlugin {
4343
void shutdown() override;
4444

4545
private:
46-
void handle_list_entities(
47-
const std::shared_ptr<ros2_medkit_msgs::srv::ListEntities::Request> request,
48-
std::shared_ptr<ros2_medkit_msgs::srv::ListEntities::Response> response);
46+
void handle_list_entities(const std::shared_ptr<ros2_medkit_msgs::srv::ListEntities::Request> request,
47+
std::shared_ptr<ros2_medkit_msgs::srv::ListEntities::Response> response);
4948

50-
void handle_list_entity_faults(
51-
const std::shared_ptr<ros2_medkit_msgs::srv::ListFaultsForEntity::Request> request,
52-
std::shared_ptr<ros2_medkit_msgs::srv::ListFaultsForEntity::Response> response);
49+
void handle_list_entity_faults(const std::shared_ptr<ros2_medkit_msgs::srv::ListFaultsForEntity::Request> request,
50+
std::shared_ptr<ros2_medkit_msgs::srv::ListFaultsForEntity::Response> response);
5351

54-
void handle_get_entity_data(
55-
const std::shared_ptr<ros2_medkit_msgs::srv::GetEntityData::Request> request,
56-
std::shared_ptr<ros2_medkit_msgs::srv::GetEntityData::Response> response);
52+
void handle_get_entity_data(const std::shared_ptr<ros2_medkit_msgs::srv::GetEntityData::Request> request,
53+
std::shared_ptr<ros2_medkit_msgs::srv::GetEntityData::Response> response);
5754

58-
void handle_get_capabilities(
59-
const std::shared_ptr<ros2_medkit_msgs::srv::GetCapabilities::Request> request,
60-
std::shared_ptr<ros2_medkit_msgs::srv::GetCapabilities::Response> response);
55+
void handle_get_capabilities(const std::shared_ptr<ros2_medkit_msgs::srv::GetCapabilities::Request> request,
56+
std::shared_ptr<ros2_medkit_msgs::srv::GetCapabilities::Response> response);
6157

6258
PluginContext * context_{nullptr};
6359
std::string service_prefix_{"/medkit"};

src/ros2_medkit_plugins/ros2_medkit_sovd_service_interface/test/test_sovd_service_interface.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class FakePluginContext : public PluginContext {
138138
void register_sampler(
139139
const std::string & /*collection*/,
140140
const std::function<tl::expected<nlohmann::json, std::string>(const std::string &, const std::string &)> &
141-
/*fn*/) override {
141+
/*fn*/) override {
142142
}
143143

144144
ResourceChangeNotifier * get_resource_change_notifier() override {
@@ -328,8 +328,7 @@ TEST_F(SovdServiceInterfaceTest, ListEntityFaults) {
328328
{"reporting_sources", {"temp_sensor"}}});
329329
context_->set_entity_faults("temp_sensor", faults);
330330

331-
auto client =
332-
node_->create_client<ros2_medkit_msgs::srv::ListFaultsForEntity>("/test_medkit/list_entity_faults");
331+
auto client = node_->create_client<ros2_medkit_msgs::srv::ListFaultsForEntity>("/test_medkit/list_entity_faults");
333332

334333
auto request = std::make_shared<ros2_medkit_msgs::srv::ListFaultsForEntity::Request>();
335334
request->entity_id = "temp_sensor";
@@ -347,8 +346,7 @@ TEST_F(SovdServiceInterfaceTest, ListEntityFaults) {
347346
}
348347

349348
TEST_F(SovdServiceInterfaceTest, ListEntityFaultsNotFound) {
350-
auto client =
351-
node_->create_client<ros2_medkit_msgs::srv::ListFaultsForEntity>("/test_medkit/list_entity_faults");
349+
auto client = node_->create_client<ros2_medkit_msgs::srv::ListFaultsForEntity>("/test_medkit/list_entity_faults");
352350

353351
auto request = std::make_shared<ros2_medkit_msgs::srv::ListFaultsForEntity::Request>();
354352
request->entity_id = "nonexistent";

0 commit comments

Comments
 (0)