Skip to content

JsonBsonEncoder: fix parsing of JsonPrimitive numbers #1937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
berlix wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −14
Open

JsonBsonEncoder: fix parsing of JsonPrimitive numbers #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bson-kotlinx/src/main/kotlin/org/bson/codecs/kotlinx/JsonBsonEncoder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ internal class JsonBsonEncoder(
primitive.isString -> encodeString(content)
content == "true" || content == "false" -> encodeBoolean(content.toBooleanStrict())
else -> {
val decimal = BigDecimal(content)
val decimal = BigDecimal(content).stripTrailingZeros()
when {
decimal.scale() != 0 ->
decimal.scale() > 0 ->
if (DOUBLE_MIN_VALUE <= decimal && decimal <= DOUBLE_MAX_VALUE) {
encodeDouble(primitive.double)
} else {
writer.writeDecimal128(Decimal128(decimal))
}
INT_MIN_VALUE <= decimal && decimal <= INT_MAX_VALUE -> encodeInt(primitive.int)
LONG_MIN_VALUE <= decimal && decimal <= LONG_MAX_VALUE -> encodeLong(primitive.long)
INT_MIN_VALUE <= decimal && decimal <= INT_MAX_VALUE -> encodeInt(decimal.toInt())
LONG_MIN_VALUE <= decimal && decimal <= LONG_MAX_VALUE -> encodeLong(decimal.toLong())
else -> writer.writeDecimal128(Decimal128(decimal))
}
}
Expand Down
47 changes: 37 additions & 10 deletions bson-kotlinx/src/test/kotlin/org/bson/codecs/kotlinx/KotlinSerializerCodecTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import kotlinx.datetime.LocalTime
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.MissingFieldException
import kotlinx.serialization.SerializationException
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.buildJsonArray
import kotlinx.serialization.json.buildJsonObject
Expand Down Expand Up @@ -116,6 +117,7 @@ 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
Expand Down Expand Up @@ -146,10 +148,10 @@ class KotlinSerializerCodecTest {
| "code": {"${'$'}code": "int i = 0;"},
| "codeWithScope": {"${'$'}code": "int x = y", "${'$'}scope": {"y": 1}},
| "dateTime": {"${'$'}date": {"${'$'}numberLong": "1577836801000"}},
| "decimal128": {"${'$'}numberDecimal": "1.0"},
| "decimal128": {"${'$'}numberDecimal": "1.1"},
| "documentEmpty": {},
| "document": {"a": {"${'$'}numberInt": "1"}},
| "double": {"${'$'}numberDouble": "62.0"},
| "double": {"${'$'}numberDouble": "62.1"},
| "int32": {"${'$'}numberInt": "42"},
| "int64": {"${'$'}numberLong": "52"},
| "maxKey": {"${'$'}maxKey": 1},
Expand Down Expand Up @@ -218,6 +220,24 @@ class KotlinSerializerCodecTest {
.append("boolean", BsonBoolean.TRUE)
.append("string", BsonString("String")))
}

@JvmStatic
fun testJsonPrimitiveNumberEncoding(): Stream<Pair<String, String>> {
return Stream.of(
"""{"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}"""
)
}
}

@ParameterizedTest
Expand Down Expand Up @@ -832,9 +852,9 @@ class KotlinSerializerCodecTest {
|"short": 1,
|"int": 22,
|"long": {"$numberLong": "3000000000"},
|"decimal": {"$numberDecimal": "10000000000000000000"}
|"decimal2": {"$numberDecimal": "3.1230E+700"}
|"float": 4.0,
|"decimal": {"$numberDecimal": "1E+19"}
|"decimal2": {"$numberDecimal": "3.123E+700"}
|"float": 4.1,
|"double": 4.2,
|"boolean": true,
|"string": "String"
Expand All @@ -849,9 +869,9 @@ class KotlinSerializerCodecTest {
put("short", 1)
put("int", 22)
put("long", 3_000_000_000)
put("decimal", BigDecimal("10000000000000000000"))
put("decimal2", BigDecimal("3.1230E+700"))
put("float", 4.0)
put("decimal", BigDecimal("1E+19"))
put("decimal2", BigDecimal("3.123E+700"))
put("float", 4.1)
put("double", 4.2)
put("boolean", true)
put("string", "String")
Expand Down Expand Up @@ -1023,10 +1043,10 @@ class KotlinSerializerCodecTest {
put("binary", JsonPrimitive("S2Fma2Egcm9ja3Mh"))
put("boolean", JsonPrimitive(true))
put("dateTime", JsonPrimitive(1577836801000))
put("decimal128", JsonPrimitive(1.0))
put("decimal128", JsonPrimitive(1.1))
put("documentEmpty", buildJsonObject {})
put("document", buildJsonObject { put("a", JsonPrimitive(1)) })
put("double", JsonPrimitive(62.0))
put("double", JsonPrimitive(62.1))
put("int32", JsonPrimitive(42))
put("int64", JsonPrimitive(52))
put("objectId", JsonPrimitive("211111111111111111111112"))
Expand All @@ -1050,6 +1070,13 @@ class KotlinSerializerCodecTest {
assertDecodesTo("""{"value": $jsonAllSupportedTypesDocument}""", dataClassWithAllSupportedJsonTypes)
}

@ParameterizedTest
@MethodSource("testJsonPrimitiveNumberEncoding")
fun testJsonPrimitiveNumberEncoding(test: Pair<String, String>) {
val (expected, actual) = test
assertEncodesTo(expected, Json.parseToJsonElement(actual))
}

@Test
fun testDataFailures() {
assertThrows<MissingFieldException>("Missing data") {
Expand Down