Update SwaggerScalaModelConverter.scala

Author: pjfanning

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

@@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.media.{ArraySchema, Schema => SchemaAnnotat
 import io.swagger.v3.oas.models.media.Schema
 import org.slf4j.LoggerFactory
 
+import scala.util.Try
 import scala.util.control.NonFatal
 
 class AnnotatedTypeForOption extends AnnotatedType
@@ -129,13 +130,14 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
             val sp: Schema[String] = PrimitiveType.STRING.createProperty().asInstanceOf[Schema[String]]
             setRequired(`type`)
             try {
-              val valueMethods = cls.getMethods.toSeq.filter { m =>
+              val mainClass = getMainClass(cls)
+              val valueMethods = mainClass.getMethods.toSeq.filter { m =>
                 m.getDeclaringClass != EnumClass &&
                   m.getReturnType.getName == "scala.Enumeration$Value" && m.getParameterCount == 0
               }
-              val enumValues = valueMethods.map(_.getName)
+              val enumValues = valueMethods.map(_.invoke(None.orNull))
               enumValues.foreach { v =>
-                sp.addEnumItemObject(v)
+                sp.addEnumItemObject(v.toString)
               }
             } catch {
               case NonFatal(t) => logger.warn(s"Failed to get values for enum ${cls.getName}", t)
@@ -162,6 +164,15 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
     }
   }
 
+  private def getMainClass(clazz: Class[_]): Class[_] = {
+    val cname = clazz.getName
+    if (cname.endsWith("$")) {
+      Try(Class.forName(cname.substring(0, cname.length - 1))).getOrElse(clazz)
+    } else {
+      clazz
+    }
+  }
+
   private def _isOptional(annotatedType: AnnotatedType, cls: Class[_]): Boolean = {
     annotatedType.getType match {
       case _: ReferenceType if isOption(cls) => true