Merge pull request #384 from RafalSumislawski/fix-model-of-enums

Fix a regression causing enum properties to be modeled as RefProperty

Author: zarthross

swagger/src/main/scala/org/http4s/rho/swagger/TypeBuilder.scala

@@ -196,7 +196,7 @@ object TypeBuilder {
         typeToProperty(tpe.typeArgs.head, sfs).withRequired(false)
       else if (tpe.isAnyVal && !tpe.isPrimitive)
         typeToProperty(ptSym.asClass.primaryConstructor.asMethod.paramLists.flatten.head.typeSignature, sfs)
-      else if (isCaseClass(ptSym) || isSumType(ptSym))
+      else if (isCaseClass(ptSym) || (isSumType(ptSym) && !isObjectEnum(ptSym)))
         RefProperty(tpe.simpleName)
       else
         DataType.fromType(tpe) match {

swagger/src/test/scala/org/http4s/rho/swagger/TypeBuilderSpec.scala

@@ -6,7 +6,7 @@ import java.util.Date
 import cats.effect.IO
 import cats.syntax.all._
 import fs2.Stream
-import org.http4s.rho.swagger.models.AbstractProperty
+import org.http4s.rho.swagger.models.{AbstractProperty, StringProperty}
 import org.specs2.execute.Result
 import org.specs2.mutable.Specification
 import shapeless.{:+:, CNil}
@@ -415,6 +415,10 @@ class TypeBuilderSpec extends Specification {
     "Build a model for a case class containing a sealed enum" in {
       val ms = modelOf[SealedEnumContainer]
       ms.size must_== 1
+      val sealedEnumContainerModel = ms.head
+      val e = sealedEnumContainerModel.properties("e")
+      val enumProperty = e.asInstanceOf[StringProperty]
+      enumProperty.enums should_== Set("FooEnum", "BarEnum")
     }
 
     "Build a model for a type recursive through sealed trait" in {