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.

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 type parameters to derived record name #447

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@ package object generic {
val param = caseClass.parameters.head
param.typeclass.imap(value => caseClass.rawConstruct(List(value)))(param.dereference)
} else {
def recursiveShortNames(typeName: TypeName): Seq[String] = {
typeName.short +: typeName.typeArguments.flatMap(recursiveShortNames)
}

Codec
.record[A](
name = caseClass.annotations
.collectFirst { case AvroName(namespace) => namespace }
.getOrElse(caseClass.typeName.short),
.getOrElse(recursiveShortNames(caseClass.typeName).mkString("__")),
namespace = caseClass.annotations
.collectFirst { case AvroNamespace(namespace) => namespace }
.getOrElse(caseClass.typeName.owner),
Expand Down
9 changes: 7 additions & 2 deletions modules/generic/src/main/scala-3/vulcan/generic/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ package object generic {
) extends Derivation[Codec] {
inline def derive[A](using Mirror.Of[A]): Codec[A] = derived[A]

final def join[A](caseClass: CaseClass[Codec, A]): Codec[A] =
final def join[A](caseClass: CaseClass[Codec, A]): Codec[A] = {
def recursiveShortNames(typeInfo: TypeInfo): Seq[String] = {
typeInfo.short +: typeInfo.typeParams.toSeq.flatMap(recursiveShortNames)
}

Codec
.record[A](
name = caseClass.annotations
.collectFirst { case AvroName(namespace) => namespace }
.getOrElse(caseClass.typeInfo.short),
.getOrElse(recursiveShortNames(caseClass.typeInfo).mkString("__")),
namespace = caseClass.annotations
.collectFirst { case AvroNamespace(namespace) => namespace }
.getOrElse(caseClass.typeInfo.owner),
Expand Down Expand Up @@ -68,6 +72,7 @@ package object generic {
}
.map(caseClass.rawConstruct(_))
}
}

final def split[A](sealedTrait: SealedTrait[Codec, A]): Codec.Aux[Any, A] = {
Codec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ final class GenericDerivationCodecSpec extends CodecBase {
}
}

it("should append types classes in record name") {
assertSchemaIs[CaseClassTypeClass[String]] {
"""{"type":"record","name":"CaseClassTypeClass__String","namespace":"vulcan.generic.examples","fields":[{"name":"value","type":["null","string"]}]}"""
}
}

it("should ignore type class names with annotation for record name") {
assertSchemaIs[CaseClassTypeClassAvroName[String]] {
"""{"type":"record","name":"CaseClassOtherName","namespace":"vulcan.generic.examples","fields":[{"name":"value","type":["null","string"]}]}"""
}
}

}

describe("encode") {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package vulcan.generic.examples

import vulcan.Codec
import vulcan.generic._

final case class CaseClassTypeClass[A](value: Option[A])

object CaseClassTypeClass {
implicit val codecString: Codec[CaseClassTypeClass[String]] = Codec.derive
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package vulcan.generic.examples

import vulcan.Codec
import vulcan.generic._

@AvroName("CaseClassOtherName")
final case class CaseClassTypeClassAvroName[A](value: Option[A])

object CaseClassTypeClassAvroName {
implicit val codecString: Codec[CaseClassTypeClassAvroName[String]] = Codec.derive
}