Revert "Fix 'microxrcedds_agent' name and dependency (backport #279) (#281)" (#284)

This reverts commit c7a4ea6758.

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
         image: ${{ matrix.docker_image }}
       steps:
       - uses: actions/checkout@v4
-      - uses: ros-tooling/setup-ros@0.7.7
+      - uses: ros-tooling/setup-ros@0.7.13
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.ros_distribution }}
@@ -31,7 +31,7 @@ jobs:
         run: |
           apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs
           apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp
-      - uses : ros-tooling/action-ros-ci@0.3.13
+      - uses : ros-tooling/action-ros-ci@0.4.3
         with:
           package-name: "micro_ros_agent"
           target-ros2-distro: ${{ matrix.ros_distribution }}

micro_ros_agent/CHANGELOG.rst

@@ -2,10 +2,6 @@
 Changelog for package micro-ros_agent
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-5.0.20 (2024-10-14)
--------------------
-* Bump micro-ROS-Agent to Fast DDS v3.0.1 (`#237 <https://github.com/micro-ROS/micro-ROS-Agent/issues/237>`_)
-
 5.0.2 (2024-05-31)
 ------------------
 * Jazzy Release

micro_ros_agent/CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.11)
 
 option(UROSAGENT_GENERATE_PROFILE
   "Generates agent.refs according to the .msgs provided in the .repos" OFF
@@ -31,10 +31,10 @@ else()
 endif()
 
 find_package(ament_cmake REQUIRED)
+find_package(microxrcedds_agent REQUIRED)
 find_package(rosidl_cmake REQUIRED)
 find_package(fastcdr REQUIRED)
-find_package(fastdds REQUIRED)
+find_package(fastrtps REQUIRED)
-find_package(microxrcedds_agent REQUIRED)
 find_package(fastrtps_cmake_module REQUIRED)
 find_package(rmw_dds_common REQUIRED)
 find_package(rmw REQUIRED)
@@ -68,7 +68,7 @@ ament_target_dependencies(${PROJECT_NAME}
   rosidl_runtime_cpp
   rosidl_typesupport_cpp
   fastcdr
-  fastdds
+  fastrtps
   rmw_dds_common
   rmw
   rmw_fastrtps_shared_cpp
@@ -78,7 +78,7 @@ ament_target_dependencies(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
   microxrcedds_agent
   fastcdr
-  fastdds
+  fastrtps
   $<$<BOOL:$<PLATFORM_ID:Linux>>:rt>
   $<$<BOOL:$<PLATFORM_ID:Linux>>:dl>
   )

micro_ros_agent/cmake/SuperBuild.cmake

@@ -19,14 +19,14 @@ unset(_deps)
 enable_language(C)
 enable_language(CXX)
 
-unset(microxrcedds_agent_DIR CACHE)
+unset(xrceagent_DIR CACHE)
-find_package(microxrcedds_agent 3 EXACT QUIET)
+find_package(xrceagent 2 EXACT QUIET)
 if(NOT xrceagent_FOUND)
-    ExternalProject_Add(microxrcedds_agent
+    ExternalProject_Add(xrceagent
             GIT_REPOSITORY
                 https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
             GIT_TAG
-                v3.0.0
+                v2.4.3
             PREFIX
                 ${PROJECT_BINARY_DIR}/agent
             INSTALL_DIR
@@ -64,5 +64,5 @@ ExternalProject_Add(micro_ros_agent
     INSTALL_COMMAND
         ""
     DEPENDS
-        microxrcedds_agent
+        xrceagent
     )

micro_ros_agent/include/agent/graph_manager/graph_manager.hpp

@@ -15,25 +15,28 @@
 #ifndef _UROS_AGENT_GRAPH_MANAGER_HPP
 #define _UROS_AGENT_GRAPH_MANAGER_HPP
 
-#include "fastdds/dds/topic/TopicDataType.hpp"
+#include "fastrtps/Domain.h"
-#include "fastdds/rtps/attributes/RTPSParticipantAttributes.hpp"
+#include <fastrtps/TopicDataType.h>
-#include "fastdds/rtps/participant/RTPSParticipant.hpp"
+#include "fastrtps/attributes/ParticipantAttributes.h"
-#include "fastdds/rtps/participant/RTPSParticipantListener.hpp"
+#include "fastrtps/participant/Participant.h"
-#include "fastdds/rtps/RTPSDomain.hpp"
+#include "fastrtps/participant/ParticipantListener.h"
+#include "fastrtps/attributes/PublisherAttributes.h"
+#include "fastrtps/publisher/Publisher.h"
+#include <fastrtps/publisher/PublisherListener.h>
+#include <fastrtps/rtps/common/MatchingInfo.h>
+
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
-#include <fastdds/dds/publisher/Publisher.hpp>
-#include <fastdds/dds/publisher/PublisherListener.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
+#include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
-#include <fastdds/dds/subscriber/DataReaderListener.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/rtps/common/MatchingInfo.hpp>
+#include <fastdds/dds/subscriber/DataReaderListener.hpp>
 
 #include "rmw/types.h"
 #include "rmw/names_and_types.h"
@@ -122,7 +125,7 @@ public:
      * @param   datawriter Pointer to the datawriter to be added.
      */
     void add_datawriter(
-            const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
+            const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
             const eprosima::fastdds::dds::DomainParticipant* participant,
             const eprosima::fastdds::dds::DataWriter* datawriter);
 
@@ -135,10 +138,10 @@ public:
      * @param   writer_qos QOS of the datawriter to be included into the graph tree.
      */
     void add_datawriter(
-            const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
+            const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
             const std::string& topic_name,
             const std::string& type_name,
-            const eprosima::fastdds::rtps::GUID_t& participant_guid,
+            const eprosima::fastrtps::rtps::GUID_t& participant_guid,
             const eprosima::fastdds::dds::DataWriterQos& writer_qos);
 
     /**
@@ -146,7 +149,7 @@ public:
      * @param   datawriter_guid rtps::GUID_t of the datawriter to be removed.
      */
     void remove_datawriter(
-            const eprosima::fastdds::rtps::GUID_t& datawriter_guid);
+            const eprosima::fastrtps::rtps::GUID_t& datawriter_guid);
 
     /**
      * @brief   Adds a DDS datareader to the graph tree.
@@ -155,7 +158,7 @@ public:
      * @param   datareader Pointer to the datareader to be added.
      */
     void add_datareader(
-            const eprosima::fastdds::rtps::GUID_t& datareader_guid,
+            const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
             const eprosima::fastdds::dds::DomainParticipant* participant,
             const eprosima::fastdds::dds::DataReader* datareader);
 
@@ -165,13 +168,13 @@ public:
      * @param   topic_name Name of the topic to which the datareader sends information to.
      * @param   type_name Type name of the sent topic.
      * @param   participant_guid rtps::GUID_t of the participant which owns this datareader.
-     * @param   reader_qos QOS of the datareader to be included into the graph tree.
+     * @param   writer_qos QOS of the datareader to be included into the graph tree.
      */
     void add_datareader(
-            const eprosima::fastdds::rtps::GUID_t& datareader_guid,
+            const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
             const std::string& topic_name,
             const std::string& type_name,
-            const eprosima::fastdds::rtps::GUID_t& participant_guid,
+            const eprosima::fastrtps::rtps::GUID_t& participant_guid,
             const eprosima::fastdds::dds::DataReaderQos& reader_qos);
 
     /**
@@ -179,7 +182,7 @@ public:
      * @param   datareader_guid rtps::GUID_t of the datareader to be removed.
      */
     void remove_datareader(
-            const  eprosima::fastdds::rtps::GUID_t& datareader_guid);
+            const  eprosima::fastrtps::rtps::GUID_t& datareader_guid);
 
     /**
      * @brief   Associates a certain DDS entity with a provided participant.
@@ -188,7 +191,7 @@ public:
      * @param   entity_kind Kind of the DDS entity.
      */
     void associate_entity(
-            const eprosima::fastdds::rtps::GUID_t& entity_guid,
+            const eprosima::fastrtps::rtps::GUID_t& entity_guid,
             const eprosima::fastdds::dds::DomainParticipant* participant,
             const dds::xrce::ObjectKind& entity_kind);
 
@@ -209,28 +212,21 @@ private:
                 GraphManager* graph_manager);
     private:
 
-        template <typename DiscoveryStatus, typename Info>
+        template <typename Info>
         void process_discovery_info(
-                DiscoveryStatus reason,
                 const Info& proxyData);
 
         void on_participant_discovery(
                 eprosima::fastdds::dds::DomainParticipant* participant,
-                eprosima::fastdds::rtps::ParticipantDiscoveryStatus reason,
+                eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info) override;
-                const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
-                bool& should_be_ignored) override;
 
-        void on_data_reader_discovery(
+        void on_subscriber_discovery(
-                eprosima::fastdds::dds::DomainParticipant* participant,
+                eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-                eprosima::fastdds::rtps::ReaderDiscoveryStatus reason,
+                eprosima::fastrtps::rtps::ReaderDiscoveryInfo&& info) override;
-                const eprosima::fastdds::dds::SubscriptionBuiltinTopicData& info,
-                bool& should_be_ignored) override;
 
-        void on_data_writer_discovery(
+        void on_publisher_discovery(
-                eprosima::fastdds::dds::DomainParticipant* participant,
+                eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-                eprosima::fastdds::rtps::WriterDiscoveryStatus reason,
+                eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info) override;
-                const eprosima::fastdds::dds::PublicationBuiltinTopicData& info,
-                bool& should_be_ignored) override;
 
         GraphManager* graphManager_from_;
     };

micro_ros_agent/include/agent/graph_manager/graph_typesupport.hpp

@@ -15,16 +15,18 @@
 #ifndef UROS_AGENT_GRAPH_PARTICIPANTS_TYPESUPPORT_HPP_
 #define UROS_AGENT_GRAPH_PARTICIPANTS_TYPESUPPORT_HPP_
 
-#include "fastdds/dds/publisher/Publisher.hpp"
+#include "fastrtps/Domain.h"
-#include "fastdds/dds/topic/TopicDataType.hpp"
+#include <fastrtps/TopicDataType.h>
-#include "fastdds/rtps/attributes/RTPSParticipantAttributes.hpp"
+#include "fastrtps/attributes/ParticipantAttributes.h"
-#include "fastdds/rtps/participant/RTPSParticipant.hpp"
+#include "fastrtps/participant/Participant.h"
-#include "fastdds/rtps/participant/RTPSParticipantListener.hpp"
+#include "fastrtps/participant/ParticipantListener.h"
-#include "fastdds/rtps/RTPSDomain.hpp"
+#include "fastrtps/attributes/PublisherAttributes.h"
+#include "fastrtps/publisher/Publisher.h"
+#include <fastrtps/publisher/PublisherListener.h>
+#include <fastrtps/rtps/common/MatchingInfo.h>
+
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-#include <fastdds/dds/publisher/PublisherListener.hpp>
-#include <fastdds/rtps/common/MatchingInfo.hpp>
 
 #include "rmw/types.h"
 #include "rmw/impl/cpp/key_value.hpp"
@@ -57,31 +59,24 @@ public:
     ParticipantEntitiesInfoTypeSupport();
 
     virtual bool serialize(
-            const void* const data,
+            void* data,
-            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     virtual bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
             void* data) override;
 
-    virtual uint32_t calculate_serialized_size(
+    virtual std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data,
+            void* data) override;
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-    virtual void* create_data() override;
+    virtual void* createData() override;
 
-    virtual void delete_data(void* data) override;
+    virtual void deleteData(void* data) override;
 
-    virtual bool compute_key(
+    virtual bool getKey(
-            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            void* data,
-            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            eprosima::fastrtps::rtps::InstanceHandle_t* handle,
-            bool force_md5 = false) override;
+            bool force_md5) override;
-
-    virtual bool compute_key(
-            const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
-            bool force_md5 = false) override;
 
 private:
 
@@ -100,31 +95,24 @@ public:
     MicrorosGraphInfoTypeSupport();
 
     virtual bool serialize(
-            const void* const data,
+            void* data,
-            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     virtual bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
             void* data) override;
 
-    virtual uint32_t calculate_serialized_size(
+    virtual std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data,
+            void* data) override;
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-    virtual void* create_data() override;
+    virtual void* createData() override;
 
-    virtual void delete_data(void* data) override;
+    virtual void deleteData(void* data) override;
 
-    virtual bool compute_key(
+    virtual bool getKey(
-            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            void* data,
-            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            eprosima::fastrtps::rtps::InstanceHandle_t* handle,
-            bool force_md5 = false) override;
+            bool force_md5) override;
-
-    virtual bool compute_key(
-            const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
-            bool force_md5 = false) override;
 
 private:
 

micro_ros_agent/package.xml

@@ -2,10 +2,10 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>micro_ros_agent</name>
-  <version>5.0.20</version>
+  <version>5.0.2</version>
   <description>micro-ROS Agent package</description>
-  <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
+  <maintainer email="eugeniocollado@eprosima.com">Eugenio Collado</maintainer>
-  <maintainer email="antoniocuadros@eprosima.com">Antonio Cuadros</maintainer>
+  <maintainer email="davidlaseca@eprosima.com">David Laseca</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
@@ -20,7 +20,6 @@
   <depend>rmw_fastrtps_shared_cpp</depend>
   <depend>rmw_dds_common</depend>
   <depend>micro_ros_msgs</depend>
-  <depend>microxrcedds_agent</depend>
 
   <test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>

micro_ros_agent/src/agent/Agent.cpp

@@ -122,10 +122,10 @@ bool Agent::create(
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
                 // TODO(jamoralp): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
+                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->add_datareader(datareader_guid, participant, datareader);
                 graph_manager_->associate_entity(
                     datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
@@ -148,10 +148,10 @@ bool Agent::create(
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
                 // TODO(jamoralp): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
+                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->remove_datareader(datareader_guid);
             });
 
@@ -179,10 +179,10 @@ bool Agent::create(
                     datawriter->guid(), participant, dds::xrce::OBJK_DATAWRITER);
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
+                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->add_datareader(datareader_guid, participant, datareader);
                 graph_manager_->associate_entity(
                     datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
@@ -209,10 +209,10 @@ bool Agent::create(
                 graph_manager_->remove_datawriter(datawriter->guid());
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
+                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->remove_datareader(datareader_guid);
             });
 
@@ -240,10 +240,10 @@ bool Agent::create(
                     datawriter->guid(), participant, dds::xrce::OBJK_DATAWRITER);
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
+                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->add_datareader(datareader_guid, participant, datareader);
                 graph_manager_->associate_entity(
                     datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
@@ -270,10 +270,10 @@ bool Agent::create(
                 graph_manager_->remove_datawriter(datawriter->guid());
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
+                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->remove_datareader(datareader_guid);
             });
 

micro_ros_agent/src/agent/graph_manager/graph_manager.cpp

@@ -16,9 +16,6 @@
 #define _UROS_AGENT_GRAPH_MANAGER_CPP
 
 #include <agent/graph_manager/graph_manager.hpp>
-#include <fastdds/dds/core/detail/DDSReturnCode.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
-#include <fastdds/rtps/reader/ReaderDiscoveryStatus.hpp>
 
 #include <memory>
 #include <string>
@@ -57,9 +54,9 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
 
     participant_qos.name(enclave);
     participant_qos.wire_protocol().builtin.readerHistoryMemoryPolicy =
-        eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
     participant_qos.wire_protocol().builtin.writerHistoryMemoryPolicy =
-        eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
 
     eprosima::fastdds::dds::StatusMask par_mask = eprosima::fastdds::dds::StatusMask::none();
     participant_.reset(eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->
@@ -94,7 +91,7 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
         eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_LAST_HISTORY_QOS;
     datawriter_qos_.history().depth = 1;
     datawriter_qos_.endpoint().history_memory_policy =
-        eprosima::fastdds::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastrtps::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
     datawriter_qos_.publish_mode().kind =
         eprosima::fastdds::dds::PublishModeQosPolicyKind::ASYNCHRONOUS_PUBLISH_MODE;
     datawriter_qos_.reliability().kind =
@@ -116,7 +113,7 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
         eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_LAST_HISTORY_QOS;
     datareader_qos.history().depth = 1;
     datareader_qos.endpoint().history_memory_policy =
-        eprosima::fastdds::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastrtps::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
     datareader_qos.reliability().kind =
         eprosima::fastdds::dds::ReliabilityQosPolicyKind::RELIABLE_RELIABILITY_QOS;
     datareader_qos.durability().kind =
@@ -354,7 +351,7 @@ void GraphManager::remove_participant(
 }
 
 void GraphManager::add_datawriter(
-        const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
+        const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
         const eprosima::fastdds::dds::DomainParticipant* participant,
         const eprosima::fastdds::dds::DataWriter* datawriter)
 {
@@ -365,10 +362,10 @@ void GraphManager::add_datawriter(
 }
 
 void GraphManager::add_datawriter(
-        const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
+        const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
         const std::string& topic_name,
         const std::string& type_name,
-        const eprosima::fastdds::rtps::GUID_t& participant_guid,
+        const eprosima::fastrtps::rtps::GUID_t& participant_guid,
         const eprosima::fastdds::dds::DataWriterQos& writer_qos)
 {
     const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
@@ -382,7 +379,7 @@ void GraphManager::add_datawriter(
 }
 
 void GraphManager::remove_datawriter(
-        const eprosima::fastdds::rtps::GUID_t& datawriter_guid)
+        const eprosima::fastrtps::rtps::GUID_t& datawriter_guid)
 {
     const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
         "rmw_fastrtps_cpp", datawriter_guid);
@@ -391,7 +388,7 @@ void GraphManager::remove_datawriter(
 }
 
 void GraphManager::add_datareader(
-        const eprosima::fastdds::rtps::GUID_t& datareader_guid,
+        const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
         const eprosima::fastdds::dds::DomainParticipant* participant,
         const eprosima::fastdds::dds::DataReader* datareader)
 {
@@ -402,10 +399,10 @@ void GraphManager::add_datareader(
 }
 
 void GraphManager::add_datareader(
-        const eprosima::fastdds::rtps::GUID_t& datareader_guid,
+        const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
         const std::string& topic_name,
         const std::string& type_name,
-        const eprosima::fastdds::rtps::GUID_t& participant_guid,
+        const eprosima::fastrtps::rtps::GUID_t& participant_guid,
         const eprosima::fastdds::dds::DataReaderQos& reader_qos)
 {
     const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
@@ -424,7 +421,7 @@ void GraphManager::add_datareader(
 }
 
 void GraphManager::remove_datareader(
-        const eprosima::fastdds::rtps::GUID_t& datareader_guid)
+        const eprosima::fastrtps::rtps::GUID_t& datareader_guid)
 {
     const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
         "rmw_fastrtps_cpp", datareader_guid);
@@ -433,7 +430,7 @@ void GraphManager::remove_datareader(
 }
 
 void GraphManager::associate_entity(
-        const eprosima::fastdds::rtps::GUID_t& entity_guid,
+        const eprosima::fastrtps::rtps::GUID_t& entity_guid,
         const eprosima::fastdds::dds::DomainParticipant* participant,
         const dds::xrce::ObjectKind& entity_kind)
 {
@@ -553,7 +550,7 @@ void GraphManager::update_node_entities_info()
     rmw_dds_common::msg::ParticipantEntitiesInfo entities_info;
     eprosima::fastdds::dds::SampleInfo sample_info;
     if (ros_discovery_datareader_->take_next_sample(&entities_info, &sample_info) ==
-        eprosima::fastdds::dds::RETCODE_OK)
+        eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK)
     {
         if (sample_info.instance_state == eprosima::fastdds::dds::InstanceStateKind::ALIVE_INSTANCE_STATE)
         {
@@ -607,19 +604,14 @@ GraphManager::ParticipantListener::ParticipantListener(
 }
 
 void GraphManager::ParticipantListener::on_participant_discovery(
-        eprosima::fastdds::dds::DomainParticipant* participant,
+        eprosima::fastdds::dds::DomainParticipant* /* participant */,
-        eprosima::fastdds::rtps::ParticipantDiscoveryStatus reason,
+        eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info)
-        const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
-        bool& should_be_ignored)
 {
-    static_cast<void>(participant);
+    switch (info.status)
-    static_cast<void>(should_be_ignored);
-
-    switch (reason)
     {
-        case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT:
+        case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT:
         {
-            auto map = rmw::impl::cpp::parse_key_value(info.user_data);
+            auto map = rmw::impl::cpp::parse_key_value(info.info.m_userData);
             auto name_found = map.find("enclave");
 
             if (map.end() == name_found)
@@ -629,14 +621,14 @@ void GraphManager::ParticipantListener::on_participant_discovery(
             const std::string enclave =
                 std::string(name_found->second.begin(), name_found->second.end());
 
-            const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.guid);
+            const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.info.m_guid);
             graphManager_from_->get_graph_cache().add_participant(gid, enclave);
             break;
         }
-        case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT:
+        case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT:
-        case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT:
+        case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT:
         {
-            const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.guid);
+            const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.info.m_guid);
             graphManager_from_->get_graph_cache().remove_participant(gid);
             break;
         }
@@ -648,133 +640,117 @@ void GraphManager::ParticipantListener::on_participant_discovery(
 }
 
 static eprosima::fastdds::dds::DataWriterQos writer_qos_conversion(
-    const eprosima::fastdds::dds::PublicationBuiltinTopicData& writer_info)
+    const eprosima::fastdds::dds::WriterQos& writer_qos)
 {
     eprosima::fastdds::dds::DataWriterQos datawriter_qos;
-    eprosima::fastdds::dds::RTPSReliableWriterQos reliable_writer_qos;
+    datawriter_qos.durability(writer_qos.m_durability);
-    reliable_writer_qos.disable_positive_acks = writer_info.disable_positive_acks;
+    datawriter_qos.durability_service(writer_qos.m_durabilityService);
-
+    datawriter_qos.deadline(writer_qos.m_deadline);
-    datawriter_qos.durability(writer_info.durability);
+    datawriter_qos.latency_budget(writer_qos.m_latencyBudget);
-    datawriter_qos.durability_service(writer_info.durability_service);
+    datawriter_qos.liveliness(writer_qos.m_liveliness);
-    datawriter_qos.deadline(writer_info.deadline);
+    datawriter_qos.reliability(writer_qos.m_reliability);
-    datawriter_qos.latency_budget(writer_info.latency_budget);
+    datawriter_qos.destination_order(writer_qos.m_destinationOrder);
-    datawriter_qos.liveliness(writer_info.liveliness);
+    datawriter_qos.lifespan(writer_qos.m_lifespan);
-    datawriter_qos.reliability(writer_info.reliability);
+    datawriter_qos.user_data(writer_qos.m_userData);
-    datawriter_qos.lifespan(writer_info.lifespan);
+    datawriter_qos.ownership(writer_qos.m_ownership);
-    datawriter_qos.user_data(writer_info.user_data);
+    datawriter_qos.ownership_strength(writer_qos.m_ownershipStrength);
-    datawriter_qos.ownership(writer_info.ownership);
+    datawriter_qos.publish_mode(writer_qos.m_publishMode);
-    datawriter_qos.ownership_strength(writer_info.ownership_strength);
+    datawriter_qos.representation(writer_qos.representation);
-    datawriter_qos.destination_order(writer_info.destination_order);
+    datawriter_qos.data_sharing(writer_qos.data_sharing);
-    datawriter_qos.reliable_writer_qos(reliable_writer_qos);
-    datawriter_qos.representation(writer_info.representation);
-    datawriter_qos.data_sharing(writer_info.data_sharing);
 
     return datawriter_qos;
 }
 
 static eprosima::fastdds::dds::DataReaderQos reader_qos_conversion(
-    const eprosima::fastdds::rtps::SubscriptionBuiltinTopicData& reader_info)
+    const eprosima::fastdds::dds::ReaderQos& reader_qos)
 {
     eprosima::fastdds::dds::DataReaderQos datareader_qos;
-    eprosima::fastdds::dds::RTPSReliableReaderQos reliable_reader_qos;
-    reliable_reader_qos.disable_positive_acks = reader_info.disable_positive_acks;
 
-    datareader_qos.durability(reader_info.durability);
+    datareader_qos.durability(reader_qos.m_durability);
-    datareader_qos.deadline(reader_info.deadline);
+    datareader_qos.deadline(reader_qos.m_deadline);
-    datareader_qos.latency_budget(reader_info.latency_budget);
+    datareader_qos.latency_budget(reader_qos.m_latencyBudget);
-    datareader_qos.lifespan(reader_info.lifespan);
+    datareader_qos.liveliness(reader_qos.m_liveliness);
-    datareader_qos.liveliness(reader_info.liveliness);
+    datareader_qos.reliability(reader_qos.m_reliability);
-    datareader_qos.reliability(reader_info.reliability);
+    datareader_qos.destination_order(reader_qos.m_destinationOrder);
-    datareader_qos.ownership(reader_info.ownership);
+    datareader_qos.user_data(reader_qos.m_userData);
-    datareader_qos.destination_order(reader_info.destination_order);
+    datareader_qos.ownership(reader_qos.m_ownership);
-    datareader_qos.user_data(reader_info.user_data);
+    datareader_qos.time_based_filter(reader_qos.m_timeBasedFilter);
-    datareader_qos.time_based_filter(reader_info.time_based_filter);
+    datareader_qos.lifespan(reader_qos.m_lifespan);
-    datareader_qos.type_consistency(reader_info.type_consistency);
+    datareader_qos.durability_service(reader_qos.m_durabilityService);
-    datareader_qos.reliable_reader_qos(reliable_reader_qos);
+    eprosima::fastdds::dds::TypeConsistencyQos consistency;
-    datareader_qos.representation(reader_info.representation);
+    consistency.type_consistency = reader_qos.type_consistency;
-    datareader_qos.data_sharing(reader_info.data_sharing);
+    datareader_qos.type_consistency(consistency);
+    datareader_qos.data_sharing(reader_qos.data_sharing);
 
     return datareader_qos;
 }
 
 template <>
-void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastdds::rtps::ReaderDiscoveryStatus, eprosima::fastdds::rtps::SubscriptionBuiltinTopicData>(
+void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastrtps::rtps::ReaderDiscoveryInfo>(
-        eprosima::fastdds::rtps::ReaderDiscoveryStatus reason,
+        const eprosima::fastrtps::rtps::ReaderDiscoveryInfo& reader_info)
-        const eprosima::fastdds::rtps::SubscriptionBuiltinTopicData& reader_info)
 {
-    switch (reason)
+    switch (reader_info.status)
     {
-        case eprosima::fastdds::rtps::ReaderDiscoveryStatus::CHANGED_QOS_READER:
+        case eprosima::fastrtps::rtps::ReaderDiscoveryInfo::CHANGED_QOS_READER:
         {
             return;
         }
-        case eprosima::fastdds::rtps::ReaderDiscoveryStatus::DISCOVERED_READER:
+        case eprosima::fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERED_READER:
         {
-            const std::string topic_name = reader_info.topic_name.to_string();
+            const std::string topic_name = reader_info.info.topicName().to_string();
-            const std::string type_name = reader_info.type_name.to_string();
+            const std::string type_name = reader_info.info.typeName().to_string();
 
-            graphManager_from_->add_datareader(reader_info.guid, topic_name, type_name,
+            graphManager_from_->add_datareader(reader_info.info.guid(), topic_name, type_name,
-                reader_info.participant_guid, reader_qos_conversion(reader_info));
+                iHandle2GUID(reader_info.info.RTPSParticipantKey()), reader_qos_conversion(reader_info.info.m_qos));
             break;
         }
         default:
         {
-            graphManager_from_->remove_datareader(reader_info.guid);
+            graphManager_from_->remove_datareader(reader_info.info.guid());
             break;
         }
     }
 }
 
 template <>
-void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastdds::rtps::WriterDiscoveryStatus, eprosima::fastdds::rtps::PublicationBuiltinTopicData>(
+void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastrtps::rtps::WriterDiscoveryInfo>(
-        eprosima::fastdds::rtps::WriterDiscoveryStatus reason,
+        const eprosima::fastrtps::rtps::WriterDiscoveryInfo& writer_info)
-        const eprosima::fastdds::rtps::PublicationBuiltinTopicData& writer_info)
 {
-    switch (reason)
+    switch (writer_info.status)
     {
-        case eprosima::fastdds::rtps::WriterDiscoveryStatus::CHANGED_QOS_WRITER:
+        case eprosima::fastrtps::rtps::WriterDiscoveryInfo::CHANGED_QOS_WRITER:
         {
             return;
         }
-        case eprosima::fastdds::rtps::WriterDiscoveryStatus::DISCOVERED_WRITER:
+        case eprosima::fastrtps::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER:
         {
-            const std::string topic_name = writer_info.topic_name.to_string();
+            const std::string topic_name = writer_info.info.topicName().to_string();
-            const std::string type_name = writer_info.type_name.to_string();
+            const std::string type_name = writer_info.info.typeName().to_string();
 
-            graphManager_from_->add_datawriter(writer_info.guid, topic_name, type_name,
+            graphManager_from_->add_datawriter(writer_info.info.guid(), topic_name, type_name,
-                writer_info.participant_guid, writer_qos_conversion(writer_info));
+                iHandle2GUID(writer_info.info.RTPSParticipantKey()), writer_qos_conversion(writer_info.info.m_qos));
             break;
         }
         default:
         {
-            graphManager_from_->remove_datawriter(writer_info.guid);
+            graphManager_from_->remove_datawriter(writer_info.info.guid());
             break;
         }
     }
 }
 
-void GraphManager::ParticipantListener::on_data_reader_discovery(
+void GraphManager::ParticipantListener::on_subscriber_discovery(
-        eprosima::fastdds::dds::DomainParticipant* participant,
+        eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-        eprosima::fastdds::rtps::ReaderDiscoveryStatus reason,
+        eprosima::fastrtps::rtps::ReaderDiscoveryInfo&& info)
-        const eprosima::fastdds::dds::SubscriptionBuiltinTopicData& info,
-        bool& should_be_ignored)
 {
-    static_cast<void>(participant);
+    process_discovery_info<eprosima::fastrtps::rtps::ReaderDiscoveryInfo>(info);
-    static_cast<void>(should_be_ignored);
-
-    process_discovery_info<eprosima::fastdds::rtps::ReaderDiscoveryStatus, eprosima::fastdds::rtps::SubscriptionBuiltinTopicData>(reason, info);
 }
 
-void GraphManager::ParticipantListener::on_data_writer_discovery(
+void GraphManager::ParticipantListener::on_publisher_discovery(
-        eprosima::fastdds::dds::DomainParticipant* participant,
+        eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-        eprosima::fastdds::rtps::WriterDiscoveryStatus reason,
+        eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info)
-        const eprosima::fastdds::dds::PublicationBuiltinTopicData& info,
-        bool& should_be_ignored)
 {
-    static_cast<void>(participant);
+    process_discovery_info<eprosima::fastrtps::rtps::WriterDiscoveryInfo>(info);
-    static_cast<void>(should_be_ignored);
-
-    process_discovery_info<eprosima::fastdds::rtps::WriterDiscoveryStatus, eprosima::fastdds::rtps::PublicationBuiltinTopicData>(reason, info);
 }
 
 GraphManager::DatareaderListener::DatareaderListener(

micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp

@@ -41,30 +41,27 @@ ParticipantEntitiesInfoTypeSupport::ParticipantEntitiesInfoTypeSupport()
         ss << message_namespace << "::";
     }
     ss << "dds_::" << message_name << "_";
-    this->set_name(ss.str().c_str());
+    this->setName(ss.str().c_str());
 
     char full_bounded;
-    max_serialized_type_size = 4 + callbacks_->max_serialized_size(full_bounded);
+    m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
 }
 
 bool ParticipantEntitiesInfoTypeSupport::serialize(
-        const void* const data,
+        void * data,
-        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastrtps::rtps::SerializedPayload_t * payload)
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation)
 {
-    static_cast<void>(data_representation);
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-
+        payload->max_size);
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
-        payload.max_size);
     eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
         eprosima::fastcdr::DDS_CDR);
 
     scdr.serialize_encapsulation();
     if (callbacks_->cdr_serialize(data, scdr))
     {
-        payload.encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
+        payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
             CDR_BE : CDR_LE;
-        payload.length = static_cast<uint32_t>(scdr.get_serialized_data_length());
+        payload->length = static_cast<uint32_t>(scdr.get_serialized_data_length());
         return true;
     }
     else
@@ -74,11 +71,11 @@ bool ParticipantEntitiesInfoTypeSupport::serialize(
 }
 
 bool ParticipantEntitiesInfoTypeSupport::deserialize(
-        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastrtps::rtps::SerializedPayload_t * payload,
         void * data)
 {
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-        payload.length);
+        payload->length);
     eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
         eprosima::fastcdr::DDS_CDR);
 
@@ -86,46 +83,35 @@ bool ParticipantEntitiesInfoTypeSupport::deserialize(
     return callbacks_->cdr_deserialize(dcdr, data);
 }
 
-uint32_t ParticipantEntitiesInfoTypeSupport::calculate_serialized_size(
+std::function<uint32_t()> ParticipantEntitiesInfoTypeSupport::getSerializedSizeProvider(
-            const void* const data,
+        void * data)
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation)
+{
+    return [data, this]() -> uint32_t
     {
-    static_cast<void>(data_representation);
-
         return static_cast<uint32_t>(4 + callbacks_->get_serialized_size(data));
+    };
 }
 
-void * ParticipantEntitiesInfoTypeSupport::create_data()
+void * ParticipantEntitiesInfoTypeSupport::createData()
 {
     return static_cast<void *>(nullptr);
 }
 
-void ParticipantEntitiesInfoTypeSupport::delete_data(
+void ParticipantEntitiesInfoTypeSupport::deleteData(
         void * data)
 {
     (void) data;
 }
 
-bool ParticipantEntitiesInfoTypeSupport::compute_key(
+bool ParticipantEntitiesInfoTypeSupport::getKey(
-        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        void * data,
-        eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+        eprosima::fastrtps::rtps::InstanceHandle_t * handle,
-        bool force_md5 /* = false */)
+        bool force_md5)
-{
-    (void) payload;
-    (void) ihandle;
-    (void) force_md5;
-    return is_compute_key_provided;
-}
-
-bool ParticipantEntitiesInfoTypeSupport::compute_key(
-        const void * const data,
-        eprosima::fastdds::rtps::InstanceHandle_t& handle,
-        bool force_md5 /* = false */)
 {
     (void) data;
     (void) handle;
     (void) force_md5;
-    return is_compute_key_provided;
+    return m_isGetKeyDefined;
 }
 
 
@@ -147,30 +133,27 @@ MicrorosGraphInfoTypeSupport::MicrorosGraphInfoTypeSupport()
         ss << message_namespace << "::";
     }
     ss << "dds_::" << message_name << "_";
-    this->set_name(ss.str().c_str());
+    this->setName(ss.str().c_str());
 
     char full_bounded;
-    max_serialized_type_size = 4 + callbacks_->max_serialized_size(full_bounded);
+    m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
 }
 
 bool MicrorosGraphInfoTypeSupport::serialize(
-        const void* const data,
+        void * data,
-        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastrtps::rtps::SerializedPayload_t * payload)
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation)
 {
-    static_cast<void>(data_representation);
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-
+        payload->max_size);
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
-        payload.max_size);
     eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
         eprosima::fastcdr::DDS_CDR);
 
     scdr.serialize_encapsulation();
     if (callbacks_->cdr_serialize(data, scdr))
     {
-        payload.encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
+        payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
             CDR_BE : CDR_LE;
-        payload.length = static_cast<uint32_t>(scdr.get_serialized_data_length());
+        payload->length = static_cast<uint32_t>(scdr.get_serialized_data_length());
         return true;
     }
     else
@@ -180,11 +163,11 @@ bool MicrorosGraphInfoTypeSupport::serialize(
 }
 
 bool MicrorosGraphInfoTypeSupport::deserialize(
-        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastrtps::rtps::SerializedPayload_t * payload,
         void * data)
 {
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-        payload.length);
+        payload->length);
     eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
         eprosima::fastcdr::DDS_CDR);
 
@@ -192,46 +175,35 @@ bool MicrorosGraphInfoTypeSupport::deserialize(
     return callbacks_->cdr_deserialize(dcdr, data);
 }
 
-uint32_t MicrorosGraphInfoTypeSupport::calculate_serialized_size(
+std::function<uint32_t()> MicrorosGraphInfoTypeSupport::getSerializedSizeProvider(
-        const void* const data,
+        void * data)
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation)
+{
+    return [data, this]() -> uint32_t
     {
-    static_cast<void>(data_representation);
-
         return static_cast<uint32_t>(4 + callbacks_->get_serialized_size(data));
+    };
 }
 
-void * MicrorosGraphInfoTypeSupport::create_data()
+void * MicrorosGraphInfoTypeSupport::createData()
 {
     return static_cast<void *>(nullptr);
 }
 
-void MicrorosGraphInfoTypeSupport::delete_data(
+void MicrorosGraphInfoTypeSupport::deleteData(
         void * data)
 {
     (void) data;
 }
 
-bool MicrorosGraphInfoTypeSupport::compute_key(
+bool MicrorosGraphInfoTypeSupport::getKey(
-        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        void * data,
-        eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+        eprosima::fastrtps::rtps::InstanceHandle_t * handle,
-        bool force_md5 /* = false */)
+        bool force_md5)
-{
-    (void) payload;
-    (void) ihandle;
-    (void) force_md5;
-    return is_compute_key_provided;
-}
-
-bool MicrorosGraphInfoTypeSupport::compute_key(
-        const void* const data,
-        eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
-        bool force_md5 /* = false */)
 {
     (void) data;
-    (void) ihandle;
+    (void) handle;
     (void) force_md5;
-    return is_compute_key_provided;
+    return m_isGetKeyDefined;
 }
 
 }  // namespace graph_manager