Able to read JSON from path

doki-theme · Sep 5, 2022 · b2a0be7 · b2a0be7
1 parent 13251fb
commit b2a0be7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "io.unthrottled.doki.build.jvm"
-version = "88.0.2"
+version = "88.0.3"
 
 java {
   withSourcesJar()

diff --git a/src/main/kotlin/io/unthrottled/doki/build/jvm/tools/ConstructableAssetSupplierFactory.kt b/src/main/kotlin/io/unthrottled/doki/build/jvm/tools/ConstructableAssetSupplierFactory.kt
@@ -1,9 +1,7 @@
 package io.unthrottled.doki.build.jvm.tools
 
-import com.google.gson.GsonBuilder
 import io.unthrottled.doki.build.jvm.models.AssetTemplateDefinition
-import java.io.InputStreamReader
-import java.nio.charset.StandardCharsets
+import io.unthrottled.doki.build.jvm.tools.PathTools.readJSONFromFile
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -36,8 +34,6 @@ class ConstructableAsset(
 
 object ConstructableAssetSupplierFactory {
 
-  private val gson = GsonBuilder().setPrettyPrinting().create()
-
   fun createCommonAssetsTemplate(
     buildSourceAssetDirectory: Path,
     masterThemesDirectory: Path
@@ -49,13 +45,7 @@ object ConstructableAssetSupplierFactory {
       )
         .filter { !Files.isDirectory(it) }
         .filter { it.fileName.toString().endsWith(".template.json") }
-        .map { Files.newInputStream(it) }
-        .map {
-          gson.fromJson(
-            InputStreamReader(it, StandardCharsets.UTF_8),
-            AssetTemplateDefinition::class.java
-          )
-        }
+        .map { readJSONFromFile(it, AssetTemplateDefinition::class.java) }
         .collect(
           Collectors.groupingBy {
             it.type ?: throw IllegalArgumentException("Expected template ${it.name} to have a type")

diff --git a/src/main/kotlin/io/unthrottled/doki/build/jvm/tools/PathTools.kt b/src/main/kotlin/io/unthrottled/doki/build/jvm/tools/PathTools.kt
@@ -1,5 +1,8 @@
 package io.unthrottled.doki.build.jvm.tools
 
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import java.io.InputStreamReader
 import java.nio.file.Files
 import java.nio.file.Files.createDirectories
 import java.nio.file.Files.exists
@@ -24,4 +27,26 @@ object PathTools {
         .forEach(Files::delete)
     }
   }
+
+  private val gson = GsonBuilder()
+    .create()
+
+  fun <T> readJSONFromFile(mappingFile: Path, typeToken: TypeToken<T>): T =
+    gson.fromJson(
+      InputStreamReader(
+        Files.newInputStream(
+          mappingFile
+        )
+      ),
+      typeToken.type
+    )
+  fun <T> readJSONFromFile(mappingFile: Path, clazz: Class<T>): T =
+    gson.fromJson(
+      InputStreamReader(
+        Files.newInputStream(
+          mappingFile
+        )
+      ),
+      clazz
+    )
 }