loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

added looking into 2nd-level objects

Browse Source
This commit is contained in:
Tony Tam 2012-09-12 09:51:53 -07:00
parent f5a69a5a3b
commit de1ef1dde3
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
View File

@ -122,7 +122,6 @@ object CoreUtils {
for ((name, m) <- sd.getModels) modelObjects += name -> m for ((name, m) <- sd.getModels) modelObjects += name -> m
// extract all base model names, strip away Containers like List[] and primitives // extract all base model names, strip away Containers like List[] and primitives
val baseNames = (for (modelName <- (modelNames.toList -- primitives)) val baseNames = (for (modelName <- (modelNames.toList -- primitives))
yield (extractBasePartFromType(modelName))).toSet yield (extractBasePartFromType(modelName))).toSet
@ -136,15 +135,31 @@ object CoreUtils {
val subObject = prop._2 val subObject = prop._2
if (containers.contains(subObject.getType)) { if (containers.contains(subObject.getType)) {
if (subObject.items != null) { if (subObject.items != null) {
if (subObject.items.ref != null) if (subObject.items.ref != null) {
subNames += subObject.items.ref subNames += subObject.items.ref
else } else {
subNames += subObject.items.getType subNames += subObject.items.getType
}
} }
} else subNames += subObject.getType } else subNames += subObject.getType
}) })
}) })
// look inside submodels
modelObjects.filter(obj => subNames.contains(obj._1)).foreach(model => {
model._2.properties.foreach(prop => {
val subObject = prop._2
if (containers.contains(subObject.getType)) {
if (subObject.items != null) {
if (subObject.items.ref != null) {
subNames += subObject.items.ref
} else {
subNames += subObject.items.getType
}
}
} else subNames += subObject.getType
})
})
val subModels = modelObjects.filter(obj => subNames.contains(obj._1)) val subModels = modelObjects.filter(obj => subNames.contains(obj._1))
val allModels = requiredModels ++ subModels val allModels = requiredModels ++ subModels
allModels.filter(m => primitives.contains(m._1) == false).toMap allModels.filter(m => primitives.contains(m._1) == false).toMap