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

Merge pull request #368 from amandaducrou/master

Browse Source 
Adding first and hasRequiredParams parameters to Codegen
This commit is contained in:
Tony Tam 2015-01-09 10:26:50 -08:00
commit 3abc42eee9
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
View File

@ -202,7 +202,10 @@ class Codegen(config: CodegenConfig) {
queryParams.size match { queryParams.size match {
case 0 => case 0 =>
case _ => queryParams.last.asInstanceOf[HashMap[String, String]] -= "hasMore" case _ => {
queryParams.head.asInstanceOf[HashMap[String, String]] += "first" -> "true"
queryParams.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
}
} }
pathParams.size match { pathParams.size match {
@ -390,7 +393,10 @@ class Codegen(config: CodegenConfig) {
"description" -> propertyDocSchema.description, "description" -> propertyDocSchema.description,
"notes" -> propertyDocSchema.description, "notes" -> propertyDocSchema.description,
"allowableValues" -> rawAllowableValuesToString(propertyDocSchema.allowableValues), "allowableValues" -> rawAllowableValuesToString(propertyDocSchema.allowableValues),
(if(propertyDocSchema.required) "required" else "isNotRequired") -> "true", (if(propertyDocSchema.required) {
data += "hasRequiredParams" -> "true"
"required"
} else "isNotRequired") -> "true",
"getter" -> config.toGetter(prop._1, config.toDeclaration(propertyDocSchema)._1), "getter" -> config.toGetter(prop._1, config.toDeclaration(propertyDocSchema)._1),
"setter" -> config.toSetter(prop._1, config.toDeclaration(propertyDocSchema)._1), "setter" -> config.toSetter(prop._1, config.toDeclaration(propertyDocSchema)._1),
"isList" -> isList, "isList" -> isList,

30
src/test/scala/CodegenTest.scala
View File

@ -24,6 +24,7 @@ import org.scalatest.FlatSpec
import org.scalatest.Matchers import org.scalatest.Matchers
import scala.beans.BeanProperty import scala.beans.BeanProperty
import scala.collection.mutable.{ HashMap, LinkedHashMap }
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class CodegenTest extends FlatSpec with Matchers { class CodegenTest extends FlatSpec with Matchers {
@ -40,8 +41,18 @@ class CodegenTest extends FlatSpec with Matchers {
List.empty, List.empty,
List.empty, List.empty,
List.empty, List.empty,
//query param
List(new Parameter("Name", Some("name"), Some("null"), false, false, "String", AnyAllowableValues, "query", None)),
List.empty, List.empty,
List.empty, None)
val testModel = new Model("Contact",
"Contact",
"Contact",
//required field
LinkedHashMap("Name" -> new ModelProperty("String", "String", 0, true, None, AnyAllowableValues, None)),
None,
None,
None) None)
behavior of "Codegen" behavior of "Codegen"
@ -52,4 +63,21 @@ class CodegenTest extends FlatSpec with Matchers {
val map = subject.apiToMap("/contacts", testOp) val map = subject.apiToMap("/contacts", testOp)
map("returnContainer") should be (Some("List")) map("returnContainer") should be (Some("List"))
} }
/*
* Field first on the query param should be true
*/
it should "have a first field on first query param and should be true" in {
val map = subject.apiToMap("/contacts", testOp)
map("queryParams").asInstanceOf[List[HashMap[String, String]]].head("first") should be ("true")
}
/*
* Field hasRequiredParams should be true
*/
it should "have a hasRequiredParams field and should be true" in {
val map = subject.modelToMap("Contact", testModel)
map("hasRequiredParams") should be ("true")
}
} }