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

added null checks

Browse Source
This commit is contained in:
Tony Tam
2012-10-09 17:53:07 -07:00
parent 46323fae7c
commit 73a2fc216e
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
View File

@@ -109,11 +109,13 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
apiListings.foreach(apiDescription => {
val basePath = apiDescription.basePath
val resourcePath = apiDescription.resourcePath
apiDescription.apis.foreach(api => {
for ((apiPath, operation) <- ApiExtractor.extractApiOperations(basePath, api)) {
output += Tuple3(basePath, apiPath, operation)
}
})
if(apiDescription.apis != null) {
apiDescription.apis.foreach(api => {
for ((apiPath, operation) <- ApiExtractor.extractApiOperations(basePath, api)) {
output += Tuple3(basePath, apiPath, operation)
}
})
}
output.map(op => processApiOperation(op._2, op._3))
allModels ++= CoreUtils.extractApiModels(apiDescription)
})

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

@@ -98,18 +98,21 @@ object CoreUtils {
val modelNames = new HashSet[String]
val modelObjects = new HashMap[String, Model]
// return types
sd.apis.foreach(api => {
if (api.operations != null)
api.operations.foreach(op => {
modelNames += op.responseClass
// POST, PUT, DELETE body
if(op.parameters != null)
op.parameters.filter(p => p.paramType == "body")
.foreach(p => modelNames += p.dataType)
if(sd.apis != null){
sd.apis.foreach(api => {
if (api.operations != null)
api.operations.foreach(op => {
modelNames += op.responseClass
// POST, PUT, DELETE body
if(op.parameters != null)
op.parameters.filter(p => p.paramType == "body")
.foreach(p => modelNames += p.dataType)
})
})
})
for ((name, m) <- sd.models)
modelObjects += name -> m
}
if(sd.models != null)
for ((name, m) <- sd.models)
modelObjects += name -> m
// extract all base model names, strip away Containers like List[] and primitives
val baseNames = (for (modelName <- (modelNames.toList -- primitives))