ctf: Make ctf2 trace have environment

Change-Id: If58b118283f9a5e3778e832edd94e358c23cded8
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/IOStructGen.java

@@ -20,7 +20,10 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNull;
@@ -46,6 +49,8 @@
 import org.eclipse.tracecompass.internal.ctf.core.utils.JsonMetadataStrings;
 
 import com.google.common.collect.Iterables;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 /**
  * IOStructGen
@@ -151,6 +156,23 @@ private void parseRoot(ICTFMetadataNode root) throws ParseException {
                     throw new ParseException("Only one trace block is allowed"); //$NON-NLS-1$
                 }
                 traceNode = child;
+                if (child instanceof JsonTraceMetadataNode node) {
+                    JsonObject environment = node.getEnvironment();
+                    if (environment != null) {
+                        Map<String, String> env = new LinkedHashMap<>();
+
+                        for (Entry<String, JsonElement> entry : environment.entrySet()) {
+                            JsonElement value = entry.getValue();
+                            if (value.isJsonPrimitive()) {
+                                env.put(entry.getKey(), value.getAsString());
+                            } else {
+                                env.put(entry.getKey(), value.toString());
+                            }
+                        }
+                        fTrace.setEnvironment(env);
+                    }
+
+                }
                 parseTrace(traceNode);
             } else if (CTFParser.tokenNames[CTFParser.STREAM].equals(type) || JsonMetadataStrings.FRAGMENT_DATA_STREAM.equals(type)) {
                 StreamParser.INSTANCE.parse(child, new StreamParser.Param(fTrace, fRoot));

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/JsonTraceMetadataNode.java

@@ -15,8 +15,8 @@
 
 import org.eclipse.tracecompass.ctf.core.CTFException;
 import org.eclipse.tracecompass.internal.ctf.core.event.types.ICTFMetadataNode;
-import org.json.JSONObject;
 
+import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 
 /**
@@ -30,7 +30,7 @@ public class JsonTraceMetadataNode extends CTFJsonMetadataNode {
     @SerializedName("uid")
     private String fUid;
     @SerializedName("environment")
-    private JSONObject fEnvironment;
+    private JsonObject fEnvironment;
     @SerializedName("packet-header-field-class")
     private JsonStructureFieldMetadataNode fPacketHeader;
 
@@ -62,7 +62,7 @@ public String getUid() {
      *
      * @return the environment
      */
-    public JSONObject getEnvironment() {
+    public JsonObject getEnvironment() {
         return fEnvironment;
     }