Add HasNoScope where missing at Server object

Author: 987Nabil

project/MimaSettings.scala

@@ -26,6 +26,8 @@ object MimaSettings {
         exclude[IncompatibleMethTypeProblem]("zio.http.Middleware.addHeader"),
         exclude[IncompatibleMethTypeProblem]("zio.http.HandlerAspect.addHeader"),
         ProblemFilters.exclude[ReversedMissingMethodProblem]("zio.http.Server.installInternal"),
+        ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.Server.serve"),
+        ProblemFilters.exclude[IncompatibleMethTypeProblem]("zio.http.Server.serve"),
       ),
       mimaFailOnProblem := failOnProblem,
     )

zio-http-benchmarks/src/main/scala/zio/http/benchmark/MethodLookupBenchmark.scala zio-http-benchmarks/src/main/scala/benchmark/MethodLookupBenchmark.scala

@@ -1,4 +1,4 @@
-package zio.http.benchmark
+package benchmark
 
 import java.util.concurrent.TimeUnit
 

zio-http-benchmarks/src/main/scala/zio/http/benchmark/RoundtripBenchmark.scala zio-http-benchmarks/src/main/scala/benchmark/RoundtripBenchmark.scala

@@ -1,4 +1,4 @@
-package zio.http.benchmark
+package benchmark
 
 import java.net.http.{HttpClient, HttpRequest, HttpResponse}
 import java.net.{ConnectException, URI}

zio-http-benchmarks/src/main/scala/zio/http/benchmark/RoutesBenchmark.scala zio-http-benchmarks/src/main/scala/benchmark/RoutesBenchmark.scala

@@ -1,4 +1,4 @@
-package zio.http.benchmark
+package benchmark
 
 import java.util.concurrent.TimeUnit
 

zio-http/jvm/src/test/scala-3/zio/http/endpoint/UnionRoundtripSpec.scala

@@ -100,7 +100,7 @@ object UnionRoundtripSpec extends ZIOHttpSpec {
     outF: Out => ZIO[Any, Err, TestResult],
   ): zio.ZIO[Server with Client with Scope, Err, TestResult] =
     for {
-      port   <- Server.install(route @@ Middleware.requestLogging())
+      port   <- Server.installRoutes(route @@ Middleware.requestLogging())
       client <- ZIO.service[Client]
       executor = makeExecutor(client, port)
       out    <- executor(endpoint.apply(in))
@@ -113,7 +113,7 @@ object UnionRoundtripSpec extends ZIOHttpSpec {
     outF: Response => ZIO[Any, Err, TestResult],
   ): zio.ZIO[Server with Client with Scope, Err, TestResult] = {
     for {
-      port   <- Server.install(route @@ Middleware.requestLogging())
+      port   <- Server.installRoutes(route @@ Middleware.requestLogging())
       client <- ZIO.service[Client]
       out    <- client.batched(in.updateURL(_.host("localhost").port(port))).orDie
       result <- outF(out)
@@ -135,7 +135,7 @@ object UnionRoundtripSpec extends ZIOHttpSpec {
     errorF: Err => ZIO[Any, Nothing, TestResult],
   ): ZIO[Client with Server with Scope, Out, TestResult] =
     for {
-      port <- Server.install(route)
+      port <- Server.installRoutes(route)
       executorLayer = ZLayer(ZIO.service[Client].map(makeExecutor(_, port)))
       out    <- ZIO
         .service[EndpointExecutor[Any, Unit, Scope]]

zio-http/jvm/src/test/scala/zio/http/ClientStreamingSpec.scala

@@ -319,7 +319,7 @@ object ClientStreamingSpec extends RoutesRunnableSpec {
     for {
       portPromise <- Promise.make[Throwable, Int]
       _           <- Server
-        .install(app)
+        .installRoutes(app)
         .intoPromise(portPromise)
         .zipRight(ZIO.never)
         .provide(

zio-http/jvm/src/test/scala/zio/http/DualSSLSpec.scala

@@ -70,7 +70,7 @@ object DualSSLSpec extends ZIOHttpSpec {
 
   override def spec = suite("SSL")(
     Server
-      .install(routes)
+      .installRoutes(routes)
       .as(
         List(
           test("succeed when client has the server certificate and client certificate is configured") {

zio-http/jvm/src/test/scala/zio/http/DynamicAppTest.scala

@@ -51,11 +51,11 @@ object DynamicAppTest extends ZIOHttpSpec {
   def spec = suite("Server")(
     test("Should allow dynamic changes to the installed app") {
       for {
-        port <- Server.install(routes1)
+        port <- Server.installRoutes(routes1)
         good   = URL.decode(s"http://localhost:$port/good").toOption.get
         better = URL.decode(s"http://localhost:$port/better").toOption.get
         okResponse      <- Client.batched(Request.get(good))
-        _               <- Server.install(routes2)
+        _               <- Server.installRoutes(routes2)
         createdResponse <- Client.batched(Request.get(better))
       } yield assertTrue(
         extractStatus(okResponse) == Status.Ok &&

zio-http/jvm/src/test/scala/zio/http/ForwardHeaderSpec.scala

@@ -19,7 +19,7 @@ object ForwardHeaderSpec extends ZIOSpecDefault {
         ).sandbox @@ Middleware.forwardHeaders(Header.Accept)
 
         for {
-          _        <- Server.install(routes)
+          _        <- Server.installRoutes(routes)
           response <- Client.batched(
             Request.get(url"http://localhost:8080/get").addHeader(Header.Accept(MediaType.application.json)),
           )

zio-http/jvm/src/test/scala/zio/http/NettyMaxHeaderLengthSpec.scala

@@ -42,7 +42,7 @@ object NettyMaxHeaderLengthSpec extends ZIOHttpSpec {
         .toRoutes
 
       for {
-        port <- Server.install(routes)
+        port <- Server.installRoutes(routes)
         url     = URL.decode(s"http://localhost:$port").toOption.get
         headers = Headers(
           UserAgent(ProductOrComment.Product("a looooooooooooooooooooooooooooong header", None)),

zio-http/jvm/src/test/scala/zio/http/NettyMaxInitialLineLengthSpec.scala

@@ -43,7 +43,7 @@ object NettyMaxInitialLineLength extends ZIOHttpSpec {
         .toRoutes
 
       for {
-        port <- Server.install(routes)
+        port <- Server.installRoutes(routes)
         url     = URL
           .decode(s"http://localhost:$port/a%20looooooooooooooooooooooooooooong%20query%20parameter")
           .toOption

zio-http/jvm/src/test/scala/zio/http/SSLSpec.scala

@@ -50,7 +50,7 @@ object SSLSpec extends ZIOHttpSpec {
 
   override def spec = suite("SSL")(
     Server
-      .install(routes)
+      .installRoutes(routes)
       .as(
         List(
           test("succeed when client has the server certificate") {

zio-http/jvm/src/test/scala/zio/http/ServerSentEventSpec.scala

@@ -25,7 +25,7 @@ object ServerSentEventSpec extends ZIOHttpSpec {
     )
 
   val server =
-    Server.install(routes)
+    Server.installRoutes(routes)
 
   def eventStream(port: Int): ZStream[Client, Throwable, ServerSentEvent[String]] =
     for {

zio-http/jvm/src/test/scala/zio/http/ZClientAspectSpec.scala

@@ -39,7 +39,7 @@ object ZClientAspectSpec extends ZIOHttpSpec {
     suite("ZClientAspect")(
       test("debug") {
         for {
-          port       <- Server.install(routes)
+          port       <- Server.installRoutes(routes)
           baseClient <- ZIO.service[Client]
           client = baseClient.url(
             URL(Path.empty, Location.Absolute(Scheme.HTTP, "localhost", Some(port))),
@@ -55,7 +55,7 @@ object ZClientAspectSpec extends ZIOHttpSpec {
       },
       test("requestLogging")(
         for {
-          port       <- Server.install(routes)
+          port       <- Server.installRoutes(routes)
           baseClient <- ZIO.service[Client]
           client = baseClient
             .url(
@@ -88,7 +88,7 @@ object ZClientAspectSpec extends ZIOHttpSpec {
       ),
       test("followRedirects")(
         for {
-          port       <- Server.install(redir ++ routes)
+          port       <- Server.installRoutes(redir ++ routes)
           baseClient <- ZIO.service[Client]
           client = baseClient
             .url(

zio-http/jvm/src/test/scala/zio/http/endpoint/AuthSpec.scala

@@ -1,12 +1,11 @@
 package zio.http.endpoint
 
 import zio.Config.Secret
-import zio.test.TestAspect.flaky
 import zio.test._
 import zio.{Scope, ZIO, durationInt}
 
 import zio.http._
-import zio.http.codec.{CodecConfig, HttpCodec}
+import zio.http.codec.HttpCodec
 import zio.http.internal.middlewares.AuthSpec.AuthContext
 
 object AuthSpec extends ZIOSpecDefault {
@@ -147,7 +146,7 @@ object AuthSpec extends ZIOSpecDefault {
 
           for {
             _        <- Server
-              .serve(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
+              .serveRoutes(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
               .forkDaemon
               .catchAllCause(c => ZIO.logInfoCause(c)) <* ZIO.sleep(1.seconds)
             response <- response
@@ -181,7 +180,7 @@ object AuthSpec extends ZIOSpecDefault {
 
           for {
             _              <- Server
-              .serve(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
+              .serveRoutes(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
               .forkDaemon
               .catchAllCause(c => ZIO.logInfoCause(c)) <* ZIO.sleep(1.seconds)
             responseBasic  <- responseBasic
@@ -207,7 +206,7 @@ object AuthSpec extends ZIOSpecDefault {
 
           for {
             _        <- Server
-              .serve(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
+              .serveRoutes(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
               .forkDaemon
               .catchAllCause(c => ZIO.logInfoCause(c)) <* ZIO.sleep(1.seconds)
             response <- response
@@ -231,7 +230,7 @@ object AuthSpec extends ZIOSpecDefault {
 
           for {
             _        <- Server
-              .serve(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
+              .serveRoutes(routes.handleErrorCauseZIO(c => ZIO.logInfoCause("yes!", c).as(Response.text(""))))
               .forkDaemon
               .catchAllCause(c => ZIO.logInfoCause(c)) <* ZIO.sleep(1.seconds)
             response <- response

zio-http/jvm/src/test/scala/zio/http/endpoint/RoundtripSpec.scala

@@ -101,7 +101,7 @@ object RoundtripSpec extends ZIOHttpSpec {
     outF: Out => ZIO[Any, Err, TestResult],
   ): zio.ZIO[Server with ZClient[Any, Any, Body, Throwable, Response] with Scope, Err, TestResult] =
     for {
-      port   <- Server.install(route @@ Middleware.requestLogging())
+      port   <- Server.installRoutes(route @@ Middleware.requestLogging())
       client <- ZIO.service[ZClient[Any, Any, Body, Throwable, Response]]
       executor = makeExecutor(client, port)
       out    <- executor(endpoint.apply(in))
@@ -114,7 +114,7 @@ object RoundtripSpec extends ZIOHttpSpec {
     outF: Response => ZIO[Any, Err, TestResult],
   ): zio.ZIO[Server with ZClient[Any, Any, Body, Throwable, Response] with Scope, Err, TestResult] = {
     for {
-      port   <- Server.install(route @@ Middleware.requestLogging())
+      port   <- Server.installRoutes(route @@ Middleware.requestLogging())
       client <- ZIO.service[ZClient[Any, Any, Body, Throwable, Response]]
       out    <- client(in.updateURL(_.host("localhost").port(port))).orDie
       result <- outF(out)
@@ -136,7 +136,7 @@ object RoundtripSpec extends ZIOHttpSpec {
     errorF: Err => ZIO[Any, Nothing, TestResult],
   ): ZIO[ZClient[Any, Any, Body, Throwable, Response] with Server with Scope, Out, TestResult] =
     for {
-      port <- Server.install(route)
+      port <- Server.installRoutes(route)
       executorLayer = ZLayer(ZIO.service[ZClient[Any, Any, Body, Throwable, Response]].map(makeExecutor(_, port)))
       out    <- ZIO
         .service[EndpointExecutor[Any, Unit, Any]]
@@ -314,7 +314,7 @@ object RoundtripSpec extends ZIOHttpSpec {
         }
 
         for {
-          port     <- Server.install(handler.toRoutes)
+          port     <- Server.installRoutes(handler.toRoutes)
           client   <- ZIO.service[ZClient[Any, Any, Body, Throwable, Response]]
           response <- client(
             Request.post(
@@ -461,7 +461,7 @@ object RoundtripSpec extends ZIOHttpSpec {
         val routes = endpointRoute.toRoutes
 
         for {
-          port <- Server.install(routes)
+          port <- Server.installRoutes(routes)
           executorLayer = ZLayer(ZIO.serviceWith[ZClient[Any, Any, Body, Throwable, Response]](makeExecutor(_, port)))
 
           cause <- ZIO

zio-http/jvm/src/test/scala/zio/http/endpoint/ServerSentEventEndpointSpec.scala

@@ -33,7 +33,7 @@ object ServerSentEventEndpointSpec extends ZIOHttpSpec {
       sseRoute.toRoutes @@ Middleware.requestLogging(logRequestBody = true) @@ Middleware.debug
 
     val server: ZIO[Server, Throwable, Nothing] =
-      Server.serve(routes)
+      Server.serveRoutes(routes)
 
     def locator(port: Int): EndpointLocator = EndpointLocator.fromURL(url"http://localhost:$port")
 
@@ -71,7 +71,7 @@ object ServerSentEventEndpointSpec extends ZIOHttpSpec {
     val routes: Routes[Any, Response] = sseRoute.toRoutes
 
     val server: URIO[Server, Nothing] =
-      Server.serve(routes)
+      Server.serveRoutes(routes)
 
     def locator(port: Int): EndpointLocator = EndpointLocator.fromURL(url"http://localhost:$port")
 

zio-http/jvm/src/test/scala/zio/http/internal/RoutesRunnableSpec.scala

@@ -107,14 +107,14 @@ abstract class RoutesRunnableSpec extends ZIOHttpSpec { self =>
       server <- ZIO.service[Server]
       ds     <- ZIO.service[DynamicServer]
       handler = DynamicServer.handler(ds)
-      port <- Server.install(handler.toRoutes)
+      port <- Server.installRoutes(handler.toRoutes)
       _    <- DynamicServer.setStart(server)
     } yield port
 
   def serve[R: EnvironmentTag](routes: Routes[R, Response]): ZIO[R with DynamicServer with Server, Nothing, Int] =
     for {
       server <- ZIO.service[Server]
-      port   <- Server.install(routes)
+      port   <- Server.installRoutes(routes)
       _      <- DynamicServer.setStart(server)
     } yield port
 

zio-http/jvm/src/test/scala/zio/http/netty/NettyStreamBodySpec.scala

@@ -33,7 +33,7 @@ object NettyStreamBodySpec extends RoutesRunnableSpec {
     for {
       portPromise <- Promise.make[Throwable, Int]
       _           <- Server
-        .install(app(streams, bodyLength))
+        .installRoutes(app(streams, bodyLength))
         .intoPromise(portPromise)
         .zipRight(ZIO.never)
         .provide(
@@ -132,7 +132,7 @@ object NettyStreamBodySpec extends RoutesRunnableSpec {
           for {
             portPromise <- Promise.make[Throwable, Int]
             _           <- Server
-              .install(app)
+              .installRoutes(app)
               .intoPromise(portPromise)
               .zipRight(ZIO.never)
               .provide(

zio-http/jvm/src/test/scala/zio/http/security/ExceptionSpec.scala

@@ -53,31 +53,31 @@ object ExceptionSpec extends ZIOSpecDefault {
     },
     test("Throw inside handle doesn't leak stacktrace") {
       for {
-        port     <- Server.install(routesError)
+        port     <- Server.installRoutes(routesError)
         response <- ZIO.scoped {
           Client.streaming(Request.get(s"http://localhost:$port/error")).flatMap(_.ignoreBody).map(_.headers.toString)
         }
       } yield assertTrue(!response.contains("Exception in thread"))
     },
     test("Die handle doesn't leak stacktrace") {
       for {
-        port     <- Server.install(routesDie)
+        port     <- Server.installRoutes(routesDie)
         response <- ZIO.scoped {
           Client.streaming(Request.get(s"http://localhost:$port/die")).flatMap(_.ignoreBody).map(_.headers.toString)
         }
       } yield assertTrue(!response.contains("Exception in thread"))
     },
     test("Failing handle doesn't leak stacktrace") {
       for {
-        port     <- Server.install(routesFail)
+        port     <- Server.installRoutes(routesFail)
         response <- ZIO.scoped {
           Client.streaming(Request.get(s"http://localhost:$port/fail")).flatMap(_.ignoreBody).map(_.headers.toString)
         }
       } yield assertTrue(!response.contains("Exception in thread"))
     },
     test("FromZIO doesn't leak stacktrace") {
       for {
-        port     <- Server.install(queryRoutes)
+        port     <- Server.installRoutes(queryRoutes)
         response <- ZIO.scoped {
           Client.streaming(Request.get(s"http://localhost:$port/search")).flatMap(_.ignoreBody).map(_.headers.toString)
         }

zio-http/jvm/src/test/scala/zio/http/security/MetricsSpec.scala

@@ -44,7 +44,7 @@ object MetricsSpec extends ZIOHttpSpec {
 
     test(name) {
       for {
-        port <- Server.install(routes)
+        port <- Server.installRoutes(routes)
         mkRequest = mkRequest0(port)
         _             <- ZIO.iterate((0, init))(_._1 < maxReq) { case (n, content) =>
           ZIO.scoped {

zio-http/jvm/src/test/scala/zio/http/security/SizeLimitsSpec.scala

@@ -70,7 +70,7 @@ object SizeLimitsSpec extends ZIOHttpSpec {
       } yield info
 
     for {
-      port <- Server.install(routes)
+      port <- Server.installRoutes(routes)
       mkRequest = mkRequest0(port)
       out1 <- loop(0, maxSize, fstContent, mkRequest, Status.Ok)
       (info1, c) = out1

zio-http/jvm/src/test/scala/zio/http/security/UserDataSpec.scala

@@ -141,7 +141,7 @@ object UserDataSpec extends ZIOSpecDefault {
         req.body.asString.orDie.map(msg => Response.error(Status.InternalServerError, msg))
       })
       for {
-        port   <- Server.install(routes)
+        port   <- Server.installRoutes(routes)
         result <- check(tuples.zip(functions)) { case (mediaType, msg, expectedResponse, _) =>
 
           val body    = Body.fromString(msg)

zio-http/shared/src/main/scala/zio/http/Routes.scala

@@ -221,7 +221,7 @@ final case class Routes[-Env, +Err](routes: Chunk[zio.http.Route[Env, Err]]) { s
     trace: Trace,
     tag: EnvironmentTag[Env1],
   ): URIO[Env1 with Server, Nothing] = {
-    Server.serve[Env1](self.handleError(_.asInstanceOf[Response]))
+    Server.serveRoutes[Env1](self.handleError(_.asInstanceOf[Response]))
   }
 
   def run(