Skip to content

Commit bc99bc1

Browse files
committed
stop JavaAnnotationInspector from looking at non-Scala classes (#646)
Update ScalaAnnotationIntrospectorModule.scala
1 parent b66ad93 commit bc99bc1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class JavaAnnotationIntrospectorInstance(config: ScalaModule.Config) extends Nop
1717

1818
override def findImplicitPropertyName(config: MapperConfig[_], param: AnnotatedMember): String = {
1919
val result = param match {
20-
case param: AnnotatedParameter => {
20+
case param: AnnotatedParameter if ScalaAnnotationIntrospector.isMaybeScalaBeanType(param.getDeclaringClass) => {
2121
val index = param.getIndex
2222
val owner = param.getOwner
2323
owner.getAnnotated match {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
190190
private def isScalaPackage(pkg: Option[Package]): Boolean =
191191
pkg.exists(_.getName.startsWith("scala."))
192192

193-
private def isMaybeScalaBeanType(cls: Class[_]): Boolean =
193+
private[introspect] def isMaybeScalaBeanType(cls: Class[_]): Boolean =
194194
(cls.extendsScalaClass(config.shouldSupportScala3Classes()) || cls.hasSignature) &&
195195
!isScalaPackage(Option(cls.getPackage))
196196

0 commit comments

Comments
 (0)