Skip to content

Commit d8e4c08

Browse files
authored
stop JavaAnnotationInspector from looking at non-Scala classes (#646)
1 parent 166b02d commit d8e4c08

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/scala/com/fasterxml/jackson/module/scala/introspect/JavaAnnotationIntrospector.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object JavaAnnotationIntrospector extends NopAnnotationIntrospector {
1515

1616
override def findImplicitPropertyName(param: AnnotatedMember): String = {
1717
val result = param match {
18-
case param: AnnotatedParameter => {
18+
case param: AnnotatedParameter if ScalaAnnotationIntrospector.isMaybeScalaBeanType(param.getDeclaringClass) => {
1919
val index = param.getIndex
2020
val owner = param.getOwner
2121
owner.getAnnotated match {

src/main/scala/com/fasterxml/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ object ScalaAnnotationIntrospector extends NopAnnotationIntrospector with ValueI
230230
private def isScalaPackage(pkg: Option[Package]): Boolean =
231231
pkg.exists(_.getName.startsWith("scala."))
232232

233-
private def isMaybeScalaBeanType(cls: Class[_]): Boolean =
233+
private[introspect] def isMaybeScalaBeanType(cls: Class[_]): Boolean =
234234
(cls.extendsScalaClass(ScalaAnnotationIntrospectorModule.shouldSupportScala3Classes()) || cls.hasSignature) &&
235235
!isScalaPackage(Option(cls.getPackage))
236236

0 commit comments

Comments
 (0)