diff options
author | Mathias <mathias@spray.cc> | 2011-09-06 11:55:22 +0200 |
---|---|---|
committer | Mathias <mathias@spray.cc> | 2011-09-06 11:55:22 +0200 |
commit | 14670623eff7d5394eadc41c56056f2a5a047a70 (patch) | |
tree | 86828d895ce38645eb6b2dc0f21ef7e3ff23334d /src/main/scala/cc | |
parent | b93e81edfe49c677cce64e32fe49850204e14c97 (diff) | |
download | spray-json-14670623eff7d5394eadc41c56056f2a5a047a70.tar.gz spray-json-14670623eff7d5394eadc41c56056f2a5a047a70.tar.bz2 spray-json-14670623eff7d5394eadc41c56056f2a5a047a70.zip |
Improve JsonReader/JsonWriter lifting to JsonFormat
Diffstat (limited to 'src/main/scala/cc')
-rw-r--r-- | src/main/scala/cc/spray/json/AdditionalFormats.scala | 12 | ||||
-rw-r--r-- | src/main/scala/cc/spray/json/JsValue.scala | 2 | ||||
-rw-r--r-- | src/main/scala/cc/spray/json/LiftedFormats.scala | 32 |
3 files changed, 13 insertions, 33 deletions
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 |