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

scala2 DeriveSchema intermediate enum fix #749

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

scala2 DeriveSchema intermediate enum fix #749

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4bd7568
scala2 Derive intermediate enum fix
googley42 Oct 12, 2024
54dbfa0
ignore test for now
googley42 Oct 12, 2024
87b45d1
created unit test
googley42 Oct 13, 2024
3929401
lint
googley42 Oct 13, 2024
846da12
consistent naming
googley42 Oct 13, 2024
2a011dd
consistent naming
googley42 Oct 13, 2024
da7ec94
work around for new Scala3 macro issue
googley42 Oct 13, 2024
596c739
downgrade ubuntu as latest does not have sbt
googley42 Dec 8, 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
2 changes: 1 addition & 1 deletion zio-schema-avro/src/test/scala/zio/schema/codec/AvroSchemaCodecSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ object AvroSchemaCodecSpec extends ZIOSpecDefault {
val expected =
"""[{"type":"record","name":"A","fields":[]},{"type":"record","name":"B","fields":[]},{"type":"record","name":"MyC","fields":[]},{"type":"record","name":"D","fields":[{"name":"s","type":"string"}]}]"""
assert(result)(isRight(equalTo(expected)))
} @@ TestAspect.scala2Only,
} @@ TestAspect.scala2Only @@ TestAspect.ignore,
Copy link
Contributor Author

@googley42 googley42 Oct 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this test was created as a workaround for the incorrect Scala2 DeriveSchema behaviour for intermediate traits - it now fails due to the fix as expected - so its OK to ignore/delete this test? cc @devsprint

test("wraps nested unions") {
val schemaA = DeriveSchema.gen[UnionWithNesting.Nested.A.type]
val schemaB = DeriveSchema.gen[UnionWithNesting.Nested.B.type]
Expand Down
2 changes: 1 addition & 1 deletion zio-schema-derivation/shared/src/main/scala-2/zio/schema/DeriveSchema.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ object DeriveSchema {
child.typeSignature
val childClass = child.asClass
if (childClass.isSealed && childClass.isTrait)
knownSubclassesOf(childClass)
Set(childClass.asType.toType)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stop recursion if child is sealed trait

else if (childClass.isCaseClass || (childClass.isClass && childClass.isAbstract)) {
val st = concreteType(concreteType(tpe, parent.asType.toType), child.asType.toType)
Set(appliedSubtype(st))
Expand Down
Loading