TypeObjectRegistry implementation (#3996)

* Refs #19837: add TypeObjectRegistry::register_type_identifier test Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::register_type_identifier implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: test fixes Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: add TypeObjectUtils::complete_type_object_consistency Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::register_type_object implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::register_type_object test Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_type_object skeleton Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_alias_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: use const references in ranged for loops Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_annotation_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_struct_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_union_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_bitset_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_sequence_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_array_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_map_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_enumerated_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::build_minimal_from_complete_bitmask_type implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::get_type_identifier Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: fix tests Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObject::get_type_identifiers implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: add TypeObject::get_type_identifiers test Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: add TypeObject::get_type_objects tests Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::get_type_objects implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry constructor implementation. Register primitive TypeIdentifiers Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::register_type_object implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::get_type_object implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: add precondition to public API Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::get_type_information implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::is_builtin_annotation implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::is_type_identifier_known implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectRegistry::get_type_dependencies impl Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: linters Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: apply review suggestion, protect against concurrent access to collections Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: apply review suggestion, rename to calculate_type_identifier Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: define NO_DEPENDENCIES constant Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: apply review suggestions to TypeObjectRegistry implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: apply review suggestions, imporve TypeObjectRegistry tests Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: TypeObjectUtils::direct_hash_type_identifier_consistency impl Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: linters Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: remove Windows warning Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: regenerate code to avoid Clang warning Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #19837: use ExtensibilityKind and TryConstructKind defined in DynamicType IDL Signed-off-by: JLBuenoLopez-eProsima <[email protected]> --------- Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
eProsima · Jan 9, 2024 · 704a60b · 704a60b
1 parent dcbd61e
commit 704a60b
Show file tree

Hide file tree

Showing 15 changed files with 1,871 additions and 217 deletions.
diff --git a/include/fastdds/dds/xtypes/common.hpp b/include/fastdds/dds/xtypes/common.hpp
@@ -25,26 +25,6 @@ namespace fastdds {
 namespace dds {
 namespace xtypes {
 
-/**
- * @brief Extensibility kinds (@extensibility annotation)
- */
-enum ExtensibilityKind
-{
-    FINAL,
-    APPENDABLE,
-    MUTABLE
-};
-
-/**
- * @brief Try construct kinds (@try_construct annotation)
- */
-enum TryConstructKind
-{
-    USE_DEFAULT,
-    DISCARD,
-    TRIM
-};
-
 /**
  * @brief EquivalenceKind values
  */

diff --git a/include/fastdds/dds/xtypes/type_representation/TypeObjectRegistry.hpp b/include/fastdds/dds/xtypes/type_representation/TypeObjectRegistry.hpp
diff --git a/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp b/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
@@ -25,8 +25,8 @@
 #include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 
-#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/xtypes/common.hpp>
+#include <fastdds/dds/xtypes/dynamic_types/Types.hpp>
 #include <fastdds/dds/xtypes/exception/Exception.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 #include <fastrtps/fastrtps_dll.h>
@@ -36,6 +36,8 @@ namespace fastdds {
 namespace dds {
 namespace xtypes {
 
+class TypeObjectRegistry;
+
 using ReturnCode_t = eprosima::fastdds::dds::ReturnCode_t;
 
 class TypeObjectUtils
@@ -63,7 +65,7 @@ class TypeObjectUtils
      * @return CollectionElementFlag instance.
      */
     RTPS_DllAPI static CollectionElementFlag build_collection_element_flag(
-            TryConstructKind try_construct_kind,
+            eprosima::fastdds::dds::TryConstructKind try_construct_kind,
             bool external);
 
     /**
@@ -79,7 +81,7 @@ class TypeObjectUtils
      * @return StructMemberFlag instance.
      */
     RTPS_DllAPI static StructMemberFlag build_struct_member_flag(
-            TryConstructKind try_construct_kind,
+            eprosima::fastdds::dds::TryConstructKind try_construct_kind,
             bool optional,
             bool must_understand,
             bool key,
@@ -94,7 +96,7 @@ class TypeObjectUtils
      * @return UnionMemberFlag instance.
      */
     RTPS_DllAPI static UnionMemberFlag build_union_member_flag(
-            TryConstructKind try_construct_kind,
+            eprosima::fastdds::dds::TryConstructKind try_construct_kind,
             bool default_member,
             bool external);
 
@@ -106,7 +108,7 @@ class TypeObjectUtils
      * @return UnionDiscriminatorFlag instance.
      */
     RTPS_DllAPI static UnionDiscriminatorFlag build_union_discriminator_flag(
-            TryConstructKind try_construct_kind,
+            eprosima::fastdds::dds::TryConstructKind try_construct_kind,
             bool key);
 
     /**
@@ -134,7 +136,7 @@ class TypeObjectUtils
      * @return StructTypeFlag instance.
      */
     RTPS_DllAPI static StructTypeFlag build_struct_type_flag(
-            ExtensibilityKind extensibility_kind,
+            eprosima::fastdds::dds::ExtensibilityKind extensibility_kind,
             bool nested,
             bool autoid_hash);
 
@@ -147,7 +149,7 @@ class TypeObjectUtils
      * @return UnionTypeFlag instance.
      */
     RTPS_DllAPI static UnionTypeFlag build_union_type_flag(
-            ExtensibilityKind extensibility_kind,
+            eprosima::fastdds::dds::ExtensibilityKind extensibility_kind,
             bool nested,
             bool autoid_hash);
 
@@ -1859,6 +1861,8 @@ class TypeObjectUtils
 
 private:
 
+    friend class TypeObjectRegistry;
+
     // Class with only static methods
     TypeObjectUtils() = delete;
     ~TypeObjectUtils() = delete;
@@ -1875,7 +1879,7 @@ class TypeObjectUtils
      */
     static void set_try_construct_behavior(
             MemberFlag& member_flag,
-            TryConstructKind try_construct_kind);
+            eprosima::fastdds::dds::TryConstructKind try_construct_kind);
 
     /**
      * @brief Set the TypeFlag object.
@@ -1887,7 +1891,7 @@ class TypeObjectUtils
      */
     static void set_type_flag(
             TypeFlag& type_flag,
-            ExtensibilityKind extensibility_kind,
+            eprosima::fastdds::dds::ExtensibilityKind extensibility_kind,
             bool nested,
             bool autoid_hash);
 
@@ -1899,7 +1903,7 @@ class TypeObjectUtils
      */
     static void set_extensibility_kind(
             TypeFlag& type_flag,
-            ExtensibilityKind extensibility_kind);
+            eprosima::fastdds::dds::ExtensibilityKind extensibility_kind);
 
     /**
      * @brief Check if a given TypeIdentifier is fully-descriptive.
@@ -2913,6 +2917,16 @@ class TypeObjectUtils
     static void complete_bitset_type_consistency(
             const CompleteBitsetType& complete_bitset_type);
 
+    /**
+     * @brief Check CompleteTypeObject consistency.
+     *
+     * @param[in] complete_type_object Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            CompleteTypeObject is not consistent.
+     */
+    static void complete_type_object_consistency(
+            const CompleteTypeObject& complete_type_object);
+
 };
 
 } // xtypes

diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -168,6 +168,7 @@ set(${PROJECT_NAME}_source_files
     dynamic-types/DynamicDataHelper.cpp
 
     fastdds/xtypes/exception/Exception.cpp
+    fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
     fastdds/xtypes/type_representation/TypeObjectUtils.cpp
     fastdds/xtypes/type_representation/TypeObjectRegistry.cpp