ctf: correctly parse integer size

Change-Id: I60f3854afcdf4454847ca49bfdee0ca7d89f9601
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

Author: MatthewKhouzam

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/integer/IntegerDeclarationParser.java

@@ -152,8 +152,11 @@ public IntegerDeclaration parse(ICTFMetadataNode integer, ICommonTreeParserParam
 
         Encoding encoding = Encoding.NONE;
 
-        if (integer instanceof JsonStructureFieldMemberMetadataNode) {
-            JsonStructureFieldMemberMetadataNode member = (JsonStructureFieldMemberMetadataNode) integer;
+        if (integer instanceof JsonStructureFieldMemberMetadataNode member) {
+            JsonElement fieldClassElement = member.getFieldClass();
+            if (fieldClassElement == null || !fieldClassElement.isJsonObject()) {
+                throw new ParseException(getClass().getName() + " fieldclass must be a json object."); //$NON-NLS-1$
+            }
             JsonObject fieldclass = member.getFieldClass().getAsJsonObject();
             role = member.getRole();
             // by default fieldclass is unsigned
@@ -193,7 +196,7 @@ public IntegerDeclaration parse(ICTFMetadataNode integer, ICommonTreeParserParam
                 return IntegerDeclaration.createVarintDeclaration(signed, base, role, true);
             }
             if (fieldclass.has(ALIGNMENT)) {
-                alignment = fieldclass.get(ALIGNMENT).getAsInt();
+                alignment = AlignmentParser.INSTANCE.parse(member, null);
             }
             size = fieldclass.get(LENGTH).getAsInt();
 
@@ -262,7 +265,8 @@ public IntegerDeclaration parse(ICTFMetadataNode integer, ICommonTreeParserParam
         }
 
         if (mappings.size() > 0) {
-            return IntegerDeclaration.createDeclaration(base, signed, base, byteOrder, encoding, clock, alignment, role, mappings);
+
+            return IntegerDeclaration.createDeclaration((int) size, signed, base, byteOrder, encoding, clock, alignment, role, mappings);
         }
 
         return IntegerDeclaration.createDeclaration((int) size, signed, base,