Merge pull request http4s/http4s#4638 from http4s/upgrades-2021-03

cats-effect-2.4.0 and scala-2.13.5
http4s · Mar 24, 2021 · 5250875 · 5250875
2 parents e3ecdef + 539790e
commit 5250875
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala
@@ -81,7 +81,7 @@ class AsyncHttp4sServlet[F[_]](
       val response =
         gate.get *>
           Sync[F]
-            .suspend(serviceFn(request))
+            .defer(serviceFn(request))
             .recoverWith(serviceErrorHandler(request))
       val servletResponse = ctx.getResponse.asInstanceOf[HttpServletResponse]
       F.race(timeout, response).flatMap(r => renderResponse(r.merge, servletResponse, bodyWriter))

diff --git a/servlet/src/main/scala/org/http4s/servlet/BlockingHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/BlockingHttp4sServlet.scala
@@ -31,7 +31,7 @@ class BlockingHttp4sServlet[F[_]](
   override def service(
       servletRequest: HttpServletRequest,
       servletResponse: HttpServletResponse): Unit =
-    F.suspend {
+    F.defer {
       val bodyWriter = servletIo.initWriter(servletResponse)
 
       val render = toRequest(servletRequest).fold(
@@ -50,12 +50,12 @@ class BlockingHttp4sServlet[F[_]](
       bodyWriter: BodyWriter[F]): F[Unit] =
     // Note: We're catching silly user errors in the lift => flatten.
     Sync[F]
-      .suspend(serviceFn(request))
+      .defer(serviceFn(request))
       .recoverWith(serviceErrorHandler(request))
       .flatMap(renderResponse(_, servletResponse, bodyWriter))
 
   private def errorHandler(servletResponse: HttpServletResponse)(t: Throwable): F[Unit] =
-    F.suspend {
+    F.defer {
       if (servletResponse.isCommitted) {
         logger.error(t)("Error processing request after response was committed")
         F.unit

diff --git a/servlet/src/main/scala/org/http4s/servlet/ServletContainer.scala b/servlet/src/main/scala/org/http4s/servlet/ServletContainer.scala
@@ -22,7 +22,9 @@ import java.util
 import javax.servlet.{DispatcherType, Filter}
 import javax.servlet.http.HttpServlet
 import org.http4s.server.ServerBuilder
+import scala.annotation.nowarn
 
+@nowarn("cat=unused")
 abstract class ServletContainer[F[_]: Async] extends ServerBuilder[F] {
   type Self <: ServletContainer[F]
 

diff --git a/servlet/src/main/scala/org/http4s/servlet/syntax/ServletContextSyntax.scala b/servlet/src/main/scala/org/http4s/servlet/syntax/ServletContextSyntax.scala
@@ -23,6 +23,7 @@ import javax.servlet.{ServletContext, ServletRegistration}
 import org.http4s.server.DefaultServiceErrorHandler
 import org.http4s.server.defaults
 import org.http4s.syntax.all._
+import scala.annotation.nowarn
 
 trait ServletContextSyntax {
   implicit def ToServletContextOps(self: ServletContext): ServletContextOps =
@@ -41,6 +42,7 @@ final class ServletContextOps private[syntax] (val self: ServletContext) extends
       mapping: String = "/*"): ServletRegistration.Dynamic =
     mountHttpApp(name, service.orNotFound, mapping)
 
+  @nowarn("cat=unused")
   def mountHttpApp[F[_]: ConcurrentEffect: ContextShift](
       name: String,
       service: HttpApp[F],