Skip to content

Update samples for Scalatra after 2.2.2. #4910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Mar 6, 2017
Merged

Update samples for Scalatra after 2.2.2. #4910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5614e11
Update samples for Scalatra after 2.2.2.
Mar 4, 2017
c268bcf
[scalatra] Revert changes to build.sbt
jimschubert Mar 5, 2017
d591b7d
Merge pull request #1 from jimschubert/update-samples-scalatra
ePaul Mar 5, 2017
9fc630e
Update scalatra samples again after revert of part of #3905.
Mar 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions modules/swagger-codegen/src/main/resources/scalatra/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,23 @@ scalaVersion := "2.11.2"
scalacOptions += "-language:postfixOps"

libraryDependencies ++= Seq(
"com.github.finagle" %% "finch-core" % "0.9.2-SNAPSHOT" changing(),
"com.github.finagle" %% "finch-argonaut" % "0.9.2-SNAPSHOT" changing(),
"io.argonaut" %% "argonaut" % "6.1",
"com.github.finagle" %% "finch-test" % "0.9.2-SNAPSHOT" % "test,it" changing(),
"org.scalacheck" %% "scalacheck" % "1.12.5" % "test,it",
"org.scalatest" %% "scalatest" % "2.2.5" % "test,it"
"org.scalatest" %% "scalatest" % "2.2.1" % "test",
"org.scalatra" %% "scalatra" % "2.3.0.RC3",
"org.scalatra" %% "scalatra-scalate" % "2.3.0.RC3",
"org.scalatra" %% "scalatra-json" % "2.3.0.RC3",
"org.scalatra" %% "scalatra-swagger" % "2.3.0.RC3",
"org.scalatra" %% "scalatra-swagger-ext" % "2.3.0.RC3",
"org.scalatra" %% "scalatra-slf4j" % "2.3.0.RC3",
"org.json4s" %% "json4s-jackson" % "3.2.10",
"org.json4s" %% "json4s-ext" % "3.2.10",
"commons-codec" % "commons-codec" % "1.7",
"net.databinder.dispatch" %% "dispatch-core" % "0.11.2",
//"net.databinder.dispatch" %% "json4s-jackson" % "0.11.2",
"net.databinder.dispatch" %% "dispatch-json4s-jackson" % "0.11.2",
"com.typesafe.akka" %% "akka-actor" % "2.3.6",
"org.eclipse.jetty" % "jetty-server" % "9.2.3.v20140905" % "container;compile;test",
"org.eclipse.jetty" % "jetty-webapp" % "9.2.3.v20140905" % "container;compile;test",
"org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;compile;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar"))
)

resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
Expand All @@ -37,9 +48,6 @@ resolvers += "Sonatype OSS Snapshots" at "http://oss.sonatype.org/content/reposi

resolvers += "Sonatype OSS Releases" at "http://oss.sonatype.org/content/repositories/releases/"

resolvers += "TM" at "http://maven.twttr.com"


ivyXML := <dependencies>
<exclude module="slf4j-log4j12"/>
<exclude module="grizzled-slf4j_2.9.1"/>
Expand Down
8 changes: 4 additions & 4 deletions samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet
parameters(pathParam[Long]("petId").description(""), headerParam[String]("apiKey").description("").optional)
)

delete("/pet/{petId}",operation(deletePetOperation)) {
delete("/pet/:petId",operation(deletePetOperation)) {


val petId = params.getOrElse("petId", halt(400))
Expand Down Expand Up @@ -131,7 +131,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet
parameters(pathParam[Long]("petId").description(""))
)

get("/pet/{petId}",operation(getPetByIdOperation)) {
get("/pet/:petId",operation(getPetByIdOperation)) {


val petId = params.getOrElse("petId", halt(400))
Expand Down Expand Up @@ -161,7 +161,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet
parameters(pathParam[Long]("petId").description(""), formParam[String]("name").description("").optional, formParam[String]("status").description("").optional)
)

post("/pet/{petId}",operation(updatePetWithFormOperation)) {
post("/pet/:petId",operation(updatePetWithFormOperation)) {


val petId = params.getOrElse("petId", halt(400))
Expand All @@ -186,7 +186,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet
parameters(pathParam[Long]("petId").description(""), formParam[String]("additionalMetadata").description("").optional, formParam[File]("file").description("").optional)
)

post("/pet/{petId}/uploadImage",operation(uploadFileOperation)) {
post("/pet/:petId/uploadImage",operation(uploadFileOperation)) {


val petId = params.getOrElse("petId", halt(400))
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet
parameters(pathParam[String]("orderId").description(""))
)

delete("/store/order/{orderId}",operation(deleteOrderOperation)) {
delete("/store/order/:orderId",operation(deleteOrderOperation)) {


val orderId = params.getOrElse("orderId", halt(400))
Expand All @@ -71,7 +71,7 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet
parameters(pathParam[Long]("orderId").description(""))
)

get("/store/order/{orderId}",operation(getOrderByIdOperation)) {
get("/store/order/:orderId",operation(getOrderByIdOperation)) {


val orderId = params.getOrElse("orderId", halt(400))
Expand Down
3 changes: 3 additions & 0 deletions samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet

delete("/user/:username",operation(deleteUserOperation)) {


val username = params.getOrElse("username", halt(400))

println("username: " + username)
Expand All @@ -107,6 +108,7 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet

get("/user/:username",operation(getUserByNameOperation)) {


val username = params.getOrElse("username", halt(400))

println("username: " + username)
Expand Down Expand Up @@ -151,6 +153,7 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet

put("/user/:username",operation(updateUserOperation)) {


val username = params.getOrElse("username", halt(400))

println("username: " + username)
Expand Down