Fix: Unnecessary Analysis prevented big models from being saved as DFD and DD

Author: 01Parzival10

bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java

@@ -98,7 +98,7 @@ else if (message.startsWith("Json2DFD:")) {
 	    		message = message.replaceFirst("Json2DFD:", "");
 	    		var name = message.split(":")[0];
 	    		message = message.replaceFirst(name + ":", "");	    		
-				var webEditorDfd = deserializeJsonAndAnnotate(message);
+				var webEditorDfd = deserializeJson(message);
 			    return Converter.convertToDFDandStringify(webEditorDfd, name);	
 	    	} 
 	    	else if (message.startsWith("DFD:")) {
@@ -131,6 +131,20 @@ private WebEditorDfd deserializeJsonAndAnnotate(String json) throws IllegalArgum
 		return Converter.analyzeAnnotate(webEditorDfd);
     }
 
+    private WebEditorDfd deserializeJson(String json) throws IllegalArgumentException {
+    	var objectMapper = new ObjectMapper();
+    	WebEditorDfd webEditorDfd;
+		try {
+			webEditorDfd = objectMapper.readValue(json, WebEditorDfd.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new IllegalArgumentException("Invalid Json Model");
+		} 
+		objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
+		return webEditorDfd;
+    }
+    
     private WebEditorDfd safeLoadAndConvertDFDString(String message) {
     	message = message.replaceFirst("DFD:", "");
 		String name = message.split(":")[0];