Refactor API params grouped

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

Author: EugenioCollado

ddsenabler/examples/action/main.cpp

@@ -120,39 +120,22 @@ static void test_data_notification_callback(
 // Static topic notification callback
 static void test_topic_notification_callback(
         const char* topic_name,
-        const char* type_name,
-        const char* serialized_qos)
+        const eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
 }
 
 // Static type query callback
 static bool test_topic_query_callback(
         const char* topic_name,
-        std::string& type_name,
-        std::string& serialized_qos)
+        eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
     return false;
 }
 
 // Static action notification callback
 static void test_action_notification_callback(
         const char* action_name,
-        const char* goal_request_action_type,
-        const char* goal_reply_action_type,
-        const char* cancel_request_action_type,
-        const char* cancel_reply_action_type,
-        const char* result_request_action_type,
-        const char* result_reply_action_type,
-        const char* feedback_action_type,
-        const char* status_action_type,
-        const char* goal_request_action_serialized_qos,
-        const char* goal_reply_action_serialized_qos,
-        const char* cancel_request_action_serialized_qos,
-        const char* cancel_reply_action_serialized_qos,
-        const char* result_request_action_serialized_qos,
-        const char* result_reply_action_serialized_qos,
-        const char* feedback_action_serialized_qos,
-        const char* status_action_serialized_qos)
+        const eprosima::ddsenabler::participants::ActionInfo& action_info)
 {
     std::lock_guard<std::mutex> lock(app_mutex_);
     if (config.action_name == std::string(action_name))
@@ -168,22 +151,22 @@ static void test_action_notification_callback(
             utils::save_action_to_file(
                 action_file,
                 action_name,
-                goal_request_action_type,
-                goal_reply_action_type,
-                cancel_request_action_type,
-                cancel_reply_action_type,
-                result_request_action_type,
-                result_reply_action_type,
-                feedback_action_type,
-                status_action_type,
-                goal_request_action_serialized_qos,
-                goal_reply_action_serialized_qos,
-                cancel_request_action_serialized_qos,
-                cancel_reply_action_serialized_qos,
-                result_request_action_serialized_qos,
-                result_reply_action_serialized_qos,
-                feedback_action_serialized_qos,
-                status_action_serialized_qos);
+                action_info.goal.request.type_name.c_str(),
+                action_info.goal.reply.type_name.c_str(),
+                action_info.cancel.request.type_name.c_str(),
+                action_info.cancel.reply.type_name.c_str(),
+                action_info.result.request.type_name.c_str(),
+                action_info.result.reply.type_name.c_str(),
+                action_info.feedback.type_name.c_str(),
+                action_info.status.type_name.c_str(),
+                action_info.goal.request.serialized_qos.c_str(),
+                action_info.goal.reply.serialized_qos.c_str(),
+                action_info.cancel.request.serialized_qos.c_str(),
+                action_info.cancel.reply.serialized_qos.c_str(),
+                action_info.result.request.serialized_qos.c_str(),
+                action_info.result.reply.serialized_qos.c_str(),
+                action_info.feedback.serialized_qos.c_str(),
+                action_info.status.serialized_qos.c_str());
 
             action_discovered_ = true;
             app_cv_.notify_all();
@@ -198,22 +181,7 @@ static void test_action_notification_callback(
 // Static action query callback
 static bool test_action_query_callback(
         const char* action_name,
-        std::string& goal_request_action_type,
-        std::string& goal_reply_action_type,
-        std::string& cancel_request_action_type,
-        std::string& cancel_reply_action_type,
-        std::string& result_request_action_type,
-        std::string& result_reply_action_type,
-        std::string& feedback_action_type,
-        std::string& status_action_type,
-        std::string& goal_request_action_serialized_qos,
-        std::string& goal_reply_action_serialized_qos,
-        std::string& cancel_request_action_serialized_qos,
-        std::string& cancel_reply_action_serialized_qos,
-        std::string& result_request_action_serialized_qos,
-        std::string& result_reply_action_serialized_qos,
-        std::string& feedback_action_serialized_qos,
-        std::string& status_action_serialized_qos)
+        eprosima::ddsenabler::participants::ActionInfo& action_info)
 {
     std::lock_guard<std::mutex> lock(app_mutex_);
     if (config.action_name == std::string(action_name))
@@ -229,22 +197,22 @@ static bool test_action_query_callback(
             if (!utils::load_action_from_file(
                     action_file,
                     action_name,
-                    goal_request_action_type,
-                    goal_reply_action_type,
-                    cancel_request_action_type,
-                    cancel_reply_action_type,
-                    result_request_action_type,
-                    result_reply_action_type,
-                    feedback_action_type,
-                    status_action_type,
-                    goal_request_action_serialized_qos,
-                    goal_reply_action_serialized_qos,
-                    cancel_request_action_serialized_qos,
-                    cancel_reply_action_serialized_qos,
-                    result_request_action_serialized_qos,
-                    result_reply_action_serialized_qos,
-                    feedback_action_serialized_qos,
-                    status_action_serialized_qos))
+                    action_info.goal.request.type_name,
+                    action_info.goal.reply.type_name,
+                    action_info.cancel.request.type_name,
+                    action_info.cancel.reply.type_name,
+                    action_info.result.request.type_name,
+                    action_info.result.reply.type_name,
+                    action_info.feedback.type_name,
+                    action_info.status.type_name,
+                    action_info.goal.request.serialized_qos,
+                    action_info.goal.reply.serialized_qos,
+                    action_info.cancel.request.serialized_qos,
+                    action_info.cancel.reply.serialized_qos,
+                    action_info.result.request.serialized_qos,
+                    action_info.result.reply.serialized_qos,
+                    action_info.feedback.serialized_qos,
+                    action_info.status.serialized_qos))
             {
                 std::cerr << "Failed to load action: " << action_name << std::endl;
                 return false;

ddsenabler/examples/publish/main.cpp

@@ -125,19 +125,18 @@ static bool test_type_query_callback(
 // Static topic notification callback
 static void test_topic_notification_callback(
         const char* topic_name,
-        const char* type_name,
-        const char* serialized_qos)
+        const eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
     bool notify = false;
     {
         std::lock_guard<std::mutex> lock(app_mutex_);
         notify = ++received_topics_ >= config.expected_topics;
-        std::cout << "Topic callback received: " << topic_name << " of type " << type_name << ", Total topics: " <<
-            received_topics_ << std::endl << serialized_qos << std::endl << std::endl;
+        std::cout << "Topic callback received: " << topic_name << " of type " << topic_info.type_name << ", Total topics: " <<
+            received_topics_ << std::endl << topic_info.serialized_qos << std::endl << std::endl;
         if (!config.persistence_path.empty() &&
                 !utils::save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(),
                 topic_name,
-                type_name, serialized_qos))
+                topic_info.type_name.c_str(), topic_info.serialized_qos.c_str()))
         {
             std::cerr << "Failed to save topic: " << topic_name << std::endl;
         }
@@ -151,8 +150,7 @@ static void test_topic_notification_callback(
 // Static type query callback
 static bool test_topic_query_callback(
         const char* topic_name,
-        std::string& type_name,
-        std::string& serialized_qos)
+        eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
     if (config.persistence_path.empty())
     {
@@ -162,8 +160,8 @@ static bool test_topic_query_callback(
 
     // Load the topic from file
     if (!utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name,
-            type_name,
-            serialized_qos))
+            topic_info.type_name,
+            topic_info.serialized_qos))
     {
         std::cerr << "Failed to load topic: " << topic_name << std::endl;
         return false;

ddsenabler/examples/service/main.cpp

@@ -120,27 +120,22 @@ static void test_data_notification_callback(
 // Static topic notification callback
 static void test_topic_notification_callback(
         const char* topic_name,
-        const char* type_name,
-        const char* serialized_qos)
+        const eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
 }
 
 // Static type query callback
 static bool test_topic_query_callback(
         const char* topic_name,
-        std::string& type_name,
-        std::string& serialized_qos)
+        eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
     return false;
 }
 
 // Static service notification callback
 static void test_service_notification_callback(
         const char* service_name,
-        const char* request_type_name,
-        const char* reply_type_name,
-        const char* request_serialized_qos,
-        const char* reply_serialized_qos)
+        const eprosima::ddsenabler::participants::ServiceInfo& service_info)
 {
     std::lock_guard<std::mutex> lock(app_mutex_);
     if (config.service_name == std::string(service_name))
@@ -155,10 +150,10 @@ static void test_service_notification_callback(
             utils::save_service_to_file(
                 service_file,
                 service_name,
-                request_type_name,
-                reply_type_name,
-                request_serialized_qos,
-                reply_serialized_qos);
+                service_info.request.type_name.c_str(),
+                service_info.reply.type_name.c_str(),
+                service_info.request.serialized_qos.c_str(),
+                service_info.reply.serialized_qos.c_str());
 
             service_discovered_ = true;
             app_cv_.notify_all();
@@ -173,10 +168,7 @@ static void test_service_notification_callback(
 // Static service query callback
 static bool test_service_query_callback(
         const char* service_name,
-        std::string& request_type_name,
-        std::string& request_serialized_qos,
-        std::string& reply_type_name,
-        std::string& reply_serialized_qos)
+        eprosima::ddsenabler::participants::ServiceInfo& service_info)
 {
     std::lock_guard<std::mutex> lock(app_mutex_);
 
@@ -197,10 +189,10 @@ static bool test_service_query_callback(
         if (utils::load_service_from_file(
                     service_file,
                     service_name,
-                    request_type_name,
-                    reply_type_name,
-                    request_serialized_qos,
-                    reply_serialized_qos))
+                    service_info.request.type_name,
+                    service_info.reply.type_name,
+                    service_info.request.serialized_qos,
+                    service_info.reply.serialized_qos))
         {
             app_cv_.notify_all();
             return true;

ddsenabler/test/DDSEnablerTester.hpp

@@ -299,8 +299,7 @@ class DDSEnablerTester : public ::testing::Test
     // eprosima::ddsenabler::participants::DdsTopicNotification topic_notification
     static void test_topic_notification_callback(
             const char* topic_name,
-            const char* type_name,
-            const char* serialized_qos)
+            const eprosima::ddsenabler::participants::TopicInfo& topic_info)
     {
         if (current_test_instance_)
         {
@@ -315,8 +314,7 @@ class DDSEnablerTester : public ::testing::Test
     // eprosima::ddsenabler::participants::DdsTopicQuery topic_query;
     static bool test_topic_query_callback(
             const char* topic_name,
-            std::string& type_name,
-            std::string& serialized_qos)
+            eprosima::ddsenabler::participants::TopicInfo& topic_info)
     {
         return false;
     }

ddsenabler/test/ddsEnablerTests/ReloadConfig.cpp

@@ -16,6 +16,7 @@
 #include <gtest/gtest.h>
 
 #include "dds_enabler_runner.hpp"
+#include "ddsenabler_participants/Callbacks.hpp"
 
 #include <filesystem>
 #include <fstream>
@@ -47,16 +48,14 @@ void test_type_notification_callback(
 // eprosima::ddsenabler::participants::DdsTopicNotification topic_notification;
 void test_topic_notification_callback(
         const char* topic_name,
-        const char* type_name,
-        const char* serialized_qos)
+        const eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
 }
 
 // eprosima::ddsenabler::participants::DdsTopicQuery topic_query;
 bool test_topic_query_callback(
         const char* topic_name,
-        std::string& type_name,
-        std::string& serialized_qos)
+        eprosima::ddsenabler::participants::TopicInfo& topic_info)
 {
     return false;
 }