Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JsonCodec derivation from encoder and decoder #1115

Merged
merged 2 commits into from
May 17, 2024
Merged

Add JsonCodec derivation from encoder and decoder #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef21ec3
Add JsonCodec derivation from encoder and decoder
guersam May 14, 2024
e6a2b6a
Disable JsonCodec derivaton from encoder & decoder for Scala 2.12
guersam May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions zio-json/shared/src/main/scala-2.12/zio/json/JsonCodecVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package zio.json

private[json] trait JsonCodecVersionSpecific
7 changes: 7 additions & 0 deletions zio-json/shared/src/main/scala-2.13/zio/json/JsonCodecVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package zio.json

private[json] trait JsonCodecVersionSpecific {

implicit def fromEncoderDecoder[A](implicit encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] =
JsonCodec(encoder, decoder)
}
3 changes: 0 additions & 3 deletions zio-json/shared/src/main/scala-2.x/zio/json/JsonCodecVersionSpecific.scala
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion zio-json/shared/src/main/scala-2.x/zio/json/JsonDecoderVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package zio.json

trait JsonDecoderVersionSpecific
private[json] trait JsonDecoderVersionSpecific
2 changes: 1 addition & 1 deletion zio-json/shared/src/main/scala-2.x/zio/json/JsonEncoderVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package zio.json

trait JsonEncoderVersionSpecific
private[json] trait JsonEncoderVersionSpecific
5 changes: 4 additions & 1 deletion zio-json/shared/src/main/scala-3/zio/json/JsonCodecVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package zio.json

trait JsonCodecVersionSpecific {
private[json] trait JsonCodecVersionSpecific {
inline def derived[A: deriving.Mirror.Of]: JsonCodec[A] = DeriveJsonCodec.gen[A]

given fromEncoderDecoder[A](using encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] =
JsonCodec(encoder, decoder)
}
2 changes: 1 addition & 1 deletion zio-json/shared/src/main/scala-3/zio/json/JsonDecoderVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package zio.json

trait JsonDecoderVersionSpecific {
private[json] trait JsonDecoderVersionSpecific {
inline def derived[A: deriving.Mirror.Of]: JsonDecoder[A] = DeriveJsonDecoder.gen[A]
}
2 changes: 1 addition & 1 deletion zio-json/shared/src/main/scala-3/zio/json/JsonEncoderVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package zio.json

trait JsonEncoderVersionSpecific {
private[json] trait JsonEncoderVersionSpecific {
inline def derived[A: deriving.Mirror.Of]: JsonEncoder[A] = DeriveJsonEncoder.gen[A]
}
2 changes: 0 additions & 2 deletions zio-json/shared/src/main/scala/zio/json/JsonCodec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ final case class JsonCodec[A](encoder: JsonEncoder[A], decoder: JsonDecoder[A])
object JsonCodec extends GeneratedTupleCodecs with CodecLowPriority0 with JsonCodecVersionSpecific {
def apply[A](implicit jsonCodec: JsonCodec[A]): JsonCodec[A] = jsonCodec

def apply[A](encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] = new JsonCodec(encoder, decoder)

private def orElseEither[A, B](A: JsonCodec[A], B: JsonCodec[B]): JsonCodec[Either[A, B]] =
JsonCodec(
JsonEncoder.orElseEither[A, B](A.encoder, B.encoder),
Expand Down
Loading