Skip to content

Preserve floating-point JSON literals as BSON doubles #2033

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
IamPritamAcharya wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Preserve floating-point JSON literals as BSON doubles #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47564ab
Fix JSON number BSON type encoding
IamPritamAcharya Aug 10, 2026
7b5c567
Merge branch 'main' into JAVA-2031
IamPritamAcharya Aug 11, 2026
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
10 changes: 7 additions & 3 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 @@ -25,6 +25,7 @@ import kotlinx.serialization.json.JsonEncoder
import kotlinx.serialization.json.JsonNull
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.double
import kotlinx.serialization.modules.SerializersModule
import org.bson.BsonWriter
import org.bson.codecs.kotlinx.utils.BsonCodecUtils.toJsonNamingStrategy
Expand Down Expand Up @@ -98,12 +99,12 @@ internal class JsonBsonEncoder(
primitive.isString -> encodeString(content)
content == "true" || content == "false" -> encodeBoolean(content.toBooleanStrict())
else -> {
val decimal = BigDecimal(content).stripTrailingZeros()
val decimal = BigDecimal(content)
when {
decimal.scale() > 0 -> {
isFloatingLiteral(content, decimal) -> {
val abs = decimal.abs()
if ((decimal.signum() == 0 || abs >= DOUBLE_MIN_VALUE) && abs <= DOUBLE_MAX_VALUE) {
encodeDouble(decimal.toDouble())
encodeDouble(primitive.double)
} else {
writer.writeDecimal128(Decimal128(decimal))
}
Expand All @@ -116,6 +117,9 @@ internal class JsonBsonEncoder(
}
}

private fun isFloatingLiteral(content: String, decimal: BigDecimal): Boolean =
content.contains('.') || decimal.scale() > 0

private fun encodeJsonObject(obj: JsonObject) {
writer.writeStartDocument()
obj.forEach { k, v ->
Expand Down
17 changes: 10 additions & 7 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 @@ -231,21 +231,24 @@ class KotlinSerializerCodecTest {
fun testJsonPrimitiveNumberEncoding(): Stream<Pair<String, String>> {
return Stream.of(
"""{"value": 0}""" to """{"value": 0}""",
"""{"value": 0}""" to """{"value": 0.0}""",
"""{"value": 0.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": 11.0}""" to """{"value": 1.1E1}""",
"""{"value": 110.0}""" to """{"value": 1.1E2}""",
"""{"value": 1100.0}""" 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": -11.0}""" to """{"value": -1.1E1}""",
"""{"value": -110.0}""" to """{"value": -1.1E2}""",
"""{"value": -1100.0}""" 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": -0.0}""" to """{"value": -0.0}""",
"""{"value": 3.0}""" to """{"value": 3.0}""",
"""{"value": 1.0E20}""" to """{"value": 1.0E20}""",
"""{"value": 9223372036854775807}""" to """{"value": 9223372036854775807}""",
"""{"value": {"${'$'}numberDecimal": "9223372036854775808"}}""" to """{"value": 9223372036854775808}""",
"""{"value": -9223372036854775808}""" to """{"value": -9223372036854775808}""",
Expand Down