handle value types like Option[Seq[T]] (#174)

* handle value types like Option[Seq[T]] * Update ErasureHelperTest.scala
swagger-akka-http · Aug 8, 2022 · 9bb35ac · 9bb35ac
1 parent 4c1bc86
commit 9bb35ac
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/main/scala-2/com/github/swagger/scala/converter/ErasureHelper.scala b/src/main/scala-2/com/github/swagger/scala/converter/ErasureHelper.scala
@@ -26,8 +26,13 @@ private[converter] object ErasureHelper {
       properties.flatMap { prop: universe.Symbol =>
         val maybeClass: Option[Class[_]] = prop.typeSignature.typeArgs.headOption.flatMap { signature =>
           if (signature.typeSymbol.isClass) {
-            Option(mirror.runtimeClass(signature.typeSymbol.asClass))
-          } else None
+            signature.typeArgs.headOption match {
+              case Some(typeArg) => Option(mirror.runtimeClass(typeArg))
+              case _ => Option(mirror.runtimeClass(signature))
+            }
+          } else {
+            None
+          }
         }
         maybeClass.map(prop.name.toString.trim -> _)
       }.toMap

diff --git a/src/test/scala/com/github/swagger/scala/converter/ErasureHelperTest.scala b/src/test/scala/com/github/swagger/scala/converter/ErasureHelperTest.scala
@@ -13,4 +13,12 @@ class ErasureHelperTest extends AnyFlatSpec with Matchers {
   "ErasureHelper" should "handle MyTrait" in {
     ErasureHelper.erasedOptionalPrimitives(classOf[ErasureHelperTest.SuperType]) shouldBe empty
   }
+  it should "handle OptionSeqLong" in {
+    val expected = if (RuntimeUtil.isScala3()) Map.empty[String, Class[_]] else Map("values" -> classOf[Long])
+    ErasureHelper.erasedOptionalPrimitives(classOf[OptionSeqLong]) shouldBe expected
+  }
+  it should "handle SeqOptionLong" in {
+    val expected = if (RuntimeUtil.isScala3()) Map.empty[String, Class[_]] else Map("values" -> classOf[Long])
+    ErasureHelper.erasedOptionalPrimitives(classOf[SeqOptionLong]) shouldBe expected
+  }
 }
diff --git a/src/test/scala/com/github/swagger/scala/converter/OptionSeqLong.scala b/src/test/scala/com/github/swagger/scala/converter/OptionSeqLong.scala
@@ -0,0 +1,3 @@
+package com.github.swagger.scala.converter
+
+case class OptionSeqLong(values: Option[Seq[Long]])
diff --git a/src/test/scala/com/github/swagger/scala/converter/SeqOptionLong.scala b/src/test/scala/com/github/swagger/scala/converter/SeqOptionLong.scala
@@ -0,0 +1,3 @@
+package com.github.swagger.scala.converter
+
+case class SeqOptionLong(values: Seq[Option[Long]])