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

update kind-projector syntax #163

Merged
merged 1 commit into from
Feb 26, 2020
Merged

update kind-projector syntax #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions modules/core/src/main/scala/vulcan/Codec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,13 +1116,13 @@ final object Codec {
doc: Option[String] = None,
aliases: Seq[String] = Seq.empty,
props: Props = Props.empty
)(f: FieldBuilder[A] => FreeApplicative[Field[A, ?], A]): Codec[A] = {
)(f: FieldBuilder[A] => FreeApplicative[Field[A, *], A]): Codec[A] = {
val typeName = if (namespace.isEmpty) name else s"$namespace.$name"
val free = f(FieldBuilder.instance)
val schema = AvroError.catchNonFatal {
val fields =
free.analyze {
λ[Field[A, ?] ~> λ[a => Either[AvroError, Chain[Schema.Field]]]] { field =>
λ[Field[A, *] ~> λ[a => Either[AvroError, Chain[Schema.Field]]]] { field =>
field.codec.schema.flatMap { schema =>
field.props.toChain
.flatMap { props =>
Expand Down Expand Up @@ -1187,7 +1187,7 @@ final object Codec {
schema.flatMap { schema =>
val fields =
free.analyze {
λ[Field[A, ?] ~> λ[a => Either[AvroError, Chain[(String, Any)]]]] { field =>
λ[Field[A, *] ~> λ[a => Either[AvroError, Chain[(String, Any)]]]] { field =>
field.codec.encode(field.access(a)).map(result => Chain.one((field.name, result)))
}
}
Expand All @@ -1209,7 +1209,7 @@ final object Codec {
val recordFields = recordSchema.getFields()

free.foldMap {
λ[Field[A, ?] ~> Either[AvroError, ?]] { field =>
λ[Field[A, *] ~> Either[AvroError, *]] { field =>
val schemaField = recordSchema.getField(field.name)
if (schemaField != null) {
val value = record.get(recordFields.indexOf(schemaField))
Expand Down Expand Up @@ -1737,7 +1737,7 @@ final object Codec {
order: Option[Schema.Field.Order] = None,
aliases: Seq[String] = Seq.empty,
props: Props = Props.empty
)(implicit codec: Codec[B]): FreeApplicative[Field[A, ?], B]
)(implicit codec: Codec[B]): FreeApplicative[Field[A, *], B]
}

private[vulcan] final object FieldBuilder {
Expand All @@ -1751,7 +1751,7 @@ final object Codec {
order: Option[Schema.Field.Order],
aliases: Seq[String],
props: Props
)(implicit codec: Codec[B]): FreeApplicative[Field[Any, ?], B] =
)(implicit codec: Codec[B]): FreeApplicative[Field[Any, *], B] =
FreeApplicative.lift {
Field(
name = name,
Expand Down