Refs #20335: regenerate types

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Author: JLBuenoLopez

fastdds_python/test/types/CMakeLists.txt

@@ -29,6 +29,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 #Create library for C++ types
 add_library(${PROJECT_NAME} SHARED
+        test_included_modulesTypeObjectSupport.cxx
         test_included_modulesPubSubTypes.cxx
         )
 if(WIN32)
@@ -135,6 +136,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 #Create library for C++ types
 add_library(${PROJECT_NAME} SHARED
+        test_modulesTypeObjectSupport.cxx
         test_modulesPubSubTypes.cxx
         )
 if(WIN32)
@@ -241,6 +243,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 #Create library for C++ types
 add_library(${PROJECT_NAME} SHARED
+        test_completeTypeObjectSupport.cxx
         test_completePubSubTypes.cxx
         )
 if(WIN32)

fastdds_python/test/types/test_complete.hpp

@@ -23,18 +23,13 @@
 #define _FAST_DDS_GENERATED_TEST_COMPLETE_HPP_
 
 #include <array>
-#include <bitset>
 #include <cstdint>
-#include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include <fastcdr/cdr/fixed_size_string.hpp>
-#include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
-#include <fastcdr/exceptions/BadParamException.h>
-
 #include "test_included_modules.hpp"
 
 #if defined(_WIN32)
@@ -65,7 +60,7 @@
  * @brief This class represents the enumeration Color defined by the user in the IDL file.
  * @ingroup test_complete
  */
-enum Color : uint32_t
+enum class Color : uint32_t
 {
     RED,
     GREEN,
@@ -77,16 +72,14 @@ enum Color : uint32_t
  * @brief This class represents the enumeration Material defined by the user in the IDL file.
  * @ingroup test_complete
  */
-enum Material : uint32_t
+enum class Material : uint32_t
 {
     WOOD,
     PLASTIC,
     METAL,
     CONCRETE,
     STONE
 };
-
-
 /*!
  * @brief This class represents the structure StructType defined by the user in the IDL file.
  * @ingroup test_complete
@@ -743,15 +736,13 @@ class StructType
     double m_double_field{0.0};
     bool m_bool_field{false};
     std::string m_string_field;
-    Color m_enum_field{::RED};
-    Material m_enum2_field{::WOOD};
+    Color m_enum_field{Color::RED};
+    Material m_enum2_field{Material::WOOD};
     eprosima::test2::StructType2 m_included_module_struct;
 
 };
 const uint32_t max_array_size = 3;
 const uint32_t max_seq_size = 5;
-
-
 /*!
  * @brief This class represents the structure CompleteTestType defined by the user in the IDL file.
  * @ingroup test_complete
@@ -4030,8 +4021,8 @@ class CompleteTestType
     double m_double_field{0.0};
     bool m_bool_field{false};
     std::string m_string_field;
-    Color m_enum_field{::RED};
-    Material m_enum2_field{::WOOD};
+    Color m_enum_field{Color::RED};
+    Material m_enum2_field{Material::WOOD};
     StructType m_struct_field;
     eprosima::fastcdr::optional<char> m_char_opt_field;
     eprosima::fastcdr::optional<uint8_t> m_uint8_opt_field;
@@ -4059,8 +4050,8 @@ class CompleteTestType
     std::array<float, max_array_size> m_array_float_field{0.0};
     std::array<double, max_array_size> m_array_double_field{0.0};
     std::array<bool, max_array_size> m_array_bool_field{false};
-    std::array<Color, max_array_size> m_array_enum_field{::RED};
-    std::array<Material, max_array_size> m_array_enum2_field{::WOOD};
+    std::array<Color, max_array_size> m_array_enum_field{Color::RED};
+    std::array<Material, max_array_size> m_array_enum2_field{Material::WOOD};
     std::array<StructType, max_array_size> m_array_struct_field;
     std::vector<char> m_bounded_sequence_char_field;
     std::vector<uint8_t> m_bounded_sequence_uint8_field;
@@ -4092,8 +4083,6 @@ class CompleteTestType
     std::vector<StructType> m_unbounded_sequence_struct_field;
 
 };
-
-
 /*!
  * @brief This class represents the structure KeyedCompleteTestType defined by the user in the IDL file.
  * @ingroup test_complete
@@ -7409,8 +7398,8 @@ class KeyedCompleteTestType
     double m_double_field{0.0};
     bool m_bool_field{false};
     std::string m_string_field;
-    Color m_enum_field{::RED};
-    Material m_enum2_field{::WOOD};
+    Color m_enum_field{Color::RED};
+    Material m_enum2_field{Material::WOOD};
     StructType m_struct_field;
     eprosima::fastcdr::optional<char> m_char_opt_field;
     eprosima::fastcdr::optional<uint8_t> m_uint8_opt_field;
@@ -7438,8 +7427,8 @@ class KeyedCompleteTestType
     std::array<float, max_array_size> m_array_float_field{0.0};
     std::array<double, max_array_size> m_array_double_field{0.0};
     std::array<bool, max_array_size> m_array_bool_field{false};
-    std::array<Color, max_array_size> m_array_enum_field{::RED};
-    std::array<Material, max_array_size> m_array_enum2_field{::WOOD};
+    std::array<Color, max_array_size> m_array_enum_field{Color::RED};
+    std::array<Material, max_array_size> m_array_enum2_field{Material::WOOD};
     std::array<StructType, max_array_size> m_array_struct_field;
     std::vector<char> m_bounded_sequence_char_field;
     std::vector<uint8_t> m_bounded_sequence_uint8_field;

fastdds_python/test/types/test_complete.i

@@ -68,8 +68,6 @@ namespace swig {
 
 %traits_penumn(enum Color);
 %traits_penumn(enum Material);
-
-
 ////////////////////////////////////////////////////////
 // Binding for class StructType
 ////////////////////////////////////////////////////////
@@ -262,8 +260,6 @@ namespace swig {
 
 
 
-
-
 ////////////////////////////////////////////////////////
 // Binding for class CompleteTestType
 ////////////////////////////////////////////////////////
@@ -1547,8 +1543,6 @@ namespace swig {
     }
 }
 
-
-
 ////////////////////////////////////////////////////////
 // Binding for class KeyedCompleteTestType
 ////////////////////////////////////////////////////////

fastdds_python/test/types/test_completeCdrAux.hpp

@@ -24,7 +24,7 @@
 
 #include "test_complete.hpp"
 
-constexpr uint32_t CompleteTestType_max_cdr_typesize {78608UL};
+constexpr uint32_t CompleteTestType_max_cdr_typesize {7900UL};
 constexpr uint32_t CompleteTestType_max_key_cdr_typesize {0UL};
 
 
@@ -34,7 +34,7 @@ constexpr uint32_t StructType_max_key_cdr_typesize {0UL};
 
 
 
-constexpr uint32_t KeyedCompleteTestType_max_cdr_typesize {78608UL};
+constexpr uint32_t KeyedCompleteTestType_max_cdr_typesize {7900UL};
 constexpr uint32_t KeyedCompleteTestType_max_key_cdr_typesize {4UL};
 
 
@@ -45,22 +45,16 @@ namespace fastcdr {
 class Cdr;
 class CdrSizeCalculator;
 
-
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const StructType& data);
 
 
 
-
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const CompleteTestType& data);
 
-
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const KeyedCompleteTestType& data);

fastdds_python/test/types/test_completeCdrAux.ipp

@@ -34,8 +34,6 @@ using namespace eprosima::fastcdr::exception;
 namespace eprosima {
 namespace fastcdr {
 
-
-
 template<>
 eProsima_user_DllExport size_t calculate_serialized_size(
         eprosima::fastcdr::CdrSizeCalculator& calculator,
@@ -226,8 +224,6 @@ void serialize_key(
 
 
 
-
-
 template<>
 eProsima_user_DllExport size_t calculate_serialized_size(
         eprosima::fastcdr::CdrSizeCalculator& calculator,
@@ -872,8 +868,6 @@ void serialize_key(
 }
 
 
-
-
 template<>
 eProsima_user_DllExport size_t calculate_serialized_size(
         eprosima::fastcdr::CdrSizeCalculator& calculator,

fastdds_python/test/types/test_completePubSubTypes.cxx

@@ -19,18 +19,18 @@
  * This file was generated by the tool fastddsgen.
  */
 
+#include "test_completePubSubTypes.h"
 
+#include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
 
-#include "test_completePubSubTypes.h"
 #include "test_completeCdrAux.hpp"
+#include "test_completeTypeObjectSupport.hpp"
 
 using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t;
 using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
 using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
 
-
-
 StructTypePubSubType::StructTypePubSubType()
 {
     setName("StructType");
@@ -219,7 +219,10 @@ bool StructTypePubSubType::getKey(
     return true;
 }
 
-
+void StructTypePubSubType::register_type_object_representation() const
+{
+    register_test_complete_type_objects();
+}
 
 
 
@@ -411,7 +414,10 @@ bool CompleteTestTypePubSubType::getKey(
     return true;
 }
 
-
+void CompleteTestTypePubSubType::register_type_object_representation() const
+{
+    register_test_complete_type_objects();
+}
 
 KeyedCompleteTestTypePubSubType::KeyedCompleteTestTypePubSubType()
 {
@@ -601,6 +607,11 @@ bool KeyedCompleteTestTypePubSubType::getKey(
     return true;
 }
 
+void KeyedCompleteTestTypePubSubType::register_type_object_representation() const
+{
+    register_test_complete_type_objects();
+}
+
 
 // Include auxiliary functions like for serializing/deserializing.
 #include "test_completeCdrAux.ipp"

fastdds_python/test/types/test_completePubSubTypes.h

@@ -39,8 +39,6 @@
 #endif  // GEN_API_VER
 
 
-
-
 /*!
  * @brief This class represents the TopicDataType of the type StructType defined by the user in the IDL file.
  * @ingroup test_complete
@@ -91,6 +89,9 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     eProsima_user_DllExport void deleteData(
             void* data) override;
 
+    //Register TypeObject representation in Fast DDS TypeObjectRegistry
+    eProsima_user_DllExport void register_type_object_representation() const override;
+
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override
     {
@@ -131,8 +132,6 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 
 
-
-
 /*!
  * @brief This class represents the TopicDataType of the type CompleteTestType defined by the user in the IDL file.
  * @ingroup test_complete
@@ -183,6 +182,9 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     eProsima_user_DllExport void deleteData(
             void* data) override;
 
+    //Register TypeObject representation in Fast DDS TypeObjectRegistry
+    eProsima_user_DllExport void register_type_object_representation() const override;
+
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override
     {
@@ -221,8 +223,6 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 };
 
-
-
 /*!
  * @brief This class represents the TopicDataType of the type KeyedCompleteTestType defined by the user in the IDL file.
  * @ingroup test_complete
@@ -273,6 +273,9 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
     eProsima_user_DllExport void deleteData(
             void* data) override;
 
+    //Register TypeObject representation in Fast DDS TypeObjectRegistry
+    eProsima_user_DllExport void register_type_object_representation() const override;
+
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override
     {