From 788e830269d5e21c43ae56268135c7822e46f6b2 Mon Sep 17 00:00:00 2001
From: uuqjz <nils.niehues@kit.edu>
Date: Wed, 23 Oct 2024 13:06:05 +0200
Subject: [PATCH] Split DFD and Web Converter

---
 .../converter/DataFlowDiagramConverter.java   | 317 +---------------
 .../converter/WebEditorConverter.java         | 355 ++++++++++++++++++
 .../converter/tests/AnnotationsTest.java      |   3 -
 .../converter/tests/BehaviorTest.java         |   2 -
 .../converter/tests/MicroSecEndTest.java      |   7 +-
 .../converter/tests/PCMTest.java              |   1 -
 .../converter/tests/WebEditorTest.java        |  25 +-
 7 files changed, 374 insertions(+), 336 deletions(-)
 create mode 100644 bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/WebEditorConverter.java

diff --git a/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/DataFlowDiagramConverter.java b/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/DataFlowDiagramConverter.java
index 2f18067..c03ee29 100644
--- a/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/DataFlowDiagramConverter.java
+++ b/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/DataFlowDiagramConverter.java
@@ -4,22 +4,15 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
 import org.dataflowanalysis.analysis.core.AbstractTransposeFlowGraph;
 import org.dataflowanalysis.analysis.core.AbstractVertex;
@@ -46,9 +39,6 @@
 public class DataFlowDiagramConverter extends Converter {
 
 	private Map<Pin, List<String>> inputPinToFlowNamesMap;
-    private final dataflowdiagramFactory dfdFactory;
-    private final datadictionaryFactory ddFactory;
-    private Map<String, Node> idToNodeMap;
 
     private final Logger logger = Logger.getLogger(DataFlowDiagramConverter.class);
     protected final static String DELIMITER_PIN_NAME = "|";
@@ -56,29 +46,6 @@ public class DataFlowDiagramConverter extends Converter {
 
     private BehaviorConverter behaviorConverter;
 
-    public DataFlowDiagramConverter() {
-        dfdFactory = dataflowdiagramFactory.eINSTANCE;
-        ddFactory = datadictionaryFactory.eINSTANCE;
-    }
-
-    /**
-     * Converts a Web Editor DFD format file into a DataFlowDiagramAndDictionary object.
-     * @param inputFile The path of the input file in Web Editor DFD format.
-     * @return DataFlowDiagramAndDictionary object representing the converted data flow diagram and dictionary.
-     */
-    public DataFlowDiagramAndDictionary webToDfd(String inputFile) {
-        return webToDfd(loadWeb(inputFile).get());
-    }
-
-    /**
-     * Converts a WebEditorDfd object into a DataFlowDiagramAndDictionary object.
-     * @param inputFile The WebEditorDfd object to convert.
-     * @return DataFlowDiagramAndDictionary object representing the converted data flow diagram and dictionary.
-     */
-    public DataFlowDiagramAndDictionary webToDfd(WebEditorDfd inputFile) {
-        return processWeb(inputFile);
-    }
-
     /**
      * Converts Data Flow Diagram and Data Dictionary provided via paths into a WebEditorDfd object, analyzes it and annotates the propagated labels in the WebDFD.
      * @param inputDataFlowDiagram The path of the data flow diagram.
@@ -149,8 +116,6 @@ public WebEditorDfd dfdToWebAndAnalyzeAndAnnotateWithCustomTFGFinder(DataFlowDia
         return processDfd(complete.dataFlowDiagram(), complete.dataDictionary(), createNodeAnnotationMap(complete, conditions, finderClass));
     }
     
-    
-
     /**
      * Stores a WebEditorDfd object into a specified output file.
      * @param web The WebEditorDfd object to store.
@@ -166,25 +131,7 @@ public void storeWeb(WebEditorDfd web, String outputFile) {
         } catch (IOException e) {
             logger.error("Could not store web dfd:", e);
         }
-    }
-    
-
-    /**
-     * Loads a WebEditorDfd object from a specified input file.
-     * @param inputFile The path of the input file.
-     * @return Optional containing the loaded WebEditorDfd object; empty if an error occurs.
-     */
-    public Optional<WebEditorDfd> loadWeb(String inputFile) {
-        objectMapper = new ObjectMapper();
-        file = new File(inputFile);
-        try {
-            WebEditorDfd result = objectMapper.readValue(file, WebEditorDfd.class);
-            return Optional.ofNullable(result); // This will never be null given readValue's behavior, but it's a safe usage pattern.
-        } catch (IOException e) {
-            logger.error("Could not load web dfd:", e);
-            return Optional.empty();
-        }
-    }
+    }   
 
     /**
      * Loads a data flow diagram and data dictionary from specified input files and returns them as a combined object.
@@ -269,169 +216,7 @@ private Map<Node, Annotation> createNodeAnnotationMap (DataFlowDiagramAndDiction
          return mapNodeToAnnotations;
     }
 
-    private DataFlowDiagramAndDictionary processWeb(WebEditorDfd webdfd) {
-        idToNodeMap = new HashMap<>();
-        Map<String, Node> pinToNodeMap = new HashMap<>();
-        Map<String, Pin> idToPinMap = new HashMap<>();
-        Map<String, Label> idToLabelMap = new HashMap<>();
-        Map<Node, Map<Pin, String>> nodeOutpinBehaviorMap = new HashMap<>();
-
-        DataFlowDiagram dataFlowDiagram = dfdFactory.createDataFlowDiagram();
-        DataDictionary dataDictionary = ddFactory.createDataDictionary();
-
-        behaviorConverter = new BehaviorConverter(dataDictionary);
-
-        createWebLabelTypes(webdfd, idToLabelMap, dataDictionary);
-
-        createWebNodes(webdfd, pinToNodeMap, idToPinMap, idToLabelMap, nodeOutpinBehaviorMap, dataFlowDiagram, dataDictionary);
-
-        createWebFlows(webdfd, pinToNodeMap, idToPinMap, dataFlowDiagram);
-
-        List<Node> nodesInBehavior = nodeOutpinBehaviorMap.keySet()
-                .stream()
-                .collect(Collectors.toList());
-
-        nodesInBehavior.forEach(node -> {
-            Map<Pin, String> outpinBehaviors = nodeOutpinBehaviorMap.get(node);
-            outpinBehaviors.forEach((outpin, behavior) -> {
-                parseBehavior(node, outpin, behavior, dataFlowDiagram, dataDictionary);
-            });
-        });
-
-        return new DataFlowDiagramAndDictionary(dataFlowDiagram, dataDictionary);
-    }
-
-    private void createWebNodes(WebEditorDfd webdfd, Map<String, Node> pinToNodeMap, Map<String, Pin> pinMap, Map<String, Label> idToLabelMap,
-            Map<Node, Map<Pin, String>> nodeOutpinBehavior, DataFlowDiagram dataFlowDiagram, DataDictionary dataDictionary) {
-        for (Child child : webdfd.model()
-                .children()) {
-            String[] type = child.type()
-                    .split(":");
-            String name = child.text();
-
-            if (type[0].equals("node")) {
-                Node node = switch (type[1]) {
-                    case "function" -> dfdFactory.createProcess();
-                    case "storage" -> dfdFactory.createStore();
-                    case "input-output" -> dfdFactory.createExternal();
-                    default -> {
-                        logger.error("Unrecognized node type: " + type[1]);
-                        continue;
-                    }
-                };
-
-                node.setEntityName(name);
-                node.setId(child.id());
-
-                var behaviour = ddFactory.createBehaviour();
-                behaviour.setEntityName(name);
-                node.setBehaviour(behaviour);
-                dataDictionary.getBehaviour()
-                        .add(behaviour);
-
-                createWebPins(pinToNodeMap, pinMap, nodeOutpinBehavior, child, node);
-
-                List<Label> labelsAtNode = child.labels()
-                        .stream()
-                        .map(it -> idToLabelMap.get(it.labelTypeValueId()))
-                        .toList();
-                node.getProperties()
-                        .addAll(labelsAtNode);
-
-                dataFlowDiagram.getNodes()
-                        .add(node);
-                idToNodeMap.put(child.id(), node);
-            }
-        }
-    }
-
-    private void createWebFlows(WebEditorDfd webdfd, Map<String, Node> pinToNodeMap, Map<String, Pin> pinMap, DataFlowDiagram dataFlowDiagram) {
-
-        webdfd.model()
-                .children()
-                .stream()
-                .filter(child -> child.type()
-                        .contains("edge:"))
-                .forEach(child -> {
-                    var source = pinToNodeMap.get(child.sourceId());
-                    var dest = pinToNodeMap.get(child.targetId());
-
-                    var flow = dfdFactory.createFlow();
-                    flow.setSourceNode(source);
-                    flow.setDestinationNode(dest);
-                    flow.setEntityName(child.text());
-
-                    var destPin = pinMap.get(child.targetId());
-                    var sourcePin = pinMap.get(child.sourceId());
-
-                    destPin.setEntityName(destPin.getEntityName() + child.text());
-                    sourcePin.setEntityName(sourcePin.getEntityName() + child.text());
-
-                    flow.setDestinationPin(destPin);
-                    flow.setSourcePin(sourcePin);
-                    flow.setId(child.id());
-                    dataFlowDiagram.getFlows()
-                            .add(flow);
-                });
-
-    }
-
-    private void createWebPins(Map<String, Node> pinToNodeMap, Map<String, Pin> pinMap, Map<Node, Map<Pin, String>> nodeOutpinBehavior, Child child,
-            Node node) {
-        for (Port port : child.ports()) {
-            switch (port.type()) {
-                case "port:dfd-input" -> pinMap.put(port.id(), createWebInPin(node, port));
-                case "port:dfd-output" -> pinMap.put(port.id(), createWebOutPin(nodeOutpinBehavior, node, port));
-                default -> logger.error("Unrecognized port type");
-            }
-            pinToNodeMap.put(port.id(), node);
-        }
-    }
 
-    private Pin createWebOutPin(Map<Node, Map<Pin, String>> nodeOutpinBehavior, Node node, Port port) {
-        var outPin = ddFactory.createPin();
-        outPin.setId(port.id());
-        outPin.setEntityName(node.getEntityName() + "_out_");
-        node.getBehaviour()
-                .getOutPin()
-                .add(outPin);
-        if (port.behavior() != null) {
-            putValue(nodeOutpinBehavior, node, outPin, port.behavior());
-        }
-        return outPin;
-    }
-
-    private Pin createWebInPin(Node node, Port port) {
-        var inPin = ddFactory.createPin();
-        inPin.setId(port.id());
-        inPin.setEntityName(node.getEntityName() + "_in_");
-        node.getBehaviour()
-                .getInPin()
-                .add(inPin);
-        return inPin;
-    }
-
-    private void createWebLabelTypes(WebEditorDfd webdfd, Map<String, Label> idToLabelMap, DataDictionary dataDictionary) {
-        for (WebEditorLabelType webLabelType : webdfd.labelTypes()) {
-            LabelType labelType = ddFactory.createLabelType();
-            labelType.setEntityName(webLabelType.name());
-            labelType.setId(webLabelType.id());
-            for (Value value : webLabelType.values()) {
-                createWebLabel(idToLabelMap, labelType, value);
-            }
-            dataDictionary.getLabelTypes()
-                    .add(labelType);
-        }
-    }
-
-    private void createWebLabel(Map<String, Label> idToLabelMap, LabelType labelType, Value value) {
-        Label label = ddFactory.createLabel();
-        label.setEntityName(value.text());
-        label.setId(value.id());
-        labelType.getLabel()
-                .add(label);
-        idToLabelMap.put(label.getId(), label);
-    }
 
     private void createLabelTypesAndValues(List<WebEditorLabelType> labelTypes, DataDictionary dataDictionary) {
         for (LabelType labelType : dataDictionary.getLabelTypes()) {
@@ -505,11 +290,11 @@ private void createNodes(DataFlowDiagram dataFlowDiagram, List<Child> children,
     private void createFlows(DataFlowDiagram dataFlowDiagram, List<Child> children) {
         for (Flow flow : dataFlowDiagram.getFlows()) {
         	fillPinToFlowNamesMap(inputPinToFlowNamesMap,flow);
-            children.add(createWebFlow(flow));
+            children.add(createFlow(flow));
         }
     }
 
-    private Child createWebFlow(Flow flow) {
+    private Child createFlow(Flow flow) {
         String id = flow.getId();
         String type = "edge:arrow";
         String sourceId = flow.getSourcePin()
@@ -584,73 +369,6 @@ private String getStringFromInputPins (List<Pin> inputPins) {
         return String.join(DELIMITER_MULTI_PIN, pinNamesAsString);
     }
 
-    private void parseBehavior(Node node, Pin outpin, String lines, DataFlowDiagram dfd, DataDictionary dd) {
-        String[] behaviorStrings = lines.split("\n");
-        var behavior = node.getBehaviour();
-        for (String behaviorString : behaviorStrings) {
-        	behaviorString = behaviorString.replace(" ", "");
-            if (behaviorString.contains("Forwarding")) {
-            	 var assignment = ddFactory.createForwardingAssignment();
-            	 assignment.setOutputPin(outpin);
-            	 
-            	 String regex = "^Forwarding\\(\\{([^}]*)\\}\\)$";
-                 Pattern pattern = Pattern.compile(regex);
-                 Matcher matcher = pattern.matcher(behaviorString);
-                 if (!matcher.matches()) { 
-                	 logger.error("Invalid behavior string:");
-                     logger.error(behaviorString);
-                     continue;
-                 }        	  
-                 
-                 assignment.getInputPins().addAll(getInPinsFromString(matcher.group(1), node, dfd));
-               
-                behavior.getAssignment()
-                        .add(assignment);
-            } else if (behaviorString.contains("Assignment")) {            	
-            	String regex = "^Assignment\\(\\{([^}]*)\\};([^;]+);\\{([^}]*)\\}\\)$";
-                Pattern pattern = Pattern.compile(regex);
-                Matcher matcher = pattern.matcher(behaviorString);
-                if (!matcher.matches()) {
-                    logger.error("Invalid behavior string:");
-                    logger.error(behaviorString);
-                    continue;
-                }              
-                
-                String inPinsAsString = matcher.group(1);
-                String term = matcher.group(2); 
-                String outLabelsAsString = matcher.group(3);
-                
-                Assignment assignment = ddFactory.createAssignment();
-                assignment.setOutputPin(outpin);
-                assignment.setTerm(behaviorConverter.stringToTerm(term));
-                assignment.getInputPins().addAll(getInPinsFromString(inPinsAsString, node, dfd));
-                
-                Arrays.asList(outLabelsAsString.split(",")).forEach(typeValuePair -> {
-                	 String typeName = typeValuePair.split("\\.")[0];
-                     String valueName = typeValuePair.split("\\.")[1];
-                     
-                     Label value = dd.getLabelTypes()
-                             .stream()
-                             .filter(labelType -> labelType.getEntityName()
-                                     .equals(typeName))
-                             .flatMap(labelType -> labelType.getLabel()
-                                     .stream())
-                             .filter(label -> label.getEntityName()
-                                     .equals(valueName))
-                             .findAny()
-                             .orElse(null);
-                     assignment.getOutputLabels()
-                     .add(value);
-                });
-              
-                behavior.getAssignment()
-                        .add(assignment);
-            }
-        }
-    }
-    
-    
-    
     private void fillPinToFlowNamesMap(Map<Pin,List<String>> map,Flow flow) {
         if (map.containsKey(flow.getDestinationPin())) {
             map.get(flow.getDestinationPin())
@@ -662,33 +380,4 @@ private void fillPinToFlowNamesMap(Map<Pin,List<String>> map,Flow flow) {
         }
     }
 
-    private void putValue(Map<Node, Map<Pin, String>> nestedHashMap, Node node, Pin pin, String value) {
-        nestedHashMap.computeIfAbsent(node, k -> new HashMap<>())
-                .put(pin, value);
-    }
-    
-    private List<Pin> getInPinsFromString(String pinString, Node node, DataFlowDiagram dfd) {
-    	List<Pin> inPins = new ArrayList<>();
-    	 List<String> pinNames = Arrays.asList(pinString.split(DELIMITER_MULTI_PIN + "\\s*"));
-
-         List<Flow> flowsToNode = dfd.getFlows()
-                 .stream()
-                 .filter(flow -> flow.getDestinationNode() == node)
-                 .toList();
-
-         Map<Pin,List<String>>pinToFlowNames = new HashMap<>();
-         for (var flow : flowsToNode) {
-             fillPinToFlowNamesMap(pinToFlowNames,flow);  
-         }
-         
-         pinNames.forEach(pinName -> {
-        	 List<String> incomingFlowNames = Arrays.asList(pinName.split(Pattern.quote(DELIMITER_PIN_NAME)));
-        	 pinToFlowNames.keySet().forEach(key -> {
-        		if (pinToFlowNames.get(key).containsAll(incomingFlowNames)) inPins.add(key);
-        	 });
-         });    	
-    	
-    	return inPins;
-    }
-
 }
diff --git a/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/WebEditorConverter.java b/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/WebEditorConverter.java
new file mode 100644
index 0000000..b8e1ab0
--- /dev/null
+++ b/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/WebEditorConverter.java
@@ -0,0 +1,355 @@
+package org.dataflowanalysis.converter;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.log4j.Logger;
+import org.dataflowanalysis.converter.webdfd.Child;
+import org.dataflowanalysis.converter.webdfd.Port;
+import org.dataflowanalysis.converter.webdfd.Value;
+import org.dataflowanalysis.converter.webdfd.WebEditorDfd;
+import org.dataflowanalysis.converter.webdfd.WebEditorLabelType;
+import org.dataflowanalysis.dfd.datadictionary.Assignment;
+import org.dataflowanalysis.dfd.datadictionary.DataDictionary;
+import org.dataflowanalysis.dfd.datadictionary.Label;
+import org.dataflowanalysis.dfd.datadictionary.LabelType;
+import org.dataflowanalysis.dfd.datadictionary.Pin;
+import org.dataflowanalysis.dfd.datadictionary.datadictionaryFactory;
+import org.dataflowanalysis.dfd.dataflowdiagram.DataFlowDiagram;
+import org.dataflowanalysis.dfd.dataflowdiagram.Flow;
+import org.dataflowanalysis.dfd.dataflowdiagram.Node;
+import org.dataflowanalysis.dfd.dataflowdiagram.dataflowdiagramFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class WebEditorConverter extends Converter{
+    
+    private final dataflowdiagramFactory dfdFactory;
+    private final datadictionaryFactory ddFactory;
+    private Map<String, Node> idToNodeMap;
+
+    private final Logger logger = Logger.getLogger(WebEditorConverter.class);
+    protected final static String DELIMITER_PIN_NAME = "|";
+    protected final static String DELIMITER_MULTI_PIN = ",";
+
+    private BehaviorConverter behaviorConverter;
+
+    public WebEditorConverter() {
+        dfdFactory = dataflowdiagramFactory.eINSTANCE;
+        ddFactory = datadictionaryFactory.eINSTANCE;
+    }
+
+    /**
+     * Converts a Web Editor DFD format file into a DataFlowDiagramAndDictionary object.
+     * @param inputFile The path of the input file in Web Editor DFD format.
+     * @return DataFlowDiagramAndDictionary object representing the converted data flow diagram and dictionary.
+     */
+    public DataFlowDiagramAndDictionary webToDfd(String inputFile) {
+        return webToDfd(loadWeb(inputFile).get());
+    }
+
+    /**
+     * Converts a WebEditorDfd object into a DataFlowDiagramAndDictionary object.
+     * @param inputFile The WebEditorDfd object to convert.
+     * @return DataFlowDiagramAndDictionary object representing the converted data flow diagram and dictionary.
+     */
+    public DataFlowDiagramAndDictionary webToDfd(WebEditorDfd inputFile) {
+        return processWeb(inputFile);
+    }
+    
+    /**
+     * Loads a WebEditorDfd object from a specified input file.
+     * @param inputFile The path of the input file.
+     * @return Optional containing the loaded WebEditorDfd object; empty if an error occurs.
+     */
+    public Optional<WebEditorDfd> loadWeb(String inputFile) {
+        objectMapper = new ObjectMapper();
+        file = new File(inputFile);
+        try {
+            WebEditorDfd result = objectMapper.readValue(file, WebEditorDfd.class);
+            return Optional.ofNullable(result); // This will never be null given readValue's behavior, but it's a safe usage pattern.
+        } catch (IOException e) {
+            logger.error("Could not load web dfd:", e);
+            return Optional.empty();
+        }
+    }
+    
+    private DataFlowDiagramAndDictionary processWeb(WebEditorDfd webdfd) {
+        idToNodeMap = new HashMap<>();
+        Map<String, Node> pinToNodeMap = new HashMap<>();
+        Map<String, Pin> idToPinMap = new HashMap<>();
+        Map<String, Label> idToLabelMap = new HashMap<>();
+        Map<Node, Map<Pin, String>> nodeOutpinBehaviorMap = new HashMap<>();
+
+        DataFlowDiagram dataFlowDiagram = dfdFactory.createDataFlowDiagram();
+        DataDictionary dataDictionary = ddFactory.createDataDictionary();
+
+        behaviorConverter = new BehaviorConverter(dataDictionary);
+
+        createLabelTypes(webdfd, idToLabelMap, dataDictionary);
+
+        createNodes(webdfd, pinToNodeMap, idToPinMap, idToLabelMap, nodeOutpinBehaviorMap, dataFlowDiagram, dataDictionary);
+
+        createFlows(webdfd, pinToNodeMap, idToPinMap, dataFlowDiagram);
+
+        List<Node> nodesInBehavior = nodeOutpinBehaviorMap.keySet()
+                .stream()
+                .collect(Collectors.toList());
+
+        nodesInBehavior.forEach(node -> {
+            Map<Pin, String> outpinBehaviors = nodeOutpinBehaviorMap.get(node);
+            outpinBehaviors.forEach((outpin, behavior) -> {
+                parseBehavior(node, outpin, behavior, dataFlowDiagram, dataDictionary);
+            });
+        });
+
+        return new DataFlowDiagramAndDictionary(dataFlowDiagram, dataDictionary);
+    }
+    
+    private void createNodes(WebEditorDfd webdfd, Map<String, Node> pinToNodeMap, Map<String, Pin> pinMap, Map<String, Label> idToLabelMap,
+            Map<Node, Map<Pin, String>> nodeOutpinBehavior, DataFlowDiagram dataFlowDiagram, DataDictionary dataDictionary) {
+        for (Child child : webdfd.model()
+                .children()) {
+            String[] type = child.type()
+                    .split(":");
+            String name = child.text();
+
+            if (type[0].equals("node")) {
+                Node node = switch (type[1]) {
+                    case "function" -> dfdFactory.createProcess();
+                    case "storage" -> dfdFactory.createStore();
+                    case "input-output" -> dfdFactory.createExternal();
+                    default -> {
+                        logger.error("Unrecognized node type: " + type[1]);
+                        continue;
+                    }
+                };
+
+                node.setEntityName(name);
+                node.setId(child.id());
+
+                var behaviour = ddFactory.createBehaviour();
+                behaviour.setEntityName(name);
+                node.setBehaviour(behaviour);
+                dataDictionary.getBehaviour()
+                        .add(behaviour);
+
+                createPins(pinToNodeMap, pinMap, nodeOutpinBehavior, child, node);
+
+                List<Label> labelsAtNode = child.labels()
+                        .stream()
+                        .map(it -> idToLabelMap.get(it.labelTypeValueId()))
+                        .toList();
+                node.getProperties()
+                        .addAll(labelsAtNode);
+
+                dataFlowDiagram.getNodes()
+                        .add(node);
+                idToNodeMap.put(child.id(), node);
+            }
+        }
+    }
+
+    private void createFlows(WebEditorDfd webdfd, Map<String, Node> pinToNodeMap, Map<String, Pin> pinMap, DataFlowDiagram dataFlowDiagram) {
+
+        webdfd.model()
+                .children()
+                .stream()
+                .filter(child -> child.type()
+                        .contains("edge:"))
+                .forEach(child -> {
+                    var source = pinToNodeMap.get(child.sourceId());
+                    var dest = pinToNodeMap.get(child.targetId());
+
+                    var flow = dfdFactory.createFlow();
+                    flow.setSourceNode(source);
+                    flow.setDestinationNode(dest);
+                    flow.setEntityName(child.text());
+
+                    var destPin = pinMap.get(child.targetId());
+                    var sourcePin = pinMap.get(child.sourceId());
+
+                    destPin.setEntityName(destPin.getEntityName() + child.text());
+                    sourcePin.setEntityName(sourcePin.getEntityName() + child.text());
+
+                    flow.setDestinationPin(destPin);
+                    flow.setSourcePin(sourcePin);
+                    flow.setId(child.id());
+                    dataFlowDiagram.getFlows()
+                            .add(flow);
+                });
+
+    }
+
+    private void createPins(Map<String, Node> pinToNodeMap, Map<String, Pin> pinMap, Map<Node, Map<Pin, String>> nodeOutpinBehavior, Child child,
+            Node node) {
+        for (Port port : child.ports()) {
+            switch (port.type()) {
+                case "port:dfd-input" -> pinMap.put(port.id(), createInPin(node, port));
+                case "port:dfd-output" -> pinMap.put(port.id(), createOutPin(nodeOutpinBehavior, node, port));
+                default -> logger.error("Unrecognized port type");
+            }
+            pinToNodeMap.put(port.id(), node);
+        }
+    }
+
+    private Pin createOutPin(Map<Node, Map<Pin, String>> nodeOutpinBehavior, Node node, Port port) {
+        var outPin = ddFactory.createPin();
+        outPin.setId(port.id());
+        outPin.setEntityName(node.getEntityName() + "_out_");
+        node.getBehaviour()
+                .getOutPin()
+                .add(outPin);
+        if (port.behavior() != null) {
+            putValue(nodeOutpinBehavior, node, outPin, port.behavior());
+        }
+        return outPin;
+    }
+
+    private Pin createInPin(Node node, Port port) {
+        var inPin = ddFactory.createPin();
+        inPin.setId(port.id());
+        inPin.setEntityName(node.getEntityName() + "_in_");
+        node.getBehaviour()
+                .getInPin()
+                .add(inPin);
+        return inPin;
+    }
+
+    private void createLabelTypes(WebEditorDfd webdfd, Map<String, Label> idToLabelMap, DataDictionary dataDictionary) {
+        for (WebEditorLabelType webLabelType : webdfd.labelTypes()) {
+            LabelType labelType = ddFactory.createLabelType();
+            labelType.setEntityName(webLabelType.name());
+            labelType.setId(webLabelType.id());
+            for (Value value : webLabelType.values()) {
+                createLabel(idToLabelMap, labelType, value);
+            }
+            dataDictionary.getLabelTypes()
+                    .add(labelType);
+        }
+    }
+
+    private void createLabel(Map<String, Label> idToLabelMap, LabelType labelType, Value value) {
+        Label label = ddFactory.createLabel();
+        label.setEntityName(value.text());
+        label.setId(value.id());
+        labelType.getLabel()
+                .add(label);
+        idToLabelMap.put(label.getId(), label);
+    }
+    
+    private void parseBehavior(Node node, Pin outpin, String lines, DataFlowDiagram dfd, DataDictionary dd) {
+        String[] behaviorStrings = lines.split("\n");
+        var behavior = node.getBehaviour();
+        for (String behaviorString : behaviorStrings) {
+            behaviorString = behaviorString.replace(" ", "");
+            if (behaviorString.contains("Forwarding")) {
+                 var assignment = ddFactory.createForwardingAssignment();
+                 assignment.setOutputPin(outpin);
+                 
+                 String regex = "^Forwarding\\(\\{([^}]*)\\}\\)$";
+                 Pattern pattern = Pattern.compile(regex);
+                 Matcher matcher = pattern.matcher(behaviorString);
+                 if (!matcher.matches()) { 
+                     logger.error("Invalid behavior string:");
+                     logger.error(behaviorString);
+                     continue;
+                 }            
+                 
+                 assignment.getInputPins().addAll(getInPinsFromString(matcher.group(1), node, dfd));
+               
+                behavior.getAssignment()
+                        .add(assignment);
+            } else if (behaviorString.contains("Assignment")) {             
+                String regex = "^Assignment\\(\\{([^}]*)\\};([^;]+);\\{([^}]*)\\}\\)$";
+                Pattern pattern = Pattern.compile(regex);
+                Matcher matcher = pattern.matcher(behaviorString);
+                if (!matcher.matches()) {
+                    logger.error("Invalid behavior string:");
+                    logger.error(behaviorString);
+                    continue;
+                }              
+                
+                String inPinsAsString = matcher.group(1);
+                String term = matcher.group(2); 
+                String outLabelsAsString = matcher.group(3);
+                
+                Assignment assignment = ddFactory.createAssignment();
+                assignment.setOutputPin(outpin);
+                assignment.setTerm(behaviorConverter.stringToTerm(term));
+                assignment.getInputPins().addAll(getInPinsFromString(inPinsAsString, node, dfd));
+                
+                Arrays.asList(outLabelsAsString.split(",")).forEach(typeValuePair -> {
+                     String typeName = typeValuePair.split("\\.")[0];
+                     String valueName = typeValuePair.split("\\.")[1];
+                     
+                     Label value = dd.getLabelTypes()
+                             .stream()
+                             .filter(labelType -> labelType.getEntityName()
+                                     .equals(typeName))
+                             .flatMap(labelType -> labelType.getLabel()
+                                     .stream())
+                             .filter(label -> label.getEntityName()
+                                     .equals(valueName))
+                             .findAny()
+                             .orElse(null);
+                     assignment.getOutputLabels()
+                     .add(value);
+                });
+              
+                behavior.getAssignment()
+                        .add(assignment);
+            }
+        }
+    }
+    
+    private void putValue(Map<Node, Map<Pin, String>> nestedHashMap, Node node, Pin pin, String value) {
+        nestedHashMap.computeIfAbsent(node, k -> new HashMap<>())
+                .put(pin, value);
+    }
+    
+    private List<Pin> getInPinsFromString(String pinString, Node node, DataFlowDiagram dfd) {
+        List<Pin> inPins = new ArrayList<>();
+         List<String> pinNames = Arrays.asList(pinString.split(DELIMITER_MULTI_PIN + "\\s*"));
+
+         List<Flow> flowsToNode = dfd.getFlows()
+                 .stream()
+                 .filter(flow -> flow.getDestinationNode() == node)
+                 .toList();
+
+         Map<Pin,List<String>>pinToFlowNames = new HashMap<>();
+         for (var flow : flowsToNode) {
+             fillPinToFlowNamesMap(pinToFlowNames,flow);  
+         }
+         
+         pinNames.forEach(pinName -> {
+             List<String> incomingFlowNames = Arrays.asList(pinName.split(Pattern.quote(DELIMITER_PIN_NAME)));
+             pinToFlowNames.keySet().forEach(key -> {
+                if (pinToFlowNames.get(key).containsAll(incomingFlowNames)) inPins.add(key);
+             });
+         });        
+        
+        return inPins;
+    }
+    
+    private void fillPinToFlowNamesMap(Map<Pin,List<String>> map,Flow flow) {
+        if (map.containsKey(flow.getDestinationPin())) {
+            map.get(flow.getDestinationPin())
+                    .add(flow.getEntityName());
+        } else {
+            List<String> flowNames = new ArrayList<>();
+            flowNames.add(flow.getEntityName());
+            map.put(flow.getDestinationPin(), flowNames);
+        }
+    }
+
+}
diff --git a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/AnnotationsTest.java b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/AnnotationsTest.java
index e88c634..74d39dd 100644
--- a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/AnnotationsTest.java
+++ b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/AnnotationsTest.java
@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -12,8 +11,6 @@
 
 import org.dataflowanalysis.analysis.core.AbstractVertex;
 import org.dataflowanalysis.analysis.core.CharacteristicValue;
-import org.dataflowanalysis.analysis.core.DataCharacteristic;
-import org.dataflowanalysis.converter.BehaviorConverter;
 import org.dataflowanalysis.converter.DataFlowDiagramAndDictionary;
 import org.dataflowanalysis.converter.DataFlowDiagramConverter;
 import org.dataflowanalysis.converter.webdfd.Annotation;
diff --git a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/BehaviorTest.java b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/BehaviorTest.java
index 5d95519..b71cbb8 100644
--- a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/BehaviorTest.java
+++ b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/BehaviorTest.java
@@ -3,9 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.dataflowanalysis.converter.BehaviorConverter;
diff --git a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/MicroSecEndTest.java b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/MicroSecEndTest.java
index dd3e575..bc79ed0 100644
--- a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/MicroSecEndTest.java
+++ b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/MicroSecEndTest.java
@@ -234,9 +234,10 @@ private String computeCompleteLabel(Label label) {
     }
 
     private void ensureCorrectDFDConversion(DataFlowDiagramAndDictionary complete) {
-        var webConverter = new DataFlowDiagramConverter();
-        var webBefore = webConverter.dfdToWeb(complete);
-        var webAfter = webConverter.dfdToWeb(webConverter.webToDfd(webBefore));
+        var webConverter = new WebEditorConverter();
+        var dfdConverter = new DataFlowDiagramConverter();
+        var webBefore = dfdConverter.dfdToWeb(complete);
+        var webAfter = dfdConverter.dfdToWeb(webConverter.webToDfd(webBefore));
         assertEquals(webBefore, webAfter);
     }
 
diff --git a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java
index 8328649..f71650b 100644
--- a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java
+++ b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java
@@ -27,7 +27,6 @@
 import org.dataflowanalysis.analysis.core.DataCharacteristic;
 import org.dataflowanalysis.analysis.core.FlowGraphCollection;
 import org.dataflowanalysis.analysis.dfd.DFDConfidentialityAnalysis;
-import org.dataflowanalysis.analysis.dfd.core.DFDTransposeFlowGraphFinder;
 import org.dataflowanalysis.analysis.dfd.simple.DFDSimpleTransposeFlowGraphFinder;
 import org.dataflowanalysis.analysis.pcm.PCMDataFlowConfidentialityAnalysisBuilder;
 import org.dataflowanalysis.analysis.pcm.core.AbstractPCMVertex;
diff --git a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/WebEditorTest.java b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/WebEditorTest.java
index ba244bb..16d3767 100644
--- a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/WebEditorTest.java
+++ b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/WebEditorTest.java
@@ -9,12 +9,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
 import org.dataflowanalysis.converter.DataFlowDiagramAndDictionary;
 import org.dataflowanalysis.converter.DataFlowDiagramConverter;
-import org.dataflowanalysis.examplemodels.Activator;
+import org.dataflowanalysis.converter.WebEditorConverter;
 import org.dataflowanalysis.converter.webdfd.WebEditorDfd;
 import org.dataflowanalysis.dfd.datadictionary.Pin;
 import org.dataflowanalysis.dfd.dataflowdiagram.Flow;
@@ -25,7 +22,8 @@
 import tools.mdsd.library.standalone.initialization.StandaloneInitializationException;
 
 public class WebEditorTest extends ConverterTest {
-    private DataFlowDiagramConverter converter;
+    private DataFlowDiagramConverter dfdConverter;
+    private WebEditorConverter webConverter;
 
     private final String minimalWebDFD = Paths.get(TEST_JSONS, "minimal.json")
             .toString();
@@ -34,14 +32,15 @@ public class WebEditorTest extends ConverterTest {
 
     @BeforeEach
     public void setup() {
-        converter = new DataFlowDiagramConverter();
+        dfdConverter = new DataFlowDiagramConverter();
+        webConverter = new WebEditorConverter();
     }
 
     @Test
     @DisplayName("Test Web -> DFD -> Web")
     public void webToDfdToWeb() throws StreamReadException, DatabindException, IOException {
-        DataFlowDiagramAndDictionary dfdBefore = converter.webToDfd(minimalWebDFD);
-        WebEditorDfd webAfter = converter.dfdToWeb(dfdBefore);
+        DataFlowDiagramAndDictionary dfdBefore = webConverter.webToDfd(minimalWebDFD);
+        WebEditorDfd webAfter = dfdConverter.dfdToWeb(dfdBefore);
 
         ObjectMapper objectMapper = new ObjectMapper();
         File file = new File(minimalWebDFD);
@@ -65,14 +64,14 @@ public void testStoreLoad() throws StreamReadException, DatabindException, IOExc
         File file = new File(minimalWebDFD);
 
         WebEditorDfd webBefore = objectMapper.readValue(file, WebEditorDfd.class);
-        DataFlowDiagramAndDictionary completeBefore = converter.webToDfd(webBefore);
+        DataFlowDiagramAndDictionary completeBefore = webConverter.webToDfd(webBefore);
 
-        converter.storeWeb(webBefore, tempWebDFD);
-        converter.storeDFD(completeBefore, "bin" + File.separator + tempWebDFD);
+        dfdConverter.storeWeb(webBefore, tempWebDFD);
+        webConverter.storeDFD(completeBefore, "bin" + File.separator + tempWebDFD);
 
-        WebEditorDfd webAfter = converter.loadWeb(tempWebDFD)
+        WebEditorDfd webAfter = webConverter.loadWeb(tempWebDFD)
                 .get();
-        DataFlowDiagramAndDictionary completeAfter = converter.loadDFD(TESTS, "bin/test.dataflowdiagram", "bin/test.datadictionary",
+        DataFlowDiagramAndDictionary completeAfter = dfdConverter.loadDFD(TESTS, "bin/test.dataflowdiagram", "bin/test.datadictionary",
                 org.dataflowanalysis.converter.tests.Activator.class);
 
         assertEquals(webBefore, webAfter);