DynamicTypeBuilderFactoryImpl::create_type_w_type_object implementati…

…on (#4368) * Refs #20335: add verbatim to DynamicTypeBuilder Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: check minimal TypeObject consistency. Check consistency before registering Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: DynamicTypeBuilderFactoryImpl::create_type_w_type_object implementation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: correctly pass reference to DynamicDataImpl::delete_data Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: create TypeObjectUtils and TypeObjectRegistry mock classes Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: fix test suite build Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: fix DDS Filter tests Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: fix warning by reverting changes Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: linters Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: fix bitmask generation Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: Fix content filter Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #20335: fix after rebase Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: regenerate types Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: fix test after union refactor Signed-off-by: JLBuenoLopez-eProsima <[email protected]> --------- Signed-off-by: JLBuenoLopez-eProsima <[email protected]> Signed-off-by: Ricardo González Moreno <[email protected]> Co-authored-by: Ricardo González Moreno <[email protected]>
eProsima · Mar 27, 2024 · a574750 · a574750
1 parent b2037b3
commit a574750
Show file tree

Hide file tree

Showing 36 changed files with 6,208 additions and 4,827 deletions.
diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx
@@ -36,10 +36,10 @@ samplePubSubType::samplePubSubType()
     setName("sample");
     uint32_t type_size =
 #if FASTCDR_VERSION_MAJOR == 1
-            static_cast<uint32_t>(sample::getMaxCdrSerializedSize());
+        static_cast<uint32_t>(sample::getMaxCdrSerializedSize());
 #else
-            sample_max_cdr_typesize;
-#endif // if FASTCDR_VERSION_MAJOR == 1
+        sample_max_cdr_typesize;
+#endif
     type_size += static_cast<uint32_t>(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */
     m_typeSize = type_size + 4; /*encapsulation*/
     m_isGetKeyDefined = true;
@@ -150,8 +150,8 @@ std::function<uint32_t()> samplePubSubType::getSerializedSizeProvider(
                        eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2);
                    size_t current_alignment {0};
                    return static_cast<uint32_t>(calculator.calculate_serialized_size(
-                              *static_cast<sample*>(data), current_alignment)) +
-                          4u /*encapsulation*/;
+                               *static_cast<sample*>(data), current_alignment)) +
+                           4u /*encapsulation*/;
                }
                catch (eprosima::fastcdr::exception::Exception& /*exception*/)
                {
@@ -189,8 +189,7 @@ bool samplePubSubType::getKey(
             sample_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS,
-            eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
 #if FASTCDR_VERSION_MAJOR == 1
     p_type->serializeKey(ser);
 #else
@@ -225,5 +224,6 @@ void samplePubSubType::register_type_object_representation() const
     register_sample_type_objects();
 }
 
+
 // Include auxiliary functions like for serializing/deserializing.
 #include "sampleCdrAux.ipp"
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp
@@ -63,7 +63,7 @@ class DynamicDataFactory : public std::enable_shared_from_this<DynamicDataFactor
      * @retval RETCODE_OK is otherwise returned.
      */
     FASTDDS_EXPORTED_API virtual ReturnCode_t delete_data(
-            traits<DynamicData>::ref_type data) = 0;
+            traits<DynamicData>::ref_type& data) = 0;
 
 protected:
 

diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp
@@ -79,7 +79,6 @@ class DynamicTypeBuilderFactory : public std::enable_shared_from_this<DynamicTyp
 
     /*!
      * Creates a new @ref DynamicTypeBuilder reference based on the given @ref TypeObject instance.
-     * @remark Not implemented yet.
      * @param[in] type_object @ref TypeObject instance to be used.
      * @return New @ref DynamicTypeBuilder reference. Nil reference returned in error case.
      */

diff --git a/include/fastdds/dds/xtypes/type_representation/ITypeObjectRegistry.hpp b/include/fastdds/dds/xtypes/type_representation/ITypeObjectRegistry.hpp
@@ -35,9 +35,9 @@ namespace xtypes {
 struct TypeObjectPair
 {
     // Minimal TypeObject
-    MinimalTypeObject minimal_type_object;
+    TypeObject minimal_type_object;
     // Complete TypeObject
-    CompleteTypeObject complete_type_object;
+    TypeObject complete_type_object;
 };
 
 class ITypeObjectRegistry

diff --git a/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp b/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
@@ -35,6 +35,9 @@
 namespace eprosima {
 namespace fastdds {
 namespace dds {
+
+class DynamicTypeBuilderFactoryImpl;
+
 namespace xtypes {
 
 class TypeObjectRegistry;
@@ -1867,6 +1870,7 @@ class TypeObjectUtils
 private:
 
     friend class TypeObjectRegistry;
+    friend class eprosima::fastdds::dds::DynamicTypeBuilderFactoryImpl;
 
     // Class with only static methods
     TypeObjectUtils() = delete;
@@ -2414,6 +2418,16 @@ class TypeObjectUtils
     static void complete_struct_type_consistency(
             const CompleteStructType& complete_struct_type);
 
+    /**
+     * @brief Check MinimalStructType consistency.
+     *
+     * @param[in] minimal_struct_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given MinimalStructType
+     *            is not consistent.
+     */
+    static void minimal_struct_type_consistency(
+            const MinimalStructType& minimal_struct_type);
+
     /**
      * @brief Check UnionCaseLabelSeq consistency.
      *
@@ -2516,6 +2530,16 @@ class TypeObjectUtils
     static void complete_union_type_consistency(
             const CompleteUnionType& complete_union_type);
 
+    /**
+     * @brief Check MinimalUnionType consistency.
+     *
+     * @param[in] minimal_union_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalUnionType is not consistent.
+     */
+    static void minimal_union_type_consistency(
+            const MinimalUnionType& minimal_union_type);
+
     /**
      * @brief Check that the annotation value is of the same type as the given TypeIdentifier.
      *
@@ -2578,6 +2602,16 @@ class TypeObjectUtils
     static void complete_annotation_type_consistency(
             const CompleteAnnotationType& complete_annotation_type);
 
+    /**
+     * @brief Check MinimalAnnotationType consistency.
+     *
+     * @param[in] minimal_annotation_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalAnnotationType is not consistent.
+     */
+    static void minimal_annotation_type_consistency(
+            const MinimalAnnotationType& minimal_annotation_type);
+
     /**
      * @brief Check CommonAliasBody consistency.
      *
@@ -2628,6 +2662,16 @@ class TypeObjectUtils
     static void complete_alias_type_consistency(
             const CompleteAliasType& complete_alias_type);
 
+    /**
+     * @brief Check MinimalAliasType consistency.
+     *
+     * @param[in] minimal_alias_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalAliasType is not consistent.
+     */
+    static void minimal_alias_type_consistency(
+            const MinimalAliasType& minimal_alias_type);
+
     /**
      * @brief Check CompleteElementDetail consistency.
      *
@@ -2678,6 +2722,16 @@ class TypeObjectUtils
     static void complete_sequence_type_consistency(
             const CompleteSequenceType& complete_sequence_type);
 
+    /**
+     * @brief Check MinimalSequenceType consistency.
+     *
+     * @param[in] minimal_sequence_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalSequenceType is not consistent.
+     */
+    static void minimal_sequence_type_consistency(
+            const MinimalSequenceType& minimal_sequence_type);
+
     /**
      * @brief Check CommonArrayHeader consistency.
      *
@@ -2708,6 +2762,16 @@ class TypeObjectUtils
     static void complete_array_type_consistency(
             const CompleteArrayType& complete_array_type);
 
+    /**
+     * @brief Check MinimalArrayType consistency.
+     *
+     * @param[in] minimal_array_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalArrayType is not consistent.
+     */
+    static void minimal_array_type_consistency(
+            const MinimalArrayType& minimal_array_type);
+
     /**
      * @brief Check CompleteMapType consistency.
      *
@@ -2718,6 +2782,16 @@ class TypeObjectUtils
     static void complete_map_type_consistency(
             const CompleteMapType& complete_map_type);
 
+    /**
+     * @brief Check MinimalMapType consistency.
+     *
+     * @param[in] minimal_map_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalMapType is not consistent.
+     */
+    static void minimal_map_type_consistency(
+            const MinimalMapType& minimal_map_type);
+
     /**
      * @brief Check CommonEnumeratedLiteral consistency.
      *
@@ -2802,6 +2876,16 @@ class TypeObjectUtils
     static void complete_enumerated_type_consistency(
             const CompleteEnumeratedType& complete_enumerated_type);
 
+    /**
+     * @brief Check MinimalEnumeratedType consistency.
+     *
+     * @param[in] minimal_enumerated_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalEnumeratedType is not consistent.
+     */
+    static void minimal_enumerated_type_consistency(
+            const MinimalEnumeratedType& minimal_enumerated_type);
+
     /**
      * @brief Check bitflag position consistency.
      *
@@ -2852,6 +2936,16 @@ class TypeObjectUtils
     static void complete_bitmask_type_consistency(
             const CompleteBitmaskType& complete_bitmask_type);
 
+    /**
+     * @brief Check MinimalBitmaskType consistency.
+     *
+     * @param[in] minimal_bitmask_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalBitmaskType is not consistent.
+     */
+    static void minimal_bitmask_type_consistency(
+            const MinimalBitmaskType& minimal_bitmask_type);
+
     /**
      * @brief Check consistency between the holder type and the bitcount.
      *
@@ -2913,6 +3007,16 @@ class TypeObjectUtils
     static void complete_bitset_type_consistency(
             const CompleteBitsetType& complete_bitset_type);
 
+    /**
+     * @brief Check MinimalBitsetType consistency.
+     *
+     * @param[in] minimal_bitset_type Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalBitsetType is not consistent.
+     */
+    static void minimal_bitset_type_consistency(
+            const MinimalBitsetType& minimal_bitset_type);
+
     /**
      * @brief Check CompleteTypeObject consistency.
      *
@@ -2923,6 +3027,26 @@ class TypeObjectUtils
     static void complete_type_object_consistency(
             const CompleteTypeObject& complete_type_object);
 
+    /**
+     * @brief Check MinimalTypeObject consistency.
+     *
+     * @param[in] minimal_type_object Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            MinimalTypeObject is not consistent.
+     */
+    static void minimal_type_object_consistency(
+            const MinimalTypeObject& minimal_type_object);
+
+    /**
+     * @brief Check TypeObject consistency.
+     *
+     * @param[in] type_object Instance to be checked.
+     * @exception eprosima::fastdds::dds::xtypes::InvalidArgumentError exception if the given
+     *            TypeObject is not consistent.
+     */
+    static void type_object_consistency(
+            const TypeObject& type_object);
+
 };
 
 } // xtypes