eProsima
diff --git a/‎.github/fastddsgen.meta
Lines changed: 6 additions & 0 deletions b/‎.github/fastddsgen.meta
Lines changed: 6 additions & 0 deletions
diff --git a/‎.github/workflows/reusable-ubuntu-ci.yaml
Lines changed: 1 addition & 9 deletions b/‎.github/workflows/reusable-ubuntu-ci.yaml
Lines changed: 1 addition & 9 deletions
diff --git a/‎.github/workflows/ubuntu-ci.yaml
Lines changed: 3 additions & 4 deletions b/‎.github/workflows/ubuntu-ci.yaml
Lines changed: 3 additions & 4 deletions
diff --git a/‎resources/Custom.stg
Lines changed: 6 additions & 1 deletion b/‎resources/Custom.stg
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/main/java/com/eprosima/fastcdr/idl/context/Context.java
Lines changed: 2 additions & 16 deletions b/‎src/main/java/com/eprosima/fastcdr/idl/context/Context.java
Lines changed: 2 additions & 16 deletions
diff --git a/‎src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg
Lines changed: 10 additions & 0 deletions b/‎src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/main/java/com/eprosima/fastcdr/idl/templates/JavaType.stg
Lines changed: 3 additions & 3 deletions b/‎src/main/java/com/eprosima/fastcdr/idl/templates/JavaType.stg
Lines changed: 3 additions & 3 deletions
@@ -1,6 +1,12 @@
 {
     "names":
     {
+        "fastdds": {
+            "cmake-args": [
+                "-DEPROSIMA_BUILD_TESTS=ON"
+
+            ]
+        },
         "fastdds_python": {
             "cmake-args": [
                 "-DBUILD_TESTING=ON"
 
@@ -122,15 +122,7 @@ jobs:
           cmake --version
           colcon build --event-handlers=console_direct+ --mixin rel-with-deb-info ccache --metas src/fastddsgen/.github/fastddsgen.meta
 
-      - name: Test fastddsgen with fastcdr v1
-        if: startsWith(inputs.fastcdr_branch, '1')
-        run: |
-          source install/local_setup.bash
-          cd src/fastddsgen
-          ./gradlew test -Dcdr_version=v1 -Dblacklist_tests=external,optional
-
-      - name: Test fastddsgen with fastcdr v2
-        if: ${{ ! startsWith(inputs.fastcdr_branch, '1') }}
+      - name: Test fastddsgen
         run: |
           source install/local_setup.bash
           cd src/fastddsgen
 
@@ -7,8 +7,8 @@ on:
         description: 'foonathan_memory_vendor branch to be used'
         required: true
         type: string
-      fastcdr_version:
-        description: 'Fast CDR branches to be used. Enclose the branch names like ["1.1.x", "master"], then in single quotes'
+      fastcdr_branch:
+        description: 'Fast CDR branches to be used'
         required: true
         type: string
       fastdds_branch:
@@ -40,14 +40,13 @@ jobs:
         java_version:
           - 'openjdk-11-jdk'
           - 'openjdk-19-jdk'
-        fastcdr_version: ${{ fromJson(inputs.fastcdr_version || '["master"]') }}
 
     uses: ./.github/workflows/reusable-ubuntu-ci.yaml
     with:
       os_image: ${{ matrix.os_image }}
       java_version: ${{ matrix.java_version }}
       foonathan_memory_vendor_branch: ${{ inputs.foonathan_memory_vendor_branch || 'master' }}
-      fastcdr_branch: ${{ matrix.fastcdr_version }}
+      fastcdr_branch: ${{ inputs.fastcdr_branch || 'master' }}
       fastdds_branch: ${{ inputs.fastdds_branch || github.head_ref }}
       fastdds_python_branch: ${{ inputs.fastdds_python_branch || '3.0.x-devel' }}
       fastddsgen_branch: ${{ inputs.fastddsgen_branch || github.ref || '4.0.x-devel' }}
 
@@ -8,6 +8,11 @@ $definitions; separator="\n"$
 
 module(ctx, parent, module, definition_list) ::= <<
 
+// In case of defining C++ namespaces here (like `namespace $module.name$ {`, property
+// `Context.using_explicitly_modules_custom_property` should be added to the related TemplateGroup.
+// Example:
+//     tmanager.addGroup("Custom.stg").enable_custom_property(Context.using_explicitly_modules_custom_property);
+
 $definition_list$
 
 >>
@@ -84,7 +89,7 @@ string_type(ctx, string) ::= <<>>
 
 wide_string_type(ctx, wstring) ::= <<>>
 
-array_declarator(ctx, array, array_type) ::= <<>>
+array_declarator(ctx, array) ::= <<>>
 
 interface(ctx, parent, interface, export_list) ::= <<>>
 
 
@@ -39,27 +39,13 @@ public interface Context
 
     public String getHeaderGuardName ();
 
-    public boolean isGenerateTypeObject();
-
-    public boolean isGenerateTypesC();
-
     public boolean isGenerateTypesROS2();
 
+    public boolean isGenerateTypeObjectSupport();
+
     public boolean isCdr();
 
     public boolean isFastcdr();
 
-    public boolean isCdr_v1();
-
-    public boolean isCdr_v2();
-
-    public boolean isCdr_both();
-
-    public void isSetCdrv1Templates();
-
-    public void isUnsetCdrv1Templates();
-
-    public boolean isCdrv1TemplatesEnabled();
-
     /*** End ***/
 }
@@ -59,3 +59,13 @@ member_array_cstring_destructor(ctx, name, loopvar, dims) ::= <<$if(rest(dims))$
 {
     free(str);
 }$endif$>>
+
+member_default_init(member) ::= <%
+$if(member.annotationDefault)$
+ {$member.annotationDefaultValue$}
+$elseif(!member.annotationOptional && !member.annotationExternal)$
+$if(member.typecode.initialValue)$
+ {$member.typecode.initialValue$}
+$endif$
+$endif$
+%>
@@ -109,7 +109,7 @@ public class $union.name$
         }; separator="\n"$
     }
 
-    public $union.discriminator.javaTypename$ getDiscriminator()
+    public $union.discriminator.typecode.javaTypename$ getDiscriminator()
     {
         return d__;
     }
@@ -127,7 +127,7 @@ public class $union.name$
         $endif$
     }
 
-    public void set$member.javaName$($union.discriminator.javaTypename$ discriminator, $member.typecode.javaTypename$ $member.name$)
+    public void set$member.javaName$($union.discriminator.typecode.javaTypename$ discriminator, $member.typecode.javaTypename$ $member.name$)
         throws Exception
     {
         $if(member.default)$
@@ -188,7 +188,7 @@ public class $union.name$
         return false;
     }
 
-    $union.discriminator.javaTypename$ d__;
+    $union.discriminator.typecode.javaTypename$ d__;
 
     $union.members : { member |private $member.typecode.javaTypename$ $member.name$_; }; separator="\n"$
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"names":`
`3`	`3`	`{`
	`4`	`+ "fastdds": {`
	`5`	`+ "cmake-args": [`
	`6`	`+ "-DEPROSIMA_BUILD_TESTS=ON"`
	`7`	`+`
	`8`	`+ ]`
	`9`	`+ },`
`4`	`10`	`"fastdds_python": {`
`5`	`11`	`"cmake-args": [`
`6`	`12`	`"-DBUILD_TESTING=ON"`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public class $union.name$`
`109`	`109`	`}; separator="\n"$`
`110`	`110`	`}`
`111`	`111`
`112`		`- public $union.discriminator.javaTypename$ getDiscriminator()`
	`112`	`+ public $union.discriminator.typecode.javaTypename$ getDiscriminator()`
`113`	`113`	`{`
`114`	`114`	`return d__;`
`115`	`115`	`}`
`@@ -127,7 +127,7 @@ public class $union.name$`
`127`	`127`	$endif$
`128`	`128`	`}`
`129`	`129`
`130`		`- public void set$member.javaName$($union.discriminator.javaTypename$ discriminator, $member.typecode.javaTypename$ $member.name$)`
	`130`	`+ public void set$member.javaName$($union.discriminator.typecode.javaTypename$ discriminator, $member.typecode.javaTypename$ $member.name$)`
`131`	`131`	`throws Exception`
`132`	`132`	`{`
`133`	`133`	$if(member.default)$
`@@ -188,7 +188,7 @@ public class $union.name$`
`188`	`188`	`return false;`
`189`	`189`	`}`
`190`	`190`
`191`		`- $union.discriminator.javaTypename$ d__;`
	`191`	`+ $union.discriminator.typecode.javaTypename$ d__;`
`192`	`192`
`193`	`193`	`$union.members : { member \|private $member.typecode.javaTypename$ $member.name$_; }; separator="\n"$`
`194`	`194`