Fixed Circe irreversible decoding

hnaderi · Sep 27, 2022 · 263e08b · 263e08b
1 parent 9ae4eee
commit 263e08b
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/modules/circe/src/main/scala/CirceReader.scala b/modules/circe/src/main/scala/CirceReader.scala
@@ -30,11 +30,23 @@ private[circe] object CirceReader extends Reader[Json] {
 
   override def string(t: Json): Either[String, String] = convert[String](t)
 
-  override def int(t: Json): Either[String, Int] = convert[Int](t)
-
-  override def long(t: Json): Either[String, Long] = convert[Long](t)
-
-  override def double(t: Json): Either[String, Double] = convert[Double](t)
+  override def int(t: Json): Either[String, Int] =
+    t.asNumber.flatMap(_.toInt) match {
+      case Some(v) => Right(v)
+      case None    => Left(s"Expected Integer, but got: $t")
+    }
+
+  override def long(t: Json): Either[String, Long] =
+    t.asNumber.flatMap(_.toLong) match {
+      case Some(v) => Right(v)
+      case None    => Left(s"Expected Long, but got: $t")
+    }
+
+  override def double(t: Json): Either[String, Double] =
+    t.asNumber match {
+      case Some(v) => Right(v.toDouble)
+      case None    => Left(s"Expected Double, but got: $t")
+    }
 
   override def bool(t: Json): Either[String, Boolean] = convert[Boolean](t)