Skip to content

Commit 70e0956

Browse files
committed
fix for #240
1 parent 39d0b61 commit 70e0956

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelPropertyParser.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ class ModelPropertyParser(cls: Class[_]) (implicit properties: LinkedHashMap[Str
2525
final val positiveInfinity = "Infinity"
2626
final val negativeInfinity = "-Infinity"
2727

28-
def parse = Option(cls).map(parseRecursive(_))
28+
def parse = {
29+
Option(cls).map(parseRecursive(_))
30+
31+
LOGGER.debug("processed fields: " + processedFields + ", " + properties.keys)
32+
}
2933

3034
def parseRecursive(hostClass: Class[_]): Unit = {
3135
LOGGER.debug("processing class " + hostClass)
@@ -337,7 +341,7 @@ class ModelPropertyParser(cls: Class[_]) (implicit properties: LinkedHashMap[Str
337341
"Map[" + keyName + "," + valueName + "]"
338342
} else if (!returnType.getClass.isAssignableFrom(classOf[ParameterizedTypeImpl]) && returnType.isInstanceOf[Class[_]] && returnType.asInstanceOf[Class[_]].isArray) {
339343
var arrayClass = returnType.asInstanceOf[Class[_]].getComponentType
340-
"Array[" + arrayClass.getName + "]"
344+
"Array[" + readName(arrayClass, isSimple) + "]"
341345
} else {
342346
if (genericReturnType.getClass.isAssignableFrom(classOf[TypeVariableImpl[_]])) {
343347
genericReturnType.asInstanceOf[TypeVariableImpl[_]].getName

modules/swagger-core/src/main/scala/com/wordnik/swagger/core/filter/SpecFilter.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ class SpecFilter {
6262

6363
def filterModels(allModels: Option[Map[String, Model]], apis: List[ApiDescription]) = {
6464
val modelNames = requiredModels(allModels, apis)
65-
LOGGER.debug("required model names: " + modelNames)
6665
val existingModels = allModels.getOrElse(Map[String, Model]())
67-
68-
LOGGER.debug("existing models: " + existingModels)
6966
val output = (for(model <- modelNames) yield {
7067
if(existingModels.contains(model))
7168
Some(model, existingModels(model))

0 commit comments

Comments
 (0)