From 5e4e84ffe7642c2b15c6c3ffdadb03b766d3998d Mon Sep 17 00:00:00 2001 From: clasnake Date: Mon, 18 Jul 2016 23:58:03 +0800 Subject: [PATCH] Fix the scalatra petstore sample compile error. --- .../languages/ScalatraServerCodegen.java | 2 +- .../src/main/resources/scalatra/api.mustache | 5 +- .../src/main/scala/ScalatraBootstrap.scala | 4 +- .../scalatra/src/main/scala/ServletApp.scala | 24 +-- .../scala/com/wordnik/client/api/PetApi.scala | 172 +++++++----------- .../com/wordnik/client/api/StoreApi.scala | 55 +++--- .../com/wordnik/client/api/UserApi.scala | 124 ++++++------- .../wordnik/client/model/ApiResponse.scala | 9 +- .../com/wordnik/client/model/Category.scala | 7 +- .../com/wordnik/client/model/Order.scala | 14 +- .../scala/com/wordnik/client/model/Pet.scala | 15 +- .../scala/com/wordnik/client/model/Tag.scala | 7 +- .../scala/com/wordnik/client/model/User.scala | 20 +- 13 files changed, 189 insertions(+), 269 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java index b148a4da08..63f43dfd38 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java @@ -42,7 +42,7 @@ public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConf "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", - "native", "super", "while") + "native", "super", "while", "type") ); defaultIncludes = new HashSet( diff --git a/modules/swagger-codegen/src/main/resources/scalatra/api.mustache b/modules/swagger-codegen/src/main/resources/scalatra/api.mustache index bd3b40b8fa..d7b36246a8 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/api.mustache +++ b/modules/swagger-codegen/src/main/resources/scalatra/api.mustache @@ -35,8 +35,7 @@ class {{classname}} (implicit val swagger: Swagger) extends ScalatraServlet val {{nickname}}Operation = (apiOperation[{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]("{{nickname}}") summary "{{{summary}}}" - parameters({{#allParams}}{{>queryParam}}{{>pathParam}}{{>bodyParam}}{{>formParam}}{{#hasMore}}, - {{/hasMore}}{{/allParams}}) + parameters({{#allParams}}{{>queryParam}}{{>pathParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ) {{httpMethod}}("{{path}}",operation({{nickname}}Operation)) { @@ -44,7 +43,7 @@ class {{classname}} (implicit val swagger: Swagger) extends ScalatraServlet {{#isFile}}val {{paramName}} = fileParams("{{paramName}}"){{/isFile}} {{^isFile}}{{#isPathParam}} val {{paramName}} = params.getOrElse("{{paramName}}", halt(400)){{/isPathParam}} - {{>queryParamOperation}}{{>headerParamOperation}}{{>formParamMustache}}{{>bodyParam}} + {{>queryParamOperation}}{{>headerParamOperation}}{{>formParamMustache}}{{>bodyParamOperation}} {{/isFile}} println("{{paramName}}: " + {{paramName}}) {{/allParams}} diff --git a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala index c78a113214..445cb7783a 100644 --- a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala +++ b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala @@ -24,7 +24,7 @@ import com.wordnik.client.api._ import akka.actor.ActorSystem -import io.swagger.app.{ResourcesApp, SwaggerApp} +import io.swagger.app.{ ResourcesApp, SwaggerApp } import javax.servlet.ServletContext import org.scalatra.LifeCycle @@ -37,7 +37,7 @@ class ScalatraBootstrap extends LifeCycle { context mount (new PetApi, "/Pet/*") context mount (new StoreApi, "/Store/*") context mount (new UserApi, "/User/*") - + context mount (new ResourcesApp, "/api-docs/*") } catch { case e: Throwable => e.printStackTrace() diff --git a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala index 35c8a3a84d..83b8e784c4 100644 --- a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala +++ b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala @@ -27,26 +27,26 @@ package io.swagger.app import _root_.akka.actor.ActorSystem import org.scalatra.swagger.{ ApiInfo, SwaggerWithAuth, Swagger } -import org.scalatra.swagger.{JacksonSwaggerBase, Swagger} +import org.scalatra.swagger.{ JacksonSwaggerBase, Swagger } import org.scalatra.ScalatraServlet -import org.json4s.{DefaultFormats, Formats} +import org.json4s.{ DefaultFormats, Formats } class ResourcesApp(implicit protected val system: ActorSystem, val swagger: SwaggerApp) - extends ScalatraServlet with JacksonSwaggerBase { + extends ScalatraServlet with JacksonSwaggerBase { before() { response.headers += ("Access-Control-Allow-Origin" -> "*") } protected def buildFullUrl(path: String) = if (path.startsWith("http")) path else { - val port = request.getServerPort - val h = request.getServerName - val prot = if (port == 443) "https" else "http" - val (proto, host) = if (port != 80 && port != 443) ("http", h+":"+port.toString) else (prot, h) - "%s://%s%s%s".format( - proto, - host, - request.getContextPath, - path) + val port = request.getServerPort + val h = request.getServerName + val prot = if (port == 443) "https" else "http" + val (proto, host) = if (port != 80 && port != 443) ("http", h + ":" + port.toString) else (prot, h) + "%s://%s%s%s".format( + proto, + host, + request.getContextPath, + path) } } diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala index 56288e3518..9a7d43dd68 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala @@ -35,11 +35,11 @@ import org.scalatra.swagger._ import org.json4s._ import org.json4s.JsonDSL._ import org.scalatra.json.{ JValueResult, JacksonJsonSupport } -import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintExceededException} +import org.scalatra.servlet.{ FileUploadSupport, MultipartConfig, SizeConstraintExceededException } import scala.collection.JavaConverters._ -class PetApi (implicit val swagger: Swagger) extends ScalatraServlet +class PetApi(implicit val swagger: Swagger) extends ScalatraServlet with FileUploadSupport with JacksonJsonSupport with SwaggerSupport { @@ -52,167 +52,133 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet contentType = formats("json") response.headers += ("Access-Control-Allow-Origin" -> "*") } - val addPetOperation = (apiOperation[Unit]("addPet") - summary "Add a new pet to the store" - parameters(bodyParam[Pet]("body").description("")) + summary "Add a new pet to the store" + parameters (bodyParam[Pet]("body").description("")) ) - post("/pet",operation(addPetOperation)) { - - - bodyParam[Pet]("body").description("") + post("/pet", operation(addPetOperation)) { + + val body = parsedBody.extract[Pet] + println("body: " + body) } - - val deletePetOperation = (apiOperation[Unit]("deletePet") - summary "Deletes a pet" - parameters(pathParam[Long]("petId").description(""), - ) + summary "Deletes a pet" + parameters (pathParam[Long]("petId").description(""), headerParam[String]("apiKey").description("").optional) ) - delete("/pet/{petId}",operation(deletePetOperation)) { - - - val petId = params.getOrElse("petId", halt(400)) - + delete("/pet/{petId}", operation(deletePetOperation)) { + + val petId = params.getOrElse("petId", halt(400)) + println("petId: " + petId) - - - val apiKey = request.getHeader("apiKey") + + val apiKey = request.getHeader("apiKey") println("apiKey: " + apiKey) } - - val findPetsByStatusOperation = (apiOperation[List[Pet]]("findPetsByStatus") - summary "Finds Pets by status" - parameters(queryParam[List[String]]("status").description("")) + summary "Finds Pets by status" + parameters (queryParam[List[String]]("status").description("")) ) - get("/pet/findByStatus",operation(findPetsByStatusOperation)) { - - - val statusString = params.getAs[String]("status") - val status = if("csv".equals("default")) { - statusString match { - case Some(str) => str.split(",") - case None => List() - } + get("/pet/findByStatus", operation(findPetsByStatusOperation)) { + + val statusString = params.getAs[String]("status") + val status = if ("csv".equals("default")) { + statusString match { + case Some(str) => str.split(",") + case None => List() } - else - List() - + } else + List() println("status: " + status) } - - val findPetsByTagsOperation = (apiOperation[List[Pet]]("findPetsByTags") - summary "Finds Pets by tags" - parameters(queryParam[List[String]]("tags").description("")) + summary "Finds Pets by tags" + parameters (queryParam[List[String]]("tags").description("")) ) - get("/pet/findByTags",operation(findPetsByTagsOperation)) { - - - val tagsString = params.getAs[String]("tags") - val tags = if("csv".equals("default")) { - tagsString match { - case Some(str) => str.split(",") - case None => List() - } + get("/pet/findByTags", operation(findPetsByTagsOperation)) { + + val tagsString = params.getAs[String]("tags") + val tags = if ("csv".equals("default")) { + tagsString match { + case Some(str) => str.split(",") + case None => List() } - else - List() - + } else + List() println("tags: " + tags) } - - val getPetByIdOperation = (apiOperation[Pet]("getPetById") - summary "Find pet by ID" - parameters(pathParam[Long]("petId").description("")) + summary "Find pet by ID" + parameters (pathParam[Long]("petId").description("")) ) - get("/pet/{petId}",operation(getPetByIdOperation)) { - - - val petId = params.getOrElse("petId", halt(400)) - + get("/pet/{petId}", operation(getPetByIdOperation)) { + + val petId = params.getOrElse("petId", halt(400)) + println("petId: " + petId) } - - val updatePetOperation = (apiOperation[Unit]("updatePet") - summary "Update an existing pet" - parameters(bodyParam[Pet]("body").description("")) + summary "Update an existing pet" + parameters (bodyParam[Pet]("body").description("")) ) - put("/pet",operation(updatePetOperation)) { - - - bodyParam[Pet]("body").description("") + put("/pet", operation(updatePetOperation)) { + + val body = parsedBody.extract[Pet] + println("body: " + body) } - - val updatePetWithFormOperation = (apiOperation[Unit]("updatePetWithForm") - summary "Updates a pet in the store with form data" - parameters(pathParam[Long]("petId").description(""), - formParam[String]("name").description("").optional, - formParam[String]("status").description("").optional) + summary "Updates a pet in the store with form data" + parameters (pathParam[Long]("petId").description(""), formParam[String]("name").description("").optional, formParam[String]("status").description("").optional) ) - post("/pet/{petId}",operation(updatePetWithFormOperation)) { - - - val petId = params.getOrElse("petId", halt(400)) - + post("/pet/{petId}", operation(updatePetWithFormOperation)) { + + val petId = params.getOrElse("petId", halt(400)) + println("petId: " + petId) - - - val name = params.getAs[String]("name") + + val name = params.getAs[String]("name") println("name: " + name) - - - val status = params.getAs[String]("status") + + val status = params.getAs[String]("status") println("status: " + status) } - - val uploadFileOperation = (apiOperation[ApiResponse]("uploadFile") - summary "uploads an image" - parameters(pathParam[Long]("petId").description(""), - formParam[String]("additionalMetadata").description("").optional, - formParam[File]("file").description("").optional) + summary "uploads an image" + parameters (pathParam[Long]("petId").description(""), formParam[String]("additionalMetadata").description("").optional, formParam[File]("file").description("").optional) ) - post("/pet/{petId}/uploadImage",operation(uploadFileOperation)) { - - - val petId = params.getOrElse("petId", halt(400)) - + post("/pet/{petId}/uploadImage", operation(uploadFileOperation)) { + + val petId = params.getOrElse("petId", halt(400)) + println("petId: " + petId) - - - val additionalMetadata = params.getAs[String]("additionalMetadata") + + val additionalMetadata = params.getAs[String]("additionalMetadata") println("additionalMetadata: " + additionalMetadata) val file = fileParams("file") - println("file: " + file) + println("file: " + file) } } \ No newline at end of file diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala index b2a8df92b3..5427c63f88 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala @@ -33,11 +33,11 @@ import org.scalatra.swagger._ import org.json4s._ import org.json4s.JsonDSL._ import org.scalatra.json.{ JValueResult, JacksonJsonSupport } -import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintExceededException} +import org.scalatra.servlet.{ FileUploadSupport, MultipartConfig, SizeConstraintExceededException } import scala.collection.JavaConverters._ -class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet +class StoreApi(implicit val swagger: Swagger) extends ScalatraServlet with FileUploadSupport with JacksonJsonSupport with SwaggerSupport { @@ -50,57 +50,48 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet contentType = formats("json") response.headers += ("Access-Control-Allow-Origin" -> "*") } - val deleteOrderOperation = (apiOperation[Unit]("deleteOrder") - summary "Delete purchase order by ID" - parameters(pathParam[String]("orderId").description("")) + summary "Delete purchase order by ID" + parameters (pathParam[String]("orderId").description("")) ) - delete("/store/order/{orderId}",operation(deleteOrderOperation)) { - - - val orderId = params.getOrElse("orderId", halt(400)) - + delete("/store/order/{orderId}", operation(deleteOrderOperation)) { + + val orderId = params.getOrElse("orderId", halt(400)) + println("orderId: " + orderId) } - - val getInventoryOperation = (apiOperation[Map[String, Int]]("getInventory") - summary "Returns pet inventories by status" - parameters() + summary "Returns pet inventories by status" + parameters () ) - get("/store/inventory",operation(getInventoryOperation)) { + get("/store/inventory", operation(getInventoryOperation)) { } - - val getOrderByIdOperation = (apiOperation[Order]("getOrderById") - summary "Find purchase order by ID" - parameters(pathParam[Long]("orderId").description("")) + summary "Find purchase order by ID" + parameters (pathParam[Long]("orderId").description("")) ) - get("/store/order/{orderId}",operation(getOrderByIdOperation)) { - - - val orderId = params.getOrElse("orderId", halt(400)) - + get("/store/order/{orderId}", operation(getOrderByIdOperation)) { + + val orderId = params.getOrElse("orderId", halt(400)) + println("orderId: " + orderId) } - - val placeOrderOperation = (apiOperation[Order]("placeOrder") - summary "Place an order for a pet" - parameters(bodyParam[Order]("body").description("")) + summary "Place an order for a pet" + parameters (bodyParam[Order]("body").description("")) ) - post("/store/order",operation(placeOrderOperation)) { - - - bodyParam[Order]("body").description("") + post("/store/order", operation(placeOrderOperation)) { + + val body = parsedBody.extract[Order] + println("body: " + body) } diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala index 7103ade331..cff4a915b6 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala @@ -33,11 +33,11 @@ import org.scalatra.swagger._ import org.json4s._ import org.json4s.JsonDSL._ import org.scalatra.json.{ JValueResult, JacksonJsonSupport } -import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintExceededException} +import org.scalatra.servlet.{ FileUploadSupport, MultipartConfig, SizeConstraintExceededException } import scala.collection.JavaConverters._ -class UserApi (implicit val swagger: Swagger) extends ScalatraServlet +class UserApi(implicit val swagger: Swagger) extends ScalatraServlet with FileUploadSupport with JacksonJsonSupport with SwaggerSupport { @@ -50,126 +50,104 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet contentType = formats("json") response.headers += ("Access-Control-Allow-Origin" -> "*") } - val createUserOperation = (apiOperation[Unit]("createUser") - summary "Create user" - parameters(bodyParam[User]("body").description("")) + summary "Create user" + parameters (bodyParam[User]("body").description("")) ) - post("/user",operation(createUserOperation)) { - - - bodyParam[User]("body").description("") + post("/user", operation(createUserOperation)) { + + val body = parsedBody.extract[User] + println("body: " + body) } - - val createUsersWithArrayInputOperation = (apiOperation[Unit]("createUsersWithArrayInput") - summary "Creates list of users with given input array" - parameters(bodyParam[List[User]]("body").description("")) + summary "Creates list of users with given input array" + parameters (bodyParam[List[User]]("body").description("")) ) - post("/user/createWithArray",operation(createUsersWithArrayInputOperation)) { - - - bodyParam[List[User]]("body").description("") + post("/user/createWithArray", operation(createUsersWithArrayInputOperation)) { + + val body = parsedBody.extract[List[User]] + println("body: " + body) } - - val createUsersWithListInputOperation = (apiOperation[Unit]("createUsersWithListInput") - summary "Creates list of users with given input array" - parameters(bodyParam[List[User]]("body").description("")) + summary "Creates list of users with given input array" + parameters (bodyParam[List[User]]("body").description("")) ) - post("/user/createWithList",operation(createUsersWithListInputOperation)) { - - - bodyParam[List[User]]("body").description("") + post("/user/createWithList", operation(createUsersWithListInputOperation)) { + + val body = parsedBody.extract[List[User]] + println("body: " + body) } - - val deleteUserOperation = (apiOperation[Unit]("deleteUser") - summary "Delete user" - parameters(pathParam[String]("username").description("")) + summary "Delete user" + parameters (pathParam[String]("username").description("")) ) - delete("/user/{username}",operation(deleteUserOperation)) { - - - val username = params.getOrElse("username", halt(400)) - + delete("/user/{username}", operation(deleteUserOperation)) { + + val username = params.getOrElse("username", halt(400)) + println("username: " + username) } - - val getUserByNameOperation = (apiOperation[User]("getUserByName") - summary "Get user by user name" - parameters(pathParam[String]("username").description("")) + summary "Get user by user name" + parameters (pathParam[String]("username").description("")) ) - get("/user/{username}",operation(getUserByNameOperation)) { - - - val username = params.getOrElse("username", halt(400)) - + get("/user/{username}", operation(getUserByNameOperation)) { + + val username = params.getOrElse("username", halt(400)) + println("username: " + username) } - - val loginUserOperation = (apiOperation[String]("loginUser") - summary "Logs user into the system" - parameters(queryParam[String]("username").description(""), - queryParam[String]("password").description("")) + summary "Logs user into the system" + parameters (queryParam[String]("username").description(""), queryParam[String]("password").description("")) ) - get("/user/login",operation(loginUserOperation)) { - - - val username = params.getAs[String]("username") + get("/user/login", operation(loginUserOperation)) { + + val username = params.getAs[String]("username") println("username: " + username) - - - val password = params.getAs[String]("password") + + val password = params.getAs[String]("password") println("password: " + password) } - - val logoutUserOperation = (apiOperation[Unit]("logoutUser") - summary "Logs out current logged in user session" - parameters() + summary "Logs out current logged in user session" + parameters () ) - get("/user/logout",operation(logoutUserOperation)) { + get("/user/logout", operation(logoutUserOperation)) { } - - val updateUserOperation = (apiOperation[Unit]("updateUser") - summary "Updated user" - parameters(pathParam[String]("username").description(""), - bodyParam[User]("body").description("")) + summary "Updated user" + parameters (pathParam[String]("username").description(""), bodyParam[User]("body").description("")) ) - put("/user/{username}",operation(updateUserOperation)) { - - - val username = params.getOrElse("username", halt(400)) - + put("/user/{username}", operation(updateUserOperation)) { + + val username = params.getOrElse("username", halt(400)) + println("username: " + username) - - - bodyParam[User]("body").description("") + + val body = parsedBody.extract[User] + println("body: " + body) } diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala index 90396f5de7..5388c99eca 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala @@ -24,10 +24,7 @@ package com.wordnik.client.model - - -case class ApiResponse ( +case class ApiResponse( code: Option[Int], -type: Option[String], -message: Option[String] -) + _type: Option[String], + message: Option[String]) diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala index 4bdadfbbe5..0173c13759 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala @@ -24,9 +24,6 @@ package com.wordnik.client.model - - -case class Category ( +case class Category( id: Option[Long], -name: Option[String] -) + name: Option[String]) diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala index 6f399b0d1c..eda2b85186 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala @@ -26,12 +26,10 @@ package com.wordnik.client.model import java.util.Date - -case class Order ( +case class Order( id: Option[Long], -petId: Option[Long], -quantity: Option[Int], -shipDate: Option[Date], -status: Option[String], // Order Status -complete: Option[Boolean] -) + petId: Option[Long], + quantity: Option[Int], + shipDate: Option[Date], + status: Option[String], // Order Status + complete: Option[Boolean]) diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala index 01aa08e73c..d9f123eafc 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala @@ -27,12 +27,11 @@ package com.wordnik.client.model import com.wordnik.client.model.Category import com.wordnik.client.model.Tag - -case class Pet ( +case class Pet( id: Option[Long], -category: Option[Category], -name: String, -photoUrls: List[String], -tags: Option[List[Tag]], -status: Option[String] // pet status in the store -) + category: Option[Category], + name: String, + photoUrls: List[String], + tags: Option[List[Tag]], + status: Option[String] // pet status in the store + ) diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala index a3d34e8d55..1b6ccd3e2c 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala @@ -24,9 +24,6 @@ package com.wordnik.client.model - - -case class Tag ( +case class Tag( id: Option[Long], -name: Option[String] -) + name: Option[String]) diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala index ff792d9137..5115e77c52 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala @@ -24,15 +24,13 @@ package com.wordnik.client.model - - -case class User ( +case class User( id: Option[Long], -username: Option[String], -firstName: Option[String], -lastName: Option[String], -email: Option[String], -password: Option[String], -phone: Option[String], -userStatus: Option[Int] // User Status -) + username: Option[String], + firstName: Option[String], + lastName: Option[String], + email: Option[String], + password: Option[String], + phone: Option[String], + userStatus: Option[Int] // User Status + )