Refs #21295: Apply suggestions

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · MiguelCompany · Jul 24, 2024 · Jul 5, 2024 · Jul 5, 2024 · Jul 5, 2024
commit 270a979697b85ae3e7f16b8483b63d68a1c13a39
diff --git a/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp b/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp
@@ -20,10 +20,7 @@
 #ifndef FASTDDS_DDS_BUILTIN_TOPIC__PARTICIPANTBUILTINTOPICDATA_HPP
 #define FASTDDS_DDS_BUILTIN_TOPIC__PARTICIPANTBUILTINTOPICDATA_HPP
 
-#include <fastdds/dds/builtin/topic/BuiltinTopicKey.hpp>
-#include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
-#include <fastdds/rtps/common/RemoteLocators.hpp>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/include/fastdds/dds/domain/DomainParticipantListener.hpp b/include/fastdds/dds/domain/DomainParticipantListener.hpp
@@ -67,10 +67,10 @@ class DomainParticipantListener :
      * This method is called when a new Participant is discovered, or a previously discovered participant changes
      * its QOS or is removed.
      *
-     * @param[out] participant Pointer to the Participant which discovered the remote participant.
-     * @param[out] reason Reason of the change in the status of the discovered participant.
-     * @param[out] info Remote participant information. User can take ownership of the object.
-     * @param[out] should_be_ignored Flag to indicate the library to automatically ignore the discovered Participant.
+     * @param [out] participant Pointer to the Participant which discovered the remote participant.
+     * @param [out] reason Reason of the change in the status of the discovered participant.
+     * @param [out] info Remote participant information. User can take ownership of the object.
+     * @param [out] should_be_ignored Flag to indicate the library to automatically ignore the discovered Participant.
      */
     virtual void on_participant_discovery(
             DomainParticipant* participant,

diff --git a/include/fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp b/include/fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp
@@ -20,8 +20,8 @@
 #ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTBUILTINTOPICDATA_HPP
 #define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTBUILTINTOPICDATA_HPP
 
-#include <fastdds/dds/builtin/topic/BuiltinTopicKey.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/rtps/builtin/data/BuiltinTopicKey.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 
 namespace eprosima {
@@ -30,55 +30,34 @@ namespace rtps {
 
 struct ParticipantBuiltinTopicData
 {
-    //! Constructor from ParticipantBuiltinTopicData
-    ParticipantBuiltinTopicData(
-            const ParticipantBuiltinTopicData& pdata)
-        : key(pdata.key)
-        , user_data(pdata.user_data)
-        , guid(pdata.guid)
-        , properties(pdata.properties)
-        , participant_name(pdata.participant_name)
-        , metatraffic_locators(pdata.metatraffic_locators)
-        , default_locators(pdata.default_locators)
-        , lease_duration(pdata.lease_duration)
-        , vendor_id(pdata.vendor_id)
-        , domain_id(pdata.domain_id)
-    {
-    }
-
-    //! Default constructor
-    ParticipantBuiltinTopicData()
-    {
-    }
-
-    //! Builtin topic Key
+    /// Builtin topic Key
     BuiltinTopicKey_t key;
 
-    //! UserData QoS
+    /// UserData QoS
     dds::UserDataQosPolicy user_data;
 
-    //! Participant GUID
+    /// Participant GUID
     GUID_t guid;
 
-    //! Properties
+    /// Properties
     dds::ParameterPropertyList_t properties;
 
-    //!Participant name
+    ///Participant name
     fastcdr::string_255 participant_name;
 
-    //!Metatraffic locators
+    ///Metatraffic locators
     RemoteLocatorList metatraffic_locators;
 
-    //!Default locators
+    ///Default locators
     RemoteLocatorList default_locators;
 
-    //! Lease Duration
+    /// Lease Duration
     Duration_t lease_duration;
 
-    // Vendor id
+    /// Vendor id
     VendorId_t vendor_id;
 
-    // Participant domain id
+    /// Participant domain id
     dds::DomainId_t domain_id;
 };
 

diff --git a/include/fastdds/rtps/participant/RTPSParticipant.hpp b/include/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -69,7 +69,6 @@ class WriterAttributes;
 class ReaderAttributes;
 class ResourceEvent;
 class WLP;
-class ParticipantProxyData;
 
 /**
  * @brief Class RTPSParticipant, contains the public API for a RTPSParticipant.
@@ -406,7 +405,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant
      */
     bool fill_discovery_data_from_cdr_message(
             ParticipantBuiltinTopicData& data,
-            fastdds::statistics::MonitorServiceStatusData& msg);
+            const fastdds::statistics::MonitorServiceStatusData& msg);
 
     /**
      * fills in the PublicationBuiltinTopicData from a MonitorService Message

diff --git a/include/fastdds/rtps/participant/RTPSParticipantListener.hpp b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp
@@ -22,6 +22,7 @@
 #include <fastdds/rtps/builtin/data/PublicationBuiltinTopicData.hpp>
 #include <fastdds/rtps/builtin/data/SubscriptionBuiltinTopicData.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 #include <fastdds/rtps/reader/ReaderDiscoveryStatus.hpp>
 #include <fastdds/rtps/writer/WriterDiscoveryStatus.hpp>
 
@@ -51,10 +52,10 @@ class FASTDDS_EXPORTED_API RTPSParticipantListener
      * This method is called when a new Participant is discovered, or a previously discovered participant changes
      * its QOS or is removed.
      *
-     * @param[out] participant Pointer to the Participant which discovered the remote participant.
-     * @param[out] reason Reason of the change in the status of the discovered participant.
-     * @param[out] info Remote participant information. User can take ownership of the object.
-     * @param[out] should_be_ignored Flag to indicate the library to automatically ignore the discovered Participant.
+     * @param [out] participant Pointer to the Participant which discovered the remote participant.
+     * @param [out] reason Reason of the change in the status of the discovered participant.
+     * @param [out] info Remote participant information. User can take ownership of the object.
+     * @param [out] should_be_ignored Flag to indicate the library to automatically ignore the discovered Participant.
      */
     virtual void on_participant_discovery(
             RTPSParticipant* participant,

diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
@@ -35,7 +35,6 @@ namespace statistics {
 
 class MonitorServiceStatusData;
 
-
 namespace dds {
 
 /**
@@ -140,19 +139,6 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant
      * @return RETCODE_OK if the operation succeeds.
      * @return RETCODE_ERROR if the  operation fails.
      */
-    FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message(
-            fastdds::rtps::ParticipantBuiltinTopicData& data,
-            statistics::MonitorServiceStatusData& msg);
-
-    /**
-     * fills in the ParticipantProxyData from a MonitorService Message
-     *
-     * @param [out] data Proxy to fill
-     * @param [in] msg MonitorService Message to get the proxy information from.
-     *
-     * @return RETCODE_OK if the operation succeeds.
-     * @return RETCODE_ERROR if the  operation fails.
-     */
     FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message(
             fastdds::rtps::ParticipantBuiltinTopicData& data,
             const statistics::MonitorServiceStatusData& msg);

diff --git a/src/cpp/fastdds/domain/DomainParticipant.cpp b/src/cpp/fastdds/domain/DomainParticipant.cpp
@@ -408,7 +408,7 @@ ReturnCode_t DomainParticipant::get_discovered_participants(
 }
 
 ReturnCode_t DomainParticipant::get_discovered_participant_data(
-        rtps::ParticipantBuiltinTopicData& participant_data,
+        ParticipantBuiltinTopicData& participant_data,
         const InstanceHandle_t& participant_handle) const
 {
     static_cast<void> (participant_data);

diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp
@@ -59,7 +59,6 @@
 #include <fastdds/topic/TopicProxy.hpp>
 #include <fastdds/topic/TopicProxyFactory.hpp>
 #include <fastdds/utils/QosConverters.hpp>
-#include <rtps/builtin/data/ProxyDataConverters.hpp>
 #include <rtps/builtin/liveliness/WLP.hpp>
 #include <rtps/RTPSDomainImpl.hpp>
 #include <utils/SystemInfo.hpp>

diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
@@ -42,7 +42,6 @@
 #include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 #include "fastdds/topic/DDSSQLFilter/DDSFilterFactory.hpp"
 #include <fastdds/topic/TopicProxyFactory.hpp>
-#include <rtps/builtin/data/ProxyDataConverters.hpp>
 #include <rtps/reader/StatefulReader.hpp>
 
 namespace eprosima {

diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp
@@ -20,8 +20,6 @@
 #ifndef RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
 #define RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-
 #include <chrono>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
@@ -235,6 +233,4 @@ class ParticipantProxyData
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-
 #endif // RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -683,7 +683,7 @@ void PDP::notify_and_maybe_ignore_new_participant(
             listener->on_participant_discovery(
                 getRTPSParticipant()->getUserRTPSParticipant(),
                 ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT,
-                std::move(info),
+                info,
                 should_be_ignored);
         }
 
@@ -1337,7 +1337,7 @@ void PDP::actions_on_remote_participant_removed(
 
         bool should_be_ignored = false;
         listener->on_participant_discovery(mp_RTPSParticipant->getUserRTPSParticipant(), reason,
-                std::move(info), should_be_ignored);
+                info, should_be_ignored);
     }
 
     {

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
@@ -24,6 +24,7 @@
 #include <mutex>
 
 #include <fastdds/rtps/reader/ReaderListener.hpp>
+
 #include <rtps/builtin/data/ParticipantProxyData.hpp>
 
 namespace eprosima {

diff --git a/src/cpp/rtps/participant/RTPSParticipant.cpp b/src/cpp/rtps/participant/RTPSParticipant.cpp
@@ -262,7 +262,7 @@ bool RTPSParticipant::disable_monitor_service() const
 
 bool RTPSParticipant::fill_discovery_data_from_cdr_message(
         ParticipantBuiltinTopicData& data,
-        fastdds::statistics::MonitorServiceStatusData& msg)
+        const fastdds::statistics::MonitorServiceStatusData& msg)
 {
     return mp_impl->fill_discovery_data_from_cdr_message(data, msg);
 }

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -2932,18 +2932,17 @@ bool RTPSParticipantImpl::disable_monitor_service() const
 
 bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message(
         fastdds::rtps::ParticipantBuiltinTopicData& data,
-        fastdds::statistics::MonitorServiceStatusData& msg)
+        const fastdds::statistics::MonitorServiceStatusData& msg)
 {
     bool ret = true;
     CDRMessage_t serialized_msg{0};
     serialized_msg.wraps = true;
 
-    serialized_msg.buffer = msg.value().entity_proxy().data();
+    serialized_msg.buffer = const_cast<octet*>(msg.value().entity_proxy().data());
     serialized_msg.length = static_cast<uint32_t>(msg.value().entity_proxy().size());
 
     ParticipantProxyData part_prox_data(m_att.allocation);
 
-
     ret = part_prox_data.readFromCDRMessage(
         &serialized_msg,
         true,

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h
@@ -1229,7 +1229,7 @@ class RTPSParticipantImpl
      */
     bool fill_discovery_data_from_cdr_message(
             ParticipantBuiltinTopicData& data,
-            fastdds::statistics::MonitorServiceStatusData& msg);
+            const fastdds::statistics::MonitorServiceStatusData& msg);
 
     /**
      * fills in the PublicationBuiltinTopicData from a MonitorService Message

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp
@@ -114,7 +114,7 @@ fastdds::dds::ReturnCode_t DomainParticipant::disable_monitor_service()
 
 fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_message(
         fastdds::rtps::ParticipantBuiltinTopicData& data,
-        fastdds::statistics::MonitorServiceStatusData& msg)
+        const fastdds::statistics::MonitorServiceStatusData& msg)
 {
 #ifdef FASTDDS_STATISTICS
     return static_cast<DomainParticipantImpl*>(impl_)->fill_discovery_data_from_cdr_message(data, msg);

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@@ -324,7 +324,7 @@ ReturnCode_t DomainParticipantImpl::disable_monitor_service()
 
 ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message(
         fastdds::rtps::ParticipantBuiltinTopicData& data,
-        fastdds::statistics::MonitorServiceStatusData& msg)
+        const fastdds::statistics::MonitorServiceStatusData& msg)
 {
     ReturnCode_t ret{efd::RETCODE_OK};
 

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
@@ -156,7 +156,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl,
      */
     efd::ReturnCode_t fill_discovery_data_from_cdr_message(
             fastdds::rtps::ParticipantBuiltinTopicData& data,
-            fastdds::statistics::MonitorServiceStatusData& msg);
+            const fastdds::statistics::MonitorServiceStatusData& msg);
 
     /**
      * fills in the WriterProxyData from a MonitorService Message

diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
@@ -164,7 +164,7 @@ class PubSubParticipant
         void on_participant_discovery(
                 eprosima::fastdds::dds::DomainParticipant*,
                 eprosima::fastdds::rtps::ParticipantDiscoveryStatus status,
-                const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info,
+                const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
                 bool& should_be_ignored)
         {
             static_cast<void>(should_be_ignored);

diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp
@@ -82,7 +82,7 @@ class PubSubWriter
         void on_participant_discovery(
                 eprosima::fastdds::dds::DomainParticipant*,
                 eprosima::fastdds::rtps::ParticipantDiscoveryStatus status,
-                const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info,
+                const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
                 bool& should_be_ignored) override
         {
             static_cast<void>(should_be_ignored);
@@ -2020,7 +2020,7 @@ class PubSubWriter
     std::string participant_profile_ = "";
     std::string datawriter_profile_ = "";
 
-    std::function<bool(const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info)> onDiscovery_;
+    std::function<bool(const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info)> onDiscovery_;
 
     //! A mutex for liveliness
     std::mutex liveliness_mutex_;

diff --git a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
@@ -37,7 +37,6 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
-#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include "BlackboxTests.hpp"
 #include "../api/dds-pim/CustomPayloadPool.hpp"
 #include "../api/dds-pim/PubSubReader.hpp"

diff --git a/test/blackbox/common/DDSBlackboxTestsBasic.cpp b/test/blackbox/common/DDSBlackboxTestsBasic.cpp
@@ -532,7 +532,7 @@ TEST(DDSBasic, IgnoreParticipant)
         void on_participant_discovery(
                 DomainParticipant* /*participant*/,
                 eprosima::fastdds::rtps::ParticipantDiscoveryStatus status,
-                const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info,
+                const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
                 bool& should_be_ignored) override
         {
             std::cout << "Using custom listener" << std::endl;

diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -594,7 +594,7 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData)
         void on_participant_discovery(
                 DomainParticipant* participant,
                 eprosima::fastdds::rtps::ParticipantDiscoveryStatus status,
-                const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info,
+                const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
                 bool& should_be_ignored)
         {
             static_cast<void>(should_be_ignored);
@@ -613,7 +613,7 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData)
             }
         }
 
-        eprosima::fastdds::rtps::ParticipantBuiltinTopicData* remote_participant_info;
+        eprosima::fastdds::dds::ParticipantBuiltinTopicData* remote_participant_info;
 
     private:
 

diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
@@ -20,7 +20,7 @@
 #include <gtest/gtest.h>
 
 // TODO(jlbueno): remove private header
-#include <rtps/builtin/data/ParticipantProxyData.hpp>
+#include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <statistics/rtps/StatisticsBase.hpp>
 #include "../types/statistics/monitorservice_typesPubSubTypes.hpp"
 #include "BlackboxTests.hpp"

diff --git a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/common/Types.hpp>
 #include <gtest/gtest.h>
 
-#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include "BlackboxTests.hpp"
 #include "PubSubParticipant.hpp"
 
@@ -113,7 +113,7 @@ TEST_P(PropertyQos, send_property_qos)
 
     PubSubParticipant<HelloWorldPubSubType> participant_2(0u, 0u, 0u, 0u);
 
-    participant_2.set_on_discovery_function([&](const rtps::ParticipantBuiltinTopicData& info) -> bool
+    participant_2.set_on_discovery_function([&](const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info) -> bool
             {
                 std::cout << "Received Property Qos: ";