Merge pull request #409 from AVSystem/bson-long-parsing

Allow interpreting Int32 as Long when reading BSON values

Author: sebaciv

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

@@ -16,7 +16,10 @@ class BsonReaderInput(br: BsonReader, override val legacyOptionEncoding: Boolean
   override def readString(): String = br.readString()
   override def readBoolean(): Boolean = br.readBoolean()
   override def readInt(): Int = br.readInt32()
-  override def readLong(): Long = br.readInt64()
+  override def readLong(): Long = bsonType match {
+    case BsonType.INT32 => br.readInt32().toLong // allow converting INT32 to Long
+    case _ => br.readInt64()
+  }
   override def readTimestamp(): Long = br.readDateTime()
   override def readDouble(): Double = br.readDouble()
   override def readBigInt(): BigInt = BigInt(br.readBinaryData().getData)

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

@@ -22,7 +22,12 @@ class BsonValueInput(bsonValue: BsonValue, override val legacyOptionEncoding: Bo
   def readString(): String = handleFailures(bsonValue.asString().getValue)
   def readBoolean(): Boolean = handleFailures(bsonValue.asBoolean().getValue)
   def readInt(): Int = handleFailures(bsonValue.asInt32().getValue)
-  def readLong(): Long = handleFailures(bsonValue.asInt64().getValue)
+  def readLong(): Long = handleFailures {
+    bsonType match {
+      case BsonType.INT32 => bsonValue.asInt32().getValue.toLong // allow converting INT32 to Long
+      case _ => bsonValue.asInt64().getValue
+    }
+  }
   override def readTimestamp(): Long = handleFailures(bsonValue.asDateTime().getValue)
   def readDouble(): Double = handleFailures(bsonValue.asDouble().getValue)
   def readBigInt(): BigInt = handleFailures(BigInt(bsonValue.asBinary().getData))

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

@@ -68,6 +68,12 @@ class BsonValueGenCodecRoundtripTest extends GenCodecRoundtripTest {
 
   def createInput(raw: BsonValue): Input =
     new BsonValueInput(raw, legacyOptionEncoding)
+
+  test("Int32 to Long decoding") {
+    val input = createInput(new BsonInt32(42))
+    val result = input.readSimple().readLong()
+    assert(result == 42L)
+  }
 }
 
 class BsonInputOutputTest extends AnyFunSuite with ScalaCheckPropertyChecks {
@@ -131,6 +137,14 @@ class BsonInputOutputTest extends AnyFunSuite with ScalaCheckPropertyChecks {
     forAll(SomethingComplex.gen)(valueEncoding(_, legacyOptionEncoding = true))
   }
 
+  test("Int32 to Long decoding") {
+    val doc = new BsonDocument("value", new BsonInt32(42))
+    val reader = new BsonDocumentReader(doc)
+    val input = new BsonReaderInput(reader, false)
+    val sth = SomethingLong.codec.read(input)
+    assert(sth == SomethingLong(42))
+  }
+
   test("All encoding schemes with problematic map keys") {
     forAll(SomethingComplex.gen) { sth =>
       val sthBefore = sth.copy(

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

@@ -2,7 +2,7 @@ package com.avsystem.commons
 package mongo
 
 import com.avsystem.commons.misc.Bytes
-import com.avsystem.commons.serialization.GenCodec
+import com.avsystem.commons.serialization.HasGenCodec
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Gen
 
@@ -17,7 +17,7 @@ case class SomethingPlain(
   list: List[String],
   map: Map[String, String]
 )
-object SomethingPlain {
+object SomethingPlain extends HasGenCodec[SomethingPlain] {
   def sizedListOf[T](maxSize: Int, gen: => Gen[T]): Gen[List[T]] = {
     Gen.resize(maxSize, Gen.listOf(gen))
   }
@@ -50,8 +50,6 @@ object SomethingPlain {
     list,
     map
   )
-
-  implicit val codec: GenCodec[SomethingPlain] = GenCodec.materialize
 }
 
 case class SomethingComplex(
@@ -61,7 +59,7 @@ case class SomethingComplex(
   nestedComplexList: List[List[SomethingPlain]],
   option: Option[Int]
 )
-object SomethingComplex {
+object SomethingComplex extends HasGenCodec[SomethingComplex] {
   val sthListGen: Gen[List[SomethingPlain]] = SomethingPlain.sizedListOf(8, SomethingPlain.gen)
 
   val gen: Gen[SomethingComplex] = for {
@@ -77,6 +75,7 @@ object SomethingComplex {
     nestedComplexList,
     option
   )
-
-  implicit val codec: GenCodec[SomethingComplex] = GenCodec.materialize
 }
+
+case class SomethingLong(value: Long)
+object SomethingLong extends HasGenCodec[SomethingLong]