Refactor TopicDataType (#165)

* Refs #21349. Regenerate source code Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #21349. Fix Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Jul 18, 2024 · 691e75e · 691e75e
1 parent 1d811c3
commit 691e75e
Show file tree

Hide file tree

Showing 12 changed files with 636 additions and 820 deletions.
diff --git a/fastdds_python/test/types/test_completePubSubTypes.cxx b/fastdds_python/test/types/test_completePubSubTypes.cxx
diff --git a/fastdds_python/test/types/test_completePubSubTypes.hpp b/fastdds_python/test/types/test_completePubSubTypes.hpp
@@ -33,10 +33,10 @@
 
 #include "test_included_modulesPubSubTypes.hpp"
 
-#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
+#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
 #error \
     Generated test_complete is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
-#endif  // GEN_API_VER
+#endif  // FASTDDS_GEN_API_VER
 
 
 /*!
@@ -55,38 +55,30 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool serialize(
             const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
-    {
-        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     eProsima_user_DllExport bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             void* data) override;
 
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data) override
-    {
-        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+    eProsima_user_DllExport uint32_t calculate_serialized_size(
             const void* const data,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-    eProsima_user_DllExport bool getKey(
+    eProsima_user_DllExport bool compute_key(
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            bool force_md5 = false) override;
+
+    eProsima_user_DllExport bool compute_key(
             const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
             bool force_md5 = false) override;
 
-    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* create_data() override;
 
-    eProsima_user_DllExport void deleteData(
+    eProsima_user_DllExport void delete_data(
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
@@ -101,10 +93,6 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-    eProsima_user_DllExport inline bool is_plain() const override
-    {
-        return false;
-    }
 
     eProsima_user_DllExport inline bool is_plain(
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
@@ -125,8 +113,10 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    eprosima::fastdds::MD5 m_md5;
-    unsigned char* m_keyBuffer;
+private:
+
+    eprosima::fastdds::MD5 md5_;
+    unsigned char* key_buffer_;
 
 };
 
@@ -148,38 +138,30 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool serialize(
             const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
-    {
-        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     eProsima_user_DllExport bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             void* data) override;
 
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data) override
-    {
-        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+    eProsima_user_DllExport uint32_t calculate_serialized_size(
             const void* const data,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-    eProsima_user_DllExport bool getKey(
+    eProsima_user_DllExport bool compute_key(
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            bool force_md5 = false) override;
+
+    eProsima_user_DllExport bool compute_key(
             const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
             bool force_md5 = false) override;
 
-    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* create_data() override;
 
-    eProsima_user_DllExport void deleteData(
+    eProsima_user_DllExport void delete_data(
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
@@ -194,10 +176,6 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-    eProsima_user_DllExport inline bool is_plain() const override
-    {
-        return false;
-    }
 
     eProsima_user_DllExport inline bool is_plain(
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
@@ -218,8 +196,10 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    eprosima::fastdds::MD5 m_md5;
-    unsigned char* m_keyBuffer;
+private:
+
+    eprosima::fastdds::MD5 md5_;
+    unsigned char* key_buffer_;
 
 };
 
@@ -239,38 +219,30 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
 
     eProsima_user_DllExport bool serialize(
             const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
-    {
-        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     eProsima_user_DllExport bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             void* data) override;
 
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data) override
-    {
-        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+    eProsima_user_DllExport uint32_t calculate_serialized_size(
             const void* const data,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-    eProsima_user_DllExport bool getKey(
+    eProsima_user_DllExport bool compute_key(
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            bool force_md5 = false) override;
+
+    eProsima_user_DllExport bool compute_key(
             const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
             bool force_md5 = false) override;
 
-    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* create_data() override;
 
-    eProsima_user_DllExport void deleteData(
+    eProsima_user_DllExport void delete_data(
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
@@ -285,10 +257,6 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-    eProsima_user_DllExport inline bool is_plain() const override
-    {
-        return false;
-    }
 
     eProsima_user_DllExport inline bool is_plain(
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
@@ -309,8 +277,10 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    eprosima::fastdds::MD5 m_md5;
-    unsigned char* m_keyBuffer;
+private:
+
+    eprosima::fastdds::MD5 md5_;
+    unsigned char* key_buffer_;
 
 };
 

diff --git a/fastdds_python/test/types/test_completePubSubTypes.i b/fastdds_python/test/types/test_completePubSubTypes.i
@@ -25,6 +25,6 @@
 #include "test_completePubSubTypes.hpp"
 %}
 
-#define GEN_API_VER 2
+#define FASTDDS_GEN_API_VER 3
 
 %include "test_completePubSubTypes.hpp"