Skip to content

Commit c90f29b

Browse files
committed
Update SwaggerScalaModelConverter.scala
1 parent 743fd78 commit c90f29b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
2727
SwaggerScalaModelConverter
2828

2929
private val logger = LoggerFactory.getLogger(classOf[SwaggerScalaModelConverter])
30+
private val EnumClass = classOf[scala.Enumeration]
3031
private val OptionClass = classOf[scala.Option[_]]
3132
private val IterableClass = classOf[scala.collection.Iterable[_]]
3233
private val SetClass = classOf[scala.collection.Set[_]]
@@ -129,9 +130,10 @@ class SwaggerScalaModelConverter extends ModelResolver(SwaggerScalaModelConverte
129130
setRequired(`type`)
130131
try {
131132
val valueMethods = cls.getMethods.toSeq.filter { m =>
132-
m.getReturnType.getName == "scala.Enumeration$Value" && m.getParameterCount == 0
133+
m.getDeclaringClass != EnumClass &&
134+
m.getReturnType.getName == "scala.Enumeration$Value" && m.getParameterCount == 0
133135
}
134-
val enumValues = valueMethods.map(_.getName).filterNot(_ == "Value")
136+
val enumValues = valueMethods.map(_.getName)
135137
enumValues.foreach { v =>
136138
sp.addEnumItemObject(v)
137139
}

0 commit comments

Comments
 (0)