diff options
| author | Jakob Odersky <jakob@odersky.com> | 2018-02-14 15:09:41 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2018-02-14 15:09:41 -0800 |
| commit | 9a1c4b945131d5b1bb9cf931d893737439fe412a (patch) | |
| tree | 288ca7a95e96fe03f4481f2991a44c4a86e4119a | |
| parent | 37049a5dc2f8bac9fe042b51f297a19d02a82617 (diff) | |
| download | spray-json-derivation-9a1c4b945131d5b1bb9cf931d893737439fe412a.tar.gz spray-json-derivation-9a1c4b945131d5b1bb9cf931d893737439fe412a.tar.bz2 spray-json-derivation-9a1c4b945131d5b1bb9cf931d893737439fe412a.zip | |
Formatting
| -rw-r--r-- | src/main/scala/DerivedFormats.scala | 4 | ||||
| -rw-r--r-- | src/main/scala/annotations.scala | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/scala/DerivedFormats.scala b/src/main/scala/DerivedFormats.scala index 4fc096e..93e2640 100644 --- a/src/main/scala/DerivedFormats.scala +++ b/src/main/scala/DerivedFormats.scala @@ -38,7 +38,7 @@ trait DerivedFormats { self: BasicFormats => def dispatch[T](ctx: SealedTrait[JsonFormat, T]): JsonFormat[T] = { val typeFieldName = ctx.annotations - .collectFirst{ + .collectFirst { case g: gadt => g.typeFieldName } .getOrElse("type") @@ -74,7 +74,7 @@ trait DerivedFormats { self: BasicFormats => s"because type '${typeName}' is unsupported.") } } - } + } } implicit def gen[T]: JsonFormat[T] = macro Magnolia.gen[T] diff --git a/src/main/scala/annotations.scala b/src/main/scala/annotations.scala index ee179ff..5382622 100644 --- a/src/main/scala/annotations.scala +++ b/src/main/scala/annotations.scala @@ -20,5 +20,4 @@ import scala.annotation.StaticAnnotation * * @param typeFieldName the name of the field to inject into a serialized JSON * object */ -final class gadt(val typeFieldName: String = "type") - extends StaticAnnotation +final class gadt(val typeFieldName: String = "type") extends StaticAnnotation |