Skip to content

Minor fixes for Scalatra 3.0 examples #86

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
merged 2 commits into from
Oct 11, 2023
Merged

Minor fixes for Scalatra 3.0 examples #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caa8e81
Minor fixes for Scalatra 3.0 examples
takezoe Oct 9, 2023
ff790ab
Use sttp instead of scalaj-http
takezoe Oct 9, 2023
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
16 changes: 8 additions & 8 deletions 3.0/async/pekko-examples/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ scalaVersion := "3.3.1"
val ScalatraVersion = "3.0.0"

libraryDependencies ++= Seq(
"org.apache.pekko" %% "pekko-actor" % "1.0.0" cross(CrossVersion.for3Use2_13),
"org.apache.pekko" %% "pekko-http" % "1.0.0" cross(CrossVersion.for3Use2_13),
"org.scalaj" %% "scalaj-http" % "2.4.2" cross(CrossVersion.for3Use2_13),
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % "test",
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % "provided",
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % "provided"
"org.apache.pekko" %% "pekko-actor" % "1.0.0" cross(CrossVersion.for3Use2_13),
"org.apache.pekko" %% "pekko-http" % "1.0.0" cross(CrossVersion.for3Use2_13),
"com.softwaremill.sttp.client3" %% "core" % "3.9.0",
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
)

enablePlugins(JettyPlugin)
Expand Down
6 changes: 4 additions & 2 deletions 3.0/async/pekko-examples/src/main/scala/com/example/app/FutureController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.app

import org.apache.pekko.actor.ActorSystem
import scalaj.http.{Http => SJHttp}
import sttp.client3._

import org.scalatra._

Expand All @@ -23,7 +23,9 @@ class FutureController(system: ActorSystem) extends ScalatraServlet with FutureS
object HttpClient {
def retrievePage()(implicit ctx: ExecutionContext): Future[String] = {
Future {
val response = SJHttp("https://scalatra.org/").asString
val backend = HttpClientSyncBackend()
val request = basicRequest.get(uri"https://scalatra.org/").response(asStringAlways)
val response = request.send(backend)
response.body
}
}
Expand Down
10 changes: 5 additions & 5 deletions 3.0/persistence/scalatra-slick/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ scalaVersion := "3.3.1"
val ScalatraVersion = "3.0.0"

libraryDependencies ++= Seq(
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % "test",
"com.typesafe.slick" %% "slick" % "3.5.0-M4",
"com.h2database" % "h2" % "1.4.200",
"com.mchange" % "c3p0" % "0.9.5.5",
"ch.qos.logback" % "logback-classic" % "1.4.11" % "provided",
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % "provided",
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % "provided"
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
"org.scalatra" %% "scalatra-specs2-jakarta" % ScalatraVersion % Test,
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
)

enablePlugins(JettyPlugin)
Expand Down
4 changes: 2 additions & 2 deletions 3.0/persistence/scalatra-squeryl/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ scalaVersion := "3.3.1"
val ScalatraVersion = "3.0.0"

libraryDependencies ++= Seq(
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
"org.scalatra" %% "scalatra-scalatest-jakarta" % ScalatraVersion % Test,
"org.squeryl" %% "squeryl" % "0.10.0",
"com.h2database" % "h2" % "1.4.200",
"com.mchange" % "c3p0" % "0.9.5.5",
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
"org.scalatra" %% "scalatra-scalatest-jakarta" % ScalatraVersion % Test,
"ch.qos.logback" % "logback-classic" % "1.4.11" % Provided,
"org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % Provided,
"jakarta.servlet" % "jakarta.servlet-api" % "5.0.0" % Provided
Expand Down
2 changes: 1 addition & 1 deletion 3.0/persistence/scalatra-squeryl/src/main/scala/ScalatraBootstrap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ScalatraBootstrap extends LifeCycle with DatabaseInit {

override def init(context: ServletContext) = {
configureDb
context mount (new ArticlesController, "/*")
context.mount(new ArticlesController, "/*")
}

override def destroy(context:ServletContext) = {
Expand Down
2 changes: 1 addition & 1 deletion 3.0/swagger-example/src/main/scala/ScalatraBootstrap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ class ScalatraBootstrap extends LifeCycle {
// This is tentative. We will rewrite it once the official version of Scalatra 2.7 is released.
context.setInitParameter("org.scalatra.cors.allowedOrigins", "http://petstore.swagger.io")
context.mount(new FlowersController, "/flowers", "flowers")
context.mount (new ResourcesApp, "/api-docs")
context.mount(new ResourcesApp, "/api-docs")
}
}