Refs #21222. Support union discriminator's @default annotation

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Jul 5, 2024 · d9e60bd · d9e60bd
1 parent bd44d84
commit d9e60bd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -295,7 +295,9 @@ public:
      */
     eProsima_user_DllExport $union.name$()
     {
-        $if(union.defaultMember)$
+        $if(union.defaultAnnotatedMember)$
+        $union.defaultAnnotatedMember.name$_();
+        $elseif(union.defaultMember)$
         $union.defaultMember.name$_();
         $endif$
     }
@@ -510,7 +512,7 @@ private:
         \}
     }; separator="\n"$
 
-    $union.discriminator.typecode.cppTypename$ m__d {$union.defaultvalue$};
+    $union.discriminator.typecode.cppTypename$ m__d {$if(union.defaultAnnotatedValue)$$union.defaultAnnotatedValue$$else$$union.defaultvalue$$endif$};
 
     union
     {

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg
@@ -877,7 +877,7 @@ $endif$
 }; separator="\n"$
 if (!tmp_ann_custom_$type.name$.empty())
 {
-    ann_custom_$type.name$ = tmp_ann_custom_$type.name$;
+    ann_custom_$name$ = tmp_ann_custom_$type.name$;
 }
 $endif$
 >>

diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test
diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser