Update JSON file parser to support input streams

Author: oshando

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONFileLoader.java

@@ -73,14 +73,20 @@ public static void loadInitialFile() {
     }
 
     /**
-     * Compares new JSON file with original file and updates list with merged results
+     * Compares new JSON file with original file and updates list with merged results. Loads new file
+     * is a JSON file was not selected.
      * @param newFilePath File path of new configuration file
      */
     public static void loadUpdatedFile(String newFilePath) {
 
-        JSONFileComparator fileComparator = new JSONFileComparator(congFile, newFilePath);
-        methods = fileComparator.compareJSONFile();
-        setConfigurationFile(newFilePath);
+        if(isFileSelected()){
+            JSONFileComparator fileComparator = new JSONFileComparator(congFile, newFilePath);
+            methods = fileComparator.compareJSONFile();
+            setConfigurationFile(newFilePath);
+        }else{
+            setConfigurationFile(newFilePath);
+            loadInitialFile();
+        }
     }
 
     /**
@@ -215,8 +221,6 @@ public static boolean methodExists(String methodSignature) {
         return methods.containsKey(methodSignature);
     }
 
-    //Returns method for the specified signature
-
     /**
      * Returns an instance of the method
      * @param methodSignature Method Signature of requested method.
@@ -227,8 +231,6 @@ public static MethodWrapper getMethod(String methodSignature) {
         return methods.get(methodSignature);
     }
 
-    //Remove method from list
-
     /**
      * Remove method from list
      * @param method Method to be removed

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONFileParser.java

@@ -14,8 +14,10 @@
 import de.fraunhofer.iem.swan.assist.util.Constants;
 import de.fraunhofer.iem.swan.data.Method;
 
+import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.ResourceBundle;
+import java.util.Set;
 
 /**
  * Parses JSON file and returns methods.
@@ -32,6 +34,13 @@ public JSONFileParser(String path) {
         congFilePath = path;
     }
 
+    /**
+     * Default constructor
+     */
+    public JSONFileParser() {
+
+    }
+
     /**
      * Returns file path for configuration file
      * @return File path as a string.
@@ -54,12 +63,30 @@ public void setCongFilePath(String congFilePath) {
      */
     public HashMap<String, MethodWrapper> parseJSONFileMap() {
 
-        HashMap<String, MethodWrapper> methods = new HashMap<String, MethodWrapper>();
         Parser parser = new Parser(congFilePath);
+        parser.parse(congFilePath);
+
+       return parseMethods(parser.methods());
+    }
+
+    /**
+     * Parses file and returns method.
+     * @return HashMap of methods
+     */
+    public HashMap<String, MethodWrapper> parseJSONFileStream(InputStreamReader streamReader) {
+
+        Parser parser = new Parser();
+        parser.parseStream(streamReader);
+        return parseMethods(parser.methods());
+    }
+
+    private HashMap<String, MethodWrapper> parseMethods(Set<Method> methodsSet){
+
         ResourceBundle resource = ResourceBundle.getBundle("dialog_messages");
+        HashMap<String, MethodWrapper> methods = new HashMap<String, MethodWrapper>();
 
         try {
-            for (Method method : parser.parseFile(congFilePath)) {
+            for (Method method :methodsSet ) {
 
                 MethodWrapper methodWrapper = new MethodWrapper(method);