Skip to content

Commit c372ad0

Browse files
committed
refactor extendsScalaClass
1 parent e159c5a commit c372ad0

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ object ScalaAnnotationIntrospector extends NopAnnotationIntrospector with ValueI
168168
}
169169

170170
private def _descriptorFor(clz: Class[_]): Option[BeanDescriptor] = {
171-
if (clz.extendsScalaClass || clz.hasSignature) {
171+
if (clz.extendsScalaClass(true) || clz.hasSignature) {
172172
val key = new ClassKey(clz)
173173
Option(ScalaAnnotationIntrospectorModule._descriptorCache.get(key)) match {
174174
case Some(result) => Some(result)
@@ -211,7 +211,7 @@ object ScalaAnnotationIntrospector extends NopAnnotationIntrospector with ValueI
211211
pkg.exists(_.getName.startsWith("scala."))
212212

213213
private def isMaybeScalaBeanType(cls: Class[_]): Boolean =
214-
(cls.extendsScalaClass || cls.hasSignature) &&
214+
(cls.extendsScalaClass(true) || cls.hasSignature) &&
215215
!isScalaPackage(Option(cls.getPackage))
216216

217217
private def isScala(a: Annotated): Boolean = {

src/main/scala/com/fasterxml/jackson/module/scala/util/Classes.scala

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ import scala.util.Try
77

88
trait ClassW extends PimpedType[Class[_]] {
99

10-
def extendsScalaClass: Boolean = {
10+
@deprecated("use extendsScalaClass(Boolean) instead", "2.14.0")
11+
def extendsScalaClass: Boolean = extendsScalaClass(true)
12+
13+
def extendsScalaClass(supportScala3Classes: Boolean): Boolean = {
1114
ClassW.productClass.isAssignableFrom(value) ||
1215
isScalaObject ||
13-
TastyUtil.hasTastyFile(value)
16+
(supportScala3Classes && TastyUtil.hasTastyFile(value))
1417
}
1518

1619
def hasSignature: Boolean = {

0 commit comments

Comments
 (0)