TypeObjectRegistry refactor (#132)

* Refs #21044. Regenerate idl files Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21044. Regenerate idl files Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Jun 14, 2024 · e42e26d · e42e26d
1 parent 7b27cf7
commit e42e26d
Show file tree

Hide file tree

Showing 16 changed files with 5,703 additions and 64,068 deletions.
diff --git a/fastdds_python/test/types/test_completePubSubTypes.cxx b/fastdds_python/test/types/test_completePubSubTypes.cxx
@@ -219,9 +219,9 @@ bool StructTypePubSubType::getKey(
     return true;
 }
 
-void StructTypePubSubType::register_type_object_representation() const
+void StructTypePubSubType::register_type_object_representation()
 {
-    register_test_complete_type_objects();
+    register_StructType_type_identifier(type_identifiers_);
 }
 
 
@@ -414,9 +414,9 @@ bool CompleteTestTypePubSubType::getKey(
     return true;
 }
 
-void CompleteTestTypePubSubType::register_type_object_representation() const
+void CompleteTestTypePubSubType::register_type_object_representation()
 {
-    register_test_complete_type_objects();
+    register_CompleteTestType_type_identifier(type_identifiers_);
 }
 
 KeyedCompleteTestTypePubSubType::KeyedCompleteTestTypePubSubType()
@@ -607,9 +607,9 @@ bool KeyedCompleteTestTypePubSubType::getKey(
     return true;
 }
 
-void KeyedCompleteTestTypePubSubType::register_type_object_representation() const
+void KeyedCompleteTestTypePubSubType::register_type_object_representation()
 {
-    register_test_complete_type_objects();
+    register_KeyedCompleteTestType_type_identifier(type_identifiers_);
 }
 
 

diff --git a/fastdds_python/test/types/test_completePubSubTypes.h b/fastdds_python/test/types/test_completePubSubTypes.h
@@ -90,7 +90,7 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() const override;
+    eProsima_user_DllExport void register_type_object_representation() override;
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override
@@ -183,7 +183,7 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() const override;
+    eProsima_user_DllExport void register_type_object_representation() override;
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override
@@ -274,7 +274,7 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() const override;
+    eProsima_user_DllExport void register_type_object_representation() override;
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override

diff --git a/fastdds_python/test/types/test_completeTypeObjectSupport.cxx b/fastdds_python/test/types/test_completeTypeObjectSupport.cxx
diff --git a/fastdds_python/test/types/test_completeTypeObjectSupport.hpp b/fastdds_python/test/types/test_completeTypeObjectSupport.hpp
@@ -36,13 +36,32 @@
 #define eProsima_user_DllExport
 #endif  // _WIN32
 
-/**
- * @brief Register every TypeObject representation defined in the IDL file in Fast DDS TypeObjectRegistry.
- */
-eProsima_user_DllExport void register_test_complete_type_objects();
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
+/**
+ * @brief Register Color related TypeIdentifier.
+ *        Fully-descriptive TypeIdentifiers are directly registered.
+ *        Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
+ *        indirectly registered as well.
+ *
+ * @param[out] TypeIdentifier of the registered type.
+ *             The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
+ *             Invalid TypeIdentifier is returned in case of error.
+ */
+eProsima_user_DllExport void register_Color_type_identifier(
+        eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
+/**
+ * @brief Register Material related TypeIdentifier.
+ *        Fully-descriptive TypeIdentifiers are directly registered.
+ *        Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
+ *        indirectly registered as well.
+ *
+ * @param[out] TypeIdentifier of the registered type.
+ *             The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
+ *             Invalid TypeIdentifier is returned in case of error.
+ */
+eProsima_user_DllExport void register_Material_type_identifier(
+        eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
 /**
  * @brief Register StructType related TypeIdentifier.
  *        Fully-descriptive TypeIdentifiers are directly registered.
@@ -54,7 +73,7 @@ eProsima_user_DllExport void register_test_complete_type_objects();
  *             Invalid TypeIdentifier is returned in case of error.
  */
 eProsima_user_DllExport void register_StructType_type_identifier(
-        eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
+        eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
 /**
  * @brief Register CompleteTestType related TypeIdentifier.
  *        Fully-descriptive TypeIdentifiers are directly registered.
@@ -66,7 +85,7 @@ eProsima_user_DllExport void register_StructType_type_identifier(
  *             Invalid TypeIdentifier is returned in case of error.
  */
 eProsima_user_DllExport void register_CompleteTestType_type_identifier(
-        eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
+        eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
 /**
  * @brief Register KeyedCompleteTestType related TypeIdentifier.
  *        Fully-descriptive TypeIdentifiers are directly registered.
@@ -78,7 +97,7 @@ eProsima_user_DllExport void register_CompleteTestType_type_identifier(
  *             Invalid TypeIdentifier is returned in case of error.
  */
 eProsima_user_DllExport void register_KeyedCompleteTestType_type_identifier(
-        eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
+        eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
 
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

diff --git a/fastdds_python/test/types/test_included_modulesPubSubTypes.cxx b/fastdds_python/test/types/test_included_modulesPubSubTypes.cxx
@@ -221,9 +221,9 @@ namespace eprosima {
             return true;
         }
 
-        void StructType2PubSubType::register_type_object_representation() const
+        void StructType2PubSubType::register_type_object_representation()
         {
-            register_test_included_modules_type_objects();
+            register_StructType2_type_identifier(type_identifiers_);
         }
 
     } // namespace test2

diff --git a/fastdds_python/test/types/test_included_modulesPubSubTypes.h b/fastdds_python/test/types/test_included_modulesPubSubTypes.h
@@ -93,7 +93,7 @@ namespace eprosima
                     void* data) override;
 
             //Register TypeObject representation in Fast DDS TypeObjectRegistry
-            eProsima_user_DllExport void register_type_object_representation() const override;
+            eProsima_user_DllExport void register_type_object_representation() override;
 
         #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
             eProsima_user_DllExport inline bool is_bounded() const override