Skip to content

Commit 4f92eac

Browse files
committed
compile issue
1 parent bc99bc1 commit 4f92eac

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
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 if ScalaAnnotationIntrospector.isMaybeScalaBeanType(param.getDeclaringClass) => {
20+
case param: AnnotatedParameter if ScalaAnnotationIntrospectorModule.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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
116116

117117
override def modifyValueInstantiator(deserializationConfig: DeserializationConfig, beanDesc: BeanDescription,
118118
defaultInstantiator: ValueInstantiator): ValueInstantiator = {
119-
if (isMaybeScalaBeanType(beanDesc.getBeanClass)) {
119+
if (scalaAnnotationIntrospectorModule.isMaybeScalaBeanType(beanDesc.getBeanClass)) {
120120
_descriptorFor(beanDesc.getBeanClass).map { descriptor =>
121121
if (scalaAnnotationIntrospectorModule.overrideMap.contains(beanDesc.getBeanClass.getName) || descriptor.properties.exists(_.param.exists(_.defaultValue.isDefined))) {
122122
defaultInstantiator match {
@@ -187,17 +187,10 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
187187
}
188188
}
189189

190-
private def isScalaPackage(pkg: Option[Package]): Boolean =
191-
pkg.exists(_.getName.startsWith("scala."))
192-
193-
private[introspect] def isMaybeScalaBeanType(cls: Class[_]): Boolean =
194-
(cls.extendsScalaClass(config.shouldSupportScala3Classes()) || cls.hasSignature) &&
195-
!isScalaPackage(Option(cls.getPackage))
196-
197190
private def isScala(a: Annotated): Boolean = {
198191
a match {
199-
case ac: AnnotatedClass => isMaybeScalaBeanType(ac.getAnnotated)
200-
case am: AnnotatedMember => isMaybeScalaBeanType(am.getDeclaringClass)
192+
case ac: AnnotatedClass => scalaAnnotationIntrospectorModule.isMaybeScalaBeanType(ac.getAnnotated)
193+
case am: AnnotatedMember => scalaAnnotationIntrospectorModule.isMaybeScalaBeanType(am.getDeclaringClass)
201194
}
202195
}
203196

@@ -403,6 +396,13 @@ trait ScalaAnnotationIntrospectorModule extends JacksonModule {
403396
recreateScalaTypeCache()
404397
}
405398

399+
private def isScalaPackage(pkg: Option[Package]): Boolean =
400+
pkg.exists(_.getName.startsWith("scala."))
401+
402+
private[introspect] def isMaybeScalaBeanType(cls: Class[_]): Boolean =
403+
(cls.extendsScalaClass(config.shouldSupportScala3Classes()) || cls.hasSignature) &&
404+
!isScalaPackage(Option(cls.getPackage))
405+
406406
private def recreateDescriptorCache(): Unit = {
407407
_descriptorCache.clear()
408408
_descriptorCache = _lookupCacheFactory.createLookupCache(16, _descriptorCacheSize)

0 commit comments

Comments
 (0)