[19648] TypeObjectUtils class

include/fastdds/dds/core/policy/QosPolicies.hpp

@@ -2510,9 +2510,9 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy
 namespace xtypes {
 
 /**
- * Class xtypes::TypeInformation
+ * Class xtypes::TypeInformationParameter
  */
-class TypeInformation : public Parameter_t, public QosPolicy
+class TypeInformationParameter : public Parameter_t, public QosPolicy
 {
 public:
 
@@ -2522,7 +2522,7 @@ class TypeInformation : public Parameter_t, public QosPolicy
     /**
      * @brief Constructor
      */
-    RTPS_DllAPI TypeInformation()
+    RTPS_DllAPI TypeInformationParameter()
         : Parameter_t(PID_TYPE_INFORMATION, 0)
         , QosPolicy(false)
         , type_information()
@@ -2533,10 +2533,10 @@ class TypeInformation : public Parameter_t, public QosPolicy
     /**
      * @brief Copy constructor
      *
-     * @param type Another instance of TypeInformation
+     * @param type Another instance of TypeInformationParameter
      */
-    RTPS_DllAPI TypeInformation(
-            const TypeInformation& type)
+    RTPS_DllAPI TypeInformationParameter(
+            const TypeInformationParameter& type)
         : Parameter_t(type.Pid, type.length)
         , QosPolicy(type.send_always_)
         , type_information(type.type_information)
@@ -2549,7 +2549,7 @@ class TypeInformation : public Parameter_t, public QosPolicy
      *
      * @param info fastrtps::types::TypeInformation to be set
      */
-    RTPS_DllAPI TypeInformation(
+    RTPS_DllAPI TypeInformationParameter(
             const fastrtps::types::TypeInformation& info)
         : Parameter_t(PID_TYPE_INFORMATION, 0)
         , QosPolicy(false)
@@ -2561,19 +2561,19 @@ class TypeInformation : public Parameter_t, public QosPolicy
     /**
      * @brief Move Constructor
      *
-     * @param type Another instance of TypeInformation
+     * @param type Another instance of TypeInformationParameter
      */
-    RTPS_DllAPI TypeInformation(
-            TypeInformation&& type)
+    RTPS_DllAPI TypeInformationParameter(
+            TypeInformationParameter&& type)
         : Parameter_t(type.Pid, type.length)
         , QosPolicy(type.send_always_)
         , type_information(std::move(type.type_information))
         , assigned_(type.assigned_)
     {
     }
 
-    RTPS_DllAPI TypeInformation& operator =(
-            const TypeInformation& type)
+    RTPS_DllAPI TypeInformationParameter& operator =(
+            const TypeInformationParameter& type)
     {
         Pid = type.Pid;
         length = type.length;
@@ -2585,8 +2585,8 @@ class TypeInformation : public Parameter_t, public QosPolicy
         return *this;
     }
 
-    RTPS_DllAPI TypeInformation& operator =(
-            TypeInformation&& type)
+    RTPS_DllAPI TypeInformationParameter& operator =(
+            TypeInformationParameter&& type)
     {
         Pid = type.Pid;
         length = type.length;
@@ -2601,11 +2601,11 @@ class TypeInformation : public Parameter_t, public QosPolicy
     /**
      * @brief Destructor
      */
-    virtual RTPS_DllAPI ~TypeInformation() override = default;
+    virtual RTPS_DllAPI ~TypeInformationParameter() override = default;
 
     inline void clear() override
     {
-        *this = TypeInformation();
+        *this = TypeInformationParameter();
     }
 
     /**
@@ -2629,7 +2629,7 @@ class TypeInformation : public Parameter_t, public QosPolicy
         assigned_ = value;
     }
 
-    RTPS_DllAPI TypeInformation& operator =(
+    RTPS_DllAPI TypeInformationParameter& operator =(
             const fastrtps::types::TypeInformation& type_info)
     {
         type_information = type_info;
@@ -2639,7 +2639,7 @@ class TypeInformation : public Parameter_t, public QosPolicy
 
 private:
 
-    //!Boolean that states if the TypeInformation has been asigned manually or not.
+    //!Boolean that states if the TypeInformationParameter has been asigned manually or not.
     bool assigned_;
 };
 

include/fastdds/dds/domain/DomainParticipantFactory.hpp

@@ -20,16 +20,15 @@
 #ifndef _FASTDDS_DOMAINPARTICIPANT_HPP_
 #define _FASTDDS_DOMAINPARTICIPANT_HPP_
 
-#include <fastrtps/attributes/ParticipantAttributes.h>
-#include <fastrtps/types/TypesBase.h>
-#include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-#include <fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp>
-#include <fastdds/dds/core/status/StatusMask.hpp>
-
 #include <map>
 #include <memory>
 #include <mutex>
 
+#include <fastdds/dds/core/status/StatusMask.hpp>
+#include <fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp>
+#include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
+#include <fastdds/dds/xtypes/type_representation/TypeObjectRegistry.hpp>
+
 namespace eprosima {
 
 namespace fastrtps {
@@ -266,6 +265,13 @@ class DomainParticipantFactory
     RTPS_DllAPI ReturnCode_t set_qos(
             const DomainParticipantFactoryQos& qos);
 
+    /**
+     * @brief Return the TypeObjectRegistry member to access the API.
+     *
+     * @return const xtypes::TypeObjectRegistry reference.
+     */
+    RTPS_DllAPI xtypes::TypeObjectRegistry& type_object_registry();
+
 protected:
 
     friend class DomainParticipant;
@@ -313,6 +319,8 @@ class DomainParticipantFactory
 
     std::shared_ptr<detail::LogResources> log_resources_;
 
+    xtypes::TypeObjectRegistry type_object_registry_;
+
     /**
      * This mutex guards the access to load the profiles.
      * Is used to lock every thread that is trying to load the profiles, so only the first one loads it and

include/fastdds/dds/topic/TopicDataType.hpp

@@ -309,31 +309,31 @@ class TopicDataType
     /**
      * Get the type information
      *
-     * @return TypeInformation
+     * @return TypeInformationParameter
      */
-    RTPS_DllAPI inline const std::shared_ptr<xtypes::TypeInformation> type_information() const
+    RTPS_DllAPI inline const std::shared_ptr<xtypes::TypeInformationParameter> type_information() const
     {
         return type_information_;
     }
 
     /**
      * Set type information
      *
-     * @param info new value for TypeInformation
+     * @param info new value for TypeInformationParameter
      */
     RTPS_DllAPI inline void type_information(
-            const xtypes::TypeInformation& info)
+            const xtypes::TypeInformationParameter& info)
     {
-        type_information_ = std::make_shared<xtypes::TypeInformation>(info);
+        type_information_ = std::make_shared<xtypes::TypeInformationParameter>(info);
     }
 
     /**
      * Set type information
      *
-     * @param info shared pointer to TypeInformation
+     * @param info shared pointer to TypeInformationParameter
      */
     RTPS_DllAPI inline void type_information(
-            std::shared_ptr<xtypes::TypeInformation> info)
+            std::shared_ptr<xtypes::TypeInformationParameter> info)
     {
         type_information_ = std::move(info);
     }
@@ -391,7 +391,7 @@ class TopicDataType
     //!Type Object XTYPES 1.1
     std::shared_ptr<TypeObjectV1> type_object_;
     //!XTYPES 1.2
-    std::shared_ptr<xtypes::TypeInformation> type_information_;
+    std::shared_ptr<xtypes::TypeInformationParameter> type_information_;
 
 private:
 

include/fastdds/dds/xtypes/common.hpp

@@ -0,0 +1,126 @@
+// Copyright 2023 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
+ * This file contains common definitions for the different XTypes modules.
+ */
+
+#ifndef _FASTDDS_DDS_XTYPES_COMMON_HPP_
+#define _FASTDDS_DDS_XTYPES_COMMON_HPP_
+
+namespace eprosima {
+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
+ */
+enum EquivalenceKindValue
+{
+    MINIMAL,
+    COMPLETE,
+    BOTH
+};
+
+/**
+ * @brief PlacementKind values (@verbatim annotation)
+ */
+enum PlacementKindValue
+{
+    BEGIN_FILE,
+    BEFORE_DECLARATION,
+    BEGIN_DECLARATION,
+    END_DECLARATION,
+    AFTER_DECLARATION,
+    END_FILE
+};
+
+// Primitive type names
+constexpr const char* boolean_type_name = "_bool";
+constexpr const char* byte_type_name = "_byte";
+constexpr const char* int16_type_name = "_int16_t";
+constexpr const char* int32_type_name = "_int32_t";
+constexpr const char* int64_type_name = "_int64_t";
+constexpr const char* uint16_type_name = "_uint16_t";
+constexpr const char* uint32_type_name = "_uint32_t";
+constexpr const char* uint64_type_name = "_uint64_t";
+constexpr const char* float32_type_name = "_float";
+constexpr const char* float64_type_name = "_double";
+constexpr const char* float128_type_name = "_long_double";
+constexpr const char* int8_type_name = "_int8_t";
+constexpr const char* uint8_type_name = "_uint8_t";
+constexpr const char* char8_type_name = "_char";
+constexpr const char* char16_type_name = "_wchar_t";
+
+// Builtin annotation names
+constexpr const char* id_annotation_name = "_id";
+constexpr const char* autoid_annotation_name = "_autoid";
+constexpr const char* optional_annotation_name = "_optional";
+constexpr const char* position_annotation_name = "_position";
+constexpr const char* value_annotation_name = "_value"; // Pending implementation
+constexpr const char* extensibility_annotation_name = "_extensibility";
+constexpr const char* final_annotation_name = "_final";
+constexpr const char* appendable_annotation_name = "_appendable";
+constexpr const char* mutable_annotation_name = "_mutable";
+constexpr const char* key_annotation_name = "_key";
+constexpr const char* must_understand_annotation_name = "_must_understand";
+constexpr const char* default_literal_annotation_name = "_default_literal";
+constexpr const char* default_annotation_name = "_default"; // Pending implementation
+constexpr const char* range_annotation_name = "_range"; // Pending implementation
+constexpr const char* min_annotation_name = "_min"; // Pending implementation
+constexpr const char* max_annotation_name = "_max"; // Pending implementation
+constexpr const char* unit_annotation_name = "_unit";
+constexpr const char* bit_bound_annotation_name = "_bit_bound";
+constexpr const char* external_annotation_name = "_external";
+constexpr const char* nested_annotation_name = "_nested";
+constexpr const char* verbatim_annotation_name = "_verbatim";
+constexpr const char* service_annotation_name = "_service";
+constexpr const char* oneway_annotation_name = "_oneway";
+constexpr const char* ami_annotation_name = "_ami";
+constexpr const char* hashid_annotation_name = "_hashid";
+constexpr const char* default_nested_annotation_name = "_default_nested";
+constexpr const char* ignore_literal_names_annotation_name = "_ignore_literal_names";
+constexpr const char* try_construct_annotation_name = "_try_construct";
+constexpr const char* non_serialized_annotation_name = "_non_serialized";
+constexpr const char* data_representation_annotation_name = "_data_representation";
+constexpr const char* topic_annotation_name = "_topic";
+
+} // xtypes
+} // dds
+} // fastdds
+} // eprosima
+
+#endif // _FASTDDS_DDS_XTYPES_COMMON_HPP_