Skip to content

Commit 32dc1d6

Browse files
authored
Netty backend (#200)
* Netty backend
1 parent 07f9a8e commit 32dc1d6

4 files changed

Lines changed: 9 additions & 3 deletions

File tree

nio-server/build.sbt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ organization := "fr.maif"
66

77
lazy val `nio-server` = (project in file("."))
88
.enablePlugins(PlayScala, DockerPlugin)
9+
.disablePlugins(PlayPekkoHttpServer)
910
.enablePlugins(NoPublish)
1011
.disablePlugins(BintrayPlugin)
1112

1213
scalaVersion := Dependencies._scalaVersion
1314

15+
PlayKeys.devSettings += "play.server.provider" -> "play.core.server.NettyServerProvider"
16+
1417
resolvers ++= Seq(
1518
Resolver.jcenterRepo,
1619
"Maven central" at "https://repo1.maven.org/maven2/"
@@ -25,6 +28,7 @@ ThisBuild / scalafixDependencies ++= Seq("org.reactivemongo" %% "reactivemongo-
2528

2629
libraryDependencies ++= Seq(
2730
ws,
31+
nettyServer,
2832
"org.apache.pekko" %% "pekko-stream" % pekko,
2933
"org.apache.pekko" %% "pekko-actor-typed" % pekko,
3034
"org.apache.pekko" %% "pekko-slf4j" % pekko,
@@ -40,7 +44,6 @@ libraryDependencies ++= Seq(
4044
"org.apache.commons" % "commons-lang3" % "3.11",
4145
"de.svenkubiak" % "jBCrypt" % "0.4.1", // ISC/BSD
4246
"com.auth0" % "java-jwt" % javaJwt, // MIT license
43-
// "com.github.pureconfig" %% "pureconfig" % pureConfig, // Apache 2.0
4447
"com.github.pureconfig" %% "pureconfig-core" % pureConfig, // Apache 2.0
4548
"com.github.pureconfig" %% "pureconfig-generic-scala3" % pureConfig, // Apache 2.0
4649
"org.scalactic" %% "scalactic" % scalaticVersion, // Apache 2.0
@@ -80,6 +83,7 @@ assembly / assemblyMergeStrategy := {
8083
case PathList(xs @ _*) if xs.lastOption.contains("mime.types") => MergeStrategy.first
8184
case PathList(ps @ _*) if ps.last == "io.netty.versions.properties" => MergeStrategy.first
8285
case PathList(ps @ _*) if ps.contains("reference-overrides.conf") => MergeStrategy.concat
86+
case PathList(ps @ _*) if ps.contains("reflect-config.json") => MergeStrategy.first
8387
case PathList(ps @ _*) if ps.contains("native-image.properties") => MergeStrategy.first
8488
case PathList(ps @ _*) if ps.last endsWith ".conf" => MergeStrategy.concat
8589
case PathList(ps @ _*) if ps.contains("buildinfo") => MergeStrategy.discard

nio-server/conf/application.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ play.application.loader = loader.NioLoader
66
// add filter NioFilter
77
play.modules.enabled += "play.modules.reactivemongo.ReactiveMongoModule"
88

9+
play.server.provider = play.core.server.NettyServerProvider
10+
911
play {
1012
filters {
1113
enabled += filters.OtoroshiFilter

nio-server/test/controllers/HomeControllerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class HomeControllerSpec extends TestUtils {
2020
callJson(s"/$tenant/bo", GET, api = false)
2121

2222
response.status must be(OK)
23-
response.contentType must be("text/html; charset=UTF-8")
23+
response.contentType.toLowerCase must be("text/html; charset=utf-8")
2424
}
2525

2626
}

nio-server/test/controllers/TenantControllerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class TenantControllerSpec extends TestUtils {
100100
postXml(path, tenantXml, headers = Seq(CONTENT_TYPE -> XML, secret))
101101

102102
resp.status mustBe CREATED
103-
resp.contentType mustBe s"$XML; charset=UTF-8"
103+
resp.contentType.toLowerCase mustBe s"$XML; charset=utf-8"
104104
}
105105

106106
"create with content-type json" in {

0 commit comments

Comments
 (0)