Updated version; added string-based methods in JsonHandler

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / util / JsonHandler.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java
index dc8ace3..df48266 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java
@@ -1,9 +1,12 @@
 package net.mograsim.logic.ui.util;
 
 import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.stream.Collectors;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -14,20 +17,40 @@ public class JsonHandler
 
        public static <T> T readJson(String path, Class<T> type) throws IOException
        {
-               try (FileReader reader = new FileReader(path); BufferedReader bf = new BufferedReader(reader))
+               try (FileInputStream jsonStream = new FileInputStream(path))
                {
-                       String json = bf.lines().dropWhile(s -> s.length() == 0 || s.charAt(0) != '{').reduce("", (x, y) -> x.concat(y));
-                       T params = parser.fromJson(json, type);
-                       return params;
+                       return readJson(jsonStream, type);
                }
        }
 
+       /**
+        * @param input The Stream is closed after being read
+        */
+       public static <T> T readJson(InputStream input, Class<T> type) throws IOException
+       {
+               try (InputStreamReader reader = new InputStreamReader(input); BufferedReader bf = new BufferedReader(reader))
+               {
+                       return fromJson(bf.lines().collect(Collectors.joining("\n")), type);
+               }
+       }
+
+       public static <T> T fromJson(String src, Class<T> type)
+       {
+               // TODO actually parse and compare version
+               String rawJson = src.lines().dropWhile(s -> s.length() == 0 || s.charAt(0) != '{').collect(Collectors.joining());
+               return parser.fromJson(rawJson, type);
+       }
+
        public static void writeJson(Object o, String path) throws IOException
        {
                try (FileWriter writer = new FileWriter(path))
                {
-                       writer.write(String.format("mograsim version: %s\n", Version.jsonCompVersion.toString()));
-                       writer.write(parser.toJson(o));
+                       writer.write(toJson(o));
                }
        }
+
+       public static String toJson(Object o)
+       {
+               return String.format("mograsim version: %s\n%s", Version.jsonCompVersion.toString(), parser.toJson(o));
+       }
 }