Refs #21044. More ExtensibilityKind standard

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Jun 7, 2024 · 81779ba · 81779ba
1 parent b60b2b4
commit 81779ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg
@@ -756,6 +756,7 @@ $endif$
 
 expected_member_flags(object, typename) ::= <<
 MemberFlag $typename$_expected_flags = 0;
+$if(object.typecode)$
 $if(object.annotationTryConstruct)$
 $if(object.annotationDiscard)$
 $typename$_expected_flags |= MemberFlagBits::TRY_CONSTRUCT1;
@@ -767,6 +768,7 @@ $endif$
 $else$
 $typename$_expected_flags |= MemberFlagBits::TRY_CONSTRUCT1;
 $endif$
+$endif$
 $if(object.annotationExternal)$
 $typename$_expected_flags |= MemberFlagBits::IS_EXTERNAL;
 $endif$
@@ -786,15 +788,13 @@ $endif$
 
 expected_type_flags(object) ::= <<
 TypeFlag $object.name$_expected_flags = 0;
-$if(!object.annotationExtensibilityNotApplied)$
 $if(object.annotationFinal)$
 $object.name$_expected_flags |= TypeFlagBits::IS_FINAL;
 $elseif(object.annotationAppendable)$
 $object.name$_expected_flags |= TypeFlagBits::IS_APPENDABLE;
 $elseif(object.annotationMutable)$
 $object.name$_expected_flags |= TypeFlagBits::IS_MUTABLE;
 $endif$
-$endif$
 $if(object.annotationNested)$
 $object.name$_expected_flags |= TypeFlagBits::IS_NESTED;
 $endif$

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg
@@ -917,7 +917,15 @@ if (eprosima::fastdds::dds::RETCODE_OK != return_code_$name$)
 
 extensibility(object) ::= <%
 $if (object.annotationExtensibilityNotApplied)$
-    eprosima::fastdds::dds::xtypes::ExtensibilityKind::NOT_APPLIED,
+    $if(object.isStructType)$
+    $if(object.inheritance)$
+    $extensibility(object.inheritance)$
+    $else$
+    eprosima::fastdds::dds::xtypes::ExtensibilityKind::APPENDABLE,
+    $endif$
+    $else$
+    eprosima::fastdds::dds::xtypes::ExtensibilityKind::APPENDABLE,
+    $endif$
 $elseif (object.annotationAppendable)$
     eprosima::fastdds::dds::xtypes::ExtensibilityKind::APPENDABLE,
 $elseif (object.annotationFinal)$