Upgrade klaxon library

MMauro94 · Oct 28, 2021 · bfe60c8 · bfe60c8
1 parent 501ac29
commit bfe60c8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31"
-    implementation 'com.beust:klaxon:5.0.5'
+    implementation 'com.beust:klaxon:5.5'
 
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.31"

diff --git a/src/main/kotlin/com/github/mmauro94/mkvtoolnix_wrapper/json/BigIntegerConverter.kt b/src/main/kotlin/com/github/mmauro94/mkvtoolnix_wrapper/json/BigIntegerConverter.kt
@@ -9,7 +9,18 @@ internal object BigIntegerConverter : Converter {
 
     override fun canConvert(cls: Class<*>) = cls == BigInteger::class.java
 
-    override fun fromJson(jv: JsonValue) = jv.long()?.toBigInteger() ?: jv.bigInteger
+    override fun fromJson(jv: JsonValue): BigInteger? {
+        return when (val long = jv.long()?.toBigInteger()) {
+            null -> {
+                when (val inside = jv.inside) {
+                    is BigInteger -> inside
+                    null -> null
+                    else -> throw KlaxonException("Invalid type ${jv.type} for BigInteger")
+                }
+            }
+            else -> long
+        }
+    }
 
     override fun toJson(value: Any): String {
         return if (value is BigInteger) value.toString()