Review changes: use HasGenCodec and pattern matching

Author: sebaciv

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

@@ -16,9 +16,9 @@ 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 = {
-    if (bsonType == BsonType.INT32) br.readInt32().toLong // allow converting INT32 to Long
-    else 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()

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

@@ -23,8 +23,10 @@ class BsonValueInput(bsonValue: BsonValue, override val legacyOptionEncoding: Bo
   def readBoolean(): Boolean = handleFailures(bsonValue.asBoolean().getValue)
   def readInt(): Int = handleFailures(bsonValue.asInt32().getValue)
   def readLong(): Long = handleFailures {
-    if (bsonType == BsonType.INT32) bsonValue.asInt32().getValue.toLong // allow converting INT32 to Long
-    else bsonValue.asInt64().getValue
+    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)

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,11 +75,7 @@ object SomethingComplex {
     nestedComplexList,
     option
   )
-
-  implicit val codec: GenCodec[SomethingComplex] = GenCodec.materialize
 }
 
 case class SomethingLong(value: Long)
-object SomethingLong {
-  implicit val codec: GenCodec[SomethingLong] = GenCodec.materialize
-}
+object SomethingLong extends HasGenCodec[SomethingLong]