JsonBsonEncoder: fix handling of negative values

Also fixes formatting in KotlinSerializerCodecTest.kt.

Author: berlix

bson-kotlinx/src/main/kotlin/org/bson/codecs/kotlinx/JsonBsonEncoder.kt

@@ -26,8 +26,6 @@ import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.double
-import kotlinx.serialization.json.int
-import kotlinx.serialization.json.long
 import kotlinx.serialization.modules.SerializersModule
 import org.bson.BsonWriter
 import org.bson.codecs.kotlinx.utils.BsonCodecUtils.toJsonNamingStrategy
@@ -41,7 +39,6 @@ internal class JsonBsonEncoder(
 ) : BsonEncoderImpl(writer, serializersModule, configuration), JsonEncoder {
 
     companion object {
-        private val DOUBLE_MIN_VALUE = BigDecimal.valueOf(Double.MIN_VALUE)
         private val DOUBLE_MAX_VALUE = BigDecimal.valueOf(Double.MAX_VALUE)
         private val INT_MIN_VALUE = BigDecimal.valueOf(Int.MIN_VALUE.toLong())
         private val INT_MAX_VALUE = BigDecimal.valueOf(Int.MAX_VALUE.toLong())
@@ -104,7 +101,7 @@ internal class JsonBsonEncoder(
                 val decimal = BigDecimal(content).stripTrailingZeros()
                 when {
                     decimal.scale() > 0 ->
-                        if (DOUBLE_MIN_VALUE <= decimal && decimal <= DOUBLE_MAX_VALUE) {
+                        if (decimal.abs() <= DOUBLE_MAX_VALUE) {
                             encodeDouble(primitive.double)
                         } else {
                             writer.writeDecimal128(Decimal128(decimal))

bson-kotlinx/src/test/kotlin/org/bson/codecs/kotlinx/KotlinSerializerCodecTest.kt

@@ -117,7 +117,6 @@ import org.bson.codecs.kotlinx.samples.SealedInterface
 import org.bson.codecs.kotlinx.samples.ValueClass
 import org.bson.json.JsonMode
 import org.bson.json.JsonWriterSettings
-import org.bson.types.Decimal128
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
@@ -224,18 +223,27 @@ class KotlinSerializerCodecTest {
         @JvmStatic
         fun testJsonPrimitiveNumberEncoding(): Stream<Pair<String, String>> {
             return Stream.of(
-        """{"value": 0}""" to """{"value": 0}""",
+                """{"value": 0}""" to """{"value": 0}""",
                 """{"value": 0}""" to """{"value": 0.0}""",
-            """{"value": 1.1}""" to """{"value": 1.1E0}""",
-            """{"value": 11}""" to """{"value": 1.1E1}""",
-            """{"value": 110}""" to """{"value": 1.1E2}""",
-            """{"value": 1100}""" to """{"value": 1.1E3}""",
-            """{"value": 0.1}""" to """{"value": 1E-1}""",
-            """{"value": 0.01}""" to """{"value": 1E-2}""",
-            """{"value": 0.001}""" to """{"value": 1E-3}""",
-            """{"value": 35485464}""" to """{"value": 35485464}""",
-            """{"value": 35485464}""" to """{"value": 35485464.0}""",
-            """{"value": {"${'$'}numberDecimal": "123456789123456789123456789"}}""" to """{"value": 123456789123456789123456789}"""
+                """{"value": 1.1}""" to """{"value": 1.1E0}""",
+                """{"value": 11}""" to """{"value": 1.1E1}""",
+                """{"value": 110}""" to """{"value": 1.1E2}""",
+                """{"value": 1100}""" to """{"value": 1.1E3}""",
+                """{"value": 0.1}""" to """{"value": 1E-1}""",
+                """{"value": 0.01}""" to """{"value": 1E-2}""",
+                """{"value": 0.001}""" to """{"value": 1E-3}""",
+                """{"value": -1.1}""" to """{"value": -1.1E0}""",
+                """{"value": -11}""" to """{"value": -1.1E1}""",
+                """{"value": -110}""" to """{"value": -1.1E2}""",
+                """{"value": -1100}""" to """{"value": -1.1E3}""",
+                """{"value": -0.1}""" to """{"value": -1E-1}""",
+                """{"value": -0.01}""" to """{"value": -1E-2}""",
+                """{"value": -0.001}""" to """{"value": -1E-3}""",
+                """{"value": 9223372036854775807}""" to """{"value": 9223372036854775807}""",
+                """{"value": {"${'$'}numberDecimal": "9223372036854775808"}}""" to """{"value": 9223372036854775808}""",
+                """{"value": -9223372036854775808}""" to """{"value": -9223372036854775808}""",
+                """{"value": {"${'$'}numberDecimal": "-9223372036854775809"}}""" to
+                    """{"value": -9223372036854775809}""",
             )
         }
     }