ctf: Allow structs to have ctf2 data

Change-Id: Ie35533f33a482aff519f9472b0a34b088be1506e
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/struct/StructParser.java

@@ -31,6 +31,7 @@
 import org.eclipse.tracecompass.internal.ctf.core.utils.JsonMetadataStrings;
 
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 /**
  *
@@ -70,9 +71,9 @@
  * `typedef`:
  *
  * <pre>
-struct {
-    // ...
-}
+ * struct {
+ *     // ...
+ * }
  *
  * </pre>
  *
@@ -189,26 +190,43 @@ public StructDeclaration parse(ICTFMetadataNode struct, ICommonTreeParserParamet
                 structName = identifier.getText();
                 hasName = true;
             }
-        } else if (struct instanceof JsonStructureFieldMetadataNode) {
-            JsonStructureFieldMetadataNode structNode = (JsonStructureFieldMetadataNode) struct;
+        } else if (struct instanceof JsonStructureFieldMetadataNode structNode) {
             if (structNode.getMinimumAlignment() != 0) {
                 structAlign = AlignmentParser.INSTANCE.parse(struct, null);
             }
             if (structNode.getMemberClasses() != null) {
                 hasBody = true;
                 structBody = struct;
             }
-        } else if (struct instanceof JsonStructureFieldMemberMetadataNode) {
-            JsonStructureFieldMemberMetadataNode memberNode = (JsonStructureFieldMemberMetadataNode) struct;
+        } else if (struct instanceof JsonStructureFieldMemberMetadataNode memberNode) {
             if (memberNode.getFieldClass().isJsonObject()) {
-                JsonElement minimumAlignment = memberNode.getFieldClass().getAsJsonObject().get(JsonMetadataStrings.MINIMUM_ALIGNMENT);
+                JsonElement fieldClassElement = memberNode.getFieldClass();
+                if (fieldClassElement == null || !fieldClassElement.isJsonObject()) {
+                    throw new ParseException(getClass().getName() + " fieldclass must be a json object."); //$NON-NLS-1$
+                }
+                JsonObject outerFieldClass = fieldClassElement.getAsJsonObject();
+                JsonElement minimumAlignment = outerFieldClass.get(JsonMetadataStrings.MINIMUM_ALIGNMENT);
                 if (minimumAlignment != null) {
                     structAlign = minimumAlignment.getAsLong();
                 }
-                JsonElement memberClasses = memberNode.getFieldClass().getAsJsonObject().get(JsonMetadataStrings.MEMBER_CLASSES);
-                if (memberClasses != null) {
+                JsonElement memberClasses = outerFieldClass.get(JsonMetadataStrings.MEMBER_CLASSES);
+                if (memberClasses != null && memberClasses.isJsonArray()) {
                     hasBody = true;
-                    structBody = struct;
+                    for (JsonElement memberElement : memberClasses.getAsJsonArray()) {
+                        if (memberElement.isJsonObject()) {
+                            String name = memberElement.getAsJsonObject().get(JsonMetadataStrings.NAME).getAsString();
+                            JsonObject memberObj = memberElement.getAsJsonObject();
+                            JsonElement nameElement = memberObj.get(JsonMetadataStrings.NAME);
+                            JsonElement fieldClass = memberObj.get(JsonMetadataStrings.FIELD_CLASS);
+                            if (nameElement == null || fieldClass == null || !fieldClass.isJsonObject()) {
+                                throw new ParseException("Member class requires 'name' and 'field-class' properties"); //$NON-NLS-1$
+                            }
+                            name = nameElement.getAsString();
+                            JsonStructureFieldMemberMetadataNode childNode = new JsonStructureFieldMemberMetadataNode(memberNode, "", "", name, fieldClass.getAsJsonObject()); //$NON-NLS-1$ //$NON-NLS-2$
+                            memberNode.addChild(childNode);
+                        }
+                    }
+                    structBody = memberNode;
                 }
             }
         }