Skip to content

Commit f5e9c9b

Browse files
committed
fix issue with JsonProperty name override for constructor vars (#782)
* Update CaseClassDeserializerTest.scala * Update CaseClassDeserializerTest.scala * Update CaseClassDeserializerTest.scala * Update ScalaAnnotationIntrospectorModule.scala
1 parent a659f93 commit f5e9c9b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
6868
case _ => {
6969
val modifiedName = ann match {
7070
case af: AnnotatedField if af.getName.contains("$") => fieldName(af)
71-
case am: AnnotatedMethod if am.getName.contains("$") => methodName(am)
71+
//case am: AnnotatedMethod if am.getName.contains("$") => methodName(am)
7272
case ap: AnnotatedParameter if ap.getName.contains("$") => paramName(ap)
7373
case _ => None
7474
}

src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object CaseClassDeserializerTest {
2222
var stringProperty: String = _
2323
}
2424

25-
case class JacksonAnnotationTestCaseClass(@JsonProperty("foo") oof:String, bar: String)
25+
case class JacksonAnnotationTestCaseClass(@JsonProperty("foo") oof: String, bar: String)
2626

2727
case class GenericTestCaseClass[T](data: T)
2828

@@ -290,7 +290,7 @@ class CaseClassDeserializerTest extends DeserializerTest {
290290

291291
it should "deserialize AnnotatedVarTestConstructor" in {
292292
val input = """{"t":123}"""
293-
val res = JsonMapper.builderWithJackson2Defaults().build().readValue(input, classOf[AnnotatedVarTestConstructor])
293+
val res = newMapper.readValue(input, classOf[AnnotatedVarTestConstructor])
294294
res.test shouldEqual 123
295295
}
296296
}

0 commit comments

Comments
 (0)