Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -290,7 +290,7 @@ class CaseClassDeserializerTest extends DeserializerTest {

it should "deserialize AnnotatedVarTestConstructor" in {
val input = """{"t":123}"""
val res = JsonMapper.builderWithJackson2Defaults().build().readValue(input, classOf[AnnotatedVarTestConstructor])
val res = newMapper.readValue(input, classOf[AnnotatedVarTestConstructor])
res.test shouldEqual 123
}
}