Merge pull request #329 from goshacodes/fix_message

fix reader message on missing fields
tethys-json · Nov 11, 2024 · fd6f7d7 · fd6f7d7
2 parents 0c04dc9 + 94ee3bb
commit fd6f7d7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/modules/core/src/main/scala-3/tethys/derivation/Derivation.scala b/modules/core/src/main/scala-3/tethys/derivation/Derivation.scala
@@ -398,7 +398,7 @@ private[derivation] class DerivationMacro(val quotes: Quotes)
               }
               ReaderError.wrongJson(
                 "Can not extract fields from json: " + uninitializedFields
-                  .mkString(", ")
+                  .mkString("'", "', '", "'")
               )(${ fieldName })
           }
 

diff --git a/modules/core/src/test/scala-3/tethys/derivation/DerivationSpec.scala b/modules/core/src/test/scala-3/tethys/derivation/DerivationSpec.scala
@@ -20,6 +20,15 @@ class DerivationSpec extends AnyFlatSpec with Matchers {
     res
   }
 
+  it should "build message correctly" in {
+    case class Foo(bar: Int, baz: String, faz: Boolean) derives JsonReader
+
+    util.Try(read[Foo](obj("bar" -> 1))) should matchPattern {
+      case util.Failure(ex)
+          if ex.getMessage == """Illegal json at '[ROOT]': Can not extract fields from json: 'baz', 'faz'""" =>
+    }
+  }
+
   it should "compile and correctly write and read product" in {
     case class Person(
         id: Int,

diff --git a/...acro-derivation/src/main/scala-2/tethys/derivation/impl/derivation/ReaderDerivation.scala b/...acro-derivation/src/main/scala-2/tethys/derivation/impl/derivation/ReaderDerivation.scala
@@ -459,7 +459,7 @@ trait ReaderDerivation
          if($predicate) {
            val $uninitializedFields = new scala.collection.mutable.ArrayBuffer[String](${xs.size})
            ..$fields
-           $readerErrorCompanion.wrongJson("Can not extract fields from json" + $uninitializedFields.mkString("'", "', '", "'"))
+           $readerErrorCompanion.wrongJson("Can not extract fields from json: " + $uninitializedFields.mkString("'", "', '", "'"))
          }
        """
     }

diff --git a/...acro-derivation/src/test/scala-2.13+/tethys/derivation/SemiautoReaderDerivationTest.scala b/...acro-derivation/src/test/scala-2.13+/tethys/derivation/SemiautoReaderDerivationTest.scala
@@ -21,6 +21,17 @@ class SemiautoReaderDerivationTest extends AnyFlatSpec with Matchers {
 
 
   behavior of "semiauto derivation"
+
+  it should "build message correctly" in {
+    case class Foo(bar: Int, baz: String, faz: Boolean)
+
+    implicit val reader: JsonReader[Foo] = tethys.derivation.semiauto.jsonReader
+
+    util.Try(read[Foo](obj("bar" -> 1))) should matchPattern {
+      case util.Failure(ex) if ex.getMessage == """Illegal json at '[ROOT]': Can not extract fields from json: 'baz', 'faz'""" =>
+    }
+  }
+
   it should "derive readers for simple case class hierarchy" in {
     implicit val dReader: JsonReader[D] = jsonReader[D]
     implicit val cReader: JsonReader[C] = jsonReader[C]