Refs #20419: Fix TypeIdentifier comparation in TypeObject tests.

.github/fastddsgen.meta

@@ -1,6 +1,12 @@
 {
     "names":
     {
+        "fastdds": {
+            "cmake-args": [
+                "-DEPROSIMA_BUILD_TESTS=ON"
+
+            ]
+        },
         "fastdds_python": {
             "cmake-args": [
                 "-DBUILD_TESTING=ON"

.github/workflows/reusable-ubuntu-ci.yaml

@@ -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

.github/workflows/ubuntu-ci.yaml

@@ -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,15 +40,14 @@ jobs:
         java_version:
           - 'openjdk-11-jdk'
           - 'openjdk-19-jdk'
-        fastcdr_version: ${{ fromJson(inputs.fastcdr_version || '["1.1.x", "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 || 'main' }}
-      fastddsgen_branch: ${{ inputs.fastddsgen_branch || github.ref || 'master' }}
-      fastdds_fallback_branch: ${{ 'master' }}
+      fastdds_python_branch: ${{ inputs.fastdds_python_branch || '3.0.x-devel' }}
+      fastddsgen_branch: ${{ inputs.fastddsgen_branch || github.ref || '4.0.x-devel' }}
+      fastdds_fallback_branch: ${{ '3.0.x-devel' }}

colcon.pkg

@@ -1,5 +1,5 @@
 {
     "name": "fastddsgen",
     "type": "gradle",
-    "test-dependencies" : ["fastrtps"]
+    "test-dependencies" : ["fastdds"]
 }

resources/Custom.stg

@@ -84,7 +84,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) ::= <<>>
 

src/main/java/com/eprosima/fastcdr/idl/context/Context.java

@@ -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 ***/
 }

src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg

@@ -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$
+%>

src/main/java/com/eprosima/fastcdr/idl/templates/JavaType.stg

@@ -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"$