From ee50178f11167d5b84ca9cb2ffae2cd39335d388 Mon Sep 17 00:00:00 2001 From: Matt Farmer Date: Sat, 25 Jul 2015 13:04:17 -0400 Subject: [PATCH] Nuke various warnings generated by relying on old compact/render code. As a bonus, all of these modules will no longer depend on the slower JValue->Document->String transformation. So there may be some performance improvements we get "for free" for lack of a better term. --- .../src/main/scala/net/liftweb/json/scalaz/JsonScalaz.scala | 2 +- .../net/liftweb/mongodb/record/field/BsonRecordField.scala | 2 +- .../main/scala/net/liftweb/mongodb/record/field/DateField.scala | 2 +- .../net/liftweb/mongodb/record/field/MongoFieldFlavor.scala | 2 +- .../scala/net/liftweb/mongodb/record/field/ObjectIdField.scala | 2 +- .../scala/net/liftweb/mongodb/record/field/PatternField.scala | 2 +- .../main/scala/net/liftweb/mongodb/record/field/UUIDField.scala | 2 +- .../record/src/main/scala/net/liftweb/record/MetaRecord.scala | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/json-scalaz7/src/main/scala/net/liftweb/json/scalaz/JsonScalaz.scala b/core/json-scalaz7/src/main/scala/net/liftweb/json/scalaz/JsonScalaz.scala index b6442dd3ad..83f1b7d65c 100644 --- a/core/json-scalaz7/src/main/scala/net/liftweb/json/scalaz/JsonScalaz.scala +++ b/core/json-scalaz7/src/main/scala/net/liftweb/json/scalaz/JsonScalaz.scala @@ -45,7 +45,7 @@ trait Types { } implicit def JValueShow[A <: JValue]: Show[A] = new Show[A] { - override def shows(json: A): String = compact(render(json)) + override def shows(json: A): String = compactRender(json) } implicit def JValueMonoid: Monoid[JValue] = Monoid.instance(_ ++ _, JNothing) diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/BsonRecordField.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/BsonRecordField.scala index 6664a0d099..2edca6b11f 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/BsonRecordField.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/BsonRecordField.scala @@ -52,7 +52,7 @@ class BsonRecordField[OwnerType <: BsonRecord[OwnerType], SubRecordType <: BsonR def asJs = asJValue match { case JNothing => JsNull case jv => new JsExp { - lazy val toJsCmd = Printer.compact(render(jv)) + lazy val toJsCmd = compactRender(jv) } } def toForm: Box[NodeSeq] = Empty diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/DateField.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/DateField.scala index 144db8a787..d58a599991 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/DateField.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/DateField.scala @@ -73,7 +73,7 @@ trait DateTypedField extends TypedField[Date] { def asJs = asJValue match { case JNothing => JsNull - case jv => JsRaw(Printer.compact(render(jv))) + case jv => JsRaw(compactRender(jv)) } def asJValue: JValue = valueBox.map(v => JsonDate(v)(formats)) openOr (JNothing: JValue) diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoFieldFlavor.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoFieldFlavor.scala index a245841bff..12cb8e7118 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoFieldFlavor.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoFieldFlavor.scala @@ -44,7 +44,7 @@ trait MongoFieldFlavor[MyType] { */ def asJs = asJValue match { case JNothing => JsNull - case jv => JsRaw(Printer.compact(render(jv))) + case jv => JsRaw(compactRender(jv)) } /** Encode the field value into a JValue */ diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/ObjectIdField.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/ObjectIdField.scala index f0a59741c7..3570c92030 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/ObjectIdField.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/ObjectIdField.scala @@ -87,7 +87,7 @@ class ObjectIdField[OwnerType <: BsonRecord[OwnerType]](rec: OwnerType) def asJs = asJValue match { case JNothing => JsNull - case jv => JsRaw(Printer.compact(render(jv))) + case jv => JsRaw(compactRender(jv)) } def asJValue: JValue = valueBox.map(v => JsonObjectId.asJValue(v, owner.meta.formats)) openOr (JNothing: JValue) diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/PatternField.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/PatternField.scala index a4a7fd2da9..ebe11ebb04 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/PatternField.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/PatternField.scala @@ -67,7 +67,7 @@ class PatternField[OwnerType <: BsonRecord[OwnerType]](rec: OwnerType) def asJs = asJValue match { case JNothing => JsNull - case jv => Str(Printer.compact(render(jv))) + case jv => Str(compactRender(jv)) } def asJValue: JValue = valueBox.map(v => JsonRegex(v)) openOr (JNothing: JValue) diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/UUIDField.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/UUIDField.scala index b0487c215c..153b6da464 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/UUIDField.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/UUIDField.scala @@ -79,7 +79,7 @@ class UUIDField[OwnerType <: BsonRecord[OwnerType]](rec: OwnerType) def asJs = asJValue match { case JNothing => JsNull - case jv => JsRaw(Printer.compact(render(jv))) + case jv => JsRaw(compactRender(jv)) } def asJValue: JValue = valueBox.map(v => JsonUUID(v)) openOr (JNothing: JValue) diff --git a/persistence/record/src/main/scala/net/liftweb/record/MetaRecord.scala b/persistence/record/src/main/scala/net/liftweb/record/MetaRecord.scala index 4787f5e788..41f4d75368 100644 --- a/persistence/record/src/main/scala/net/liftweb/record/MetaRecord.scala +++ b/persistence/record/src/main/scala/net/liftweb/record/MetaRecord.scala @@ -241,7 +241,7 @@ trait MetaRecord[BaseRecord <: Record[BaseRecord]] { * @return a JsObj */ def asJsExp(inst: BaseRecord): JsExp = new JsExp { - lazy val toJsCmd = Printer.compact(render(asJValue(inst))) + lazy val toJsCmd = compactRender(asJValue(inst)) } /** Encode a record instance into a JValue */