From 7106d3c23d40f9a38025c171b8add80af2fdba19 Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 11 Jul 2017 12:05:51 -0700 Subject: Making string to json marshallers not implicit --- src/main/scala/xyz/driver/core/json.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/scala/xyz/driver/core/json.scala') diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala index 1097789..6e780ed 100644 --- a/src/main/scala/xyz/driver/core/json.scala +++ b/src/main/scala/xyz/driver/core/json.scala @@ -213,15 +213,15 @@ object json { } } - implicit val jsValueToStringMarshaller: Marshaller[JsValue, String] = + val jsValueToStringMarshaller: Marshaller[JsValue, String] = Marshaller.strict[JsValue, String](value => Marshalling.Opaque[String](() => value.compactPrint)) - implicit def valueToStringMarshaller[T](implicit jsonFormat: JsonWriter[T]): Marshaller[T, String] = + def valueToStringMarshaller[T](implicit jsonFormat: JsonWriter[T]): Marshaller[T, String] = jsValueToStringMarshaller.compose[T](jsonFormat.write) - implicit val stringToJsValueUnmarshaller: Unmarshaller[String, JsValue] = + val stringToJsValueUnmarshaller: Unmarshaller[String, JsValue] = Unmarshaller.strict[String, JsValue](value => value.parseJson) - implicit def stringToValueUnmarshaller[T](implicit jsonFormat: JsonReader[T]): Unmarshaller[String, T] = + def stringToValueUnmarshaller[T](implicit jsonFormat: JsonReader[T]): Unmarshaller[String, T] = stringToJsValueUnmarshaller.map[T](jsonFormat.read) } -- cgit v1.2.3