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 5ec8ec45d9..69d1e0d594 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 @@ -22,8 +22,7 @@ package field import common._ import http.js.JsExp import http.js.JE.JsNull -import json.JsonAST._ -import json.Printer +import json._ import net.liftweb.record._ import com.mongodb._ import org.bson.Document diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/JsonObjectField.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/JsonObjectField.scala index 5961849d7d..edd15000fe 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/JsonObjectField.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/JsonObjectField.scala @@ -1,5 +1,5 @@ /* -* Copyright 2010-2012 WorldWide Conferencing, LLC +* Copyright 2010-2017 WorldWide Conferencing, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,7 @@ package field import scala.xml.{NodeSeq, Text} import net.liftweb.common.{Box, Empty, Failure, Full} import net.liftweb.http.js.JE.{JsNull, Str} -import net.liftweb.json.JsonAST._ -import net.liftweb.json.{JsonParser, Printer} +import net.liftweb.json._ import net.liftweb.record.{Field, FieldHelpers, MandatoryTypedField, Record} import net.liftweb.util.Helpers.tryo import com.mongodb.DBObject 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 602d249465..8fe0fa6908 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 @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 WorldWide Conferencing, LLC + * Copyright 2010-2017 WorldWide Conferencing, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,7 @@ package field import net.liftweb.common.{Box, Empty, Failure, Full} import net.liftweb.http.js.JE.{JsNull, JsRaw} -import net.liftweb.json.Printer -import net.liftweb.json.JsonAST._ +import net.liftweb.json._ import com.mongodb.DBObject /** diff --git a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoMapField.scala b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoMapField.scala index ab44be8255..576017c4d1 100644 --- a/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoMapField.scala +++ b/persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoMapField.scala @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 WorldWide Conferencing, LLC + * Copyright 2010-2017 WorldWide Conferencing, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,7 @@ import scala.xml.NodeSeq import net.liftweb.common.{Box, Empty, Failure, Full} import net.liftweb.http.js.JE.{JsNull, JsRaw} -import net.liftweb.json.JsonAST._ -import net.liftweb.json.{JsonParser, Printer} +import net.liftweb.json._ import net.liftweb.record._ import net.liftweb.util.Helpers.tryo @@ -38,7 +37,7 @@ class MongoMapField[OwnerType <: BsonRecord[OwnerType], MapValueType](rec: Owner extends Field[Map[String, MapValueType], OwnerType] with MandatoryTypedField[Map[String, MapValueType]] with MongoFieldFlavor[Map[String, MapValueType]] { - import Meta.Reflection._ + import mongodb.Meta.Reflection._ def owner = rec 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 3570c92030..9966582f21 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 @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 WorldWide Conferencing, LLC + * Copyright 2010-2017 WorldWide Conferencing, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,7 @@ import java.util.Date import net.liftweb.common.{Box, Empty, Failure, Full} import net.liftweb.http.js.JE.{JsNull, JsObj, JsRaw, Str} import net.liftweb.http.S -import net.liftweb.json.JsonAST._ -import net.liftweb.json.Printer +import net.liftweb.json._ import net.liftweb.record.{Field, FieldHelpers, MandatoryTypedField, Record} import net.liftweb.util.Helpers._ 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 ebe11ebb04..f3a34130da 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 @@ -1,5 +1,5 @@ /* -* Copyright 2010-2014 WorldWide Conferencing, LLC +* Copyright 2010-2017 WorldWide Conferencing, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,7 @@ import scala.xml.NodeSeq import net.liftweb.common.{Box, Empty, Failure, Full} import net.liftweb.http.js.JE.{JsNull, Str} -import net.liftweb.json.JsonAST._ -import net.liftweb.json.{JsonParser, Printer} +import net.liftweb.json._ import net.liftweb.mongodb.record._ import net.liftweb.record.{Field, FieldHelpers, MandatoryTypedField} import net.liftweb.util.Helpers.tryo 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 153b6da464..da646357b0 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 @@ -1,5 +1,5 @@ /* -* Copyright 2010-2014 WorldWide Conferencing, LLC +* Copyright 2010-2017 WorldWide Conferencing, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,7 @@ import scala.xml.NodeSeq import net.liftweb.common.{Box, Empty, Failure, Full} import net.liftweb.http.js.JE.{JsNull, JsRaw} import net.liftweb.http.S -import net.liftweb.json.JsonAST._ -import net.liftweb.json.Printer +import net.liftweb.json._ import net.liftweb.mongodb.record._ import net.liftweb.record.{Field, FieldHelpers, MandatoryTypedField} import net.liftweb.util.Helpers._