Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: guardrail-dev/guardrail
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 725acfdb27a0b547e046c426bb3bce5842fac251
Choose a base ref
..
head repository: guardrail-dev/guardrail
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 377a61639d65796431f485dd3e93749e97370f1d
Choose a head ref
Showing with 2 additions and 6 deletions.
  1. +2 −6 ...es/scala-support/src/main/scala/dev/guardrail/generators/scala/circe/CirceProtocolGenerator.scala
8 changes: 2 additions & 6 deletions ...-support/src/main/scala/dev/guardrail/generators/scala/circe/CirceProtocolGenerator.scala
View file
Original file line number Diff line number Diff line change
@@ -335,9 +335,7 @@ class CirceProtocolGenerator private (circeVersion: CirceModelGenerator, applyVa
}

q"""
${circeVersion.encoderObjectCompanion}.instance[${Type.Name(clsName)}]({ a =>
_root_.io.circe.JsonObject.fromIterable($allFields)
})
${circeVersion.encoderObjectCompanion}.instance[${Type.Name(clsName)}](a => _root_.io.circe.JsonObject.fromIterable($allFields))
"""
}
val (readOnlyDefn, readOnlyFilter) = NonEmptyList.fromList(readOnlyKeys).fold((List.empty[Stat], identity[Term] _)) { roKeys =>
@@ -452,12 +450,10 @@ class CirceProtocolGenerator private (circeVersion: CirceModelGenerator, applyVa
val (terms, enumerators) = pairs.unzip
q"""
new _root_.io.circe.Decoder[${Type.Name(clsName)}] {
final def apply(c: _root_.io.circe.HCursor): _root_.io.circe.Decoder.Result[${Type.Name(clsName)}] = {
val extraNames = c.keys.fold(Set.empty[String])(_.toSet).diff(knownFieldNames)
final def apply(c: _root_.io.circe.HCursor): _root_.io.circe.Decoder.Result[${Type.Name(clsName)}] =
for {
..${enumerators}
} yield ${Term.Name(clsName)}(..${terms})
}
}
"""
}