Skip to content

Add HasPolyCborCodec #430

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

Merged
merged 8 commits into from
Feb 1, 2023
Merged

Add HasPolyCborCodec #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e963b6b
add PolyCborCoded
Jan 31, 2023
b7fe8ef
do not validate multiple times (maybe)
Jan 31, 2023
3e3363c
refactor
Jan 31, 2023
6a72146
do not validate multiple times
Jan 31, 2023
7416069
review
Jan 31, 2023
b0f0457
review
Feb 1, 2023
921fb9b
remove GenCodec bound
Feb 1, 2023
ab65125
fix test
Feb 1, 2023
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
14 changes: 14 additions & 0 deletions commons-core/src/main/scala/com/avsystem/commons/serialization/cbor/CborAdtMetadata.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,3 +253,17 @@ trait CborAdtInstances[T] {
def cborCodec: GenObjectCodec[T] =
metadata.setup(_.validate()).adjustCodec(stdCodec)
}

trait CborAdtPolyInstances[C[_]] {
def stdCodec[T: GenCodec]: GenObjectCodec[C[T]]
def metadata[T]: CborAdtMetadata[C[T]]
}

/**
* Like [[HasCborCodec]] but for parameterized (generic) data types.
*/
abstract class HasPolyCborCodec[C[_]](implicit instances: MacroInstances[CborOptimizedCodecs, CborAdtPolyInstances[C]]) {
private lazy val validatedInstances = instances(CborOptimizedCodecs, this).setup(_.metadata[Nothing].validate())

implicit def codec[T: GenCodec]: GenObjectCodec[C[T]] = validatedInstances.metadata[T].adjustCodec(validatedInstances.stdCodec[T])
}
12 changes: 12 additions & 0 deletions ...ons-core/src/test/scala/com/avsystem/commons/serialization/cbor/CborInputOutputTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ case class CustomKeysRecord(
)
object CustomKeysRecord extends HasCborCodec[CustomKeysRecord]

@cborDiscriminator(0)
sealed trait GenericSealedTrait[+T]
object GenericSealedTrait extends HasPolyCborCodec[GenericSealedTrait] {
@cborKey(0)
case class Success[+T](@cborKey(1) value: T) extends GenericSealedTrait[T]
@cborKey(1)
case class Failure(@cborKey(1) message: String) extends GenericSealedTrait[Nothing]
}

@cborDiscriminator(0)
sealed trait CustomKeysFlatUnion extends Product with Serializable
object CustomKeysFlatUnion extends HasCborCodec[CustomKeysFlatUnion] {
Expand Down Expand Up @@ -211,6 +220,9 @@ class CborInputOutputTest extends AnyFunSuite {
test("chunked byte string") {
assert(CborInput.readRawCbor[Bytes](RawCbor.fromHex("5F426162426162426162FF")) == Bytes("ababab"))
}

roundtrip[GenericSealedTrait[Int]](GenericSealedTrait.Success[Int](234), "A200000118EA")
roundtrip[GenericSealedTrait[Boolean]](GenericSealedTrait.Failure("error"), "A2000101656572726F72")
}

class CborGenCodecRoundtripTest extends GenCodecRoundtripTest {
Expand Down