Update ScalaAnnotationIntrospectorModule.scala

Author: pjfanning

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

@@ -2,13 +2,12 @@ package com.fasterxml.jackson.module.scala.introspect
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.databind.`type`.{ClassKey, ReferenceType, SimpleType}
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.cfg.MapperConfig
 import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator
 import com.fasterxml.jackson.databind.deser._
 import com.fasterxml.jackson.databind.introspect._
-import com.fasterxml.jackson.databind.util.{AccessPattern, Converter, LRUMap, LookupCache}
-import com.fasterxml.jackson.databind.{BeanDescription, DeserializationConfig, DeserializationContext, JavaType, JsonDeserializer, KeyDeserializer, MapperFeature}
+import com.fasterxml.jackson.databind.util.{AccessPattern, LRUMap, LookupCache}
+import com.fasterxml.jackson.databind.{BeanDescription, DeserializationConfig, DeserializationContext, JavaType, MapperFeature}
 import com.fasterxml.jackson.module.scala.JacksonModule
 import com.fasterxml.jackson.module.scala.util.Implicits._
 
@@ -25,17 +24,41 @@ object ScalaAnnotationIntrospector extends NopAnnotationIntrospector with ValueI
   /**
    * jackson-module-scala does not always properly handle deserialization of Options or Collections wrapping
    * Scala primitives (eg Int, Long, Boolean). There are general issues with serializing and deserializing
-   * Scala 2 Enumerations. These issues can be worked around by adding Jackson annotations on the affected fields.
+   * Scala 2 Enumerations. This function will not help with Enumerations.
+   * <p>
+   * This function is experimental and may be removed or significantly reworked in a later release.
+   * <p>
+   * These issues can be worked around by adding Jackson annotations on the affected fields.
    * This function is designed to be used when it is not possible to apply Jackson annotations.
    *
-   * @param clazz
-   * @param fieldName
-   * @param referencedType
+   * @param clazz the (case) class
+   * @param fieldName the field name in the (case) class
+   * @param referencedType the referenced type of the field - for `Option[Long]` - the referenced type is `Long`
+   * @see [[clearRegisteredReferencedTypes()]]
+   * @see [[clearRegisteredReferencedTypes(Class[_])]]
+   * @since 2.13.0
    */
   def registerReferencedType(clazz: Class[_], fieldName: String, referencedType: Class[_]): Unit = {
     overrideMap.getOrElseUpdate(clazz, ClassOverrides()).overrides.update(fieldName, referencedType)
   }
 
+  /**
+   * clears the state associated with reference types for the given class
+   * @param clazz the class for which to remove the registered reference types
+   * @see [[registerReferencedType]]
+   * @see [[clearRegisteredReferencedTypes()]]
+   * @since 2.13.0
+   */
+  def clearRegisteredReferencedTypes(clazz: Class[_]): Unit = {
+    overrideMap.remove(clazz)
+  }
+
+  /**
+   * clears all the state associated with reference types
+   * @see [[registerReferencedType]]
+   * @see [[clearRegisteredReferencedTypes(Class[_])]]
+   * @since 2.13.0
+   */
   def clearRegisteredReferencedTypes(): Unit = {
     overrideMap.clear()
   }
@@ -257,41 +280,10 @@ trait ScalaAnnotationIntrospectorModule extends JacksonModule {
 private case class WrappedCreatorProperty(creatorProperty: CreatorProperty, refClass: Class[_])
   extends CreatorProperty(creatorProperty, creatorProperty.getFullName) {
 
-  override def getAnnotation[A <: Annotation](acls: Class[A]): A = {
-    val result = Option(super.getAnnotation(acls)) match {
-      case None if acls.isAssignableFrom(classOf[JsonDeserialize]) => Some(getInstanceOfContentAsAnnotation())
-      case result => result
-    }
-    result.orNull.asInstanceOf[A]
-  }
-
-  override def getContextAnnotation[A <: Annotation](acls: Class[A]): A = {
-    val result = Option(super.getContextAnnotation(acls)) match {
-      case None if acls.isAssignableFrom(classOf[JsonDeserialize]) => Some(getInstanceOfContentAsAnnotation())
-      case result => result
-    }
-    result.orNull.asInstanceOf[A]
-  }
-
   override def getType: JavaType = {
     super.getType match {
       case rt: ReferenceType => ReferenceType.upgradeFrom(rt, SimpleType.constructUnsafe(refClass))
       case other => other
     }
   }
-
-  private def getInstanceOfContentAsAnnotation() = {
-    new JsonDeserialize() {
-      override def contentAs: Class[_] = refClass
-      override def annotationType: Class[JsonDeserialize] = classOf[JsonDeserialize]
-      override def as(): Class[_] = classOf[Void]
-      override def keyAs(): Class[_] = classOf[Void]
-      override def builder(): Class[_] = classOf[Void]
-      override def contentConverter(): Class[_ <: Converter[_, _]] = classOf[Converter.None]
-      override def converter(): Class[_ <: Converter[_, _]] = classOf[Converter.None]
-      override def using(): Class[_ <: JsonDeserializer[_]] = classOf[JsonDeserializer.None]
-      override def contentUsing(): Class[_ <: JsonDeserializer[_]] = classOf[JsonDeserializer.None]
-      override def keyUsing(): Class[_ <: KeyDeserializer] = classOf[KeyDeserializer.None]
-    }
-  }
 }