Fix of missing application of field mapper when some other supported annotation is used except @named

Author: plokhotnyuk

jsoniter-scala-macros/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala

@@ -826,7 +826,7 @@ object JsonCodecMaker {
       val classInfos = new mutable.LinkedHashMap[Type, ClassInfo]
 
       def getClassInfo(tpe: Type): ClassInfo = classInfos.getOrElseUpdate(tpe, {
-        case class FieldAnnotations(partiallyMappedName: String, transient: Boolean, stringified: Boolean)
+        case class FieldAnnotations(partiallyMappedName: Option[String], transient: Boolean, stringified: Boolean)
 
         def hasSupportedAnnotation(m: TermSymbol): Boolean = {
           m.info: Unit // to enforce the type information completeness and availability of annotations
@@ -862,7 +862,7 @@ object JsonCodecMaker {
               warn(s"Both $supportedTransientTypeNames and '${typeOf[named]}' or " +
                 s"$supportedTransientTypeNames and '${typeOf[stringified]}' defined for '$name' of '$tpe'.")
             }
-            val partiallyMappedName = namedValueOpt(m.annotations.find(_.tree.tpe =:= typeOf[named]), tpe).getOrElse(name)
+            val partiallyMappedName = namedValueOpt(m.annotations.find(_.tree.tpe =:= typeOf[named]), tpe)
             annotations = annotations.updated(name, FieldAnnotations(partiallyMappedName, trans > 0, strings > 0))
           case _ =>
         }
@@ -877,8 +877,8 @@ object JsonCodecMaker {
             val annotationOption = annotations.get(name)
             if (annotationOption.exists(_.transient)) None
             else {
-              val fieldNameMapper: String => String = n => cfg.fieldNameMapper.lift(n).getOrElse(n)
-              val mappedName = annotationOption.fold(fieldNameMapper(name))(_.partiallyMappedName)
+              val mappedName = annotationOption.flatMap(_.partiallyMappedName)
+                .getOrElse(cfg.fieldNameMapper.lift(name).getOrElse(name))
               val tmpName = TermName("_" + symbol.name)
               val getter = getters.getOrElse(name,
                 fail(s"'$name' parameter of '$tpe' should be defined as 'val' or 'var' in the primary constructor."))

jsoniter-scala-macros/shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala

@@ -885,7 +885,7 @@ object JsonCodecMaker {
       val classInfos = new mutable.LinkedHashMap[TypeRepr, ClassInfo]
 
       def getClassInfo(tpe: TypeRepr): ClassInfo = classInfos.getOrElseUpdate(tpe, {
-        case class FieldAnnotations(partiallyMappedName: String, transient: Boolean, stringified: Boolean)
+        case class FieldAnnotations(partiallyMappedName: Option[String], transient: Boolean, stringified: Boolean)
 
         def hasSupportedAnnotation(m: Symbol): Boolean = m.annotations.exists { a =>
           val tpe = a.tpe
@@ -912,7 +912,7 @@ object JsonCodecMaker {
             if ((named > 0 || strings > 0) && trans > 0)
               warn(s"Both $supportedTransientTypeNames and '${Type.show[named]}' or " +
                 s"$supportedTransientTypeNames and '${Type.show[stringified]}' defined for '$name' of '${tpe.show}'.")
-            val partiallyMappedName = namedValueOpt(m.annotations.find(_.tpe =:= TypeRepr.of[named]), tpe).getOrElse(name)
+            val partiallyMappedName = namedValueOpt(m.annotations.find(_.tpe =:= TypeRepr.of[named]), tpe)
             annotations = annotations.updated(name, FieldAnnotations(partiallyMappedName, trans > 0, strings > 0))
           case _ =>
         }
@@ -926,7 +926,8 @@ object JsonCodecMaker {
             i += 1
             val name = symbol.name
             val annotationOption = annotations.get(name)
-            val mappedName = annotationOption.fold(cfg.fieldNameMapper(name).getOrElse(name))(_.partiallyMappedName)
+            val mappedName = annotationOption.flatMap(_.partiallyMappedName)
+              .getOrElse(cfg.fieldNameMapper(name).getOrElse(name))
             val field = tpeClassSym.fieldMember(name)
             val getterOrField =
               if (field.exists) {

jsoniter-scala-macros/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerSpec.scala

@@ -2068,6 +2068,10 @@ class JsonCodecMakerSpec extends VerifyingSpec {
       verifySerDeser(codecOfStringified, Stringified(1, 2, Option(1), List(2)),
         """{"i":"1","bi":"2","o":"1","l":["2"]}""")
     }
+    "serialize and deserialize fields that have field name mapper and stringified by annotation" in {
+      verifySerDeser(make(CodecMakerConfig.withFieldNameMapper { case x => x + "_" }), Stringified(1, 2, Option(1), List(2)),
+        """{"i_":"1","bi_":"2","o_":"1","l_":["2"]}""")
+    }
     "throw parse exception when stringified fields have non-string values" in {
       verifyDeserError(codecOfStringified, """{"i":1,"bi":"2","o":"1","l":["2"]}""",
         """expected '"', offset: 0x00000005""")