Merge pull request #413 from pulewicz/accept-bson-ints-as-doubles

Accept ints as doubles in Bson inputs

Author: Roman Janusz

commons-mongo/jvm/src/main/scala/com/avsystem/commons/mongo/BsonReaderInput.scala

@@ -37,8 +37,13 @@ class BsonReaderInput(br: BsonReader, override val legacyOptionEncoding: Boolean
   override def readTimestamp(): Long =
     expect(BsonType.DATE_TIME, br.readDateTime())
 
-  override def readDouble(): Double =
-    expect(BsonType.DOUBLE, br.readDouble())
+  override def readDouble(): Double = handleFailures {
+    bsonType match {
+      case BsonType.DOUBLE => br.readDouble()
+      case BsonType.INT32 => br.readInt32().toDouble
+      case _ => wrongType(BsonType.DOUBLE, BsonType.INT32)
+    }
+  }
 
   override def readBinary(): Array[Byte] =
     expect(BsonType.BINARY, br.readBinaryData().getData)

commons-mongo/jvm/src/main/scala/com/avsystem/commons/mongo/BsonValueInput.scala

@@ -33,8 +33,13 @@ class BsonValueInput(bsonValue: BsonValue, override val legacyOptionEncoding: Bo
   override def readTimestamp(): Long =
     expect(BsonType.DATE_TIME, bsonValue.asDateTime().getValue)
 
-  def readDouble(): Double =
-    expect(BsonType.DOUBLE, bsonValue.asDouble().getValue)
+  override def readDouble(): Double = handleFailures {
+    bsonType match {
+      case BsonType.DOUBLE => bsonValue.asDouble().getValue
+      case BsonType.INT32 => readInt().toDouble
+      case _ => wrongType(BsonType.DOUBLE, BsonType.INT32)
+    }
+  }
 
   def readBinary(): Array[Byte] =
     expect(BsonType.BINARY, bsonValue.asBinary().getData)

commons-mongo/jvm/src/test/scala/com/avsystem/commons/mongo/BsonInputOutputTest.scala

@@ -9,9 +9,10 @@ import org.bson.types.Decimal128
 import org.scalactic.source.Position
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
-
 import java.nio.ByteBuffer
 
+import com.avsystem.commons.serialization.GenCodec.ReadFailure
+
 class BinaryBsonGenCodecRoundtripTest extends GenCodecRoundtripTest {
   type Raw = Array[Byte]
 
@@ -75,6 +76,18 @@ class BsonValueGenCodecRoundtripTest extends GenCodecRoundtripTest {
     val result = input.readSimple().readLong()
     assert(result == 42L)
   }
+
+  test("Int32 to Double decoding") {
+    val input = createInput(new BsonInt32(43))
+    val result = input.readSimple().readDouble()
+    assert(result == 43D)
+  }
+
+  test("Int64 to Double decoding exception") {
+    val input = createInput(new BsonInt64(44))
+
+    assertThrows[ReadFailure](input.readSimple().readDouble())
+  }
 }
 
 class BsonInputOutputTest extends AnyFunSuite with ScalaCheckPropertyChecks {
@@ -234,6 +247,26 @@ class BsonInputOutputTest extends AnyFunSuite with ScalaCheckPropertyChecks {
     }
   }
 
+  test("BsonBinaryReader Int types to Double decoding") {
+    val document = new BsonDocument()
+      .append("int", new BsonInt32(42))
+      .append("long", new BsonInt64(42L))
+
+      val rawJson = document.toJson(JsonWriterSettings.builder.outputMode(JsonMode.EXTENDED).build)
+      val input = new BsonReaderInput(new BsonBinaryReader(RawBsonDocument.parse(rawJson).getByteBuffer.asNIO()))
+
+      val objectInput = input.readObject()
+
+      val intField = objectInput.peekField("int")
+      assert(intField.nonEmpty)
+      assert(intField.get.readDouble() == 42D)
+
+
+      val longField = objectInput.peekField("long")
+      assert(longField.nonEmpty)
+      assertThrows[ReadFailure](longField.get.readDouble())
+  }
+
   test("BsonBinaryReader type metadata") {
     forAll(SomethingPlain.gen) { sth =>
       val document = somethingToBson(sth)