Make the DdsPipeConfiguration required

Signed-off-by: tempate <[email protected]>
eProsima · Oct 24, 2023 · a2cf1d6 · a2cf1d6
1 parent 65d4f1a
commit a2cf1d6
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/fastddsspy_participants/test/blackbox/model/EndpointDatabaseTest.cpp b/fastddsspy_participants/test/blackbox/model/EndpointDatabaseTest.cpp
@@ -122,8 +122,7 @@ std::shared_ptr<DdsPipe> create_pipe(
         discovery_database,
         payload_pool,
         participant_database,
-        thread_pool
-        );
+        thread_pool);
 
     return pipe;
 }

diff --git a/fastddsspy_participants/test/blackbox/model/ParticipantDatabaseTest.cpp b/fastddsspy_participants/test/blackbox/model/ParticipantDatabaseTest.cpp
@@ -122,8 +122,8 @@ std::shared_ptr<DdsPipe> create_pipe(
         discovery_database,
         payload_pool,
         participant_database,
-        thread_pool
-        );
+        thread_pool);
+
     return pipe;
 }
 

diff --git a/fastddsspy_tool/src/cpp/tool/Backend.cpp b/fastddsspy_tool/src/cpp/tool/Backend.cpp
@@ -66,7 +66,7 @@ Backend::Backend(
     ddspipe::core::DdsPipeConfiguration ddspipe_configuration;
 
     pipe_ = std::make_unique<ddspipe::core::DdsPipe>(
-        ddspipe_configuration,
+        configuration.ddspipe_configuration,
         discovery_database_,
         payload_pool_,
         participant_database_,
@@ -80,7 +80,8 @@ Backend::~Backend()
     pipe_->disable();
 }
 
-utils::ReturnCode Backend::reload_configuration(const yaml::Configuration& new_configuration)
+utils::ReturnCode Backend::reload_configuration(
+        const yaml::Configuration& new_configuration)
 {
     return pipe_->reload_configuration(new_configuration.ddspipe_configuration);
 }

diff --git a/fastddsspy_tool/src/cpp/tool/Backend.hpp b/fastddsspy_tool/src/cpp/tool/Backend.hpp
@@ -46,7 +46,8 @@ class Backend
 
     ~Backend();
 
-    utils::ReturnCode reload_configuration(const yaml::Configuration& new_configuration);
+    utils::ReturnCode reload_configuration(
+            const yaml::Configuration& new_configuration);
 
     std::shared_ptr<eprosima::spy::participants::SpyModel> model() const noexcept;
 

diff --git a/fastddsspy_tool/src/cpp/tool/Controller.cpp b/fastddsspy_tool/src/cpp/tool/Controller.cpp
@@ -63,7 +63,8 @@ void Controller::one_shot_run(
     run_command_(input_.parse_as_command(args));
 }
 
-utils::ReturnCode Controller::reload_configuration(const yaml::Configuration& new_configuration)
+utils::ReturnCode Controller::reload_configuration(
+        const yaml::Configuration& new_configuration)
 {
     return backend_.reload_configuration(new_configuration);
 }

diff --git a/fastddsspy_yaml/include/fastddsspy_yaml/YamlReaderConfiguration.hpp b/fastddsspy_yaml/include/fastddsspy_yaml/YamlReaderConfiguration.hpp
@@ -17,10 +17,15 @@
 #include <cpp_utils/memory/Heritable.hpp>
 #include <cpp_utils/time/time_utils.hpp>
 
+#include <ddspipe_core/configuration/DdsPipeConfiguration.hpp>
+#include <ddspipe_core/configuration/IConfiguration.hpp>
 #include <ddspipe_core/types/topic/filter/IFilterTopic.hpp>
 #include <ddspipe_core/types/topic/dds/DistributedTopic.hpp>
+<<<<<<< HEAD
 #include <ddspipe_core/configuration/DdsPipeConfiguration.hpp>
 #include <ddspipe_core/configuration/IConfiguration.hpp>
+=======
+>>>>>>> 4c906f4 (Make the DdsPipeConfiguration required)
 
 #include <ddspipe_participants/configuration/SimpleParticipantConfiguration.hpp>
 #include <ddspipe_participants/configuration/ParticipantConfiguration.hpp>
@@ -29,6 +34,8 @@
 #include <ddspipe_yaml/YamlReader.hpp>
 
 #include <fastddsspy_participants/configuration/SpyParticipantConfiguration.hpp>
+#include <fastddsspy_participants/types/EndpointInfo.hpp>
+#include <fastddsspy_participants/types/ParticipantInfo.hpp>
 
 #include <fastddsspy_yaml/library/library_dll.h>
 

diff --git a/fastddsspy_yaml/src/cpp/YamlReaderConfiguration.cpp b/fastddsspy_yaml/src/cpp/YamlReaderConfiguration.cpp
@@ -96,7 +96,10 @@ void Configuration::load_configuration_(
         WildcardDdsFilterTopic rpc_request_topic, rpc_response_topic;
         rpc_request_topic.topic_name.set_value("rq/*");
         rpc_response_topic.topic_name.set_value("rr/*");
+<<<<<<< HEAD
 
+=======
+>>>>>>> 4c906f4 (Make the DdsPipeConfiguration required)
         ddspipe_configuration.blocklist.insert(
             utils::Heritable<WildcardDdsFilterTopic>::make_heritable(rpc_request_topic));
         ddspipe_configuration.blocklist.insert(