eProsima · JLBuenoLopez · Apr 16, 2024 · Feb 2, 2024 · Feb 4, 2024 · Mar 4, 2024
diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp
diff --git a/code/DynamicTypesIDLExamples.idl b/code/DynamicTypesIDLExamples.idl
@@ -37,15 +37,15 @@ union TypeObject switch(octet)
 struct PrimitivesStruct
 {
     boolean my_bool;
+    octet my_octet;
     char my_char;
     wchar my_wchar;
-    octet my_octet;
+    long my_long;
+    unsigned long my_ulong;
     int8 my_int8;
     uint8 my_uint8;
     short my_short;
     unsigned short my_ushort;
-    long my_long;
-    unsigned long my_ulong;
     long long my_longlong;
     unsigned long long my_ulonglong;
     float my_float;

diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.hpp b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.hpp
@@ -80,9 +80,9 @@ class HelloWorld
     eProsima_user_DllExport HelloWorld(
             const HelloWorld& x)
     {
-        m_index = x.m_index;
+                    m_index = x.m_index;
 
-        m_message = x.m_message;
+                    m_message = x.m_message;
 
     }
 
@@ -105,9 +105,9 @@ class HelloWorld
             const HelloWorld& x)
     {
 
-        m_index = x.m_index;
+                    m_index = x.m_index;
 
-        m_message = x.m_message;
+                    m_message = x.m_message;
 
         return *this;
     }
@@ -133,7 +133,7 @@ class HelloWorld
             const HelloWorld& x) const
     {
         return (m_index == x.m_index &&
-               m_message == x.m_message);
+           m_message == x.m_message);
     }
 
     /*!
@@ -174,6 +174,7 @@ class HelloWorld
         return m_index;
     }
 
+
     /*!
      * @brief This function copies the value in member message
      * @param _message New value to be copied in member message
@@ -212,6 +213,8 @@ class HelloWorld
         return m_message;
     }
 
+
+
 private:
 
     uint32_t m_index{0};

diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx
@@ -25,6 +25,8 @@
 #include <fastdds/rtps/common/CdrSerialization.hpp>
 
 #include "HelloWorldCdrAux.hpp"
+#include "HelloWorldTypeObjectSupport.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;
@@ -219,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation() const
 {
-    EPROSIMA_LOG_WARNING(XTYPES_TYPE_REPRESENTATION,
-        "TypeObject type representation support disabled in generated code");
+    register_HelloWorld_type_objects();
 }
 
 

diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.cxx b/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.cxx
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.hpp b/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.hpp
@@ -0,0 +1,54 @@
+// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*!
+ * @file HelloWorldTypeObjectSupport.hpp
+ * Header file containing the API required to register the TypeObject representation of the described types in the IDL file
+ *
+ * This file was generated by the tool fastddsgen.
+ */
+
+#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+
+
+#if defined(_WIN32)
+#if defined(EPROSIMA_USER_DLL_EXPORT)
+#define eProsima_user_DllExport __declspec( dllexport )
+#else
+#define eProsima_user_DllExport
+#endif  // EPROSIMA_USER_DLL_EXPORT
+#else
+#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_HelloWorld_type_objects();
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
+
+/**
+ * @brief Register HelloWorld 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.
+ */
+eProsima_user_DllExport void register_HelloWorld_type_identifier();
+
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
+
+#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
diff --git a/code/XMLTester.xml b/code/XMLTester.xml
@@ -4280,15 +4280,15 @@
 <!-->XML_PRIMITIVES<-->
 <struct name="PrimitivesStruct">
     <member name="my_bool" type="boolean"/>
+    <member name="my_octet" type="byte"/>
     <member name="my_char" type="char8"/>
     <member name="my_wchar" type="char16"/>
-    <member name="my_octet" type="octet"/>
+    <member name="my_long" type="int32"/>
+    <member name="my_ulong" type="uint32"/>
     <member name="my_int8" type="int8"/>
     <member name="my_uint8" type="uint8"/>
     <member name="my_short" type="int16"/>
     <member name="my_ushort" type="uint16"/>
-    <member name="my_long" type="int32"/>
-    <member name="my_ulong" type="uint32"/>
     <member name="my_longlong" type="int64"/>
     <member name="my_ulonglong" type="uint64"/>
     <member name="my_float" type="float32"/>
@@ -4331,9 +4331,10 @@
 </struct>
 <!--><-->
 
+<!-- TODO: fix XSD -->
 <!-->XML_TYPEDEF<-->
 <typedef name="MyAliasedEnum" type="nonBasic" nonBasicTypeName="MyEnum"/>
-<!-- TODO: XSD does not allow to set bounds to aliased strings -->
+<!-- XSD does not allow to set bounds to aliased strings -->
 <typedef name="MyAliasedBoundedString" type="string"/>
 <typedef name="MyRecursiveAlias" type="nonBasic" nonBasicTypeName="MyAliasedEnum"/>
 
@@ -4346,8 +4347,7 @@
 
 <!-->XML_SEQUENCES<-->
 <struct name="SequenceStruct">
-    <!-- XML Sequence Type definition does not support unbounded sequences -->
-    <member name="bitmask_sequence" type="nonBasic" nonBasicTypeName="MyBitMask" sequenceMaxLength="1000"/>
+    <member name="bitmask_sequence" type="nonBasic" nonBasicTypeName="MyBitMask" sequenceMaxLength="-1"/>
     <member name="short_sequence" sequenceMaxLength="5" type="int16"/>
 </struct>
 <!--><-->
@@ -4360,8 +4360,7 @@
 
 <!-->XML_MAPS<-->
 <struct name="MapStruct">
-    <!-- XML Map Type definition does not support unbounded maps -->
-    <member name="string_alias_unbounded_map" type="nonBasic" nonBasicTypeName="MyAliasedBoundedString" key_type="string" mapMaxLength="1000"/>
+    <member name="string_alias_unbounded_map" type="nonBasic" nonBasicTypeName="MyAliasedBoundedString" key_type="string" mapMaxLength="-1"/>
     <member name="short_long_map" type="int32" key_type="int16" mapMaxLength="2"/>
 </struct>
 <!--><-->

diff --git a/docs/03-exports/aliases-api.include b/docs/03-exports/aliases-api.include
@@ -150,20 +150,20 @@
 .. |DomainParticipant::enable-monitor-service-api| replace:: :cpp:func:`enable_monitor_service()<eprosima::fastdds::dds::DomainParticipant::enable_monitor_service>`
 .. |DomainParticipant::disable-monitor-service-api| replace:: :cpp:func:`disable_monitor_service()<eprosima::fastdds::dds::DomainParticipant::disable_monitor_service>`
 
+.. |DomainParticipant::get_participant_qos_from_profile| replace:: :cpp:func:`get_participant_qos_from_profile()<eprosima::fastdds::dds::DomainParticipant::get_participant_qos_from_profile>`
 .. |DomainParticipantFactory-api| replace:: :cpp:class:`DomainParticipantFactory<eprosima::fastdds::dds::DomainParticipantFactory>`
+.. |DomainParticipantFactory::check_xml_static_discovery-api| replace:: :cpp:func:`DomainParticipantFactory::check_xml_static_discovery()<eprosima::fastdds::dds::DomainParticipantFactory::check_xml_static_discovery>`
 .. |DomainParticipantFactory::create_participant_with_default_profile-api| replace:: :cpp:func:`create_participant_with_default_profile()<eprosima::fastdds::dds::DomainParticipantFactory::create_participant_with_default_profile>`
 .. |DomainParticipantFactory::create_participant_with_profile-api| replace:: :cpp:func:`create_participant_with_profile()<eprosima::fastdds::dds::DomainParticipantFactory::create_participant_with_profile>`
 .. |DomainParticipantFactory::create_participant-api| replace:: :cpp:func:`create_participant()<eprosima::fastdds::dds::DomainParticipantFactory::create_participant>`
 .. |DomainParticipantFactory::delete_participant-api| replace:: :cpp:func:`delete_participant()<eprosima::fastdds::dds::DomainParticipantFactory::delete_participant>`
 .. |DomainParticipantFactory::get_default_participant_qos-api| replace:: :cpp:func:`get_default_participant_qos()<eprosima::fastdds::dds::DomainParticipantFactory::get_default_participant_qos>`
-.. |DomainParticipant::get_participant_qos_from_profile| replace:: :cpp:func:`get_participant_qos_from_profile()<eprosima::fastdds::dds::DomainParticipant::get_participant_qos_from_profile>`
+.. |DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name-api| replace:: :cpp:func:`DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name()<eprosima::fastdds::dds::DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name>`
 .. |DomainParticipantFactory::get_instance-api| replace:: :cpp:func:`get_instance()<eprosima::fastdds::dds::DomainParticipantFactory::get_instance>`
 .. |DomainParticipantFactory::load_XML_profiles_file-api| replace:: :cpp:func:`load_XML_profiles_file()<eprosima::fastdds::dds::DomainParticipantFactory::load_XML_profiles_file>`
 .. |DomainParticipantFactory::load_XML_profiles_string-api| replace:: :cpp:func:`load_XML_profiles_string()<eprosima::fastdds::dds::DomainParticipantFactory::load_XML_profiles_string>`
 .. |DomainParticipantFactory::set_default_participant_qos-api| replace:: :cpp:func:`set_default_participant_qos()<eprosima::fastdds::dds::DomainParticipantFactory::set_default_participant_qos>`
 .. |DomainParticipantFactory::set_qos-api| replace:: :cpp:func:`DomainParticipantFactory::set_qos()<eprosima::fastdds::dds::DomainParticipantFactory::set_qos>`
-.. |DomainParticipantFactory::check_xml_static_discovery-api| replace:: :cpp:func:`DomainParticipantFactory::check_xml_static_discovery()<eprosima::fastdds::dds::DomainParticipantFactory::check_xml_static_discovery>`
-.. |DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name-api| replace:: :cpp:func:`DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name()<eprosima::fastdds::dds::DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name>`
 
 .. |DomainParticipantFactoryQos-api| replace:: :cpp:class:`DomainParticipantFactoryQos<eprosima::fastdds::dds::DomainParticipantFactoryQos>`
 .. |DomainParticipantFactoryQos::entity_factory-api| replace:: :cpp:func:`entity_factory()<eprosima::fastdds::dds::DomainParticipantFactoryQos::entity_factory>`
@@ -954,35 +954,35 @@
 .. |AnnotationDescriptor-api| replace:: :cpp:class:`AnnotationDescriptor <eprosima::fastdds::dds::AnnotationDescriptor>`
 .. |AnnotationDescriptor::set_value-api| replace:: :cpp:func:`AnnotationDescriptor::set_value() <eprosima::fastdds::dds::AnnotationDescriptor::set_value>`
 .. |DynamicData-api| replace:: :cpp:class:`DynamicData <eprosima::fastdds::dds::DynamicData>`
+.. |DynamicData::get_boolean_value| replace:: :cpp:func:`DynamicData::get_boolean_value <eprosima::fastdds::dds::DynamicData::get_boolean_value>`
+.. |DynamicData::get_complex_value| replace:: :cpp:func:`DynamicData::get_complex_value <eprosima::fastdds::dds::DynamicData::get_complex_value>`
 .. |DynamicData::get_member_id_by_name| replace:: :cpp:func:`DynamicData::get_member_id_by_name <eprosima::fastdds::dds::DynamicData::get_member_id_by_name>`
-.. |DynamicData::loan_value| replace:: :cpp:func:`DynamicData::loan_value <eprosima::fastdds::dds::DynamicData::loan_value>`
-.. |DynamicData::return_loaned_value| replace:: :cpp:func:`DynamicData::return_loaned_value <eprosima::fastdds::dds::DynamicData::return_loaned_value>`
 .. |DynamicData::get_string_value| replace:: :cpp:func:`DynamicData::get_string_value <eprosima::fastdds::dds::DynamicData::get_string_value>`
 .. |DynamicData::get_wstring_value| replace:: :cpp:func:`DynamicData::get_wstring_value <eprosima::fastdds::dds::DynamicData::get_wstring_value>`
-.. |DynamicData::set_string_value| replace:: :cpp:func:`DynamicData::set_string_value <eprosima::fastdds::dds::DynamicData::set_string_value>`
-.. |DynamicData::set_wstring_value| replace:: :cpp:func:`DynamicData::set_wstring_value <eprosima::fastdds::dds::DynamicData::set_wstring_value>`
-.. |DynamicData::get_boolean_value| replace:: :cpp:func:`DynamicData::get_boolean_value <eprosima::fastdds::dds::DynamicData::get_boolean_value>`
+.. |DynamicData::loan_value| replace:: :cpp:func:`DynamicData::loan_value <eprosima::fastdds::dds::DynamicData::loan_value>`
+.. |DynamicData::return_loaned_value| replace:: :cpp:func:`DynamicData::return_loaned_value <eprosima::fastdds::dds::DynamicData::return_loaned_value>`
 .. |DynamicData::set_boolean_value| replace:: :cpp:func:`DynamicData::set_boolean_value <eprosima::fastdds::dds::DynamicData::set_boolean_value>`
-.. |DynamicData::get_complex_value| replace:: :cpp:func:`DynamicData::get_complex_value <eprosima::fastdds::dds::DynamicData::get_complex_value>`
 .. |DynamicData::set_complex_value| replace:: :cpp:func:`DynamicData::set_complex_value <eprosima::fastdds::dds::DynamicData::set_complex_value>`
+.. |DynamicData::set_string_value| replace:: :cpp:func:`DynamicData::set_string_value <eprosima::fastdds::dds::DynamicData::set_string_value>`
+.. |DynamicData::set_wstring_value| replace:: :cpp:func:`DynamicData::set_wstring_value <eprosima::fastdds::dds::DynamicData::set_wstring_value>`
 .. |DynamicDataFactory-api| replace:: :cpp:class:`DynamicDataFactory <eprosima::fastdds::dds::DynamicDataFactory>`
 .. |DynamicPubSubType-api| replace:: :cpp:class:`DynamicPubSubType <eprosima::fastdds::dds::DynamicPubSubType>`
 .. |DynamicType-api| replace:: :cpp:class:`DynamicType <eprosima::fastdds::dds::DynamicType>`
 .. |DynamicTypeBuilder-api| replace:: :cpp:class:`DynamicTypeBuilder <eprosima::fastdds::dds::DynamicTypeBuilder>`
 .. |DynamicTypeBuilder::add_member| replace:: :cpp:func:`DynamicTypeBuilder::add_member <eprosima::fastdds::dds::DynamicTypeBuilder::add_member>`
-.. |DynamicTypeBuilder::apply_annotation| replace:: :cpp:func:`DynamicTypeBuilder::apply_annotation <eprosima::fastdds::dds::DynamicTypeBuilder::apply_annotation>`
 .. |DynamicTypeBuilder::apply_annotation_to_member| replace:: :cpp:func:`DynamicTypeBuilder::apply_annotation_to_member <eprosima::fastdds::dds::DynamicTypeBuilder::apply_annotation_to_member>`
+.. |DynamicTypeBuilder::apply_annotation| replace:: :cpp:func:`DynamicTypeBuilder::apply_annotation <eprosima::fastdds::dds::DynamicTypeBuilder::apply_annotation>`
 .. |DynamicTypeBuilder::build| replace:: :cpp:func:`DynamicTypeBuilder::build <eprosima::fastdds::dds::DynamicTypeBuilder::build>`
 .. |DynamicTypeBuilderFactory-api| replace:: :cpp:class:`DynamicTypeBuilderFactory <eprosima::fastdds::dds::DynamicTypeBuilderFactory>`
-.. |DynamicTypeBuilderFactory::get_primitive_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::get_primitive_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::get_primitive_type>`
-.. |DynamicTypeBuilderFactory::create_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_type>`
-.. |DynamicTypeBuilderFactory::create_type_w_type_object| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_type_w_type_object <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_type_w_type_object>`
-.. |DynamicTypeBuilderFactory::create_string_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_string_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_string_type>`
-.. |DynamicTypeBuilderFactory::create_wstring_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_wstring_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_wstring_type>`
-.. |DynamicTypeBuilderFactory::create_sequence_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_sequence_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_sequence_type>`
 .. |DynamicTypeBuilderFactory::create_array_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_array_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_array_type>`
-.. |DynamicTypeBuilderFactory::create_map_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_map_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_map_type>`
 .. |DynamicTypeBuilderFactory::create_bitmask_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_bitmask_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_bitmask_type>`
+.. |DynamicTypeBuilderFactory::create_map_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_map_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_map_type>`
+.. |DynamicTypeBuilderFactory::create_sequence_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_sequence_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_sequence_type>`
+.. |DynamicTypeBuilderFactory::create_string_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_string_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_string_type>`
+.. |DynamicTypeBuilderFactory::create_type_w_type_object| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_type_w_type_object <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_type_w_type_object>`
+.. |DynamicTypeBuilderFactory::create_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_type>`
+.. |DynamicTypeBuilderFactory::create_wstring_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::create_wstring_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::create_wstring_type>`
+.. |DynamicTypeBuilderFactory::get_primitive_type| replace:: :cpp:func:`DynamicTypeBuilderFactory::get_primitive_type <eprosima::fastdds::dds::DynamicTypeBuilderFactory::get_primitive_type>`
 .. |DynamicTypeMember-api| replace:: :cpp:class:`DynamicTypeMember <eprosima::fastdds::dds::DynamicTypeMember>`
 .. |MemberDescriptor-api| replace:: :cpp:class:`MemberDescriptor <eprosima::fastdds::dds::MemberDescriptor>`
 .. |TypeDescriptor-api| replace:: :cpp:class:`TypeDescriptor <eprosima::fastdds::dds::TypeDescriptor>`