ctf: fix if type is not declared explicity, but as a subfield

MatthewKhouzam · MatthewKhouzam · commit cbc7bd785760 · 2025-12-05T01:06:02.000-05:00
Change-Id: Ib3654d5468236a9e3ab1a2a2b0cb49dbfc76e251
Signed-off-by: Matthew Khouzam &lt;matthew.khouzam@ericsson.com&gt;
diff --git a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasParser.java b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasParser.java
@@ -138,6 +138,11 @@ public IDeclaration parse(ICTFMetadataNode typealias, ICommonTreeParserParameter
                 }
             }
             if (fieldClass != null) {
+                if (type.isEmpty()) {
+                    if (fieldClass.isJsonObject()) {
+                        type = fieldClass.get(JsonMetadataStrings.TYPE).getAsString();
+                    }
+                }
                 if (JsonMetadataStrings.FIXED_UNSIGNED_INTEGER_FIELD.equals(type)) {
                     fieldClass.addProperty(SIGNED, false);
                     fieldClass.addProperty(VARINT, false);

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,11 @@ public IDeclaration parse(ICTFMetadataNode typealias, ICommonTreeParserParameter`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`if (fieldClass != null) {`
	`141`	`+ if (type.isEmpty()) {`
	`142`	`+ if (fieldClass.isJsonObject()) {`
	`143`	`+ type = fieldClass.get(JsonMetadataStrings.TYPE).getAsString();`
	`144`	`+ }`
	`145`	`+ }`
`141`	`146`	`if (JsonMetadataStrings.FIXED_UNSIGNED_INTEGER_FIELD.equals(type)) {`
`142`	`147`	`fieldClass.addProperty(SIGNED, false);`
`143`	`148`	`fieldClass.addProperty(VARINT, false);`