Fix deprecation warnings and issue revealed by upgrade to snakeyaml-e…

…ngine 2.3.
charleskorn · Apr 25, 2021 · ec3fb4b · ec3fb4b
1 parent 2318134
commit ec3fb4b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/jvmMain/kotlin/com/charleskorn/kaml/Yaml.kt b/src/jvmMain/kotlin/com/charleskorn/kaml/Yaml.kt
@@ -47,10 +47,11 @@ public actual class Yaml(
             override fun flush() { }
         }
 
-        val output = YamlOutput(writer, serializersModule, configuration)
-        output.encodeSerializableValue(serializer, value)
+        YamlOutput(writer, serializersModule, configuration).use { output ->
+            output.encodeSerializableValue(serializer, value)
+        }
 
-        return writer.toString()
+        return writer.toString().trimEnd()
     }
 
     public actual companion object {

diff --git a/src/jvmMain/kotlin/com/charleskorn/kaml/YamlOutput.kt b/src/jvmMain/kotlin/com/charleskorn/kaml/YamlOutput.kt
@@ -30,13 +30,15 @@ import org.snakeyaml.engine.v2.api.StreamDataWriter
 import org.snakeyaml.engine.v2.common.FlowStyle
 import org.snakeyaml.engine.v2.common.ScalarStyle
 import org.snakeyaml.engine.v2.emitter.Emitter
+import org.snakeyaml.engine.v2.events.DocumentEndEvent
 import org.snakeyaml.engine.v2.events.DocumentStartEvent
 import org.snakeyaml.engine.v2.events.ImplicitTuple
 import org.snakeyaml.engine.v2.events.MappingEndEvent
 import org.snakeyaml.engine.v2.events.MappingStartEvent
 import org.snakeyaml.engine.v2.events.ScalarEvent
 import org.snakeyaml.engine.v2.events.SequenceEndEvent
 import org.snakeyaml.engine.v2.events.SequenceStartEvent
+import org.snakeyaml.engine.v2.events.StreamEndEvent
 import org.snakeyaml.engine.v2.events.StreamStartEvent
 import java.util.Optional
 
@@ -45,7 +47,7 @@ internal class YamlOutput(
     writer: StreamDataWriter,
     override val serializersModule: SerializersModule,
     private val configuration: YamlConfiguration
-) : AbstractEncoder() {
+) : AbstractEncoder(), AutoCloseable {
     private val settings = DumpSettings.builder()
         .setIndent(configuration.encodingIndentationSize)
         .setWidth(configuration.breakScalarsAt)
@@ -126,6 +128,11 @@ internal class YamlOutput(
         }
     }
 
+    override fun close() {
+        emitter.emit(DocumentEndEvent(false))
+        emitter.emit(StreamEndEvent())
+    }
+
     private fun emitScalar(value: String, style: ScalarStyle) {
         val tag = getAndClearTypeName()
 

diff --git a/src/jvmMain/kotlin/com/charleskorn/kaml/YamlParser.kt b/src/jvmMain/kotlin/com/charleskorn/kaml/YamlParser.kt
@@ -28,8 +28,8 @@ import java.io.StringReader
 internal class YamlParser(yamlSource: String) {
     private val dummyFileName = "DUMMY_FILE_NAME"
     private val loadSettings = LoadSettings.builder().setLabel(dummyFileName).build()
-    private val streamReader = StreamReader(StringReader(yamlSource), loadSettings)
-    private val events = ParserImpl(streamReader, loadSettings)
+    private val streamReader = StreamReader(loadSettings, StringReader(yamlSource))
+    private val events = ParserImpl(loadSettings, streamReader)
 
     init {
         consumeEventOfType(Event.ID.StreamStart, YamlPath.root)