JsonUtils: Always read the file using the UTF-8 charset. Also small c…

…lean-up.
maruohon · Oct 22, 2021 · 0a19043 · 0a19043
1 parent 294d64b
commit 0a19043
Showing 1 changed file with 4 additions and 22 deletions.
diff --git a/src/main/java/fi/dy/masa/malilib/util/JsonUtils.java b/src/main/java/fi/dy/masa/malilib/util/JsonUtils.java
@@ -1,8 +1,9 @@
 package fi.dy.masa.malilib.util;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
@@ -415,13 +416,10 @@ public static JsonElement parseJsonFile(File file)
         {
             String fileName = file.getAbsolutePath();
 
-            try
+            try (InputStreamReader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))
             {
                 JsonParser parser = new JsonParser();
-                FileReader reader = new FileReader(file);
-
                 JsonElement element = parser.parse(reader);
-                reader.close();
 
                 return element;
             }
@@ -436,17 +434,15 @@ public static JsonElement parseJsonFile(File file)
 
     public static boolean writeJsonToFile(JsonObject root, File file)
     {
-        OutputStreamWriter writer = null;
         File fileTmp = new File(file.getParentFile(), file.getName() + ".tmp");
 
         if (fileTmp.exists())
         {
             fileTmp = new File(file.getParentFile(), UUID.randomUUID() + ".tmp");
         }
 
-        try
+        try (OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(fileTmp), StandardCharsets.UTF_8))
         {
-            writer = new OutputStreamWriter(new FileOutputStream(fileTmp), StandardCharsets.UTF_8);
             writer.write(GSON.toJson(root));
             writer.close();
 
@@ -461,20 +457,6 @@ public static boolean writeJsonToFile(JsonObject root, File file)
         {
             MaLiLib.logger.warn("Failed to write JSON data to file '{}'", fileTmp.getAbsolutePath(), e);
         }
-        finally
-        {
-            try
-            {
-                if (writer != null)
-                {
-                    writer.close();
-                }
-            }
-            catch (Exception e)
-            {
-                MaLiLib.logger.warn("Failed to close JSON file", e);
-            }
-        }
 
         return false;
     }