From 74ddbf7a16bfa853138cf7d3c8dcefd0f4e52465 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 19 Apr 2018 09:16:52 +0800 Subject: [PATCH] update scalatra with oas2 spec (#131) --- .../scalatra/.swagger-codegen/VERSION | 2 +- .../scala/io/swagger/server/api/PetApi.scala | 34 +++++-------------- .../io/swagger/server/api/StoreApi.scala | 6 ++-- .../scala/io/swagger/server/api/UserApi.scala | 24 ++++++------- 4 files changed, 24 insertions(+), 42 deletions(-) diff --git a/samples/server/petstore/scalatra/.swagger-codegen/VERSION b/samples/server/petstore/scalatra/.swagger-codegen/VERSION index 50794f17f1a5..096bf47efe31 100644 --- a/samples/server/petstore/scalatra/.swagger-codegen/VERSION +++ b/samples/server/petstore/scalatra/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.1-SNAPSHOT \ No newline at end of file +3.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala index 482a00f5bfe8..1db3d57cc5b0 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala @@ -43,15 +43,15 @@ class PetApi(implicit val swagger: Swagger) extends ScalatraServlet val addPetOperation = (apiOperation[Unit]("addPet") summary "Add a new pet to the store" - parameters(bodyParam[Pet]("body").description("")) + parameters(bodyParam[Pet]("pet").description("")) ) post("/pet",operation(addPetOperation)) { - val body = parsedBody.extract[Pet] + val pet = parsedBody.extract[Pet] - println("body: " + body) + println("pet: " + pet) } @@ -84,16 +84,7 @@ class PetApi(implicit val swagger: Swagger) extends ScalatraServlet get("/pet/findByStatus",operation(findPetsByStatusOperation)) { - val statusString = params.getAs[String]("status") - val status = if("csv" == "default" || "csv" == "csv") { - statusString match { - case Some(str) => str.split(",").toSeq - case None => Seq() - } - } - else - Seq() - + val status = params.getAs[List[String]]("status") println("status: " + status) } @@ -108,16 +99,7 @@ class PetApi(implicit val swagger: Swagger) extends ScalatraServlet get("/pet/findByTags",operation(findPetsByTagsOperation)) { - val tagsString = params.getAs[String]("tags") - val tags = if("csv" == "default" || "csv" == "csv") { - tagsString match { - case Some(str) => str.split(",").toSeq - case None => Seq() - } - } - else - Seq() - + val tags = params.getAs[List[String]]("tags") println("tags: " + tags) } @@ -141,15 +123,15 @@ class PetApi(implicit val swagger: Swagger) extends ScalatraServlet val updatePetOperation = (apiOperation[Unit]("updatePet") summary "Update an existing pet" - parameters(bodyParam[Pet]("body").description("")) + parameters(bodyParam[Pet]("pet").description("")) ) put("/pet",operation(updatePetOperation)) { - val body = parsedBody.extract[Pet] + val pet = parsedBody.extract[Pet] - println("body: " + body) + println("pet: " + pet) } diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala index eb6256bbaf3c..2b008e356ea6 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala @@ -81,15 +81,15 @@ class StoreApi(implicit val swagger: Swagger) extends ScalatraServlet val placeOrderOperation = (apiOperation[Order]("placeOrder") summary "Place an order for a pet" - parameters(bodyParam[Order]("body").description("")) + parameters(bodyParam[Order]("order").description("")) ) post("/store/order",operation(placeOrderOperation)) { - val body = parsedBody.extract[Order] + val order = parsedBody.extract[Order] - println("body: " + body) + println("order: " + order) } } diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala index 3b34708598d5..fea8023d9bfa 100644 --- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala @@ -41,45 +41,45 @@ class UserApi(implicit val swagger: Swagger) extends ScalatraServlet val createUserOperation = (apiOperation[Unit]("createUser") summary "Create user" - parameters(bodyParam[User]("body").description("")) + parameters(bodyParam[User]("user").description("")) ) post("/user",operation(createUserOperation)) { - val body = parsedBody.extract[User] + val user = parsedBody.extract[User] - println("body: " + body) + println("user: " + user) } val createUsersWithArrayInputOperation = (apiOperation[Unit]("createUsersWithArrayInput") summary "Creates list of users with given input array" - parameters(bodyParam[List[User]]("body").description("")) + parameters(bodyParam[List[User]]("user").description("")) ) post("/user/createWithArray",operation(createUsersWithArrayInputOperation)) { - val body = parsedBody.extract[List[User]] + val user = parsedBody.extract[List[User]] - println("body: " + body) + println("user: " + user) } val createUsersWithListInputOperation = (apiOperation[Unit]("createUsersWithListInput") summary "Creates list of users with given input array" - parameters(bodyParam[List[User]]("body").description("")) + parameters(bodyParam[List[User]]("user").description("")) ) post("/user/createWithList",operation(createUsersWithListInputOperation)) { - val body = parsedBody.extract[List[User]] + val user = parsedBody.extract[List[User]] - println("body: " + body) + println("user: " + user) } @@ -146,7 +146,7 @@ class UserApi(implicit val swagger: Swagger) extends ScalatraServlet val updateUserOperation = (apiOperation[Unit]("updateUser") summary "Updated user" - parameters(pathParam[String]("username").description(""), bodyParam[User]("body").description("")) + parameters(pathParam[String]("username").description(""), bodyParam[User]("user").description("")) ) put("/user/:username",operation(updateUserOperation)) { @@ -157,9 +157,9 @@ class UserApi(implicit val swagger: Swagger) extends ScalatraServlet println("username: " + username) - val body = parsedBody.extract[User] + val user = parsedBody.extract[User] - println("body: " + body) + println("user: " + user) } }