Refs #21295: Make ParticipantProxyData private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · Jul 9, 2024 · 591d105 · 591d105
1 parent c1281c4
commit 591d105
Show file tree

Hide file tree

Showing 69 changed files with 149 additions and 153 deletions.
diff --git a/examples/cpp/discovery_server/ServerApp.hpp b/examples/cpp/discovery_server/ServerApp.hpp
@@ -51,7 +51,7 @@ class ServerApp : public Application, public DomainParticipantListener
     void on_participant_discovery(
             DomainParticipant* participant,
             fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS status,
-            const fastdds::rtps::ParticipantProxyData& info,
+            const fastdds::rtps::ParticipantBuiltinTopicData& info,
             bool& should_be_ignored) override;
 
     //! Run publisher

diff --git a/include/fastdds/rtps/builtin/data/WriterProxyData.hpp b/include/fastdds/rtps/builtin/data/WriterProxyData.hpp
@@ -40,7 +40,6 @@ namespace rtps {
 
 struct CDRMessage_t;
 class NetworkFactory;
-class ParticipantProxyData;
 
 /**
  **@ingroup BUILTIN_MODULE

diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp
@@ -21,7 +21,6 @@
 #define FASTDDS_RTPS_PARTICIPANT__PARTICIPANTDISCOVERYINFO_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/include/fastdds/rtps/participant/RTPSParticipant.hpp b/include/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -27,7 +27,6 @@
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/fastdds_dll.hpp>
@@ -69,6 +68,7 @@ class WriterAttributes;
 class ReaderAttributes;
 class ResourceEvent;
 class WLP;
+class ParticipantProxyData;
 
 /**
  * @brief Class RTPSParticipant, contains the public API for a RTPSParticipant.

diff --git a/include/fastdds/rtps/participant/RTPSParticipantListener.hpp b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp
@@ -30,7 +30,6 @@ namespace fastdds {
 namespace rtps {
 
 class RTPSParticipant;
-class ParticipantProxyData;
 
 /**
  * Class RTPSParticipantListener with virtual method that the user can overload to respond to certain events.

diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
@@ -26,14 +26,14 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
 
 class ReaderProxyData;
 class WriterProxyData;
+class ParticipantProxyData;
 } // namespace rtps
 
 namespace statistics {

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/rtps/attributes/ReaderAttributes.hpp>
 #include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
@@ -37,6 +36,7 @@
 #include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/RTPSDomainImpl.hpp>

diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
@@ -22,11 +22,11 @@
 #include <algorithm>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/utils/IPFinder.hpp>
-
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
+
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/endpoint/EDPStatic.h>
 #include <rtps/builtin/discovery/participant/PDPClient.h>

diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 
 #include <chrono>
 #include <mutex>

diff --git a/...tps/builtin/data/ParticipantProxyData.hpp → ...tps/builtin/data/ParticipantProxyData.hpp b/...tps/builtin/data/ParticipantProxyData.hpp → ...tps/builtin/data/ParticipantProxyData.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
-#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#ifndef RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#define RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -64,13 +64,13 @@ class ParticipantProxyData
 {
 public:
 
-    FASTDDS_EXPORTED_API ParticipantProxyData(
+    ParticipantProxyData(
             const RTPSParticipantAllocationAttributes& allocation);
 
-    FASTDDS_EXPORTED_API ParticipantProxyData(
+    ParticipantProxyData(
             const ParticipantProxyData& pdata);
 
-    FASTDDS_EXPORTED_API virtual ~ParticipantProxyData();
+    virtual ~ParticipantProxyData();
 
     //!Protocol version
     ProtocolVersion_t m_protocolVersion;
@@ -130,30 +130,30 @@ class ParticipantProxyData
      * @param pdata Object to copy the data from
      * @return True on success
      */
-    FASTDDS_EXPORTED_API bool updateData(
+    bool updateData(
             ParticipantProxyData& pdata);
 
     /**
      * Get the size in bytes of the CDR serialization of this object.
      * @param include_encapsulation Whether to include the size of the encapsulation info.
      * @return size in bytes of the CDR serialization.
      */
-    FASTDDS_EXPORTED_API uint32_t get_serialized_size(
+    uint32_t get_serialized_size(
             bool include_encapsulation) const;
 
     /**
      * Write as a parameter list on a CDRMessage_t
      * @return True on success
      */
-    FASTDDS_EXPORTED_API bool writeToCDRMessage(
+    bool writeToCDRMessage(
             CDRMessage_t* msg,
             bool write_encapsulation);
 
     /**
      * Read the parameter list from a received CDRMessage_t
      * @return True on success
      */
-    FASTDDS_EXPORTED_API bool readFromCDRMessage(
+    bool readFromCDRMessage(
             CDRMessage_t* msg,
             bool use_encapsulation,
             const NetworkFactory& network,
@@ -162,62 +162,62 @@ class ParticipantProxyData
             fastdds::rtps::VendorId_t source_vendor_id = c_VendorId_eProsima);
 
     //! Clear the data (restore to default state).
-    FASTDDS_EXPORTED_API void clear();
+    void clear();
 
     /**
      * Copy the data from another object.
      * @param pdata Object to copy the data from
      */
-    FASTDDS_EXPORTED_API void copy(
+    void copy(
             const ParticipantProxyData& pdata);
 
     /**
      * Set participant persistent GUID_t
      * @param guid valid GUID_t
      */
-    FASTDDS_EXPORTED_API void set_persistence_guid(
+    void set_persistence_guid(
             const GUID_t& guid);
 
     /**
      * Retrieve participant persistent GUID_t
      * @return guid persistent GUID_t or c_Guid_Unknown
      */
-    FASTDDS_EXPORTED_API GUID_t get_persistence_guid() const;
+    GUID_t get_persistence_guid() const;
 
     /**
      * Set participant client server sample identity
      * @param sid valid SampleIdentity
      */
-    FASTDDS_EXPORTED_API void set_sample_identity(
+    void set_sample_identity(
             const SampleIdentity& sid);
 
     /**
      * Retrieve participant SampleIdentity
      * @return SampleIdentity
      */
-    FASTDDS_EXPORTED_API SampleIdentity get_sample_identity() const;
+    SampleIdentity get_sample_identity() const;
 
     /**
      * Identifies the participant as client of the given server
      * @param guid valid backup server GUID
      */
-    FASTDDS_EXPORTED_API void set_backup_stamp(
+    void set_backup_stamp(
             const GUID_t& guid);
 
     /**
      * Retrieves BACKUP server stamp. On deserialization hints if lease duration must be enforced
      * @return GUID
      */
-    FASTDDS_EXPORTED_API GUID_t get_backup_stamp() const;
+    GUID_t get_backup_stamp() const;
 
-    FASTDDS_EXPORTED_API void assert_liveliness();
+    void assert_liveliness();
 
-    FASTDDS_EXPORTED_API const std::chrono::steady_clock::time_point& last_received_message_tm() const
+    const std::chrono::steady_clock::time_point& last_received_message_tm() const
     {
         return last_received_message_tm_;
     }
 
-    FASTDDS_EXPORTED_API const std::chrono::microseconds& lease_duration() const
+    const std::chrono::microseconds& lease_duration() const
     {
         return lease_duration_;
     }
@@ -237,4 +237,4 @@ class ParticipantProxyData
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#endif // RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
diff --git a/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp b/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp
@@ -24,12 +24,13 @@
 #include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp>
 #include <fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
+
 namespace eprosima {
 namespace fastdds {
 namespace rtps {

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
@@ -27,14 +27,14 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/attributes/TopicAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/reader/ReaderListener.hpp>
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <fastdds/rtps/writer/WriterListener.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/data/ProxyHashTables.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/network/utils/external_locators.hpp>

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
@@ -22,12 +22,12 @@
 #include <mutex>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #if HAVE_SECURITY
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp
@@ -21,9 +21,9 @@
 #define _FASTDDS_RTPS_EDPSERVER2_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/CacheChange.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataBase.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
@@ -29,14 +29,14 @@
 #include <fastdds/rtps/attributes/ReaderAttributes.hpp>
 #include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimpleListeners.h>
 #include <rtps/builtin/discovery/endpoint/EDPUtils.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
@@ -21,16 +21,16 @@
 
 #include <mutex>
 
+#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/InstanceHandle.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/history/WriterHistory.hpp>
 
-#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/network/NetworkFactory.h>

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
@@ -25,12 +25,12 @@
 #include <tinyxml2.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <fastdds/rtps/writer/RTPSWriter.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <xmlparser/XMLEndpointParser.h>

diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
@@ -23,11 +23,11 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>

diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp
@@ -23,8 +23,7 @@
 
 #include <mutex>
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDPListener.h>
 
 namespace eprosima {

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -28,17 +28,17 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
-
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/utils/IPLocator.hpp>
+
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/data/ProxyDataConverters.hpp>
 #include <rtps/builtin/data/ProxyHashTables.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>