Merge pull request #75 from http4s/jetty-10

Jetty 10 and friends

Author: rossabaker

.github/workflows/ci.yml

@@ -30,14 +30,10 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.8, 2.12.17, 3.2.0]
-        java: [temurin@8, temurin@11, temurin@17]
+        java: [temurin@11, temurin@17]
         exclude:
-          - scala: 2.12.17
-            java: temurin@11
           - scala: 2.12.17
             java: temurin@17
-          - scala: 3.2.0
-            java: temurin@11
           - scala: 3.2.0
             java: temurin@17
     runs-on: ${{ matrix.os }}
@@ -47,22 +43,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v1
-        with:
-          distribution: temurin
-          java-version: 8
-
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v2
-        with:
-          distribution: jdkfile
-          java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
-
       - name: Download Java (temurin@11)
         id: download-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -111,26 +91,26 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@11'
         run: sbt '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
         run: sbt '++${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@11'
         run: sbt '++${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@11'
         run: sbt '++${{ matrix.scala }}' doc
 
       - name: Check scalafix lints
-        if: matrix.java == 'temurin@8' && !startsWith(matrix.scala, '3.')
+        if: matrix.java == 'temurin@11' && !startsWith(matrix.scala, '3.')
         run: sbt '++${{ matrix.scala }}' 'scalafixAll --check'
 
       - name: Check unused compile dependencies
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@11'
         run: sbt '++${{ matrix.scala }}' unusedCompileDependenciesTest
 
       - name: Make target directories
@@ -156,30 +136,14 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.8]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v1
-        with:
-          distribution: temurin
-          java-version: 8
-
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v2
-        with:
-          distribution: jdkfile
-          java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
-
       - name: Download Java (temurin@11)
         id: download-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -274,30 +238,14 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.8]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v1
-        with:
-          distribution: temurin
-          java-version: 8
-
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v2
-        with:
-          distribution: jdkfile
-          java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
-
       - name: Download Java (temurin@11)
         id: download-java-temurin-11
         if: matrix.java == 'temurin@11'

build.sbt

@@ -1,6 +1,6 @@
-// https://typelevel.org/sbt-typelevel/faq.html#what-is-a-base-version-anyway
-ThisBuild / tlBaseVersion := "0.23" // your current series x.y
-ThisBuild / tlMimaPreviousVersions ++= (0 to 11).map(y => s"0.23.$y").toSet
+import org.typelevel.sbt.gha
+
+ThisBuild / tlBaseVersion := "0.24" // your current series x.y
 
 ThisBuild / licenses := Seq(License.Apache2)
 ThisBuild / developers := List(
@@ -14,6 +14,10 @@ ThisBuild / tlSitePublishBranch := Some("main")
 val Scala213 = "2.13.8"
 ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.17", "3.2.0")
 ThisBuild / scalaVersion := Scala213 // the default Scala
+ThisBuild / githubWorkflowJavaVersions ~= {
+  // Jetty 10 bumps the requirement to Java 11
+  _.filter { case JavaSpec(_, major) => major.toInt >= 11 }
+}
 
 ThisBuild / resolvers +=
   "s01 snapshots".at("https://s01.oss.sonatype.org/content/repositories/snapshots/")
@@ -23,9 +27,9 @@ lazy val root = project
   .enablePlugins(NoPublishPlugin)
   .aggregate(jettyServer, jettyClient)
 
-val jettyVersion = "9.4.50.v20221201"
+val jettyVersion = "10.0.13"
 val http4sVersion = "0.23.17"
-val http4sServletVersion = "0.23.13"
+val http4sServletVersion = "0.24.0-M2"
 val munitCatsEffectVersion = "1.0.7"
 val slf4jVersion = "1.7.25"
 

flake.nix

@@ -18,8 +18,7 @@
           imports = [ typelevel-nix.typelevelShell ];
           name = "http4s-jetty-shell";
           typelevelShell = {
-            jdk.package = pkgs.jdk8;
-            nodejs.enable = true;
+            jdk.package = pkgs.jdk11;
           };
         };
       }

jetty-client/src/main/scala/org/http4s/jetty/client/JettyClient.scala

@@ -25,7 +25,6 @@ import fs2._
 import org.eclipse.jetty.client.HttpClient
 import org.eclipse.jetty.client.api.{Request => JettyRequest}
 import org.eclipse.jetty.http.{HttpVersion => JHttpVersion}
-import org.eclipse.jetty.util.ssl.SslContextFactory
 import org.http4s.client.Client
 import org.log4s.Logger
 import org.log4s.getLogger
@@ -39,19 +38,19 @@ object JettyClient {
 
   def resource[F[_]](
       client: HttpClient = defaultHttpClient()
-  )(implicit F: Async[F]): Resource[F, Client[F]] = Dispatcher.parallel[F].flatMap { implicit D =>
+  )(implicit F: Async[F]): Resource[F, Client[F]] = Dispatcher.parallel[F].flatMap { dispatcher =>
     val acquire = F
       .pure(client)
       .flatTap(client => F.delay(client.start()))
       .map(client =>
         Client[F] { req =>
           Resource.suspend(F.async[Resource[F, Response[F]]] { cb =>
-            F.bracket(StreamRequestContentProvider()) { dcp =>
+            F.bracket(StreamRequestContent[F](dispatcher)) { dcp =>
               (for {
                 jReq <- F.catchNonFatal(toJettyRequest(client, req, dcp))
-                rl <- ResponseListener(cb)
+                rl <- ResponseListener(cb, dispatcher)
                 _ <- F.delay(jReq.send(rl))
-                _ <- dcp.write(req)
+                _ <- dcp.write(req.body)
               } yield Option.empty[F[Unit]]).recover { case e =>
                 cb(Left(e))
                 Option.empty[F[Unit]]
@@ -75,8 +74,7 @@ object JettyClient {
     Stream.resource(resource(client))
 
   def defaultHttpClient(): HttpClient = {
-    val sslCtxFactory = new SslContextFactory.Client();
-    val c = new HttpClient(sslCtxFactory)
+    val c = new HttpClient()
     c.setFollowRedirects(false)
     c.setDefaultRequestContentType(null)
     c
@@ -85,7 +83,7 @@ object JettyClient {
   private def toJettyRequest[F[_]](
       client: HttpClient,
       request: Request[F],
-      dcp: StreamRequestContentProvider[F],
+      dcp: StreamRequestContent[F],
   ): JettyRequest = {
     val jReq = client
       .newRequest(request.uri.toString)
@@ -98,9 +96,10 @@ object JettyClient {
           case _ => JHttpVersion.HTTP_1_1
         }
       )
-
-    for (h <- request.headers.headers if h.isNameValid)
-      jReq.header(h.name.toString, h.value)
-    jReq.content(dcp)
+    jReq.headers { jettyHeaders =>
+      for (h <- request.headers.headers if h.isNameValid)
+        jettyHeaders.add(h.name.toString, h.value)
+    }
+    jReq.body(dcp)
   }
 }

jetty-client/src/main/scala/org/http4s/jetty/client/ResponseListener.scala

@@ -39,7 +39,8 @@ import java.nio.ByteBuffer
 private[jetty] final case class ResponseListener[F[_]](
     queue: Queue[F, Option[Item]],
     cb: Callback[Resource[F, Response[F]]],
-)(implicit F: Async[F], D: Dispatcher[F])
+    dispatcher: Dispatcher[F],
+)(implicit F: Async[F])
     extends JettyResponse.Listener.Adapter {
   import ResponseListener.logger
 
@@ -69,7 +70,9 @@ private[jetty] final case class ResponseListener[F[_]](
       }
       .leftMap { t => abort(t, response); t }
 
-    D.unsafeRunAndForget(F.delay(cb(r)).attempt.flatMap(loggingAsyncCallback[F, Unit](logger)))
+    dispatcher.unsafeRunAndForget(
+      F.delay(cb(r)).attempt.flatMap(loggingAsyncCallback[F, Unit](logger))
+    )
   }
 
   private def getHttpVersion(version: JHttpVersion): HttpVersion =
@@ -100,7 +103,7 @@ private[jetty] final case class ResponseListener[F[_]](
   override def onFailure(response: JettyResponse, failure: Throwable): Unit =
     if (responseSent) enqueue(Item.Raise(failure))(_ => F.unit)
     else
-      D.unsafeRunAndForget(
+      dispatcher.unsafeRunAndForget(
         F.delay(cb(Left(failure))).attempt.flatMap(loggingAsyncCallback[F, Unit](logger))
       )
 
@@ -122,7 +125,7 @@ private[jetty] final case class ResponseListener[F[_]](
     enqueue(Item.Done)(loggingAsyncCallback[F, Unit](logger))
 
   private def enqueue(item: Item)(cb: Either[Throwable, Unit] => F[Unit]): Unit =
-    D.unsafeRunAndForget(queue.offer(item.some).attempt.flatMap(cb))
+    dispatcher.unsafeRunAndForget(queue.offer(item.some).attempt.flatMap(cb))
 }
 
 private[jetty] object ResponseListener {
@@ -138,9 +141,10 @@ private[jetty] object ResponseListener {
   private val logger = getLogger
 
   def apply[F[_]](
-      cb: Callback[Resource[F, Response[F]]]
-  )(implicit F: Async[F], D: Dispatcher[F]): F[ResponseListener[F]] =
+      cb: Callback[Resource[F, Response[F]]],
+      dispatcher: Dispatcher[F],
+  )(implicit F: Async[F]): F[ResponseListener[F]] =
     Queue
       .synchronous[F, Option[Item]]
-      .map(q => ResponseListener(q, cb))
+      .map(q => ResponseListener(q, cb, dispatcher))
 }

jetty-client/src/main/scala/org/http4s/jetty/client/StreamRequestContentProvider.scala jetty-client/src/main/scala/org/http4s/jetty/client/StreamRequestContent.scala

@@ -22,19 +22,21 @@ import cats.effect._
 import cats.effect.std._
 import cats.syntax.all._
 import fs2._
-import org.eclipse.jetty.client.util.DeferredContentProvider
+import org.eclipse.jetty.client.util.AsyncRequestContent
 import org.eclipse.jetty.util.{Callback => JettyCallback}
 import org.http4s.jetty.client.internal.loggingAsyncCallback
 import org.log4s.getLogger
 
-private[jetty] final case class StreamRequestContentProvider[F[_]](s: Semaphore[F])(implicit
-    F: Async[F],
-    D: Dispatcher[F],
-) extends DeferredContentProvider {
-  import StreamRequestContentProvider.logger
+private[jetty] class StreamRequestContent[F[_]] private (
+    s: Semaphore[F],
+    dispatcher: Dispatcher[F],
+)(implicit
+    F: Async[F]
+) extends AsyncRequestContent {
+  import StreamRequestContent.logger
 
-  def write(req: Request[F]): F[Unit] =
-    req.body.chunks
+  def write(body: Stream[F, Byte]): F[Unit] =
+    body.chunks
       .through(pipe)
       .compile
       .drain
@@ -53,13 +55,15 @@ private[jetty] final case class StreamRequestContentProvider[F[_]](s: Semaphore[
 
   private val callback: JettyCallback = new JettyCallback {
     override def succeeded(): Unit =
-      D.unsafeRunAndForget(s.release.attempt.flatMap(loggingAsyncCallback[F, Unit](logger)))
+      dispatcher.unsafeRunAndForget(
+        s.release.attempt.flatMap(loggingAsyncCallback[F, Unit](logger))
+      )
   }
 }
 
-private[jetty] object StreamRequestContentProvider {
+private[jetty] object StreamRequestContent {
   private val logger = getLogger
 
-  def apply[F[_]: Async: Dispatcher](): F[StreamRequestContentProvider[F]] =
-    Semaphore[F](1).map(StreamRequestContentProvider(_))
+  def apply[F[_]: Async](dispatcher: Dispatcher[F]): F[StreamRequestContent[F]] =
+    Semaphore[F](1).map(new StreamRequestContent(_, dispatcher))
 }

jetty-server/src/main/scala/org/http4s/jetty/server/JettyBuilder.scala

@@ -52,7 +52,7 @@ import java.util
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLParameters
 import javax.servlet.DispatcherType
-import javax.servlet.Filter
+import javax.servlet.http.HttpFilter
 import javax.servlet.http.HttpServlet
 import scala.annotation.nowarn
 import scala.collection.immutable
@@ -189,7 +189,7 @@ sealed class JettyBuilder[F[_]] private (
     })
 
   override def mountFilter(
-      filter: Filter,
+      filter: HttpFilter,
       urlMapping: String,
       name: Option[String],
       dispatches: util.EnumSet[DispatcherType],

jetty-server/src/main/scala/org/http4s/jetty/server/JettyLifeCycle.scala

@@ -56,7 +56,7 @@ private[jetty] object JettyLifeCycle {
     */
   private[this] def stopLifeCycle[F[_]](lifeCycle: LifeCycle)(implicit F: Async[F]): F[Unit] =
     F.async_[Unit] { cb =>
-      lifeCycle.addLifeCycleListener(
+      lifeCycle.addEventListener(
         new LifeCycle.Listener {
           override def lifeCycleStopped(a: LifeCycle): Unit =
             cb(Right(()))
@@ -96,7 +96,7 @@ private[jetty] object JettyLifeCycle {
     */
   private[this] def startLifeCycle[F[_]](lifeCycle: LifeCycle)(implicit F: Async[F]): F[Unit] =
     F.async_[Unit] { cb =>
-      lifeCycle.addLifeCycleListener(
+      lifeCycle.addEventListener(
         new LifeCycle.Listener {
           override def lifeCycleStarted(a: LifeCycle): Unit =
             cb(Right(()))