Merge branch 'main' into fix-casting-handle-errors

987Nabil · Sep 18, 2024 · 0c22a50 · 0c22a50
2 parents f937544 + 087ee94
commit 0c22a50
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 33 deletions.
diff --git a/zio-http-gen/src/main/scala/zio/http/gen/scala/CodeGen.scala b/zio-http-gen/src/main/scala/zio/http/gen/scala/CodeGen.scala
@@ -371,7 +371,7 @@ object CodeGen {
       case "www-authenticate"                 => "HeaderCodec.wwwAuthenticate"
       case "x-frame-options"                  => "HeaderCodec.xFrameOptions"
       case "x-requested-with"                 => "HeaderCodec.xRequestedWith"
-      case name                               => s"HeaderCodec.name[String]($name)"
+      case name                               => s"""HeaderCodec.name[String]("$name")"""
     }
     s""".header($headerSelector)"""
   }

diff --git a/zio-http-gen/src/test/resources/EndpointWithHeaders.scala b/zio-http-gen/src/test/resources/EndpointWithHeaders.scala
@@ -9,6 +9,7 @@ object Users {
   val get = Endpoint(Method.GET / "api" / "v1" / "users")
     .header(HeaderCodec.accept)
     .header(HeaderCodec.contentType)
+    .header(HeaderCodec.name[String]("token"))
     .in[Unit]
 
 }
diff --git a/zio-http-gen/src/test/scala/zio/http/gen/scala/CodeGenSpec.scala b/zio-http-gen/src/test/scala/zio/http/gen/scala/CodeGenSpec.scala
@@ -151,7 +151,10 @@ object CodeGenSpec extends ZIOSpecDefault {
       },
       test("Endpoint with headers") {
         val endpoint =
-          Endpoint(Method.GET / "api" / "v1" / "users").header(HeaderCodec.accept).header(HeaderCodec.contentType)
+          Endpoint(Method.GET / "api" / "v1" / "users")
+            .header(HeaderCodec.accept)
+            .header(HeaderCodec.contentType)
+            .header(HeaderCodec.name[String]("Token"))
         val openAPI  = OpenAPIGen.fromEndpoints(endpoint)
 
         codeGenFromOpenAPI(openAPI) { testDir =>

diff --git a/zio-http/jvm/src/main/scala/zio/http/netty/server/ServerInboundHandler.scala b/zio-http/jvm/src/main/scala/zio/http/netty/server/ServerInboundHandler.scala
@@ -48,8 +48,8 @@ private[zio] final case class ServerInboundHandler(
 
   implicit private val unsafe: Unsafe = Unsafe.unsafe
 
-  private var routes: Routes[Any, Response] = _
-  private var runtime: NettyRuntime         = _
+  private var handler: Handler[Any, Nothing, Request, Response] = _
+  private var runtime: NettyRuntime                             = _
 
   val inFlightRequests: LongAdder = new LongAdder()
   private val readClientCert      = config.sslConfig.exists(_.includeClientCert)
@@ -58,7 +58,7 @@ private[zio] final case class ServerInboundHandler(
   def refreshApp(): Unit = {
     val pair = appRef.get()
 
-    this.routes = pair._1
+    this.handler = pair._1.toHandler
     this.runtime = new NettyRuntime(pair._2)
   }
 
@@ -88,7 +88,7 @@ private[zio] final case class ServerInboundHandler(
             releaseRequest()
           } else {
             val req  = makeZioRequest(ctx, jReq)
-            val exit = routes(req)
+            val exit = handler(req)
             if (attemptImmediateWrite(ctx, req.method, exit)) {
               releaseRequest()
             } else {

diff --git a/zio-http/jvm/src/test/scala/zio/http/ClientSpec.scala b/zio-http/jvm/src/test/scala/zio/http/ClientSpec.scala
@@ -105,7 +105,7 @@ object ClientSpec extends RoutesRunnableSpec {
       val url  = URL.decode("https://test.com").toOption.get
       val resp = ZClient.batched(Request.get(url)).timeout(500.millis)
       assertZIO(resp)(isNone)
-    } @@ timeout(5.seconds) @@ flaky(20),
+    } @@ timeout(5.seconds) @@ flaky(20) @@ TestAspect.ignore, // annoying in CI
     test("authorization header without scheme") {
       val app             =
         Handler

diff --git a/zio-http/shared/src/main/scala/zio/http/RoutePattern.scala b/zio-http/shared/src/main/scala/zio/http/RoutePattern.scala
@@ -172,16 +172,15 @@ object RoutePattern                                                       {
         tree.add(p, v)
       }
 
+    private val wildcardsTree = roots.getOrElse(Method.ANY, null)
+
     def get(method: Method, path: Path): Chunk[A] = {
-      val wildcards = roots.get(Method.ANY) match {
-        case None        => Chunk.empty
-        case Some(value) => value.get(path)
+      val forMethod = roots.getOrElse(method, null) match {
+        case null  => Chunk.empty
+        case value => value.get(path)
       }
-
-      (roots.get(method) match {
-        case None        => Chunk.empty
-        case Some(value) => value.get(path)
-      }) ++ wildcards
+      if (wildcardsTree eq null) forMethod
+      else forMethod ++ wildcardsTree.get(path)
     }
 
     def map[B](f: A => B): Tree[B] =

diff --git a/zio-http/shared/src/main/scala/zio/http/Routes.scala b/zio-http/shared/src/main/scala/zio/http/Routes.scala
@@ -245,20 +245,25 @@ final case class Routes[-Env, +Err](routes: Chunk[zio.http.Route[Env, Err]]) { s
    */
   def toHandler(implicit ev: Err <:< Response): Handler[Env, Nothing, Request, Response] = {
     implicit val trace: Trace = Trace.empty
+    val tree                  = self.tree
     Handler
       .fromFunctionHandler[Request] { req =>
         val chunk = tree.get(req.method, req.path)
-
-        if (chunk.length == 0) Handler.notFound
-        else if (chunk.length == 1) chunk(0)
-        else {
-          // TODO: Support precomputed fallback among all chunk elements:
-          chunk.tail.foldLeft(chunk.head) { (acc, h) =>
-            acc.catchAll { response =>
-              if (response.status == Status.NotFound) h
-              else Handler.fail(response)
+        chunk.length match {
+          case 0 => Handler.notFound
+          case 1 => chunk(0)
+          case n => // TODO: Support precomputed fallback among all chunk elements
+            var acc = chunk(0)
+            var i   = 1
+            while (i < n) {
+              val h = chunk(i)
+              acc = acc.catchAll { response =>
+                if (response.status == Status.NotFound) h
+                else Handler.fail(response)
+              }
+              i += 1
             }
-          }
+            acc
         }
       }
       .merge

diff --git a/zio-http/shared/src/main/scala/zio/http/codec/PathCodec.scala b/zio-http/shared/src/main/scala/zio/http/codec/PathCodec.scala
@@ -788,7 +788,7 @@ object PathCodec {
     def get(path: Path): Chunk[A] =
       get(path, 0)
 
-    private def get(path: Path, from: Int, skipLiteralsFor: Set[Int] = Set.empty): Chunk[A] = {
+    private def get(path: Path, from: Int, skipLiteralsFor: Set[Int] = null): Chunk[A] = {
       val segments  = path.segments
       val nSegments = segments.length
       var subtree   = self
@@ -801,7 +801,7 @@ object PathCodec {
         val segment = segments(i)
 
         // Fast path, jump down the tree:
-        if (!skipLiteralsFor.contains(i) && subtree.literals.contains(segment)) {
+        if ((skipLiteralsFor.eq(null) || !skipLiteralsFor.contains(i)) && subtree.literals.contains(segment)) {
 
           // this subtree segment have conflict with others
           // will try others if result was empty
@@ -875,19 +875,19 @@ object PathCodec {
 
       // Might be some other matches because trailing matches everything:
       if (subtree ne null) {
-        subtree.others.get(SegmentCodec.trailing) match {
-          case Some(subtree) =>
-            result = result ++ subtree.value
-          case None          =>
+        subtree.others.getOrElse(SegmentCodec.Trailing, null) match {
+          case null    => ()
+          case subtree => result = result ++ subtree.value
         }
       }
 
       if (trySkipLiteralIdx.nonEmpty && result.isEmpty) {
         trySkipLiteralIdx = trySkipLiteralIdx.reverse
+        val skipLiteralsFor0 = if (skipLiteralsFor eq null) Set.empty[Int] else skipLiteralsFor
         while (trySkipLiteralIdx.nonEmpty && result.isEmpty) {
           val skipIdx = trySkipLiteralIdx.head
           trySkipLiteralIdx = trySkipLiteralIdx.tail
-          result = get(path, from, skipLiteralsFor + skipIdx)
+          result = get(path, from, skipLiteralsFor0 + skipIdx)
         }
         result
       } else result

diff --git a/zio-http/shared/src/main/scala/zio/http/codec/internal/BodyCodec.scala b/zio-http/shared/src/main/scala/zio/http/codec/internal/BodyCodec.scala
@@ -159,7 +159,7 @@ private[http] object BodyCodec {
       trace: Trace,
     ): Body = {
       val (mediaType, bc @ BinaryCodecWithSchema(_, _)) = codec.chooseFirstOrDefault(mediaTypes)
-      Body.fromChunk(bc.codec(config).encode(value)).contentType(mediaType)
+      Body.fromChunk(bc.codec(config).encode(value), mediaType)
     }
 
     type Element = A