use inputstream for input

Author: fractalwrench

core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonReader.kt

@@ -3,6 +3,9 @@ package com.fractalwrench.json2kotlin
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
+import java.io.BufferedReader
+import java.io.InputStream
+import java.io.InputStreamReader
 
 /**
  * Reads and serialises a JSON string to a JSONElement, using GSON.
@@ -14,8 +17,10 @@ class JsonReader(private val jsonParser: JsonParser) {
     /**
      * Reads a JSON string using GSON.
      */
-    internal fun readJsonTree(input: String, args: ConversionArgs): JsonObject {
-        with(jsonParser.parse(input)) {
+    internal fun readJsonTree(input: InputStream, args: ConversionArgs): JsonObject {
+        // TODO check IO is closed properly everywhere!
+
+        with(jsonParser.parse(BufferedReader(InputStreamReader(input)))) {
             return when {
                 isJsonObject -> asJsonObject
                 isJsonArray -> addRootWrapper(asJsonArray, args.rootClassName)

core/src/main/kotlin/com/fractalwrench/json2kotlin/Kotlin2JsonConverter.kt

@@ -1,6 +1,7 @@
 package com.fractalwrench.json2kotlin
 
 import com.google.gson.*
+import java.io.InputStream
 import java.io.OutputStream
 
 /**
@@ -17,12 +18,8 @@ class Kotlin2JsonConverter(val buildDelegate: SourceBuildDelegate = GsonBuildDel
     /**
      * Converts a JSON string to Kotlin, writing it to the OutputStream.
      */
-    fun convert(input: String, output: OutputStream, args: ConversionArgs) { // FIXME should take an InputStream as input
+    fun convert(input: InputStream, output: OutputStream, args: ConversionArgs) {
         try {
-            if (input.isEmpty()) {
-                throw IllegalArgumentException("Json input empty")
-            }
-
             val jsonRoot = jsonReader.readJsonTree(input, args)
             val stack = traverser.traverse(jsonRoot, args.rootClassName)
             val typeHolder = ClassTypeHolder(buildDelegate, ::defaultGroupingStrategy)

core/src/test/kotlin/com/fractalwrench/json2kotlin/ConverterArgsTest.kt

@@ -17,7 +17,7 @@ class ConverterArgsTest {
     fun testPackageName() {
         val jsonFilename = "args/Package.json"
         val expectedFilename = "args/PackageExample.kt"
-        val json = fileReader.readContents(jsonFilename)
+        val json = fileReader.inputStream(jsonFilename)
 
         val outputStream = ByteArrayOutputStream()
         jsonConverter.convert(json, outputStream, ConversionArgs("PackageExample", "com.fractalwrench.foo"))

core/src/test/kotlin/com/fractalwrench/json2kotlin/InvalidJsonConverterTest.kt

@@ -25,9 +25,9 @@ class InvalidJsonConverterTest(val jsonFilename: String) {
     /**
      * Takes a JSON file and converts it into the equivalent Kotlin class, then compares to expected output.
      */
-    @Test(expected = IllegalArgumentException::class)
+    @Test(expected = RuntimeException::class)
     fun testJsonToKotlinConversion() {
-        val json = fileReader.readContents(jsonFilename)
+        val json = fileReader.inputStream(jsonFilename)
         val outputStream = ByteArrayOutputStream()
         val args = ConversionArgs(jsonFilename.replace(".kt", ""))
         jsonConverter.convert(json, outputStream, args)

core/src/test/kotlin/com/fractalwrench/json2kotlin/JsonConverterTest.kt

@@ -8,18 +8,19 @@ import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import java.io.ByteArrayOutputStream
 import java.io.File
+import java.io.InputStream
 import java.util.*
 
 @RunWith(Parameterized::class)
 open class JsonConverterTest(val expectedFilename: String, val jsonFilename: String) {
 
     private val fileReader = ResourceFileReader()
     private val jsonConverter = Kotlin2JsonConverter()
-    internal lateinit var json: String
+    internal lateinit var json: InputStream
 
     @Before
     fun setUp() {
-        json = fileReader.readContents(jsonFilename)
+        json = fileReader.inputStream(jsonFilename)
     }
 
     companion object {

core/src/test/kotlin/com/fractalwrench/json2kotlin/ResourceFileReader.kt

@@ -1,8 +1,14 @@
 package com.fractalwrench.json2kotlin
 
+import java.io.InputStream
+
 internal class ResourceFileReader {
     fun readContents(resourceName: String): String {
         val resource = ResourceFileReader::class.java.classLoader.getResource(resourceName)
         return resource?.readText() ?: ""
     }
+
+    fun inputStream(resourceName: String): InputStream {
+        return ResourceFileReader::class.java.classLoader.getResourceAsStream(resourceName)
+    }
 }