Fixed imports in mongo-record

lift · Apr 22, 2017 · 24f494b · 24f494b
1 parent 393f557
commit 24f494b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 21 deletions.
diff --git a/...ence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/BsonRecordField.scala b/...ence/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/...ence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/JsonObjectField.scala b/...ence/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/...nce/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoFieldFlavor.scala b/...nce/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/...stence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/MongoMapField.scala b/...stence/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/...stence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/ObjectIdField.scala b/...stence/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/...istence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/field/PatternField.scala b/...istence/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
@@ -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._