RTypeCache

Author: pjfanning

src/main/scala-2/com/github/swagger/scala/converter/SubtypeHelper.scala

@@ -16,12 +16,11 @@ object SubtypeHelper {
       if (classSymbol.isJava) {
         Seq.empty
       } else if (symbol.isClass) {
-        val clazzes = symbol.asClass.knownDirectSubclasses
+        symbol.asClass.knownDirectSubclasses
           .toSeq
           .sortBy(_.info.toString)
           .flatMap(s => if (s.isClass) Some(s.asClass) else None)
-          .map(c => mirror.runtimeClass(c).getName)
-        clazzes.map(cn => Class.forName(cn, true, Thread.currentThread().getContextClassLoader))
+          .map(c => mirror.runtimeClass(c))
       } else {
         Seq.empty
       }

src/main/scala-3/com/github/swagger/scala/converter/ErasureHelper.scala

@@ -13,7 +13,7 @@ private[converter] object ErasureHelper {
 
   def erasedOptionalPrimitives(cls: Class[_]): Map[String, Class[_]] = {
     try {
-      val rType = RType.of(cls)
+      val rType = RTypeCache.getRType(cls)
       rType match {
         case classInfo: ClassInfo => {
           val results = classInfo.fields.flatMap { fieldInfo =>

src/main/scala-3/com/github/swagger/scala/converter/RTypeCache.scala

@@ -0,0 +1,15 @@
+package com.github.swagger.scala.converter
+
+import co.blocke.scala_reflection.RType
+
+import scala.collection.concurrent.TrieMap
+
+object RTypeCache {
+  private val trieMap = TrieMap[Class[_], RType]()
+
+  def getRType(cls: Class[_]): RType = trieMap.getOrElseUpdate(cls, RType.of(cls))
+
+  def remove(cls: Class[_]): Option[RType] = trieMap.remove(cls)
+
+  def clear(): Unit = trieMap.clear()
+}

src/main/scala/com/github/swagger/scala/converter/SwaggerScalaModelConverter.scala

@@ -29,10 +29,10 @@ object SwaggerScalaModelConverter {
   private var requiredBasedOnAnnotation = true
 
   /** If you use swagger annotations to override what is automatically derived, then be aware that
-    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = [[false]], by default. You are advised to set the required
+    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = false, by default. You are advised to set the required
     * flag on this annotation to the correct value. If you would prefer to have the Schema annotation required flag ignored and to rely on
     * the this module inferring the value (as ot would if you don't annotate the classes or fields), then set
-    * [[SwaggerScalaModelConverter.setRequiredBasedOnAnnotation]] to [[true]] and the required property on the annotation will be ignored,
+    * [[SwaggerScalaModelConverter.setRequiredBasedOnAnnotation]] to true and the required property on the annotation will be ignored,
     * unless the field is an [[Option]].
     *
     * @param value
@@ -43,10 +43,10 @@ object SwaggerScalaModelConverter {
   }
 
   /** If you use swagger annotations to override what is automatically derived, then be aware that
-    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = [[false]], by default. You are advised to set the required
+    * [[io.swagger.v3.oas.annotations.media.Schema]] annotation has required = false, by default. You are advised to set the required
     * flag on this annotation to the correct value. If you would prefer to have the Schema annotation required flag ignored and to rely on
     * the this module inferring the value (as ot would if you don't annotate the classes or fields), then set
-    * [[SwaggerScalaModelConverter.setRequiredBasedOnAnnotation]] to [[true]] and the required property on the annotation will be ignored,
+    * [[SwaggerScalaModelConverter.setRequiredBasedOnAnnotation]] to true and the required property on the annotation will be ignored,
     * unless the field is an [[Option]].
     *
     * @return
@@ -215,7 +215,7 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
   private def filterUnwantedProperties(schema: Schema[_], propertiesToKeep: Seq[PropertyDescriptor]): Unit = {
     val propNamesSet = propertiesToKeep.map(getAnnotatedPropertyName).toSet
     val originalProps = nullSafeMap(schema.getProperties)
-    val newProps = originalProps.filter { case (key, value) =>
+    val newProps = originalProps.filter { case (key, _) =>
       propNamesSet.contains(key)
     }
     if (originalProps.size > newProps.size) {
@@ -401,7 +401,6 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
     property.param match {
       case Some(constructorParameter) =>
         val types = constructorParameter.constructor.getParameterTypes
-        val annotations = constructorParameter.constructor.getParameterAnnotations
         val index = constructorParameter.index
         if (index > types.size) {
           AnyClass