Update vertx-web to 4.5.8 (#3787)

softwaremill · May 27, 2024 · d7c7626 · d7c7626
1 parent 3f67cd8
commit d7c7626
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -44,6 +44,7 @@ concurrentRestrictions in Global ++= Seq(
 excludeLintKeys in Global ++= Set(ideSkipProject, reStartArgs)
 
 val CompileAndTest = "compile->compile;test->test"
+val CompileAndTestAndProvided = "compile->compile;test->test;provided->provided"
 
 def versionedScalaSourceDirectories(sourceDir: File, scalaVersion: String): List[File] =
   CrossVersion.partialVersion(scalaVersion) match {
@@ -535,7 +536,7 @@ lazy val perfTests: ProjectMatrix = (projectMatrix in file("perf-tests"))
     nettyServer,
     nettyServerCats,
     playServer,
-    vertxServer,
+    vertxServer % CompileAndTestAndProvided,
     vertxServerCats,
     nimaServer
   )
@@ -1461,7 +1462,8 @@ lazy val vertxServer: ProjectMatrix = (projectMatrix in file("server/vertx-serve
   .settings(
     name := "tapir-vertx-server",
     libraryDependencies ++= Seq(
-      "io.vertx" % "vertx-web" % Versions.vertx
+      "io.vertx" % "vertx-web" % Versions.vertx,
+      "io.vertx" % "vertx-codegen" % Versions.vertx % "provided"
     )
   )
   .jvmPlatform(scalaVersions = scala2And3Versions)
@@ -1477,7 +1479,7 @@ lazy val vertxServerCats: ProjectMatrix = (projectMatrix in file("server/vertx-s
     )
   )
   .jvmPlatform(scalaVersions = scala2And3Versions)
-  .dependsOn(serverCore, vertxServer % CompileAndTest, serverTests % Test, catsEffect % Test)
+  .dependsOn(serverCore, vertxServer % CompileAndTestAndProvided, serverTests % Test, catsEffect % Test)
 
 lazy val vertxServerZio: ProjectMatrix = (projectMatrix in file("server/vertx-server/zio"))
   .settings(commonJvmSettings)
@@ -1488,7 +1490,7 @@ lazy val vertxServerZio: ProjectMatrix = (projectMatrix in file("server/vertx-se
     )
   )
   .jvmPlatform(scalaVersions = scala2And3Versions)
-  .dependsOn(serverCore, vertxServer % CompileAndTest, zio, serverTests % Test)
+  .dependsOn(serverCore, vertxServer % CompileAndTestAndProvided, zio, serverTests % Test)
 
 lazy val zioHttpServer: ProjectMatrix = (projectMatrix in file("server/zio-http-server"))
   .settings(commonJvmSettings)

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -45,7 +45,7 @@ object Versions {
   val play29Client = "2.2.7"
   val play29Server = "2.9.3"
   val tethys = "0.26.0"
-  val vertx = "4.5.7"
+  val vertx = "4.5.8"
   val jsScalaJavaTime = "2.5.0"
   val nativeScalaJavaTime = "2.4.0-M3"
   val jwtScala = "10.0.1"

diff --git a/server/vertx-server/src/main/scala/sttp/tapir/server/vertx/encoders/package.scala b/server/vertx-server/src/main/scala/sttp/tapir/server/vertx/encoders/package.scala
@@ -10,6 +10,7 @@ import io.vertx.core.http.{ServerWebSocket, WebSocketFrameType}
 import io.vertx.core.streams.ReadStream
 import sttp.ws.WebSocketFrame
 import scala.annotation.tailrec
+import java.util.concurrent.Callable
 
 package object encoders {
 
@@ -23,7 +24,7 @@ package object encoders {
       case _: ByteArrayInputStream =>
         Future.succeededFuture(inputStreamToBufferUnsafe(is, byteLimit))
       case _ =>
-        vertx.executeBlocking { promise => promise.complete(inputStreamToBufferUnsafe(is, byteLimit)) }
+        vertx.executeBlocking(new Callable[Buffer] { override def call(): Buffer = inputStreamToBufferUnsafe(is, byteLimit) })
     }
   }