change signature to allow type inference (#2406)

* change signature to allow type inference * format fix
zio · Aug 29, 2023 · 8182fd3 · 8182fd3
1 parent 74c3220
commit 8182fd3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 50 deletions.
diff --git a/zio-http/src/main/scala/zio/http/codec/PathCodec.scala b/zio-http/src/main/scala/zio/http/codec/PathCodec.scala
@@ -324,25 +324,16 @@ sealed trait PathCodec[A] { self =>
 
   override def toString(): String = render
 
-  final def transform[A2](f: A => A2, g: A2 => A): PathCodec[A2] =
+  final def transform[A2](f: A => A2)(g: A2 => A): PathCodec[A2] =
     PathCodec.TransformOrFail[A, A2](self, in => Right(f(in)), output => Right(g(output)))
 
-  final def transformOrFail[A2](
-    f: A => Either[String, A2],
-    g: A2 => Either[String, A],
-  ): PathCodec[A2] =
+  final def transformOrFail[A2](f: A => Either[String, A2])(g: A2 => Either[String, A]): PathCodec[A2] =
     PathCodec.TransformOrFail[A, A2](self, f, g)
 
-  final def transformOrFailLeft[A2](
-    f: A => Either[String, A2],
-    g: A2 => A,
-  ): PathCodec[A2] =
+  final def transformOrFailLeft[A2](f: A => Either[String, A2])(g: A2 => A): PathCodec[A2] =
     PathCodec.TransformOrFail[A, A2](self, f, output => Right(g(output)))
 
-  final def transformOrFailRight[A2](
-    f: A => A2,
-    g: A2 => Either[String, A],
-  ): PathCodec[A2] =
+  final def transformOrFailRight[A2](f: A => A2)(g: A2 => Either[String, A]): PathCodec[A2] =
     PathCodec.TransformOrFail[A, A2](self, in => Right(f(in)), g)
 }
 object PathCodec          {

diff --git a/zio-http/src/main/scala/zio/http/codec/SegmentCodec.scala b/zio-http/src/main/scala/zio/http/codec/SegmentCodec.scala
@@ -66,26 +66,17 @@ sealed trait SegmentCodec[A] { self =>
     _render
   }
 
-  final def transform[A2](f: A => A2, g: A2 => A): PathCodec[A2] =
-    PathCodec.Segment(self).transform(f, g)
-
-  final def transformOrFail[A2](
-    f: A => Either[String, A2],
-    g: A2 => Either[String, A],
-  ): PathCodec[A2] =
-    PathCodec.Segment(self).transformOrFail(f, g)
-
-  final def transformOrFailLeft[A2](
-    f: A => Either[String, A2],
-    g: A2 => A,
-  ): PathCodec[A2] =
-    PathCodec.Segment(self).transformOrFailLeft(f, g)
-
-  final def transformOrFailRight[A2](
-    f: A => A2,
-    g: A2 => Either[String, A],
-  ): PathCodec[A2] =
-    PathCodec.Segment(self).transformOrFailRight(f, g)
+  final def transform[A2](f: A => A2)(g: A2 => A): PathCodec[A2] =
+    PathCodec.Segment(self).transform(f)(g)
+
+  final def transformOrFail[A2](f: A => Either[String, A2])(g: A2 => Either[String, A]): PathCodec[A2] =
+    PathCodec.Segment(self).transformOrFail(f)(g)
+
+  final def transformOrFailLeft[A2](f: A => Either[String, A2])(g: A2 => A): PathCodec[A2] =
+    PathCodec.Segment(self).transformOrFailLeft(f)(g)
+
+  final def transformOrFailRight[A2](f: A => A2)(g: A2 => Either[String, A]): PathCodec[A2] =
+    PathCodec.Segment(self).transformOrFailRight(f)(g)
 }
 object SegmentCodec          {
   def bool(name: String): SegmentCodec[Boolean] = SegmentCodec.BoolSeg(name)

diff --git a/zio-http/src/test/scala/zio/http/codec/PathCodecSpec.scala b/zio-http/src/test/scala/zio/http/codec/PathCodecSpec.scala
@@ -55,15 +55,13 @@ object PathCodecSpec extends ZIOHttpSpec {
         test("transformed") {
           val codec =
             PathCodec.path("/users") /
-              SegmentCodec.int("user-id").transform(UserId.apply, (uid: UserId) => uid.value) /
+              SegmentCodec.int("user-id").transform(UserId.apply)(_.value) /
               SegmentCodec.literal("posts") /
               SegmentCodec
                 .string("post-id")
-                .transformOrFailLeft(
-                  s => Try(s.toInt).toEither.left.map(_ => "Not a number").map(n => PostId(n.toString)),
-                  (pid: PostId) => pid.value,
-                )
-
+                .transformOrFailLeft(s =>
+                  Try(s.toInt).toEither.left.map(_ => "Not a number").map(n => PostId(n.toString)),
+                )(_.value)
           assertTrue(codec.segments.length == 5)
         },
       ),
@@ -104,15 +102,13 @@ object PathCodecSpec extends ZIOHttpSpec {
         test("transformed") {
           val codec =
             PathCodec.path("/users") /
-              SegmentCodec.int("user-id").transform(UserId.apply, (uid: UserId) => uid.value) /
+              SegmentCodec.int("user-id").transform(UserId.apply)(_.value) /
               SegmentCodec.literal("posts") /
               SegmentCodec
                 .string("post-id")
-                .transformOrFailLeft(
-                  s => Try(s.toInt).toEither.left.map(_ => "Not a number").map(n => PostId(n.toString)),
-                  (pid: PostId) => pid.value,
-                )
-
+                .transformOrFailLeft(s =>
+                  Try(s.toInt).toEither.left.map(_ => "Not a number").map(n => PostId(n.toString)),
+                )(_.value)
           assertTrue(
             codec.decode(Path("/users/1/posts/456")) == Right((UserId(1), PostId("456"))),
             codec.decode(Path("/users/1/posts/abc")) == Left("Not a number"),
@@ -156,14 +152,13 @@ object PathCodecSpec extends ZIOHttpSpec {
         test("transformed") {
           val codec =
             PathCodec.path("/users") /
-              SegmentCodec.int("user-id").transform(UserId.apply, (uid: UserId) => uid.value) /
+              SegmentCodec.int("user-id").transform(UserId.apply)(_.value) /
               SegmentCodec.literal("posts") /
               SegmentCodec
                 .string("post-id")
-                .transformOrFailLeft(
-                  s => Try(s.toInt).toEither.left.map(_ => "Not a number").map(n => PostId(n.toString)),
-                  (pid: PostId) => pid.value,
-                )
+                .transformOrFailLeft(s =>
+                  Try(s.toInt).toEither.left.map(_ => "Not a number").map(n => PostId(n.toString)),
+                )(_.value)
 
           assertTrue(
             codec.render == "/users/{user-id}/posts/{post-id}",