From dc6a57ac0a02d5eaf35d448afa04d5e3e2f18052 Mon Sep 17 00:00:00 2001 From: Jules Ivanic Date: Tue, 19 Nov 2024 12:25:41 +1100 Subject: [PATCH 1/2] Clean `zio.http.codec.internal.AtomizedCodecs` code --- .../http/codec/internal/AtomizedCodecs.scala | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala b/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala index e8dfb11302..0d7555cd8b 100644 --- a/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala +++ b/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala @@ -44,28 +44,36 @@ private[http] final case class AtomizedCodecs( def makeInputsBuilder(): Mechanic.InputsBuilder = { Atomized( - Array.ofDim(method.length), - Array.ofDim(status.length), - Array.ofDim(path.length), - Array.ofDim(query.length), - Array.ofDim(header.length), - Array.ofDim(content.length), + method = Array.ofDim(method.length), + path = Array.ofDim(path.length), + query = Array.ofDim(query.length), + header = Array.ofDim(header.length), + content = Array.ofDim(content.length), + status = Array.ofDim(status.length), ) } def optimize: AtomizedCodecs = AtomizedCodecs( - method.materialize, - path.materialize, - query.materialize, - header.materialize, - content.materialize, - status.materialize, + method = method.materialize, + path = path.materialize, + query = query.materialize, + header = header.materialize, + content = content.materialize, + status = status.materialize, ) } private[http] object AtomizedCodecs { - val empty = AtomizedCodecs(Chunk.empty, Chunk.empty, Chunk.empty, Chunk.empty, Chunk.empty, Chunk.empty) + val empty: AtomizedCodecs = + AtomizedCodecs( + method = Chunk.empty, + path = Chunk.empty, + query = Chunk.empty, + header = Chunk.empty, + content = Chunk.empty, + status = Chunk.empty + ) def flatten[R, A](in: HttpCodec[R, A]): AtomizedCodecs = { val atoms = flattenedAtoms(in) @@ -80,7 +88,7 @@ private[http] object AtomizedCodecs { private def flattenedAtoms[R, A](in: HttpCodec[R, A]): Chunk[Atom[_, _]] = in match { case Combine(left, right, _) => flattenedAtoms(left) ++ flattenedAtoms(right) - case atom: Atom[_, _] => Chunk(atom) + case atom: Atom[_, _] => Chunk.single(atom) case map: TransformOrFail[_, _, _] => flattenedAtoms(map.api) case Annotated(api, _) => flattenedAtoms(api) case Empty => Chunk.empty From 4baa2116a95b44c32cd7c4dcc1f3dcc5bd612099 Mon Sep 17 00:00:00 2001 From: Jules Ivanic Date: Tue, 26 Nov 2024 18:22:11 +1100 Subject: [PATCH 2/2] fmt --- .../src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala b/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala index 0d7555cd8b..52cce2c84a 100644 --- a/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala +++ b/zio-http/shared/src/main/scala/zio/http/codec/internal/AtomizedCodecs.scala @@ -72,7 +72,7 @@ private[http] object AtomizedCodecs { query = Chunk.empty, header = Chunk.empty, content = Chunk.empty, - status = Chunk.empty + status = Chunk.empty, ) def flatten[R, A](in: HttpCodec[R, A]): AtomizedCodecs = {