Merge pull request #251 from earldouglas/not-so-required

Set param as 'required' iff required, else set as 'optional'
This commit is contained in:
Tony Tam 2014-08-26 14:33:00 -07:00
commit 013c19eb36

View File

@ -143,16 +143,17 @@ class Codegen(config: CodegenConfig) {
case _ => case _ =>
} }
if (!param.required) { if (param.required) {
params += "required" -> "true"
} else {
params += "optional" -> "true" params += "optional" -> "true"
} }
param.paramType match { param.paramType match {
case "body" => { case "body" => {
params += "paramName" -> "body" params += "paramName" -> "body"
params += "baseName" -> "body" params += "baseName" -> "body"
param.required match { if (!param.required) {
case true => params += "required" -> "true" bodyParamRequired = None
case _ => bodyParamRequired = None
} }
bodyParam = Some("body") bodyParam = Some("body")
@ -167,19 +168,16 @@ class Codegen(config: CodegenConfig) {
case "query" => { case "query" => {
params += "paramName" -> config.toVarName(param.name) params += "paramName" -> config.toVarName(param.name)
params += "baseName" -> param.name params += "baseName" -> param.name
params += "required" -> param.required.toString
queryParams += params.clone queryParams += params.clone
} }
case "header" => { case "header" => {
params += "paramName" -> config.toVarName(param.name) params += "paramName" -> config.toVarName(param.name)
params += "baseName" -> param.name params += "baseName" -> param.name
params += "required" -> param.required.toString
headerParams += params.clone headerParams += params.clone
} }
case "form" => { case "form" => {
params += "paramName" -> config.toVarName(param.name) params += "paramName" -> config.toVarName(param.name)
params += "baseName" -> param.name params += "baseName" -> param.name
params += "required" -> param.required.toString
formParams += params.clone formParams += params.clone
} }
case x @ _ => throw new Exception("Unknown parameter type: " + x) case x @ _ => throw new Exception("Unknown parameter type: " + x)