diff options
author | Jakob Odersky <jakob@odersky.com> | 2018-03-29 13:11:43 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2018-04-17 22:36:20 -0700 |
commit | 83942244b48d8f7a68ecdaade90b92a79378d43c (patch) | |
tree | aa12e0ae1d69e27dae645cd50e545d6551e2497e /shared/src/main/scala/DerivedFormats.scala | |
parent | 4e50db580a11468cd12cfb4374a8825f88b3c090 (diff) | |
download | spray-json-derivation-83942244b48d8f7a68ecdaade90b92a79378d43c.tar.gz spray-json-derivation-83942244b48d8f7a68ecdaade90b92a79378d43c.tar.bz2 spray-json-derivation-83942244b48d8f7a68ecdaade90b92a79378d43c.zip |
Allow deserialization of option fields if they are omitted
Fixes #5
Diffstat (limited to 'shared/src/main/scala/DerivedFormats.scala')
-rw-r--r-- | shared/src/main/scala/DerivedFormats.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/shared/src/main/scala/DerivedFormats.scala b/shared/src/main/scala/DerivedFormats.scala index d0cac38..eabfa82 100644 --- a/shared/src/main/scala/DerivedFormats.scala +++ b/shared/src/main/scala/DerivedFormats.scala @@ -24,7 +24,12 @@ trait DerivedFormats { self: BasicFormats => ctx.rawConstruct(Seq.empty) } else { ctx.construct { param => - param.typeclass.read(obj.fields(param.label)) + val fieldValue = if (param.option) { + obj.fields.getOrElse(param.label, JsNull) + } else { + obj.fields(param.label) + } + param.typeclass.read(fieldValue) } } case js => |