Merge pull request #601 from http4s/netty-reactive-streams-3

Use netty-reactive-streams 3
http4s · Jan 11, 2024 · 87ac54e · 87ac54e
2 parents 4b884f0 + c01def6
commit 87ac54e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -46,7 +46,7 @@ lazy val core = project
     libraryDependencies ++= List(
       "org.log4s" %% "log4s" % "1.10.0",
       "co.fs2" %% "fs2-reactive-streams" % "3.9.3",
-      ("com.typesafe.netty" % "netty-reactive-streams-http" % "2.0.12")
+      ("org.playframework.netty" % "netty-reactive-streams-http" % "3.0.2")
         .exclude("io.netty", "netty-codec-http")
         .exclude("io.netty", "netty-handler"),
       "io.netty" % "netty-codec-http" % netty,

diff --git a/client/src/main/scala/org/http4s/netty/client/Http4sChannelPoolMap.scala b/client/src/main/scala/org/http4s/netty/client/Http4sChannelPoolMap.scala
@@ -21,7 +21,6 @@ import cats.effect.Async
 import cats.effect.Resource
 import cats.effect.std.Dispatcher
 import cats.syntax.all._
-import com.typesafe.netty.http.HttpStreamsClientHandler
 import fs2.io.net.tls.TLSParameters
 import io.netty.bootstrap.Bootstrap
 import io.netty.channel.Channel
@@ -47,6 +46,7 @@ import org.http4s.Response
 import org.http4s.Uri
 import org.http4s.Uri.Scheme
 import org.http4s.client.RequestKey
+import org.playframework.netty.http.HttpStreamsClientHandler
 
 import java.net.ConnectException
 import scala.concurrent.duration.Duration

diff --git a/client/src/main/scala/org/http4s/netty/client/Http4sWebsocketHandler.scala b/client/src/main/scala/org/http4s/netty/client/Http4sWebsocketHandler.scala
@@ -24,7 +24,6 @@ import cats.effect.kernel.Deferred
 import cats.effect.std.Dispatcher
 import cats.effect.std.Queue
 import cats.syntax.all._
-import com.typesafe.netty.HandlerPublisher
 import io.netty.buffer.Unpooled
 import io.netty.channel._
 import io.netty.handler.codec.http.websocketx._
@@ -33,6 +32,7 @@ import org.http4s.client.websocket.WSConnection
 import org.http4s.client.websocket.WSFrame
 import org.http4s.netty.client.Http4sWebsocketHandler.fromWSFrame
 import org.http4s.netty.client.Http4sWebsocketHandler.toWSFrame
+import org.playframework.netty.HandlerPublisher
 import org.reactivestreams.Subscriber
 import org.reactivestreams.Subscription
 import scodec.bits.ByteVector

diff --git a/core/src/main/scala/org/http4s/netty/NettyModelConversion.scala b/core/src/main/scala/org/http4s/netty/NettyModelConversion.scala
@@ -20,7 +20,6 @@ package netty
 import cats.effect._
 import cats.syntax.all._
 import com.comcast.ip4s.SocketAddress
-import com.typesafe.netty.http._
 import fs2.Chunk
 import fs2.Stream
 import fs2.interop.reactivestreams._
@@ -36,6 +35,7 @@ import org.http4s.headers.`Content-Length`
 import org.http4s.headers.`Transfer-Encoding`
 import org.http4s.headers.{Connection => ConnHeader}
 import org.http4s.{HttpVersion => HV}
+import org.playframework.netty.http._
 import org.typelevel.ci.CIString
 import org.typelevel.vault.Vault
 import scodec.bits.ByteVector

diff --git a/server/src/main/scala/org/http4s/netty/server/NettyPipelineHelpers.scala b/server/src/main/scala/org/http4s/netty/server/NettyPipelineHelpers.scala
@@ -18,7 +18,6 @@ package org.http4s.netty.server
 
 import cats.effect.Async
 import cats.effect.std.Dispatcher
-import com.typesafe.netty.http.HttpStreamsServerHandler
 import io.netty.channel.Channel
 import io.netty.channel.ChannelInitializer
 import io.netty.channel.ChannelPipeline
@@ -34,6 +33,7 @@ import org.http4s.HttpApp
 import org.http4s.netty.void
 import org.http4s.server.ServiceErrorHandler
 import org.http4s.server.websocket.WebSocketBuilder
+import org.playframework.netty.http.HttpStreamsServerHandler
 
 private object NettyPipelineHelpers {
 

diff --git a/server/src/main/scala/org/http4s/netty/server/ServerNettyModelConversion.scala b/server/src/main/scala/org/http4s/netty/server/ServerNettyModelConversion.scala
@@ -20,7 +20,6 @@ import cats.effect.Async
 import cats.effect.Resource
 import cats.effect.kernel.Sync
 import cats.implicits._
-import com.typesafe.netty.http.DefaultWebSocketHttpResponse
 import fs2.Pipe
 import fs2.interop.reactivestreams._
 import io.netty.buffer.Unpooled
@@ -50,6 +49,7 @@ import org.http4s.websocket.WebSocketFrame
 import org.http4s.websocket.WebSocketFrame._
 import org.http4s.websocket.WebSocketSeparatePipe
 import org.http4s.{HttpVersion => HV}
+import org.playframework.netty.http.DefaultWebSocketHttpResponse
 import org.reactivestreams.Processor
 import org.reactivestreams.Subscriber
 import org.reactivestreams.Subscription