Skip to content

Commit e42e26d

Browse files
richiwarerichiware
authored
TypeObjectRegistry refactor (#132)
* Refs #21044. Regenerate idl files Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #21044. Regenerate idl files Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 7b27cf7 commit e42e26d

16 files changed

Lines changed: 5703 additions & 64068 deletions

‎fastdds_python/test/types/test_completePubSubTypes.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ bool StructTypePubSubType::getKey(
219219
return true;
220220
}
221221

222-
void StructTypePubSubType::register_type_object_representation() const
222+
void StructTypePubSubType::register_type_object_representation()
223223
{
224-
register_test_complete_type_objects();
224+
register_StructType_type_identifier(type_identifiers_);
225225
}
226226

227227

@@ -414,9 +414,9 @@ bool CompleteTestTypePubSubType::getKey(
414414
return true;
415415
}
416416

417-
void CompleteTestTypePubSubType::register_type_object_representation() const
417+
void CompleteTestTypePubSubType::register_type_object_representation()
418418
{
419-
register_test_complete_type_objects();
419+
register_CompleteTestType_type_identifier(type_identifiers_);
420420
}
421421

422422
KeyedCompleteTestTypePubSubType::KeyedCompleteTestTypePubSubType()
@@ -607,9 +607,9 @@ bool KeyedCompleteTestTypePubSubType::getKey(
607607
return true;
608608
}
609609

610-
void KeyedCompleteTestTypePubSubType::register_type_object_representation() const
610+
void KeyedCompleteTestTypePubSubType::register_type_object_representation()
611611
{
612-
register_test_complete_type_objects();
612+
register_KeyedCompleteTestType_type_identifier(type_identifiers_);
613613
}
614614

615615

‎fastdds_python/test/types/test_completePubSubTypes.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
9090
void* data) override;
9191

9292
//Register TypeObject representation in Fast DDS TypeObjectRegistry
93-
eProsima_user_DllExport void register_type_object_representation() const override;
93+
eProsima_user_DllExport void register_type_object_representation() override;
9494

9595
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
9696
eProsima_user_DllExport inline bool is_bounded() const override
@@ -183,7 +183,7 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
183183
void* data) override;
184184

185185
//Register TypeObject representation in Fast DDS TypeObjectRegistry
186-
eProsima_user_DllExport void register_type_object_representation() const override;
186+
eProsima_user_DllExport void register_type_object_representation() override;
187187

188188
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
189189
eProsima_user_DllExport inline bool is_bounded() const override
@@ -274,7 +274,7 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
274274
void* data) override;
275275

276276
//Register TypeObject representation in Fast DDS TypeObjectRegistry
277-
eProsima_user_DllExport void register_type_object_representation() const override;
277+
eProsima_user_DllExport void register_type_object_representation() override;
278278

279279
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
280280
eProsima_user_DllExport inline bool is_bounded() const override

‎fastdds_python/test/types/test_completeTypeObjectSupport.cxx‎

Lines changed: 2629 additions & 38010 deletions
Large diffs are not rendered by default.

‎fastdds_python/test/types/test_completeTypeObjectSupport.hpp‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,32 @@
3636
#define eProsima_user_DllExport
3737
#endif // _WIN32
3838

39-
/**
40-
* @brief Register every TypeObject representation defined in the IDL file in Fast DDS TypeObjectRegistry.
41-
*/
42-
eProsima_user_DllExport void register_test_complete_type_objects();
43-
4439
#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
4540

41+
/**
42+
* @brief Register Color related TypeIdentifier.
43+
* Fully-descriptive TypeIdentifiers are directly registered.
44+
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
45+
* indirectly registered as well.
46+
*
47+
* @param[out] TypeIdentifier of the registered type.
48+
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
49+
* Invalid TypeIdentifier is returned in case of error.
50+
*/
51+
eProsima_user_DllExport void register_Color_type_identifier(
52+
eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
53+
/**
54+
* @brief Register Material related TypeIdentifier.
55+
* Fully-descriptive TypeIdentifiers are directly registered.
56+
* Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is
57+
* indirectly registered as well.
58+
*
59+
* @param[out] TypeIdentifier of the registered type.
60+
* The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers.
61+
* Invalid TypeIdentifier is returned in case of error.
62+
*/
63+
eProsima_user_DllExport void register_Material_type_identifier(
64+
eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
4665
/**
4766
* @brief Register StructType related TypeIdentifier.
4867
* Fully-descriptive TypeIdentifiers are directly registered.
@@ -54,7 +73,7 @@ eProsima_user_DllExport void register_test_complete_type_objects();
5473
* Invalid TypeIdentifier is returned in case of error.
5574
*/
5675
eProsima_user_DllExport void register_StructType_type_identifier(
57-
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
76+
eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
5877
/**
5978
* @brief Register CompleteTestType related TypeIdentifier.
6079
* Fully-descriptive TypeIdentifiers are directly registered.
@@ -66,7 +85,7 @@ eProsima_user_DllExport void register_StructType_type_identifier(
6685
* Invalid TypeIdentifier is returned in case of error.
6786
*/
6887
eProsima_user_DllExport void register_CompleteTestType_type_identifier(
69-
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
88+
eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
7089
/**
7190
* @brief Register KeyedCompleteTestType related TypeIdentifier.
7291
* Fully-descriptive TypeIdentifiers are directly registered.
@@ -78,7 +97,7 @@ eProsima_user_DllExport void register_CompleteTestType_type_identifier(
7897
* Invalid TypeIdentifier is returned in case of error.
7998
*/
8099
eProsima_user_DllExport void register_KeyedCompleteTestType_type_identifier(
81-
eprosima::fastdds::dds::xtypes::TypeIdentifier& type_id);
100+
eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids);
82101

83102

84103
#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

‎fastdds_python/test/types/test_included_modulesPubSubTypes.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ namespace eprosima {
221221
return true;
222222
}
223223

224-
void StructType2PubSubType::register_type_object_representation() const
224+
void StructType2PubSubType::register_type_object_representation()
225225
{
226-
register_test_included_modules_type_objects();
226+
register_StructType2_type_identifier(type_identifiers_);
227227
}
228228

229229
} // namespace test2

‎fastdds_python/test/types/test_included_modulesPubSubTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ namespace eprosima
9393
void* data) override;
9494

9595
//Register TypeObject representation in Fast DDS TypeObjectRegistry
96-
eProsima_user_DllExport void register_type_object_representation() const override;
96+
eProsima_user_DllExport void register_type_object_representation() override;
9797

9898
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
9999
eProsima_user_DllExport inline bool is_bounded() const override

0 commit comments

Comments
 (0)