fixes #119

erosb · Oct 30, 2024 · a3b836a · a3b836a
1 parent 2fc9624
commit a3b836a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/src/main/kotlin/com/github/erosb/jsonsKema/JsonParser.kt b/src/main/kotlin/com/github/erosb/jsonsKema/JsonParser.kt
@@ -10,11 +10,21 @@ import java.math.BigInteger
 import java.net.URI
 
 private class SourceWalker(
-    input: InputStream,
-    private val documentSource: URI,
-    private val reader: Reader = BufferedReader(InputStreamReader(input)),
+    inputReader: Reader,
+    private val documentSource: URI
 ) {
 
+    private val reader = inputReader.let { if (it.markSupported()) it else BufferedReader(it) }
+
+    constructor(input: InputStream, documentSource: URI) : this(
+        BufferedReader(InputStreamReader(input)),
+        documentSource
+    )
+
+    init {
+        reader.markSupported()
+    }
+
     private var lineNumber = 1
     private var position = 1
 
@@ -107,6 +117,12 @@ class JsonParser {
         this.documentSource = documentSource
     }
 
+    @JvmOverloads
+    constructor(schemaJson: Reader, documentSource: URI = DEFAULT_BASE_URI) {
+        this.walker = SourceWalker(schemaJson, documentSource)
+        this.documentSource = documentSource
+    }
+
     constructor(schemaInputStream: InputStream, documentSource: URI) {
         this.walker = SourceWalker(schemaInputStream, documentSource)
         this.documentSource = documentSource

diff --git a/src/test/kotlin/com/github/erosb/jsonsKema/JsonParserTest.kt b/src/test/kotlin/com/github/erosb/jsonsKema/JsonParserTest.kt
@@ -5,6 +5,9 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
+import java.io.BufferedReader
+import java.io.ByteArrayInputStream
+import java.io.InputStreamReader
 import java.math.BigDecimal
 import java.math.BigInteger
 
@@ -39,6 +42,24 @@ class JsonParserTest {
         assertEquals("Extraneous character found: n", exception.message)
     }
 
+    @Test
+    fun `create from Reader`() {
+        val parser = JsonParser(
+            BufferedReader(
+            InputStreamReader(ByteArrayInputStream("true".toByteArray()))
+            )
+        )
+        assertEquals(JsonBoolean(true, SourceLocation(1, 1, JsonPointer())), parser.parse())
+    }
+
+    @Test
+    fun `create from non-buffered`() {
+        val parser = JsonParser(
+            InputStreamReader(ByteArrayInputStream("  true".toByteArray()))
+        )
+        assertEquals(JsonBoolean(true, SourceLocation(1, 3, JsonPointer())), parser.parse())
+    }
+
     @Test
     fun `null token mismatch`() {
         val exception = assertThrows(JsonParseException::class.java) {