From 57bc594e1daa7dff6013759d6fc65f183118aa33 Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 24 May 2011 23:02:25 +0200 Subject: Add JsonFormat for JsValues, some more helpers --- .../scala/cc/spray/json/AdditionalFormats.scala | 62 +++ .../scala/cc/spray/json/DefaultJsonProtocol.scala | 7 +- src/main/scala/cc/spray/json/GenericFormats.scala | 415 --------------------- src/main/scala/cc/spray/json/ProductFormats.scala | 407 ++++++++++++++++++++ src/main/scala/cc/spray/json/StandardFormats.scala | 11 +- 5 files changed, 476 insertions(+), 426 deletions(-) create mode 100644 src/main/scala/cc/spray/json/AdditionalFormats.scala delete mode 100644 src/main/scala/cc/spray/json/GenericFormats.scala create mode 100644 src/main/scala/cc/spray/json/ProductFormats.scala (limited to 'src/main/scala/cc') diff --git a/src/main/scala/cc/spray/json/AdditionalFormats.scala b/src/main/scala/cc/spray/json/AdditionalFormats.scala new file mode 100644 index 0000000..62a30e7 --- /dev/null +++ b/src/main/scala/cc/spray/json/AdditionalFormats.scala @@ -0,0 +1,62 @@ +/* + * Original implementation (C) 2009-2011 Debasish Ghosh + * Adapted and extended in 2011 by Mathias Doenitz + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cc.spray.json + +/** + * Provides additional JsonFormats and helpers + */ +trait AdditionalFormats { + + implicit object JsValueFormat extends JsonFormat[JsValue] { + def write(value: JsValue) = value + def read(value: JsValue) = value + } + + def formatFromWriter[T :JsonWriter] = new JsonFormat[T] { + def write(obj: T) = obj.toJson + def read(value: JsValue) = throw new RuntimeException("JsonFormat constructed from JsonWriter can't read from JSON") + } + + def formatFromReader[T :JsonReader] = new JsonFormat[T] { + def write(obj: T) = throw new RuntimeException("JsonFormat constructed from JsonReader can't write JSON") + def read(value: JsValue) = value.fromJson[T] + } + + /** + * Lazy wrapper around serialization. Useful when you want to serialize (mutually) recursive structures. + */ + def lazyFormat[T](format: => JsonFormat[T]) = new JsonFormat[T]{ + lazy val delegate = format; + def write(x: T) = delegate.write(x); + def read(value: JsValue) = delegate.read(value); + } + + /** + * Wraps an existing JsonReader with Exception protection. + */ + def safeReader[A :JsonReader] = new JsonReader[Either[Exception, A]] { + def read(json: JsValue) = { + try { + Right(json.fromJson) + } catch { + case e: Exception => Left(e) + } + } + } + +} \ No newline at end of file diff --git a/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala b/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala index a8201c2..6f8daf5 100644 --- a/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala +++ b/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala @@ -20,6 +20,11 @@ package cc.spray.json /** * Provides all the predefined JsonFormats. */ -trait DefaultJsonProtocol extends BasicFormats with StandardFormats with CollectionFormats with GenericFormats +trait DefaultJsonProtocol + extends BasicFormats + with StandardFormats + with CollectionFormats + with ProductFormats + with AdditionalFormats object DefaultJsonProtocol extends DefaultJsonProtocol diff --git a/src/main/scala/cc/spray/json/GenericFormats.scala b/src/main/scala/cc/spray/json/GenericFormats.scala deleted file mode 100644 index 8856e02..0000000 --- a/src/main/scala/cc/spray/json/GenericFormats.scala +++ /dev/null @@ -1,415 +0,0 @@ -/* - * Original implementation (C) 2009-2011 Debasish Ghosh - * Adapted and extended in 2011 by Mathias Doenitz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cc.spray.json - -/** - * Provides the helpers for constructing custom JsonFormat implementations. - */ -trait GenericFormats { - - private type JF[T] = JsonFormat[T] // simple alias for reduced verbosity - - /** - * Lazy wrapper around serialization. Useful when you want to serialize mutually recursive structures. - */ - def lazyFormat[T](format: => JF[T]) = new JF[T]{ - lazy val delegate = format; - def write(x: T) = delegate.write(x); - def read(value: JsValue) = delegate.read(value); - } - - def jsonFormat[A :JF, T <: Product](construct: A => T, a: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A] - ) - } - - def jsonFormat[A :JF, B :JF, T <: Product](construct: (A, B) => T, a: String, b: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, T <: Product](construct: (A, B, C) => T, - a: String, b: String, c: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, T <: Product](construct: (A, B, C, D) => T, - a: String, b: String, c: String, d: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, T <: Product](construct: (A, B, C, D, E) => T, - a: String, b: String, c: String, d: String, e: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, T <: Product](construct: (A, B, C, D, E, F) => T, - a: String, b: String, c: String, d: String, e: String, f: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, T <: Product](construct: (A, B, C, D, E, F, G) => T, - a: String, b: String, c: String, d: String, e: String, f: String, g: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H) => T, - a: String, b: String, c: String, d: String, e: String, f: String, g: String, h: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H, I) => T, - a: String, b: String, c: String, d: String, e: String, f: String, g: String, h: String, i: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson), - JsField(i, element[I](p, 8).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H], - field(value, i).fromJson[I] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H, I, J) => T, a: String, b: String, c: String, d: String, e: String, - f: String, g: String, h: String, i: String, j: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson), - JsField(i, element[I](p, 8).toJson), - JsField(j, element[J](p, 9).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H], - field(value, i).fromJson[I], - field(value, j).fromJson[J] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H, I, J, K) => T, a: String, b: String, c: String, d: String, e: String, - f: String, g: String, h: String, i: String, j: String, k: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson), - JsField(i, element[I](p, 8).toJson), - JsField(j, element[J](p, 9).toJson), - JsField(k, element[K](p, 10).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H], - field(value, i).fromJson[I], - field(value, j).fromJson[J], - field(value, k).fromJson[K] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H, I, J, K, L) => T, a: String, b: String, c: String, d: String, e: String, - f: String, g: String, h: String, i: String, j: String, k: String, l: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson), - JsField(i, element[I](p, 8).toJson), - JsField(j, element[J](p, 9).toJson), - JsField(k, element[K](p, 10).toJson), - JsField(l, element[L](p, 11).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H], - field(value, i).fromJson[I], - field(value, j).fromJson[J], - field(value, k).fromJson[K], - field(value, l).fromJson[L] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, M :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H, I, J, K, L, M) => T, a: String, b: String, c: String, d: String, e: String, - f: String, g: String, h: String, i: String, j: String, k: String, l: String, m: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson), - JsField(i, element[I](p, 8).toJson), - JsField(j, element[J](p, 9).toJson), - JsField(k, element[K](p, 10).toJson), - JsField(l, element[L](p, 11).toJson), - JsField(m, element[M](p, 12).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H], - field(value, i).fromJson[I], - field(value, j).fromJson[J], - field(value, k).fromJson[K], - field(value, l).fromJson[L], - field(value, m).fromJson[M] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, M :JF, N :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H, I, J, K, L, M, N) => T, a: String, b: String, c: String, d: String, e: String, - f: String, g: String, h: String, i: String, j: String, k: String, l: String, m: String, n: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson), - JsField(i, element[I](p, 8).toJson), - JsField(j, element[J](p, 9).toJson), - JsField(k, element[K](p, 10).toJson), - JsField(l, element[L](p, 11).toJson), - JsField(m, element[M](p, 12).toJson), - JsField(n, element[N](p, 13).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H], - field(value, i).fromJson[I], - field(value, j).fromJson[J], - field(value, k).fromJson[K], - field(value, l).fromJson[L], - field(value, m).fromJson[M], - field(value, n).fromJson[N] - ) - } - - def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, M :JF, N :JF, O :JF, T <: Product] - (construct: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O) => T, a: String, b: String, c: String, d: String, e: String, - f: String, g: String, h: String, i: String, j: String, k: String, l: String, m: String, n: String, o: String) = new JF[T]{ - def write(p: T) = JsObject( - JsField(a, element[A](p, 0).toJson), - JsField(b, element[B](p, 1).toJson), - JsField(c, element[C](p, 2).toJson), - JsField(d, element[D](p, 3).toJson), - JsField(e, element[E](p, 4).toJson), - JsField(f, element[F](p, 5).toJson), - JsField(g, element[G](p, 6).toJson), - JsField(h, element[H](p, 7).toJson), - JsField(i, element[I](p, 8).toJson), - JsField(j, element[J](p, 9).toJson), - JsField(k, element[K](p, 10).toJson), - JsField(l, element[L](p, 11).toJson), - JsField(m, element[M](p, 12).toJson), - JsField(n, element[N](p, 13).toJson), - JsField(o, element[O](p, 14).toJson) - ) - def read(value: JsValue) = construct( - field(value, a).fromJson[A], - field(value, b).fromJson[B], - field(value, c).fromJson[C], - field(value, d).fromJson[D], - field(value, e).fromJson[E], - field(value, f).fromJson[F], - field(value, g).fromJson[G], - field(value, h).fromJson[H], - field(value, i).fromJson[I], - field(value, j).fromJson[J], - field(value, k).fromJson[K], - field(value, l).fromJson[L], - field(value, m).fromJson[M], - field(value, n).fromJson[N], - field(value, o).fromJson[O] - ) - } - - // helpers - - private def element[T](p: Product, ix: Int) = p.productElement(ix).asInstanceOf[T] - - private def field(value: JsValue, fieldName: String) = value match { - case jso: JsObject => { - jso.fields - .find(_.name == fieldName) - .getOrElse(throw new DeserializationException("Object is missing required member '" + fieldName + "'")) - .value - } - case _ => throw new DeserializationException("Object expected") - } -} diff --git a/src/main/scala/cc/spray/json/ProductFormats.scala b/src/main/scala/cc/spray/json/ProductFormats.scala new file mode 100644 index 0000000..39b44fb --- /dev/null +++ b/src/main/scala/cc/spray/json/ProductFormats.scala @@ -0,0 +1,407 @@ +/* + * Original implementation (C) 2009-2011 Debasish Ghosh + * Adapted and extended in 2011 by Mathias Doenitz + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cc.spray.json + +/** + * Provides the helpers for constructing custom JsonFormat implementations for types implementing the Product trait + * (especially case classes) + */ +trait ProductFormats { + + private type JF[T] = JsonFormat[T] // simple alias for reduced verbosity + + def jsonFormat[A :JF, T <: Product](construct: A => T, a: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A] + ) + } + + def jsonFormat[A :JF, B :JF, T <: Product](construct: (A, B) => T, a: String, b: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, T <: Product](construct: (A, B, C) => T, + a: String, b: String, c: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, T <: Product](construct: (A, B, C, D) => T, + a: String, b: String, c: String, d: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, T <: Product](construct: (A, B, C, D, E) => T, + a: String, b: String, c: String, d: String, e: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, T <: Product](construct: (A, B, C, D, E, F) => T, + a: String, b: String, c: String, d: String, e: String, f: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, T <: Product](construct: (A, B, C, D, E, F, G) => T, + a: String, b: String, c: String, d: String, e: String, f: String, g: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H) => T, + a: String, b: String, c: String, d: String, e: String, f: String, g: String, h: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H, I) => T, + a: String, b: String, c: String, d: String, e: String, f: String, g: String, h: String, i: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson), + JsField(i, element[I](p, 8).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H], + field(value, i).fromJson[I] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H, I, J) => T, a: String, b: String, c: String, d: String, e: String, + f: String, g: String, h: String, i: String, j: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson), + JsField(i, element[I](p, 8).toJson), + JsField(j, element[J](p, 9).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H], + field(value, i).fromJson[I], + field(value, j).fromJson[J] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H, I, J, K) => T, a: String, b: String, c: String, d: String, e: String, + f: String, g: String, h: String, i: String, j: String, k: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson), + JsField(i, element[I](p, 8).toJson), + JsField(j, element[J](p, 9).toJson), + JsField(k, element[K](p, 10).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H], + field(value, i).fromJson[I], + field(value, j).fromJson[J], + field(value, k).fromJson[K] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H, I, J, K, L) => T, a: String, b: String, c: String, d: String, e: String, + f: String, g: String, h: String, i: String, j: String, k: String, l: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson), + JsField(i, element[I](p, 8).toJson), + JsField(j, element[J](p, 9).toJson), + JsField(k, element[K](p, 10).toJson), + JsField(l, element[L](p, 11).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H], + field(value, i).fromJson[I], + field(value, j).fromJson[J], + field(value, k).fromJson[K], + field(value, l).fromJson[L] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, M :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H, I, J, K, L, M) => T, a: String, b: String, c: String, d: String, e: String, + f: String, g: String, h: String, i: String, j: String, k: String, l: String, m: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson), + JsField(i, element[I](p, 8).toJson), + JsField(j, element[J](p, 9).toJson), + JsField(k, element[K](p, 10).toJson), + JsField(l, element[L](p, 11).toJson), + JsField(m, element[M](p, 12).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H], + field(value, i).fromJson[I], + field(value, j).fromJson[J], + field(value, k).fromJson[K], + field(value, l).fromJson[L], + field(value, m).fromJson[M] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, M :JF, N :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H, I, J, K, L, M, N) => T, a: String, b: String, c: String, d: String, e: String, + f: String, g: String, h: String, i: String, j: String, k: String, l: String, m: String, n: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson), + JsField(i, element[I](p, 8).toJson), + JsField(j, element[J](p, 9).toJson), + JsField(k, element[K](p, 10).toJson), + JsField(l, element[L](p, 11).toJson), + JsField(m, element[M](p, 12).toJson), + JsField(n, element[N](p, 13).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H], + field(value, i).fromJson[I], + field(value, j).fromJson[J], + field(value, k).fromJson[K], + field(value, l).fromJson[L], + field(value, m).fromJson[M], + field(value, n).fromJson[N] + ) + } + + def jsonFormat[A :JF, B :JF, C :JF, D :JF, E :JF, F :JF, G :JF, H :JF, I :JF, J :JF, K :JF, L :JF, M :JF, N :JF, O :JF, T <: Product] + (construct: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O) => T, a: String, b: String, c: String, d: String, e: String, + f: String, g: String, h: String, i: String, j: String, k: String, l: String, m: String, n: String, o: String) = new JF[T]{ + def write(p: T) = JsObject( + JsField(a, element[A](p, 0).toJson), + JsField(b, element[B](p, 1).toJson), + JsField(c, element[C](p, 2).toJson), + JsField(d, element[D](p, 3).toJson), + JsField(e, element[E](p, 4).toJson), + JsField(f, element[F](p, 5).toJson), + JsField(g, element[G](p, 6).toJson), + JsField(h, element[H](p, 7).toJson), + JsField(i, element[I](p, 8).toJson), + JsField(j, element[J](p, 9).toJson), + JsField(k, element[K](p, 10).toJson), + JsField(l, element[L](p, 11).toJson), + JsField(m, element[M](p, 12).toJson), + JsField(n, element[N](p, 13).toJson), + JsField(o, element[O](p, 14).toJson) + ) + def read(value: JsValue) = construct( + field(value, a).fromJson[A], + field(value, b).fromJson[B], + field(value, c).fromJson[C], + field(value, d).fromJson[D], + field(value, e).fromJson[E], + field(value, f).fromJson[F], + field(value, g).fromJson[G], + field(value, h).fromJson[H], + field(value, i).fromJson[I], + field(value, j).fromJson[J], + field(value, k).fromJson[K], + field(value, l).fromJson[L], + field(value, m).fromJson[M], + field(value, n).fromJson[N], + field(value, o).fromJson[O] + ) + } + + // helpers + + private def element[T](p: Product, ix: Int) = p.productElement(ix).asInstanceOf[T] + + private def field(value: JsValue, fieldName: String) = value match { + case jso: JsObject => { + jso.fields + .find(_.name == fieldName) + .getOrElse(throw new DeserializationException("Object is missing required member '" + fieldName + "'")) + .value + } + case _ => throw new DeserializationException("Object expected") + } +} diff --git a/src/main/scala/cc/spray/json/StandardFormats.scala b/src/main/scala/cc/spray/json/StandardFormats.scala index 20012b4..8b0dc3a 100644 --- a/src/main/scala/cc/spray/json/StandardFormats.scala +++ b/src/main/scala/cc/spray/json/StandardFormats.scala @@ -23,19 +23,10 @@ import scala.{Left, Right} * Provides the JsonFormats for the non-collection standard types. */ trait StandardFormats { + this: AdditionalFormats => private type JF[T] = JsonFormat[T] // simple alias for reduced verbosity - def safeReader[A :JsonFormat] = new JsonReader[Either[Exception, A]] { - def read(json: JsValue) = { - try { - Right(json.fromJson) - } catch { - case e: Exception => Left(e) - } - } - } - implicit def optionFormat[T :JF] = new JF[Option[T]] { def write(option: Option[T]) = option match { case Some(x) => x.toJson -- cgit v1.2.3