Update branches in .repos (#477)

juanlofer-eprosima · web-flow · commit 94b581eb445b · 2024-09-17T15:39:16.000+02:00
* Update branches in .repos

Signed-off-by: Juan Lopez Fernandez &lt;juanlopez@eprosima.com&gt;

* BONUS: remove deprecated log macros

Signed-off-by: Juan Lopez Fernandez &lt;juanlopez@eprosima.com&gt;

---------

Signed-off-by: Juan Lopez Fernandez &lt;juanlopez@eprosima.com&gt;
diff --git a/ddsrouter.repos b/ddsrouter.repos
@@ -10,15 +10,15 @@ repositories:
     fastdds:
         type: git
         url: https://github.com/eProsima/Fast-DDS.git
-        version: 2.x
+        version: 3.x
     dev-utils:
         type: git
         url: https://github.com/eProsima/dev-utils.git
-        version: 0.x
+        version: 1.x
     ddspipe:
         type: git
         url: https://github.com/eProsima/DDS-Pipe.git
-        version: main
+        version: 1.x
     ddsrouter:
         type: git
         url: https://github.com/eProsima/DDS-Router.git
diff --git a/ddsrouter_core/src/cpp/configuration/SpecsConfiguration.cpp b/ddsrouter_core/src/cpp/configuration/SpecsConfiguration.cpp
@@ -37,7 +37,8 @@ bool SpecsConfiguration::is_valid(
 
     if (topic_qos.history_depth == 0U)
     {
-        logWarning(DDSROUTER_SPECS, "Using non limited histories could lead to memory exhaustion in long executions.");
+        EPROSIMA_LOG_WARNING(DDSROUTER_SPECS,
+                "Using non limited histories could lead to memory exhaustion in long executions.");
     }
 
     return true;
diff --git a/ddsrouter_core/src/cpp/core/DdsRouter.cpp b/ddsrouter_core/src/cpp/core/DdsRouter.cpp
@@ -87,8 +87,9 @@ void DdsRouter::init_participants_()
                           << "Failed to create creating Participant " << participant_config.second->id);
         }
 
-        logInfo(DDSROUTER, "Participant created with id: " << new_participant->id()
-                                                           << " and kind " << participant_config.first << ".");
+        EPROSIMA_LOG_INFO(DDSROUTER, "Participant created with id: " << new_participant->id()
+                                                                     << " and kind " << participant_config.first <<
+                ".");
 
         // Add this participant to the database. If it is repeated it will cause an exception
         try
@@ -126,7 +127,7 @@ utils::ReturnCode DdsRouter::start() noexcept
     utils::ReturnCode ret = ddspipe_->enable();
     if (ret == utils::ReturnCode::RETCODE_OK)
     {
-        logInfo(DDSROUTER, "Starting DDS Router.");
+        EPROSIMA_LOG_INFO(DDSROUTER, "Starting DDS Router.");
     }
 
     return ret;
@@ -137,7 +138,7 @@ utils::ReturnCode DdsRouter::stop() noexcept
     utils::ReturnCode ret = ddspipe_->disable();
     if (ret == utils::ReturnCode::RETCODE_OK)
     {
-        logInfo(DDSROUTER, "Stopping DDS Router.");
+        EPROSIMA_LOG_INFO(DDSROUTER, "Stopping DDS Router.");
     }
 
     return ret;
diff --git a/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp b/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp
@@ -58,7 +58,7 @@ YamlReaderConfiguration::load_ddsrouter_configuration(
                     break;
 
                 case ddspipe::yaml::YamlReaderVersion::V_4_0:
-                    logWarning(DDSROUTER_YAML,
+                    EPROSIMA_LOG_WARNING(DDSROUTER_YAML,
                             "The yaml configuration version " << version <<
                             " is deprecated and will be removed in a future release. Please update to v5.0.");
                     break;
@@ -68,13 +68,13 @@ YamlReaderConfiguration::load_ddsrouter_configuration(
         {
             // Get default version
             version = default_yaml_version();
-            logWarning(DDSROUTER_YAML,
+            EPROSIMA_LOG_WARNING(DDSROUTER_YAML,
                     "No version of yaml configuration given. Using version " << version << " by default. " <<
                     "Add " << ddspipe::yaml::VERSION_TAG << " tag to your configuration in order to not break compatibility " <<
                     "in future releases.");
         }
 
-        logInfo(DDSROUTER_YAML, "Loading DDSRouter configuration with version: " << version << ".");
+        EPROSIMA_LOG_INFO(DDSROUTER_YAML, "Loading DDSRouter configuration with version: " << version << ".");
 
         // Load DDS Router Configuration
         core::DdsRouterConfiguration router_configuration =
diff --git a/ddsrouter_yaml/src/cpp/YamlReader_configuration.cpp b/ddsrouter_yaml/src/cpp/YamlReader_configuration.cpp
@@ -116,7 +116,7 @@ YamlReader::get<std::shared_ptr<participants::ParticipantConfiguration>>(
                     PARTICIPANT_KIND_TAG,
                     version);
 
-    logInfo(DDSROUTER_YAML_CONFIGURATION, "Loading Participant of kind " << kind << ".");
+    EPROSIMA_LOG_INFO(DDSROUTER_YAML_CONFIGURATION, "Loading Participant of kind " << kind << ".");
 
     switch (kind)
     {
diff --git a/tools/ddsrouter_tool/src/cpp/main.cpp b/tools/ddsrouter_tool/src/cpp/main.cpp
@@ -84,7 +84,7 @@ int main(
     // NOTE: this check is redundant with option parse arg check
     if (!is_file_accessible(commandline_args.file_path.c_str(), eprosima::utils::FileAccessMode::read))
     {
-        logError(
+        EPROSIMA_LOG_ERROR(
             DDSROUTER_ARGS,
             "File '" << commandline_args.file_path << "' does not exist or it is not accessible.");
         return static_cast<int>(ui::ProcessReturnCode::required_argument_failed);
@@ -185,7 +185,7 @@ int main(
                     }
                     catch (const std::exception& e)
                     {
-                        logWarning(DDSROUTER_EXECUTION,
+                        EPROSIMA_LOG_WARNING(DDSROUTER_EXECUTION,
                                 "Error reloading configuration file " << file_name << " with error: " << e.what());
                     }
                 };
@@ -223,7 +223,7 @@ int main(
                         }
                         catch (const std::exception& e)
                         {
-                            logWarning(DDSROUTER_EXECUTION,
+                            EPROSIMA_LOG_WARNING(DDSROUTER_EXECUTION,
                                     "Error reloading configuration file " << commandline_args.file_path << " with error: " <<
                                     e.what());
                         }
@@ -270,15 +270,15 @@ int main(
     }
     catch (const eprosima::utils::ConfigurationException& e)
     {
-        logError(DDSROUTER_ERROR,
+        EPROSIMA_LOG_ERROR(DDSROUTER_ERROR,
                 "Error Loading DDS Router Configuration from file " << commandline_args.file_path <<
                 ". Error message:\n " <<
                 e.what());
         return static_cast<int>(ui::ProcessReturnCode::execution_failed);
     }
     catch (const eprosima::utils::InitializationException& e)
     {
-        logError(DDSROUTER_ERROR,
+        EPROSIMA_LOG_ERROR(DDSROUTER_ERROR,
                 "Error Initializing DDS Router. Error message:\n " <<
                 e.what());
         return static_cast<int>(ui::ProcessReturnCode::execution_failed);
diff --git a/tools/ddsrouter_tool/src/cpp/user_interface/arguments_configuration.cpp b/tools/ddsrouter_tool/src/cpp/user_interface/arguments_configuration.cpp
@@ -213,7 +213,7 @@ ProcessReturnCode parse_arguments(
         // Unknown args provided
         if (parse.nonOptionsCount())
         {
-            logError(DDSROUTER_ARGS, "ERROR: Unknown argument: <" << parse.nonOption(0) << ">." );
+            EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "ERROR: Unknown argument: <" << parse.nonOption(0) << ">." );
             option::printUsage(fwrite, stdout, usage, columns);
             return ProcessReturnCode::incorrect_argument;
         }
@@ -267,7 +267,7 @@ ProcessReturnCode parse_arguments(
                     break;
 
                 case optionIndex::UNKNOWN_OPT:
-                    logError(DDSROUTER_ARGS, opt << " is not a valid argument.");
+                    EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, opt << " is not a valid argument.");
                     option::printUsage(fwrite, stdout, usage, columns);
                     return ProcessReturnCode::incorrect_argument;
                     break;
@@ -292,7 +292,7 @@ option::ArgStatus Arg::Unknown(
 {
     if (msg)
     {
-        logError(
+        EPROSIMA_LOG_ERROR(
             DDSROUTER_ARGS,
             "Unknown option '" << option << "'. Use -h to see this executable possible arguments.");
     }
@@ -310,7 +310,7 @@ option::ArgStatus Arg::Required(
 
     if (msg)
     {
-        logError(DDSROUTER_ARGS, "Option '" << option << "' required.");
+        EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' required.");
     }
     return option::ARG_ILLEGAL;
 }
@@ -330,7 +330,7 @@ option::ArgStatus Arg::Numeric(
 
     if (msg)
     {
-        logError(DDSROUTER_ARGS, "Option '" << option << "' requires a numeric argument.");
+        EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires a numeric argument.");
     }
     return option::ARG_ILLEGAL;
 }
@@ -350,7 +350,7 @@ option::ArgStatus Arg::Float(
 
     if (msg)
     {
-        logError(DDSROUTER_ARGS, "Option '" << option << "' requires a float argument.");
+        EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires a float argument.");
     }
     return option::ARG_ILLEGAL;
 }
@@ -365,7 +365,7 @@ option::ArgStatus Arg::String(
     }
     if (msg)
     {
-        logError(DDSROUTER_ARGS, "Option '" << option << "' requires a text argument.");
+        EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires a text argument.");
     }
     return option::ARG_ILLEGAL;
 }
@@ -384,7 +384,7 @@ option::ArgStatus Arg::Readable_File(
     }
     if (msg)
     {
-        logError(DDSROUTER_ARGS, "Option '" << option << "' requires an existing readable file as argument.");
+        EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires an existing readable file as argument.");
     }
     return option::ARG_ILLEGAL;
 }
@@ -405,7 +405,7 @@ option::ArgStatus Arg::Valid_Options(
     {
         if (msg)
         {
-            logError(DDSROUTER_ARGS, "Option '" << option.name << "' requires a text argument.");
+            EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option.name << "' requires a text argument.");
         }
         return option::ARG_ILLEGAL;
     }
@@ -424,7 +424,7 @@ option::ArgStatus Arg::Valid_Options(
         }
         error_msg << "}.";
 
-        logError(DDSROUTER_ARGS, error_msg);
+        EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, error_msg);
     }
 
     return option::ARG_ILLEGAL;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ bool SpecsConfiguration::is_valid(`
`37`	`37`
`38`	`38`	`if (topic_qos.history_depth == 0U)`
`39`	`39`	`{`
`40`		`- logWarning(DDSROUTER_SPECS, "Using non limited histories could lead to memory exhaustion in long executions.");`
	`40`	`+ EPROSIMA_LOG_WARNING(DDSROUTER_SPECS,`
	`41`	`+ "Using non limited histories could lead to memory exhaustion in long executions.");`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,9 @@ void DdsRouter::init_participants_()`
`87`	`87`	`<< "Failed to create creating Participant " << participant_config.second->id);`
`88`	`88`	`}`
`89`	`89`
`90`		`- logInfo(DDSROUTER, "Participant created with id: " << new_participant->id()`
`91`		`- << " and kind " << participant_config.first << ".");`
	`90`	`+ EPROSIMA_LOG_INFO(DDSROUTER, "Participant created with id: " << new_participant->id()`
	`91`	`+ << " and kind " << participant_config.first <<`
	`92`	`+ ".");`
`92`	`93`
`93`	`94`	`// Add this participant to the database. If it is repeated it will cause an exception`
`94`	`95`	`try`
`@@ -126,7 +127,7 @@ utils::ReturnCode DdsRouter::start() noexcept`
`126`	`127`	`utils::ReturnCode ret = ddspipe_->enable();`
`127`	`128`	`if (ret == utils::ReturnCode::RETCODE_OK)`
`128`	`129`	`{`
`129`		`- logInfo(DDSROUTER, "Starting DDS Router.");`
	`130`	`+ EPROSIMA_LOG_INFO(DDSROUTER, "Starting DDS Router.");`
`130`	`131`	`}`
`131`	`132`
`132`	`133`	`return ret;`
`@@ -137,7 +138,7 @@ utils::ReturnCode DdsRouter::stop() noexcept`
`137`	`138`	`utils::ReturnCode ret = ddspipe_->disable();`
`138`	`139`	`if (ret == utils::ReturnCode::RETCODE_OK)`
`139`	`140`	`{`
`140`		`- logInfo(DDSROUTER, "Stopping DDS Router.");`
	`141`	`+ EPROSIMA_LOG_INFO(DDSROUTER, "Stopping DDS Router.");`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ YamlReader::get<std::shared_ptr<participants::ParticipantConfiguration>>(`
`116`	`116`	`PARTICIPANT_KIND_TAG,`
`117`	`117`	`version);`
`118`	`118`
`119`		`- logInfo(DDSROUTER_YAML_CONFIGURATION, "Loading Participant of kind " << kind << ".");`
	`119`	`+ EPROSIMA_LOG_INFO(DDSROUTER_YAML_CONFIGURATION, "Loading Participant of kind " << kind << ".");`
`120`	`120`
`121`	`121`	`switch (kind)`
`122`	`122`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ int main(`
`84`	`84`	`// NOTE: this check is redundant with option parse arg check`
`85`	`85`	`if (!is_file_accessible(commandline_args.file_path.c_str(), eprosima::utils::FileAccessMode::read))`
`86`	`86`	`{`
`87`		`- logError(`
	`87`	`+ EPROSIMA_LOG_ERROR(`
`88`	`88`	`DDSROUTER_ARGS,`
`89`	`89`	`"File '" << commandline_args.file_path << "' does not exist or it is not accessible.");`
`90`	`90`	`return static_cast<int>(ui::ProcessReturnCode::required_argument_failed);`
`@@ -185,7 +185,7 @@ int main(`
`185`	`185`	`}`
`186`	`186`	`catch (const std::exception& e)`
`187`	`187`	`{`
`188`		`- logWarning(DDSROUTER_EXECUTION,`
	`188`	`+ EPROSIMA_LOG_WARNING(DDSROUTER_EXECUTION,`
`189`	`189`	`"Error reloading configuration file " << file_name << " with error: " << e.what());`
`190`	`190`	`}`
`191`	`191`	`};`
`@@ -223,7 +223,7 @@ int main(`
`223`	`223`	`}`
`224`	`224`	`catch (const std::exception& e)`
`225`	`225`	`{`
`226`		`- logWarning(DDSROUTER_EXECUTION,`
	`226`	`+ EPROSIMA_LOG_WARNING(DDSROUTER_EXECUTION,`
`227`	`227`	`"Error reloading configuration file " << commandline_args.file_path << " with error: " <<`
`228`	`228`	`e.what());`
`229`	`229`	`}`
`@@ -270,15 +270,15 @@ int main(`
`270`	`270`	`}`
`271`	`271`	`catch (const eprosima::utils::ConfigurationException& e)`
`272`	`272`	`{`
`273`		`- logError(DDSROUTER_ERROR,`
	`273`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ERROR,`
`274`	`274`	`"Error Loading DDS Router Configuration from file " << commandline_args.file_path <<`
`275`	`275`	`". Error message:\n " <<`
`276`	`276`	`e.what());`
`277`	`277`	`return static_cast<int>(ui::ProcessReturnCode::execution_failed);`
`278`	`278`	`}`
`279`	`279`	`catch (const eprosima::utils::InitializationException& e)`
`280`	`280`	`{`
`281`		`- logError(DDSROUTER_ERROR,`
	`281`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ERROR,`
`282`	`282`	`"Error Initializing DDS Router. Error message:\n " <<`
`283`	`283`	`e.what());`
`284`	`284`	`return static_cast<int>(ui::ProcessReturnCode::execution_failed);`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ ProcessReturnCode parse_arguments(`
`213`	`213`	`// Unknown args provided`
`214`	`214`	`if (parse.nonOptionsCount())`
`215`	`215`	`{`
`216`		`- logError(DDSROUTER_ARGS, "ERROR: Unknown argument: <" << parse.nonOption(0) << ">." );`
	`216`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "ERROR: Unknown argument: <" << parse.nonOption(0) << ">." );`
`217`	`217`	`option::printUsage(fwrite, stdout, usage, columns);`
`218`	`218`	`return ProcessReturnCode::incorrect_argument;`
`219`	`219`	`}`
`@@ -267,7 +267,7 @@ ProcessReturnCode parse_arguments(`
`267`	`267`	`break;`
`268`	`268`
`269`	`269`	`case optionIndex::UNKNOWN_OPT:`
`270`		`- logError(DDSROUTER_ARGS, opt << " is not a valid argument.");`
	`270`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, opt << " is not a valid argument.");`
`271`	`271`	`option::printUsage(fwrite, stdout, usage, columns);`
`272`	`272`	`return ProcessReturnCode::incorrect_argument;`
`273`	`273`	`break;`
`@@ -292,7 +292,7 @@ option::ArgStatus Arg::Unknown(`
`292`	`292`	`{`
`293`	`293`	`if (msg)`
`294`	`294`	`{`
`295`		`- logError(`
	`295`	`+ EPROSIMA_LOG_ERROR(`
`296`	`296`	`DDSROUTER_ARGS,`
`297`	`297`	`"Unknown option '" << option << "'. Use -h to see this executable possible arguments.");`
`298`	`298`	`}`
`@@ -310,7 +310,7 @@ option::ArgStatus Arg::Required(`
`310`	`310`
`311`	`311`	`if (msg)`
`312`	`312`	`{`
`313`		`- logError(DDSROUTER_ARGS, "Option '" << option << "' required.");`
	`313`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' required.");`
`314`	`314`	`}`
`315`	`315`	`return option::ARG_ILLEGAL;`
`316`	`316`	`}`
`@@ -330,7 +330,7 @@ option::ArgStatus Arg::Numeric(`
`330`	`330`
`331`	`331`	`if (msg)`
`332`	`332`	`{`
`333`		`- logError(DDSROUTER_ARGS, "Option '" << option << "' requires a numeric argument.");`
	`333`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires a numeric argument.");`
`334`	`334`	`}`
`335`	`335`	`return option::ARG_ILLEGAL;`
`336`	`336`	`}`
`@@ -350,7 +350,7 @@ option::ArgStatus Arg::Float(`
`350`	`350`
`351`	`351`	`if (msg)`
`352`	`352`	`{`
`353`		`- logError(DDSROUTER_ARGS, "Option '" << option << "' requires a float argument.");`
	`353`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires a float argument.");`
`354`	`354`	`}`
`355`	`355`	`return option::ARG_ILLEGAL;`
`356`	`356`	`}`
`@@ -365,7 +365,7 @@ option::ArgStatus Arg::String(`
`365`	`365`	`}`
`366`	`366`	`if (msg)`
`367`	`367`	`{`
`368`		`- logError(DDSROUTER_ARGS, "Option '" << option << "' requires a text argument.");`
	`368`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires a text argument.");`
`369`	`369`	`}`
`370`	`370`	`return option::ARG_ILLEGAL;`
`371`	`371`	`}`
`@@ -384,7 +384,7 @@ option::ArgStatus Arg::Readable_File(`
`384`	`384`	`}`
`385`	`385`	`if (msg)`
`386`	`386`	`{`
`387`		`- logError(DDSROUTER_ARGS, "Option '" << option << "' requires an existing readable file as argument.");`
	`387`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option << "' requires an existing readable file as argument.");`
`388`	`388`	`}`
`389`	`389`	`return option::ARG_ILLEGAL;`
`390`	`390`	`}`
`@@ -405,7 +405,7 @@ option::ArgStatus Arg::Valid_Options(`
`405`	`405`	`{`
`406`	`406`	`if (msg)`
`407`	`407`	`{`
`408`		`- logError(DDSROUTER_ARGS, "Option '" << option.name << "' requires a text argument.");`
	`408`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, "Option '" << option.name << "' requires a text argument.");`
`409`	`409`	`}`
`410`	`410`	`return option::ARG_ILLEGAL;`
`411`	`411`	`}`
`@@ -424,7 +424,7 @@ option::ArgStatus Arg::Valid_Options(`
`424`	`424`	`}`
`425`	`425`	`error_msg << "}.";`
`426`	`426`
`427`		`- logError(DDSROUTER_ARGS, error_msg);`
	`427`	`+ EPROSIMA_LOG_ERROR(DDSROUTER_ARGS, error_msg);`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`return option::ARG_ILLEGAL;`