File tree Expand file tree Collapse file tree 4 files changed +21
-2
lines changed
main/scala-2/com/github/swagger/scala/converter
test/scala/com/github/swagger/scala/converter Expand file tree Collapse file tree 4 files changed +21
-2
lines changed Original file line number Diff line number Diff line change @@ -26,8 +26,13 @@ private[converter] object ErasureHelper {
2626 properties.flatMap { prop : universe.Symbol =>
2727 val maybeClass : Option [Class [_]] = prop.typeSignature.typeArgs.headOption.flatMap { signature =>
2828 if (signature.typeSymbol.isClass) {
29- Option (mirror.runtimeClass(signature.typeSymbol.asClass))
30- } else None
29+ signature.typeArgs.headOption match {
30+ case Some (typeArg) => Option (mirror.runtimeClass(typeArg))
31+ case _ => Option (mirror.runtimeClass(signature))
32+ }
33+ } else {
34+ None
35+ }
3136 }
3237 maybeClass.map(prop.name.toString.trim -> _)
3338 }.toMap
Original file line number Diff line number Diff line change @@ -13,4 +13,12 @@ class ErasureHelperTest extends AnyFlatSpec with Matchers {
1313 " ErasureHelper" should " handle MyTrait" in {
1414 ErasureHelper .erasedOptionalPrimitives(classOf [ErasureHelperTest .SuperType ]) shouldBe empty
1515 }
16+ it should " handle OptionSeqLong" in {
17+ val expected = if (RuntimeUtil .isScala3()) Map .empty[String , Class [_]] else Map (" values" -> classOf [Long ])
18+ ErasureHelper .erasedOptionalPrimitives(classOf [OptionSeqLong ]) shouldBe expected
19+ }
20+ it should " handle SeqOptionLong" in {
21+ val expected = if (RuntimeUtil .isScala3()) Map .empty[String , Class [_]] else Map (" values" -> classOf [Long ])
22+ ErasureHelper .erasedOptionalPrimitives(classOf [SeqOptionLong ]) shouldBe expected
23+ }
1624}
Original file line number Diff line number Diff line change 1+ package com .github .swagger .scala .converter
2+
3+ case class OptionSeqLong (values : Option [Seq [Long ]])
Original file line number Diff line number Diff line change 1+ package com .github .swagger .scala .converter
2+
3+ case class SeqOptionLong (values : Seq [Option [Long ]])
You can’t perform that action at this time.
0 commit comments