From 14670623eff7d5394eadc41c56056f2a5a047a70 Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 6 Sep 2011 11:55:22 +0200 Subject: Improve JsonReader/JsonWriter lifting to JsonFormat --- .../scala/cc/spray/json/AdditionalFormats.scala | 12 +++++++ src/main/scala/cc/spray/json/JsValue.scala | 2 +- src/main/scala/cc/spray/json/LiftedFormats.scala | 32 ----------------- .../cc/spray/json/AdditionalFormatsSpec.scala | 41 ++++++++++++++++++++++ .../scala/cc/spray/json/LiftedFormatsSpec.scala | 40 --------------------- 5 files changed, 54 insertions(+), 73 deletions(-) delete mode 100644 src/main/scala/cc/spray/json/LiftedFormats.scala create mode 100644 src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala delete mode 100644 src/test/scala/cc/spray/json/LiftedFormatsSpec.scala (limited to 'src') diff --git a/src/main/scala/cc/spray/json/AdditionalFormats.scala b/src/main/scala/cc/spray/json/AdditionalFormats.scala index 96be8d2..e8b59c7 100644 --- a/src/main/scala/cc/spray/json/AdditionalFormats.scala +++ b/src/main/scala/cc/spray/json/AdditionalFormats.scala @@ -32,6 +32,18 @@ trait AdditionalFormats { def read(json: JsValue) = reader.read(json) } + def lift[T](writer :JsonWriter[T]) = new JsonFormat[T] { + def write(obj: T): JsValue = writer.write(obj) + def read(value: JsValue) = + throw new UnsupportedOperationException("JsonReader implementation missing") + } + + def lift[T <: AnyRef](reader :JsonReader[T]) = new JsonFormat[T] { + def write(obj: T): JsValue = + throw new UnsupportedOperationException("No JsonWriter[" + obj.getClass + "] available") + def read(value: JsValue) = reader.read(value) + } + /** * Lazy wrapper around serialization. Useful when you want to serialize (mutually) recursive structures. */ diff --git a/src/main/scala/cc/spray/json/JsValue.scala b/src/main/scala/cc/spray/json/JsValue.scala index edd7636..a02de0f 100644 --- a/src/main/scala/cc/spray/json/JsValue.scala +++ b/src/main/scala/cc/spray/json/JsValue.scala @@ -26,7 +26,7 @@ import collection.mutable.ListBuffer sealed trait JsValue { override def toString = CompactPrinter(this) def toString(printer: (JsValue => String)) = printer(this) - def fromJson[T :JsonReader]: T = jsonReader.read(this) + def fromJson[T :JsonReader]: T = jsonReader[T].read(this) } object JsValue { diff --git a/src/main/scala/cc/spray/json/LiftedFormats.scala b/src/main/scala/cc/spray/json/LiftedFormats.scala deleted file mode 100644 index a7c32be..0000000 --- a/src/main/scala/cc/spray/json/LiftedFormats.scala +++ /dev/null @@ -1,32 +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 - -trait LiftedFormats { - implicit def liftJsonWriter[T](implicit writer: JsonWriter[T]): JsonFormat[T] = new JsonFormat[T] { - def write(obj: T): JsValue = writer.write(obj) - def read(value: JsValue) = throw new UnsupportedOperationException("No reader available") - } - - implicit def liftJsonReader[T](implicit reader: JsonReader[T]): JsonFormat[T] = new JsonFormat[T] { - def write(obj: T): JsValue = throw new UnsupportedOperationException("No writer available") - def read(value: JsValue) = reader.read(value) - } -} - -object LiftedFormats extends LiftedFormats \ No newline at end of file diff --git a/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala b/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala new file mode 100644 index 0000000..7368128 --- /dev/null +++ b/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala @@ -0,0 +1,41 @@ +package cc.spray.json + +import org.specs2.mutable._ + +class AdditionalFormatsSpec extends Specification { + + case class Container[A](inner: Option[A]) + + object ReaderProtocol extends DefaultJsonProtocol { + implicit def containerReader[T :JsonFormat] = lift { + new JsonReader[Container[T]] { + def read(value: JsValue) = value match { + case JsObject(JsField("content", obj: JsValue) :: Nil) => Container(Some(jsonReader[T].read(obj))) + case _ => throw new DeserializationException("Unexpected format: " + value.toString) + } + } + } + } + + object WriterProtocol extends DefaultJsonProtocol { + implicit def containerWriter[T :JsonFormat] = lift { + new JsonWriter[Container[T]] { + def write(obj: Container[T]) = JsObject(JsField("content", obj.inner.toJson)) + } + } + } + + "The liftJsonWriter" should { + val obj = Container(Some(Container(Some(List(1, 2, 3))))) + + "properly write a Container[Container[List[Int]]] to JSON" in { + import WriterProtocol._ + obj.toJson.toString mustEqual """{"content":{"content":[1,2,3]}}""" + } + + "properly read a Container[Container[List[Int]]] from JSON" in { + import ReaderProtocol._ + JsonParser("""{"content":{"content":[1,2,3]}}""").fromJson[Container[Container[List[Int]]]] mustEqual obj + } + } +} \ No newline at end of file diff --git a/src/test/scala/cc/spray/json/LiftedFormatsSpec.scala b/src/test/scala/cc/spray/json/LiftedFormatsSpec.scala deleted file mode 100644 index f98e2d5..0000000 --- a/src/test/scala/cc/spray/json/LiftedFormatsSpec.scala +++ /dev/null @@ -1,40 +0,0 @@ -package cc.spray.json - -import org.specs2.mutable._ -import cc.spray.json.DefaultJsonProtocol._ - -/** - * User: dirk - * Date: 31-08-11 - * Time: 10:01 - */ - -class LiftedFormatsSpec extends Specification { - - case class Container[A](obj: Option[A]) - - implicit def containerWriter[T](implicit writer: JsonWriter[T]) = new JsonWriter[Container[T]] { - import LiftedFormats.liftJsonWriter - def write(obj: Container[T]): JsValue = JsObject(JsField("content", obj.obj.toJson)) - } - - implicit def containerReader[T](implicit reader: JsonReader[T]) = new JsonReader[Container[T]] { - import LiftedFormats.liftJsonReader - def read(value: JsValue): Container[T] = { - value match { - case JsObject(JsField("content", obj: JsValue) :: Nil) => Container(Some(reader.read(obj))) - case _ => throw new DeserializationException("Unexpected format: " + value.toString) - } - } - } - - val obj = Container(Some(Container(Some(List(1, 2, 3))))) - - "The liftJsonWriter" should { - "convert a Container[Container[List[Int]]] to JsValue and back" in { - val r = obj.toJson - r.fromJson[Container[Container[List[Int]]]] - ok - } - } -} \ No newline at end of file -- cgit v1.2.3