Improve PlayServerInterpreter.toRoutes (#3838)

softwaremill · Jun 13, 2024 · c5c59e1 · c5c59e1
1 parent 8660b71
commit c5c59e1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/perf-tests/README.md b/perf-tests/README.md
@@ -31,7 +31,7 @@ sbt -Dtapir.perf.user-count=100 -Dtapir.perf.duration-seconds=60
 ```
 or within an already running interactive sbt session:
 ```
-set ThisBuild/javaOptions += ""-Dtapir.perf.user-count=100"
+set ThisBuild/javaOptions += "-Dtapir.perf.user-count=100"
 ```
 If not set, default values will be used (see `sttp.tapir.perf.CommonSimulations`).
 

diff --git a/perf-tests/src/test/scala/sttp/tapir/perf/Simulations.scala b/perf-tests/src/test/scala/sttp/tapir/perf/Simulations.scala
@@ -76,7 +76,7 @@ object CommonSimulations {
     )
       .exec(handleLatencyHistogram(histogram, warmup))
 
-    scenario(s"Repeatedly invoke POST with short string body")
+    scenario(s"${namePrefix(warmup)} Repeatedly invoke POST with short string body")
       .during(duration(warmup))(execHttpPost)
       .inject(atOnceUsers(userCount))
       .protocols(httpProtocol)
@@ -92,7 +92,7 @@ object CommonSimulations {
     )
       .exec(handleLatencyHistogram(histogram, warmup))
 
-    scenario(s"Repeatedly invoke POST with short byte array body")
+    scenario(s"${namePrefix(warmup)} Repeatedly invoke POST with short byte array body")
       .during(duration(warmup))(execHttpPost)
       .inject(atOnceUsers(userCount))
       .protocols(httpProtocol)
@@ -108,7 +108,7 @@ object CommonSimulations {
     )
       .exec(handleLatencyHistogram(histogram, warmup))
 
-    scenario(s"Repeatedly invoke POST with large byte array")
+    scenario(s"${namePrefix(warmup)} Repeatedly invoke POST with large byte array")
       .during(duration(warmup))(execHttpPost)
       .inject(atOnceUsers(userCount))
       .protocols(httpProtocol)
@@ -124,7 +124,7 @@ object CommonSimulations {
     )
       .exec(handleLatencyHistogram(histogram, warmup))
 
-    scenario(s"Repeatedly invoke POST with large byte array, interpreted to a String")
+    scenario(s"${namePrefix(warmup)} Repeatedly invoke POST with large byte array, interpreted to a String")
       .during(duration(warmup))(execHttpPost)
       .inject(atOnceUsers(userCount))
       .protocols(httpProtocol)

diff --git a/server/play-server/src/main/scala/sttp/tapir/server/play/PlayServerInterpreter.scala b/server/play-server/src/main/scala/sttp/tapir/server/play/PlayServerInterpreter.scala
@@ -43,6 +43,16 @@ trait PlayServerInterpreter {
     val filterServerEndpoints = FilterServerEndpoints(serverEndpoints)
     val singleEndpoint = serverEndpoints.size == 1
 
+    implicit val bodyListener: BodyListener[Future, PlayResponseBody] = new PlayBodyListener
+
+    val interpreter = new ServerInterpreter(
+      filterServerEndpoints,
+      new PlayRequestBody(playServerOptions),
+      new PlayToResponseBody,
+      playServerOptions.interceptors,
+      playServerOptions.deleteFile
+    )
+
     new PartialFunction[RequestHeader, Handler] {
       override def isDefinedAt(request: RequestHeader): Boolean = {
         val filtered = filterServerEndpoints(PlayServerRequest(request, request))
@@ -76,15 +86,7 @@ trait PlayServerInterpreter {
           header: RequestHeader,
           request: Request[PekkoStreams.BinaryStream]
       ): Future[Either[Result, Flow[Message, Message, Any]]] = {
-        implicit val bodyListener: BodyListener[Future, PlayResponseBody] = new PlayBodyListener
         val serverRequest = PlayServerRequest(header, request)
-        val interpreter = new ServerInterpreter(
-          filterServerEndpoints,
-          new PlayRequestBody(playServerOptions),
-          new PlayToResponseBody,
-          playServerOptions.interceptors,
-          playServerOptions.deleteFile
-        )
 
         interpreter(serverRequest)
           .map {

diff --git a/server/play29-server/src/main/scala/sttp/tapir/server/play/PlayServerInterpreter.scala b/server/play29-server/src/main/scala/sttp/tapir/server/play/PlayServerInterpreter.scala
@@ -43,6 +43,16 @@ trait PlayServerInterpreter {
     val filterServerEndpoints = FilterServerEndpoints(serverEndpoints)
     val singleEndpoint = serverEndpoints.size == 1
 
+    implicit val bodyListener: BodyListener[Future, PlayResponseBody] = new PlayBodyListener
+
+    val interpreter = new ServerInterpreter(
+      filterServerEndpoints,
+      new PlayRequestBody(playServerOptions),
+      new PlayToResponseBody,
+      playServerOptions.interceptors,
+      playServerOptions.deleteFile
+    )
+
     new PartialFunction[RequestHeader, Handler] {
       override def isDefinedAt(request: RequestHeader): Boolean = {
         val filtered = filterServerEndpoints(PlayServerRequest(request, request))
@@ -76,15 +86,7 @@ trait PlayServerInterpreter {
           header: RequestHeader,
           request: Request[AkkaStreams.BinaryStream]
       ): Future[Either[Result, Flow[Message, Message, Any]]] = {
-        implicit val bodyListener: BodyListener[Future, PlayResponseBody] = new PlayBodyListener
         val serverRequest = PlayServerRequest(header, request)
-        val interpreter = new ServerInterpreter(
-          filterServerEndpoints,
-          new PlayRequestBody(playServerOptions),
-          new PlayToResponseBody,
-          playServerOptions.interceptors,
-          playServerOptions.deleteFile
-        )
 
         interpreter(serverRequest)
           .map {