From 07d9832b524411554272370f5925ac31c6a66095 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 10 Nov 2025 12:46:14 +0100 Subject: [PATCH 1/4] Update CaseClassDeserializerTest.scala --- .../module/scala/deser/CaseClassDeserializerTest.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala b/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala index f85ed997..c84ebf47 100644 --- a/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala +++ b/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonSetter, Nulls} import tools.jackson.databind.annotation.JsonDeserialize import tools.jackson.databind.exc.MismatchedInputException import tools.jackson.databind.json.JsonMapper -import tools.jackson.databind.{DatabindException, DeserializationFeature, ObjectMapper, ObjectReader, PropertyNamingStrategies} +import tools.jackson.databind.{DatabindException, DeserializationFeature, MapperFeature, ObjectMapper, ObjectReader, PropertyNamingStrategies} import tools.jackson.module.scala.{DefaultScalaModule, ScalaModule} import tools.jackson.module.scala.ser.{ClassWithOnlyUnitField, ClassWithUnitField} @@ -290,7 +290,11 @@ class CaseClassDeserializerTest extends DeserializerTest { it should "deserialize AnnotatedVarTestConstructor" in { val input = """{"t":123}""" - val res = JsonMapper.builderWithJackson2Defaults().build().readValue(input, classOf[AnnotatedVarTestConstructor]) + val mapper = JsonMapper.builder() + .addModule(module) + //.enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS) + .build() + val res = mapper.readValue(input, classOf[AnnotatedVarTestConstructor]) res.test shouldEqual 123 } } From 9ac67b5037dca52dfa8414332be03349c721d501 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 11 Nov 2025 11:57:50 +0100 Subject: [PATCH 2/4] Update CaseClassDeserializerTest.scala --- .../module/scala/deser/CaseClassDeserializerTest.scala | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala b/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala index c84ebf47..ccd4765f 100644 --- a/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala +++ b/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonSetter, Nulls} import tools.jackson.databind.annotation.JsonDeserialize import tools.jackson.databind.exc.MismatchedInputException import tools.jackson.databind.json.JsonMapper -import tools.jackson.databind.{DatabindException, DeserializationFeature, MapperFeature, ObjectMapper, ObjectReader, PropertyNamingStrategies} +import tools.jackson.databind.{DatabindException, DeserializationFeature, ObjectMapper, ObjectReader, PropertyNamingStrategies} import tools.jackson.module.scala.{DefaultScalaModule, ScalaModule} import tools.jackson.module.scala.ser.{ClassWithOnlyUnitField, ClassWithUnitField} @@ -290,11 +290,7 @@ class CaseClassDeserializerTest extends DeserializerTest { it should "deserialize AnnotatedVarTestConstructor" in { val input = """{"t":123}""" - val mapper = JsonMapper.builder() - .addModule(module) - //.enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS) - .build() - val res = mapper.readValue(input, classOf[AnnotatedVarTestConstructor]) + val res = newMapper.readValue(input, classOf[AnnotatedVarTestConstructor]) res.test shouldEqual 123 } } From debe2f64659b0197f033ffd20048262698c1e222 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 11 Nov 2025 12:26:20 +0100 Subject: [PATCH 3/4] Update CaseClassDeserializerTest.scala --- .../jackson/module/scala/deser/CaseClassDeserializerTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala b/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala index ccd4765f..dee5161d 100644 --- a/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala +++ b/src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala @@ -22,7 +22,7 @@ object CaseClassDeserializerTest { var stringProperty: String = _ } - case class JacksonAnnotationTestCaseClass(@JsonProperty("foo") oof:String, bar: String) + case class JacksonAnnotationTestCaseClass(@JsonProperty("foo") oof: String, bar: String) case class GenericTestCaseClass[T](data: T) From 7496d9acf96ce429793d00a8e3f2ebbb6a4fcf2a Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 11 Nov 2025 15:03:25 +0100 Subject: [PATCH 4/4] Update ScalaAnnotationIntrospectorModule.scala --- .../scala/introspect/ScalaAnnotationIntrospectorModule.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala b/src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala index 48ce08dd..af51b8c8 100644 --- a/src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala +++ b/src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala @@ -68,7 +68,7 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca case _ => { val modifiedName = ann match { case af: AnnotatedField if af.getName.contains("$") => fieldName(af) - case am: AnnotatedMethod if am.getName.contains("$") => methodName(am) + //case am: AnnotatedMethod if am.getName.contains("$") => methodName(am) case ap: AnnotatedParameter if ap.getName.contains("$") => paramName(ap) case _ => None }