Deduplicate 'handleFailures' call

Author: sebaciv

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

@@ -17,7 +17,7 @@ class BsonReaderInput(br: BsonReader, override val legacyOptionEncoding: Boolean
   override def readBoolean(): Boolean = br.readBoolean()
   override def readInt(): Int = br.readInt32()
   override def readLong(): Long = {
-    if (bsonType == BsonType.INT32) br.readInt32().toLong // allow to treat INT32 as Long
+    if (bsonType == BsonType.INT32) br.readInt32().toLong // allow converting INT32 to Long
     else br.readInt64()
   }
   override def readTimestamp(): Long = br.readDateTime()

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

@@ -22,9 +22,9 @@ 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 = {
-    if (bsonType == BsonType.INT32) handleFailures(bsonValue.asInt32().getValue.toLong) // allow to treat INT32 as Long
-    else handleFailures(bsonValue.asInt64().getValue)
+  def readLong(): Long = handleFailures {
+    if (bsonType == BsonType.INT32) bsonValue.asInt32().getValue.toLong // allow converting INT32 to Long
+    else bsonValue.asInt64().getValue
   }
   override def readTimestamp(): Long = handleFailures(bsonValue.asDateTime().getValue)
   def readDouble(): Double = handleFailures(bsonValue.asDouble().getValue)