diff --git a/README.md b/README.md
index ca7655d1..0db72ebc 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,11 @@ Starting with version 1.10.0, the package for Salat has changed.
**Version 1.10.x and Later**
-TODO
-
`import salat._`
**Version 1.9.x and Earlier**
-`import com.novus.salat._`
+`import salat._`
### Repositories
diff --git a/notes/1.10.0.markdown b/notes/1.10.0.markdown
index 1bfedb47..0c8274b4 100644
--- a/notes/1.10.0.markdown
+++ b/notes/1.10.0.markdown
@@ -1,11 +1,13 @@
-# DRAFT
+1.10.0 is a major release of Salat with breaking changes. It includes support for Casbah 2.8.2 / Mongo 3.0, various bug fixes, and better error messages for common serialization issues.
-1.10.0 is a major release of Salat with breaking changes.
-
-Notably, the package has changed from `com.novus.salat._` to `salat._`
+Most notably, the package has changed from `com.novus.salat._` to `salat._`
# Change Log
+## Major Changes
+
+- \#177 Change package from `com.nouvs.salat._` to just `salat._`
+
## Dependency Upgrades
- \#145 Upgrade to Casbah 2.8.2 (@danslapman, @sief, @noahlz)
@@ -27,4 +29,4 @@ Notably, the package has changed from `com.novus.salat._` to `salat._`
- Introduced a new subclass of `Error`, `SalatGlitch`, that specifically identifies errors that occur during serialization / deserialization. Note that there are still many points in code that throw RuntimeException (via sys.error) - overhaul/normalization of Salat's errors remains an outstanding TODO.
-- Previously case classes with fields of type `Int`, `Option[Int]`, `Seq[Int]`, or `Map[Int]` would experience narrowing with information loss, or a classcast exception when attempting to unbox the field value, if the deserialized a JSON or Mongo document contained a Double value in the field. In addition, a JSON document with goofy contents like `{"foo":"nine-point-oh"}` would return a `None`, swallowing the `NumberFormatException`, if `"foo"` was an `Option[Double]` or somesuch. With this version, deserialization will fail more agressively if the JSON document has a field with a String in an invalid number format, or a Double literal that cannot be narrowed without loss of information (9.0001). Doubles that can be narrowed without loss will be converted to an Int, however (`9.0` converted to `9`, for example).
+- Previously case classes with fields of type `Int`, `Option[Int]`, `Seq[Int]`, or `Map[Int]` would experience narrowing with information loss, or a classcast exception when attempting to unbox the field value, if the deserialized a JSON or Mongo document contained a Double value in the field. In addition, a JSON document with goofy contents like `{"foo":"nine-point-oh"}` would return a `None`, swallowing the `NumberFormatException`, if `"foo"` was an `Option[Double]` or somesuch. With this version, deserialization will fail more agressively if the JSON document has a field with a String in an invalid number format, or a Double literal that cannot be narrowed without loss of information (9.0001). However, in an attempt to account for the fact that JavaScript only has a float numeric type, Doubles that can be narrowed without loss will be converted to an Int (`9.0` converted to `9`, for example).
diff --git a/notes/about.markdown b/notes/about.markdown
index c8d61ece..94e0086f 100644
--- a/notes/about.markdown
+++ b/notes/about.markdown
@@ -8,10 +8,10 @@ Salat currently supports bidirectional serialization for:
Find us online:
-- Project: [http://novus.github.com/salat][project]
-- Source code: [https://github.com/novus/salat][source]
-- Wiki: [https://github.com/novus/salat/wiki][wiki]
-- CI: [http://travis-ci.org/#!/novus/salat][ci]
+- Project: [http://salat.github.io/salat][project]
+- Source code: [https://github.com/salat/salat][source]
+- Wiki: [https://github.com/salat/salat/wiki][wiki]
+- CI: [http://travis-ci.org/#!/salat/salat][ci]
- Mailing List: [http://groups.google.com/group/scala-salat][group]
- StackOverflow: [http://stackoverflow.com/questions/tagged/salat][so]
@@ -19,9 +19,9 @@ Salat is an Open Source project under the Apache License v2.
[casbah]: https://github.com/mongodb/casbah/
[JSON4S]: http://json4s.org/
-[project]: http://novus.github.com/salat
-[source]: https://github.com/novus/salat
-[wiki]: https://github.com/novus/salat/wiki
-[ci]: http://travis-ci.org/#!/novus/salat
+[project]: http://salat.github.io/salat
+[source]: https://github.com/salat/salat
+[wiki]: https://github.com/salat/salat/wiki
+[ci]: http://travis-ci.org/#!/salat/salat
[group]: http://groups.google.com/group/scala-salat
[so]: http://stackoverflow.com/questions/tagged/salat
diff --git a/salat-core/src/main/scala/com/novus/salat/Context.scala b/salat-core/src/main/scala/salat/Context.scala
similarity index 97%
rename from salat-core/src/main/scala/com/novus/salat/Context.scala
rename to salat-core/src/main/scala/salat/Context.scala
index d8f4cceb..6a1e9111 100644
--- a/salat-core/src/main/scala/com/novus/salat/Context.scala
+++ b/salat-core/src/main/scala/salat/Context.scala
@@ -25,17 +25,17 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
import java.lang.reflect.Modifier
import java.util.concurrent.ConcurrentHashMap
import com.mongodb.casbah.Imports._
-import com.novus.salat.annotations.util._
-import com.novus.salat.json.JSONConfig
-import com.novus.salat.transformers.CustomTransformer
-import com.novus.salat.util._
-import com.novus.salat.{Field => SField}
+import salat.annotations.util._
+import salat.json.JSONConfig
+import salat.transformers.CustomTransformer
+import salat.util._
+import salat.{Field => SField}
import org.json4s.JsonAST.JObject
trait Context extends ContextLifecycle with Logging {
@@ -171,7 +171,7 @@ trait Context extends ContextLifecycle with Logging {
}
protected[salat] def needsProxyGrater(clazz: Class[_]) = {
- val usedSalatAnnotation = clazz.annotated_?[com.novus.salat.annotations.raw.Salat]
+ val usedSalatAnnotation = clazz.annotated_?[salat.annotations.raw.Salat]
val isTrait = clazz.isInterface
val isAbstractClazz = Modifier.isAbstract(clazz.getModifiers)
val outcome = usedSalatAnnotation || isTrait || isAbstractClazz
diff --git a/salat-core/src/main/scala/com/novus/salat/CustomGrater.scala b/salat-core/src/main/scala/salat/CustomGrater.scala
similarity index 95%
rename from salat-core/src/main/scala/com/novus/salat/CustomGrater.scala
rename to salat-core/src/main/scala/salat/CustomGrater.scala
index dd1c037e..0253decf 100644
--- a/salat-core/src/main/scala/com/novus/salat/CustomGrater.scala
+++ b/salat-core/src/main/scala/salat/CustomGrater.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat
+package salat
import com.mongodb.DBObject
import com.mongodb.casbah.commons.Implicits._
import com.mongodb.casbah.commons.MongoDBObject
-import com.novus.salat.json.ToJField
-import com.novus.salat.transformers.CustomTransformer
+import salat.json.ToJField
+import salat.transformers.CustomTransformer
import org.json4s.JsonAST.JObject
import org.json4s._
diff --git a/salat-core/src/main/scala/com/novus/salat/Field.scala b/salat-core/src/main/scala/salat/Field.scala
similarity index 95%
rename from salat-core/src/main/scala/com/novus/salat/Field.scala
rename to salat-core/src/main/scala/salat/Field.scala
index 97c6750e..3b273c33 100644
--- a/salat-core/src/main/scala/com/novus/salat/Field.scala
+++ b/salat-core/src/main/scala/salat/Field.scala
@@ -25,14 +25,14 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
import java.lang.reflect.Method
-import com.novus.salat.annotations.raw._
-import com.novus.salat.annotations.util._
-import com.novus.salat.transformers._
-import com.novus.salat.util.Logging
+import salat.annotations.raw._
+import salat.annotations.util._
+import salat.transformers._
+import salat.util.Logging
import scala.tools.scalap.scalax.rules.scalasig._
diff --git a/salat-core/src/main/scala/com/novus/salat/Grater.scala b/salat-core/src/main/scala/salat/Grater.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/Grater.scala
rename to salat-core/src/main/scala/salat/Grater.scala
index d5a755a2..002eace6 100644
--- a/salat-core/src/main/scala/com/novus/salat/Grater.scala
+++ b/salat-core/src/main/scala/salat/Grater.scala
@@ -25,16 +25,16 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
import java.lang.reflect.{InvocationTargetException, Method}
import com.mongodb.casbah.Imports._
-import com.novus.salat.annotations.raw._
-import com.novus.salat.annotations.util._
-import com.novus.salat.json.{FromJValue, ToJField}
-import com.novus.salat.util.{Logging, _}
-import com.novus.salat.{Field => SField}
+import salat.annotations.raw._
+import salat.annotations.util._
+import salat.json.{FromJValue, ToJField}
+import salat.util.{Logging, _}
+import salat.{Field => SField}
import org.json4s._
import org.json4s.native.JsonMethods._
import org.json4s.native.JsonParser
@@ -106,7 +106,7 @@ abstract class Grater[X <: AnyRef](val clazz: Class[X])(implicit val ctx: Contex
def fromBSON(bytes: Array[Byte]): X = {
val decoded = org.bson.BSON.decode(bytes)
- val mdbo = com.novus.salat.bson.BSONObjectToMongoDbObject(decoded)
+ val mdbo = salat.bson.BSONObjectToMongoDbObject(decoded)
asObject(mdbo)
}
diff --git a/salat-core/src/main/scala/com/novus/salat/NumericStrategies.scala b/salat-core/src/main/scala/salat/NumericStrategies.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/NumericStrategies.scala
rename to salat-core/src/main/scala/salat/NumericStrategies.scala
index bb8634d4..fbd4b71f 100644
--- a/salat-core/src/main/scala/com/novus/salat/NumericStrategies.scala
+++ b/salat-core/src/main/scala/salat/NumericStrategies.scala
@@ -26,11 +26,11 @@
*
*/
-package com.novus.salat
+package salat
import java.math.{BigInteger, MathContext}
-import com.novus.salat.util.Logging
+import salat.util.Logging
sealed trait BigDecimalStrategy extends Logging {
@@ -54,6 +54,7 @@ sealed trait BigDecimalStrategy extends Logging {
/**
* To provide backward compatibility with different serialization output, be as forgiving as possible when deserializing
+ *
* @param x anything that could reasonably be coerced into BigDecimal-hood
* @return BigDecimal
*/
diff --git a/salat-core/src/main/scala/com/novus/salat/ProxyGrater.scala b/salat-core/src/main/scala/salat/ProxyGrater.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/ProxyGrater.scala
rename to salat-core/src/main/scala/salat/ProxyGrater.scala
index 9e1a41d5..6f920195 100644
--- a/salat-core/src/main/scala/com/novus/salat/ProxyGrater.scala
+++ b/salat-core/src/main/scala/salat/ProxyGrater.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat
+package salat
import com.mongodb.casbah.Imports._
import org.json4s.JsonAST.JObject
diff --git a/salat-core/src/main/scala/com/novus/salat/TypeHintStrategy.scala b/salat-core/src/main/scala/salat/TypeHintStrategy.scala
similarity index 97%
rename from salat-core/src/main/scala/com/novus/salat/TypeHintStrategy.scala
rename to salat-core/src/main/scala/salat/TypeHintStrategy.scala
index f360c938..111c9e2d 100644
--- a/salat-core/src/main/scala/com/novus/salat/TypeHintStrategy.scala
+++ b/salat-core/src/main/scala/salat/TypeHintStrategy.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
import java.util.concurrent.ConcurrentHashMap
import java.util.regex.Pattern
-import com.novus.salat.util.encoding.TypeHintEncoding
-import com.novus.salat.util.{ClassPrettyPrinter, Logging}
+import salat.util.encoding.TypeHintEncoding
+import salat.util.{ClassPrettyPrinter, Logging}
// TODO: oof. this is not OO design at its most graceful. refactor it!
diff --git a/salat-core/src/main/scala/com/novus/salat/bson/BSONObjectToMongoDbObject.scala b/salat-core/src/main/scala/salat/bson/BSONObjectToMongoDbObject.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/bson/BSONObjectToMongoDbObject.scala
rename to salat-core/src/main/scala/salat/bson/BSONObjectToMongoDbObject.scala
index c310e62e..43e7e448 100644
--- a/salat-core/src/main/scala/com/novus/salat/bson/BSONObjectToMongoDbObject.scala
+++ b/salat-core/src/main/scala/salat/bson/BSONObjectToMongoDbObject.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.bson
+package salat.bson
import com.mongodb.casbah.Imports._
import org.bson._
diff --git a/salat-core/src/main/scala/com/novus/salat/conversions/JodaDateTimeZoneHelpers.scala b/salat-core/src/main/scala/salat/conversions/JodaDateTimeZoneHelpers.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/conversions/JodaDateTimeZoneHelpers.scala
rename to salat-core/src/main/scala/salat/conversions/JodaDateTimeZoneHelpers.scala
index de4a2a75..fa0e8365 100644
--- a/salat-core/src/main/scala/com/novus/salat/conversions/JodaDateTimeZoneHelpers.scala
+++ b/salat-core/src/main/scala/salat/conversions/JodaDateTimeZoneHelpers.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.conversions
+package salat.conversions
import com.mongodb.casbah.commons.conversions.MongoConversionHelper
import com.mongodb.casbah.commons.conversions.scala.JodaDateTimeHelpers
diff --git a/salat-core/src/main/scala/com/novus/salat/dao/DAO.scala b/salat-core/src/main/scala/salat/dao/DAO.scala
similarity index 96%
rename from salat-core/src/main/scala/com/novus/salat/dao/DAO.scala
rename to salat-core/src/main/scala/salat/dao/DAO.scala
index f416d445..129fd672 100644
--- a/salat-core/src/main/scala/com/novus/salat/dao/DAO.scala
+++ b/salat-core/src/main/scala/salat/dao/DAO.scala
@@ -26,22 +26,24 @@
*
*/
-package com.novus.salat.dao
+package salat.dao
import com.mongodb.casbah.Imports._
import com.mongodb.{DBObject, WriteConcern}
-import com.novus.salat._
+import salat._
trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* In the absence of a specified write concern, supplies a default write concern.
+ *
* @return default write concern to use for insert, update, save and remove operations
*/
def defaultWriteConcern: WriteConcern
/**
* In the absence of a specific read preference, supplies a default read preference.
+ *
* @return default read preference to use for find and findOne
*/
def defaultReadPreference: ReadPreference
@@ -54,6 +56,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Inserts a document into the database.
+ *
* @param t instance of ObjectType
* @return if insert succeeds, ID of inserted object
*/
@@ -61,6 +64,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Inserts a document into the database.
+ *
* @param t instance of ObjectType
* @param wc write concern
* @return if insert succeeds, ID of inserted object
@@ -69,6 +73,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Inserts a group of documents into the database.
+ *
* @param docs variable length argument of ObjectType instances
* @return if write concern succeeds, a list of object IDs
* TODO: this implicit: dumbest design decision on the face of the planet?
@@ -87,6 +92,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Queries for a list of identifiers.
+ *
* @param query query
* @tparam A type view bound to DBObject
* @return list of IDs
@@ -95,6 +101,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Queries for an object in this collection.
+ *
* @param ref object for which to search
* @tparam A type view bound to DBObject
* @return a typed cursor to iterate over results
@@ -103,6 +110,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Queries for an object in this collection.
+ *
* @param ref object for which to search
* @param keys fields to return
* @tparam A type view bound to DBObject
@@ -113,6 +121,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Queries for an object in this collection.
+ *
* @param ref object for which to search
* @param keys fields to return
* @param rp read preference to use for this search
@@ -124,6 +133,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Returns a single object from this collection.
+ *
* @param t object for which to search
* @tparam A type view bound to DBObject
* @return (Option[ObjectType]) Some() of the object found, or None if no such object exists
@@ -132,6 +142,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Returns a single object from this collection.
+ *
* @param t object for which to search
* @param rp the read preference for this search
* @tparam A type view bound to DBObject
@@ -141,6 +152,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Find an object by its ID.
+ *
* @param id identifier
* @return (Option[ObjectType]) Some() of the object found, or None if no such object exists
*/
@@ -148,6 +160,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Find an object by its ID.
+ *
* @param id identifier
* @return (Option[ObjectType]) Some() of the object found, or None if no such object exists
*/
@@ -155,6 +168,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Saves an object to this collection.
+ *
* @param t object to save
* @param wc write concern
* @return (WriteResult) result of write operation
@@ -163,6 +177,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Saves an object to this collection.
+ *
* @param t object to save
* @return (WriteResult) result of write operation
*/
@@ -172,6 +187,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Performs an update operation.
+ *
* @param q search query for old object to update
* @param o object with which to update q
* @param upsert if the database should create the element if it does not exist
@@ -183,6 +199,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Performs an update operation.
+ *
* @param q search query for old object to update
* @param t object with which to update q
* @param upsert if the database should create the element if it does not exist
@@ -196,6 +213,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Performs a find and update operation.
+ *
* @param q search query to find and modify
* @param t object with which to modify q
* @return (Option[ObjectType]) Some() of the object found (before, or after, the update)
@@ -204,16 +222,17 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Finds the first document in the query (sorted) and updates it.
+ *
* @param q query to match
* @param sort sort to apply before picking first document
* @param t object with which to modify q
- *
* @return (Option[ObjectType]) Some() of the old document, or None if no such object exists
*/
def findAndModify[A <% DBObject, B <% DBObject](q: A, sort: B, t: ObjectType): Option[ObjectType]
/**
* Remove a matching object from the collection
+ *
* @param t object to remove from the collection
* @return (WriteResult) result of write operation
*/
@@ -223,6 +242,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Remove a matching object from the collection
+ *
* @param t object to remove from the collection
* @param wc write concern
* @return (WriteResult) result of write operation
@@ -231,6 +251,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Removes objects from the database collection.
+ *
* @param q the object that documents to be removed must match
* @return (WriteResult) result of write operation
*/
@@ -240,6 +261,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Removes objects from the database collection.
+ *
* @param q the object that documents to be removed must match
* @param wc write concern
* @return (WriteResult) result of write operation
@@ -248,6 +270,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Remove document identified by this ID.
+ *
* @param id the ID of the document to be removed
* @param wc write concern
* @return (WriteResult) result of write operation
@@ -256,6 +279,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Remove documents matching any of the supplied list of IDs.
+ *
* @param ids the list of IDs identifying the list of documents to be removed
* @param wc wrote concern
* @return (WriteResult) result of write operation
@@ -264,6 +288,7 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Count the number of documents matching the search criteria.
+ *
* @param q object for which to search
* @param fieldsThatMustExist list of field keys that must exist
* @param fieldsThatMustNotExist list of field keys that must not exist
@@ -274,10 +299,11 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Projection typed to a case class, trait or abstract superclass.
+ *
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (Option[P]) Some() of the object found, or None if no such object exists
*/
@@ -285,10 +311,11 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Projection typed to a type for which Casbah or mongo-java-driver handles conversion
+ *
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (Option[P]) Some() of the object found, or None if no such object exists
*/
@@ -296,10 +323,11 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Projection typed to a case class, trait or abstract superclass.
+ *
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (List[P]) of the objects found
*/
@@ -307,10 +335,11 @@ trait BaseDAOMethods[ObjectType <: AnyRef, ID <: Any] {
/**
* Projection typed to a type for which Casbah or mongo-java-driver handles conversion
+ *
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (List[P]) of the objects found
*/
@@ -337,7 +366,7 @@ trait DAO[ObjectType <: AnyRef, ID <: Any] extends BaseDAOMethods[ObjectType, ID
def collection: MongoCollection
/**
- * @return [[com.novus.salat.Grater]] to serialize and deserialize `ObjectType`
+ * @return [[salat.Grater]] to serialize and deserialize `ObjectType`
*/
def _grater: Grater[ObjectType]
diff --git a/salat-core/src/main/scala/com/novus/salat/dao/ModelCompanion.scala b/salat-core/src/main/scala/salat/dao/ModelCompanion.scala
similarity index 96%
rename from salat-core/src/main/scala/com/novus/salat/dao/ModelCompanion.scala
rename to salat-core/src/main/scala/salat/dao/ModelCompanion.scala
index 0591ea89..0abd2cc4 100644
--- a/salat-core/src/main/scala/com/novus/salat/dao/ModelCompanion.scala
+++ b/salat-core/src/main/scala/salat/dao/ModelCompanion.scala
@@ -26,11 +26,11 @@
*
*/
-package com.novus.salat.dao
+package salat.dao
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.util.Logging
+import salat._
+import salat.util.Logging
import org.json4s.JsonAST.{JArray, JObject}
/**
@@ -39,9 +39,9 @@ import org.json4s.JsonAST.{JArray, JObject}
* {{{
* package model
*
- * import com.novus.salat.annotations._
+ * import salat.annotations._
* import com.mongodb.casbah.Imports._
- * import com.novus.salat.dao.{ SalatDAO, ModelCompanion }
+ * import salat.dao.{ SalatDAO, ModelCompanion }
*
* object MyModel extends ModelCompanion[MyModel, ObjectId] {
* val collection = MongoConnection()("my_db")("my_model_coll")
@@ -233,7 +233,7 @@ trait ModelCompanion[ObjectType <: AnyRef, ID <: Any] extends BaseDAOMethods[Obj
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (Option[P]) Some() of the object found, or None if no such object exists
*/
@@ -244,7 +244,7 @@ trait ModelCompanion[ObjectType <: AnyRef, ID <: Any] extends BaseDAOMethods[Obj
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (List[P]) of the objects found
*/
@@ -255,7 +255,7 @@ trait ModelCompanion[ObjectType <: AnyRef, ID <: Any] extends BaseDAOMethods[Obj
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (Option[P]) Some() of the object found, or None if no such object exists
*/
@@ -266,7 +266,7 @@ trait ModelCompanion[ObjectType <: AnyRef, ID <: Any] extends BaseDAOMethods[Obj
* @param query object for which to search
* @param field field to project on
* @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (List[P]) of the objects found
*/
diff --git a/salat-core/src/main/scala/com/novus/salat/dao/SalatDAO.scala b/salat-core/src/main/scala/salat/dao/SalatDAO.scala
similarity index 93%
rename from salat-core/src/main/scala/com/novus/salat/dao/SalatDAO.scala
rename to salat-core/src/main/scala/salat/dao/SalatDAO.scala
index 1a252bfc..f13bd7fb 100644
--- a/salat-core/src/main/scala/com/novus/salat/dao/SalatDAO.scala
+++ b/salat-core/src/main/scala/salat/dao/SalatDAO.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.dao
+package salat.dao
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.MongoCursorBase
import com.mongodb.casbah.commons.{Logging, MongoDBObject}
import com.mongodb.{DBObject, WriteConcern}
-import com.novus.salat._
+import salat._
/**
* Sample DAO implementation.
@@ -39,18 +39,18 @@ import com.novus.salat._
* @param collection MongoDB collection
* @param mot implicit manifest for ObjectType
* @param mid implicit manifest for ID
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam ObjectType class to be persisted
* @tparam ID _id type
*/
abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCollection)(implicit
mot: Manifest[ObjectType],
mid: Manifest[ID], ctx: Context)
- extends com.novus.salat.dao.DAO[ObjectType, ID] with Logging {
+ extends salat.dao.DAO[ObjectType, ID] with Logging {
dao =>
- /** Supplies the [[com.novus.salat.Grater]] from the implicit [[com.novus.salat.Context]] and `ObjectType` manifest */
+ /** Supplies the [[salat.Grater]] from the implicit [[salat.Context]] and `ObjectType` manifest */
val _grater = grater[ObjectType](ctx, mot)
/**
@@ -127,7 +127,7 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
* @param parentIdField parent id field key
* @param mct implicit manifest for `ChildType`
* @param mcid implicit manifest for `ChildID`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param ctx implicit [[salat.Context]]
* @tparam ChildType type of child object
* @tparam ChildID type of child _id field
*/
@@ -256,6 +256,7 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Remove documents matching parent id
+ *
* @param parentId parent id
* @param wc write concern
*/
@@ -265,6 +266,7 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Remove documents matching parent ids
+ *
* @param parentIds parent ids
* @param wc write concern
*/
@@ -274,11 +276,12 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Projection typed to a case class, trait or abstract superclass.
+ *
* @param parentId parent id
- * @param field field to project on
- * @param query (optional) object for which to search
- * @param mr implicit manifest typed to `R`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param field field to project on
+ * @param query (optional) object for which to search
+ * @param mr implicit manifest typed to `R`
+ * @param ctx implicit [[salat.Context]]
* @tparam R type of projected field
* @return (List[R]) of the objects found
*/
@@ -288,11 +291,12 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Projection typed to a case class, trait or abstract superclass.
+ *
* @param parentIds parent ids
- * @param field field to project on
- * @param query (optional) object for which to search
- * @param mr implicit manifest typed to `R`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param field field to project on
+ * @param query (optional) object for which to search
+ * @param mr implicit manifest typed to `R`
+ * @param ctx implicit [[salat.Context]]
* @tparam R type of projected field
* @return (List[R]) of the objects found
*/
@@ -302,11 +306,12 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Projection typed to a type for which Casbah or mongo-java-driver handles conversion
+ *
* @param parentId parent id
- * @param field field to project on
- * @param query (optional) object for which to search
- * @param mr implicit manifest typed to `R`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param field field to project on
+ * @param query (optional) object for which to search
+ * @param mr implicit manifest typed to `R`
+ * @param ctx implicit [[salat.Context]]
* @tparam R type of projected field
* @return (List[R]) of the objects found
*/
@@ -316,11 +321,12 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Projection typed to a type for which Casbah or mongo-java-driver handles conversion
+ *
* @param parentIds parent ids
- * @param field field to project on
- * @param query (optional) object for which to search
- * @param mr implicit manifest typed to `R`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param field field to project on
+ * @param query (optional) object for which to search
+ * @param mr implicit manifest typed to `R`
+ * @param ctx implicit [[salat.Context]]
* @tparam R type of projected field
* @return (List[R]) of the objects found
*/
@@ -528,6 +534,7 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Performs a find and update operation.
+ *
* @param q search query to find and modify
* @param t object with which to modify q
* @return (Option[ObjectType]) Some() of the object found (before, or after, the update)
@@ -537,10 +544,10 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
/**
* Finds the first document in the query (sorted) and updates it.
+ *
* @param q query to match
* @param sort sort to apply before picking first document
* @param t object with which to modify q
- *
* @return (Option[ObjectType]) Some() of the old document, or None if no such object exists
*/
def findAndModify[A <% DBObject, B <% DBObject](q: A, sort: B, t: ObjectType): Option[ObjectType] =
@@ -560,10 +567,10 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
)
/**
- * @param query object for which to search
+ * @param query object for which to search
* @param field field to project on
- * @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param m implicit manifest typed to `P`
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (Option[P]) Some() of the object found, or None if no such object exists
*/
@@ -575,10 +582,10 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
}
/**
- * @param query object for which to search
+ * @param query object for which to search
* @param field field to project on
- * @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param m implicit manifest typed to `P`
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (Option[P]) Some() of the object found, or None if no such object exists
*/
@@ -590,10 +597,10 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
}
/**
- * @param query object for which to search
+ * @param query object for which to search
* @param field field to project on
- * @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param m implicit manifest typed to `P`
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (List[P]) of the objects found
*/
@@ -604,10 +611,10 @@ abstract class SalatDAO[ObjectType <: AnyRef, ID <: Any](val collection: MongoCo
}
/**
- * @param query object for which to search
+ * @param query object for which to search
* @param field field to project on
- * @param m implicit manifest typed to `P`
- * @param ctx implicit [[com.novus.salat.Context]]
+ * @param m implicit manifest typed to `P`
+ * @param ctx implicit [[salat.Context]]
* @tparam P type of projected field
* @return (List[P]) of the objects found
*/
diff --git a/salat-core/src/main/scala/com/novus/salat/dao/SalatDAOErrors.scala b/salat-core/src/main/scala/salat/dao/SalatDAOErrors.scala
similarity index 99%
rename from salat-core/src/main/scala/com/novus/salat/dao/SalatDAOErrors.scala
rename to salat-core/src/main/scala/salat/dao/SalatDAOErrors.scala
index 52c68b24..8c819f55 100644
--- a/salat-core/src/main/scala/com/novus/salat/dao/SalatDAOErrors.scala
+++ b/salat-core/src/main/scala/salat/dao/SalatDAOErrors.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.dao
+package salat.dao
import com.mongodb.casbah.TypeImports._
import com.mongodb.{DBObject, WriteConcern}
diff --git a/salat-core/src/main/scala/com/novus/salat/dao/SalatMongoCursor.scala b/salat-core/src/main/scala/salat/dao/SalatMongoCursor.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/dao/SalatMongoCursor.scala
rename to salat-core/src/main/scala/salat/dao/SalatMongoCursor.scala
index e460aa4a..8b6b23b2 100644
--- a/salat-core/src/main/scala/com/novus/salat/dao/SalatMongoCursor.scala
+++ b/salat-core/src/main/scala/salat/dao/SalatMongoCursor.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.dao
+package salat.dao
import com.mongodb.DBCursor
import com.mongodb.casbah.CursorExplanation
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.util.Logging
+import salat._
+import salat.util.Logging
/**
* Unfortunately, MongoCursorBase is typed to DBObject, but....
diff --git a/salat-core/src/main/scala/com/novus/salat/dao/ValidatingDAO.scala b/salat-core/src/main/scala/salat/dao/ValidatingDAO.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/dao/ValidatingDAO.scala
rename to salat-core/src/main/scala/salat/dao/ValidatingDAO.scala
index 0e222fdd..ec2aa9e0 100644
--- a/salat-core/src/main/scala/com/novus/salat/dao/ValidatingDAO.scala
+++ b/salat-core/src/main/scala/salat/dao/ValidatingDAO.scala
@@ -26,11 +26,11 @@
*
*/
-package com.novus.salat.dao
+package salat.dao
import com.mongodb
import com.mongodb.casbah.Imports._
-import com.novus.salat.Context
+import salat.Context
case class ValidationError[T](t: T, iter: Iterable[Throwable]) extends Error(
"""
@@ -99,6 +99,7 @@ abstract class ValidatingSalatDAO[ObjectType <: AnyRef, ID <: Any](override val
/**
* Performs an update operation.
+ *
* @param q search query for old object to update
* @param t object with which to update q
* @param upsert if the database should create the element if it does not exist
diff --git a/salat-core/src/main/scala/com/novus/salat/global.scala b/salat-core/src/main/scala/salat/global.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/global.scala
rename to salat-core/src/main/scala/salat/global.scala
index 8af3ec9c..7226748b 100644
--- a/salat-core/src/main/scala/com/novus/salat/global.scala
+++ b/salat-core/src/main/scala/salat/global.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
package object global {
diff --git a/salat-core/src/main/scala/com/novus/salat/impls/ImplClasses.scala b/salat-core/src/main/scala/salat/impls/ImplClasses.scala
similarity index 99%
rename from salat-core/src/main/scala/com/novus/salat/impls/ImplClasses.scala
rename to salat-core/src/main/scala/salat/impls/ImplClasses.scala
index 7f4102d6..a93e86ae 100644
--- a/salat-core/src/main/scala/com/novus/salat/impls/ImplClasses.scala
+++ b/salat-core/src/main/scala/salat/impls/ImplClasses.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
import scala.collection.immutable.{IndexedSeq => IIndexedSeq, List => IList, Map => IMap, Seq => ISeq, Set => ISet}
import scala.collection.mutable.{ArrayBuffer, Buffer, DoubleLinkedList, IndexedSeq => MIndexedSeq, LinkedList, Map => MMap, Seq => MSeq, Set => MSet}
diff --git a/salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala b/salat-core/src/main/scala/salat/json/JSONConfig.scala
similarity index 99%
rename from salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala
rename to salat-core/src/main/scala/salat/json/JSONConfig.scala
index 2078b5d9..35f8d02c 100644
--- a/salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala
+++ b/salat-core/src/main/scala/salat/json/JSONConfig.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.json
+package salat.json
import java.util.{Date, TimeZone}
diff --git a/salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala b/salat-core/src/main/scala/salat/json/ToJValue.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala
rename to salat-core/src/main/scala/salat/json/ToJValue.scala
index 7c2c9c0b..72d739a4 100644
--- a/salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala
+++ b/salat-core/src/main/scala/salat/json/ToJValue.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat.json
+package salat.json
import java.net.URL
import com.mongodb.casbah.Imports._
-import com.novus.salat.util.Logging
-import com.novus.salat.{Field => SField, StringTypeHintStrategy, TypeFinder, _}
+import salat.util.Logging
+import salat.{Field => SField, StringTypeHintStrategy, TypeFinder, _}
import org.bson.types.BSONTimestamp
import org.joda.time.{DateTime, DateTimeZone}
import org.json4s._
diff --git a/salat-core/src/main/scala/com/novus/salat/package.scala b/salat-core/src/main/scala/salat/package.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/package.scala
rename to salat-core/src/main/scala/salat/package.scala
index 45d33dd6..6b391c5e 100644
--- a/salat-core/src/main/scala/com/novus/salat/package.scala
+++ b/salat-core/src/main/scala/salat/package.scala
@@ -25,11 +25,11 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
import java.math.{MathContext, RoundingMode}
-import com.novus.salat.util._
+import salat.util._
object `package` extends Logging {
diff --git a/salat-core/src/main/scala/com/novus/salat/transformers/CustomTransformer.scala b/salat-core/src/main/scala/salat/transformers/CustomTransformer.scala
similarity index 96%
rename from salat-core/src/main/scala/com/novus/salat/transformers/CustomTransformer.scala
rename to salat-core/src/main/scala/salat/transformers/CustomTransformer.scala
index 0356124b..7be4d54b 100644
--- a/salat-core/src/main/scala/com/novus/salat/transformers/CustomTransformer.scala
+++ b/salat-core/src/main/scala/salat/transformers/CustomTransformer.scala
@@ -26,9 +26,9 @@
*
*/
-package com.novus.salat.transformers
+package salat.transformers
-import com.novus.salat.util.Logging
+import salat.util.Logging
abstract class CustomTransformer[ModelObject <: AnyRef: Manifest, SerializedRepr <: AnyRef: Manifest]() extends Logging {
diff --git a/salat-core/src/main/scala/com/novus/salat/transformers/Transformer.scala b/salat-core/src/main/scala/salat/transformers/Transformer.scala
similarity index 95%
rename from salat-core/src/main/scala/com/novus/salat/transformers/Transformer.scala
rename to salat-core/src/main/scala/salat/transformers/Transformer.scala
index 4b7126a2..cad4b767 100644
--- a/salat-core/src/main/scala/com/novus/salat/transformers/Transformer.scala
+++ b/salat-core/src/main/scala/salat/transformers/Transformer.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.transformers
+package salat.transformers
-import com.novus.salat._
-import com.novus.salat.transformers.in.{MapInjector, OptionInjector, TraversableInjector}
-import com.novus.salat.transformers.out.{MapExtractor, OptionExtractor, TraversableExtractor}
-import com.novus.salat.util.Logging
+import salat._
+import salat.transformers.in.{MapInjector, OptionInjector, TraversableInjector}
+import salat.transformers.out.{MapExtractor, OptionExtractor, TraversableExtractor}
+import salat.util.Logging
import scala.tools.scalap.scalax.rules.scalasig.TypeRefType
diff --git a/salat-core/src/main/scala/com/novus/salat/transformers/extract/Extractors.scala b/salat-core/src/main/scala/salat/transformers/extract/Extractors.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/transformers/extract/Extractors.scala
rename to salat-core/src/main/scala/salat/transformers/extract/Extractors.scala
index 8d813cd9..f164d6b8 100644
--- a/salat-core/src/main/scala/com/novus/salat/transformers/extract/Extractors.scala
+++ b/salat-core/src/main/scala/salat/transformers/extract/Extractors.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.transformers
+package salat.transformers
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.annotations.util._
-import com.novus.salat.util.Logging
+import salat._
+import salat.annotations.util._
+import salat.util.Logging
import scala.tools.scalap.scalax.rules.scalasig._
@@ -356,7 +356,7 @@ package out {
self: Transformer =>
val strategy = {
- val s = getClassNamed_!(path).annotation[com.novus.salat.annotations.raw.EnumAs].
+ val s = getClassNamed_!(path).annotation[salat.annotations.raw.EnumAs].
map(_.strategy())
if (s.isDefined) s.get else ctx.defaultEnumStrategy
}
diff --git a/salat-core/src/main/scala/com/novus/salat/transformers/inject/Injectors.scala b/salat-core/src/main/scala/salat/transformers/inject/Injectors.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/transformers/inject/Injectors.scala
rename to salat-core/src/main/scala/salat/transformers/inject/Injectors.scala
index 00adb46c..346bf286 100644
--- a/salat-core/src/main/scala/com/novus/salat/transformers/inject/Injectors.scala
+++ b/salat-core/src/main/scala/salat/transformers/inject/Injectors.scala
@@ -25,15 +25,15 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.transformers
+package salat.transformers
import java.lang.reflect.Method
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.annotations.util._
-import com.novus.salat.impls._
-import com.novus.salat.util._
+import salat._
+import salat.annotations.util._
+import salat.impls._
+import salat.util._
import scala.tools.scalap.scalax.rules.scalasig._
@@ -578,7 +578,7 @@ package in {
override def transform(value: Any)(implicit ctx: Context): Any = {
val strategy = {
- val s = getClassNamed_!(path).annotation[com.novus.salat.annotations.raw.EnumAs].map(_.strategy())
+ val s = getClassNamed_!(path).annotation[salat.annotations.raw.EnumAs].map(_.strategy())
if (s.isDefined) s.get else ctx.defaultEnumStrategy
}
diff --git a/salat-core/src/main/scala/com/novus/salat/util/MapPrettyPrinter.scala b/salat-core/src/main/scala/salat/util/MapPrettyPrinter.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/util/MapPrettyPrinter.scala
rename to salat-core/src/main/scala/salat/util/MapPrettyPrinter.scala
index b9011030..9ad2f264 100644
--- a/salat-core/src/main/scala/com/novus/salat/util/MapPrettyPrinter.scala
+++ b/salat-core/src/main/scala/salat/util/MapPrettyPrinter.scala
@@ -25,10 +25,10 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
import com.mongodb.casbah.commons.Imports._
-import com.novus.salat._
+import salat._
/**
* Hello, is this thing on? If you are having trouble using Salat to serialize your thingy, dump it in here
diff --git a/salat-core/src/main/scala/com/novus/salat/util/MissingGraterExplanation.scala b/salat-core/src/main/scala/salat/util/MissingGraterExplanation.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/util/MissingGraterExplanation.scala
rename to salat-core/src/main/scala/salat/util/MissingGraterExplanation.scala
index b88d192c..ca71f71e 100644
--- a/salat-core/src/main/scala/com/novus/salat/util/MissingGraterExplanation.scala
+++ b/salat-core/src/main/scala/salat/util/MissingGraterExplanation.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
import java.lang.reflect.Modifier
import com.mongodb.casbah.commons.Imports._
-import com.novus.salat._
+import salat._
object MissingGraterExplanation extends Logging {
diff --git a/salat-core/src/main/scala/com/novus/salat/util/PrettyPrinters.scala b/salat-core/src/main/scala/salat/util/PrettyPrinters.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/util/PrettyPrinters.scala
rename to salat-core/src/main/scala/salat/util/PrettyPrinters.scala
index fd6cb74f..3e58181b 100644
--- a/salat-core/src/main/scala/com/novus/salat/util/PrettyPrinters.scala
+++ b/salat-core/src/main/scala/salat/util/PrettyPrinters.scala
@@ -25,11 +25,11 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
import java.lang.reflect.{ParameterizedType, Type}
-import com.novus.salat.{ConcreteGrater, DefaultArg, Field => SField}
+import salat.{ConcreteGrater, DefaultArg, Field => SField}
import scala.reflect.Manifest
import scala.tools.scalap.scalax.rules.scalasig.TypeRefType
diff --git a/salat-core/src/main/scala/com/novus/salat/util/ToObjectGlitch.scala b/salat-core/src/main/scala/salat/util/ToObjectGlitch.scala
similarity index 98%
rename from salat-core/src/main/scala/com/novus/salat/util/ToObjectGlitch.scala
rename to salat-core/src/main/scala/salat/util/ToObjectGlitch.scala
index cd58991d..0dfd4401 100644
--- a/salat-core/src/main/scala/com/novus/salat/util/ToObjectGlitch.scala
+++ b/salat-core/src/main/scala/salat/util/ToObjectGlitch.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
import java.lang.reflect.Constructor
import com.mongodb.casbah.commons.TypeImports._
-import com.novus.salat._
+import salat._
import scala.tools.scalap.scalax.rules.scalasig.SymbolInfoSymbol
diff --git a/salat-core/src/test/java/com/novus/salat/custom/Bicycle.java b/salat-core/src/test/java/salat/custom/Bicycle.java
similarity index 98%
rename from salat-core/src/test/java/com/novus/salat/custom/Bicycle.java
rename to salat-core/src/test/java/salat/custom/Bicycle.java
index 9b65d4f5..c46852f6 100644
--- a/salat-core/src/test/java/com/novus/salat/custom/Bicycle.java
+++ b/salat-core/src/test/java/salat/custom/Bicycle.java
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.custom;
+package salat.custom;
/**
* I had forgot about how to do all of this, but fortunately the IDE auto-generates nearly everything.
diff --git a/salat-core/src/test/resources/logback-test.xml b/salat-core/src/test/resources/logback-test.xml
index c92679ca..48dfa8e0 100644
--- a/salat-core/src/test/resources/logback-test.xml
+++ b/salat-core/src/test/resources/logback-test.xml
@@ -35,7 +35,6 @@
-
diff --git a/salat-core/src/test/scala/com/novus/salat/test/util/MissingGraterExplanationSpec.scala b/salat-core/src/test/scala/com/novus/salat/test/util/MissingGraterExplanationSpec.scala
deleted file mode 100644
index 2d61ccec..00000000
--- a/salat-core/src/test/scala/com/novus/salat/test/util/MissingGraterExplanationSpec.scala
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2010 - 2015 Novus Partners, Inc. (http://www.novus.com)
- * Copyright (c) 2015 - 2016 Rose Toomey (https://github.com/rktoomey) and other individual contributors where noted
- *
- * Module: salat-core
- * Class: MissingGraterExplanationSpec.scala
- * Last modified: 2016-07-10 23:42:23 EDT
- *
- * 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.
- *
- * Project: http://github.com/salat/salat
- * Wiki: http://github.com/salat/salat/wiki
- * Slack: https://scala-salat.slack.com
- * Mailing list: http://groups.google.com/group/scala-salat
- * StackOverflow: http://stackoverflow.com/questions/tagged/salat
- *
- */
-//package com.novus.salat.test.util
-//
-//import com.novus.salat._
-//import com.novus.salat.test.global._
-//import com.novus.salat.test.model._
-//import com.mongodb.casbah.Imports._
-//import com.novus.salat.test._
-//import com.mongodb.util.JSON
-//import com.novus.salat.util.{GraterGlitch, GraterFromDboGlitch}
-//
-//class MissingGraterExplanationSpec extends SalatSpec {
-// "Missing grater explanation" should {
-// "handle type hint glitches in DBOs" in {
-// "explain when a type hint refers to a class that can't be found" in {
-// // type hint "com.novus.salat.test.model.DoesNotExist" refers to non-existent class
-// val badCandy = """{ "_typeHint" : "com.novus.salat.test.model.ManyMauds" ,
-// "mauds" : [ { "_typeHint" : "com.novus.salat.test.model.DoesNotExist" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
-// { "_typeHint" : "com.novus.salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "com.novus.salat.test.model.Ida" , "lake" : 8.0}}]}"""
-// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterGlitch]
-// }
-//// "explain when a type hint refers to a trait" in {
-//// // type hint "com.novus.salat.test.model.MaudLike" refers to trait
-//// val badCandy = """{ "_typeHint" : "com.novus.salat.test.model.ManyMauds" ,
-//// "mauds" : [ { "_typeHint" : "com.novus.salat.test.model.MaudLike" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
-//// { "_typeHint" : "com.novus.salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "com.novus.salat.test.model.Ida" , "lake" : 8.0}}]}"""
-//// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterFromDboGlitch]
-//// }
-//// "explain when a type hint refers to an abstract class" in {
-//// // type hint "com.novus.salat.test.model.Vertebrate" refers to abstract class
-//// val badCandy = """{ "_typeHint" : "com.novus.salat.test.model.ManyMauds" ,
-//// "mauds" : [ { "_typeHint" : "com.novus.salat.test.model.Vertebrate" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
-//// { "_typeHint" : "com.novus.salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "com.novus.salat.test.model.Ida" , "lake" : 8.0}}]}"""
-//// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterFromDboGlitch]
-//// }
-// "explain when a type hint refers to a class that is not a case class" in {
-// // type hint "com.novus.salat.test.model.NotACaseClass" refers to something that is... not a case class!
-// val badCandy = """{ "_typeHint" : "com.novus.salat.test.model.NotACaseClass" ,
-// "mauds" : [ { "_typeHint" : "com.novus.salat.test.model.Vertebrate" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
-// { "_typeHint" : "com.novus.salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "com.novus.salat.test.model.Ida" , "lake" : 8.0}}]}"""
-// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterFromDboGlitch]
-// }
-// }
-// }
-//}
\ No newline at end of file
diff --git a/salat-core/src/test/scala/com/novus/salat/test/BasicCaseObjectSpec.scala b/salat-core/src/test/scala/salat/test/BasicCaseObjectSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/BasicCaseObjectSpec.scala
rename to salat-core/src/test/scala/salat/test/BasicCaseObjectSpec.scala
index 40908a49..72d685db 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/BasicCaseObjectSpec.scala
+++ b/salat-core/src/test/scala/salat/test/BasicCaseObjectSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class BasicCaseObjectSpec extends SalatSpec {
"a grater" should {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/BigDecimalPrecisionTest.scala b/salat-core/src/test/scala/salat/test/BigDecimalPrecisionTest.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/BigDecimalPrecisionTest.scala
rename to salat-core/src/test/scala/salat/test/BigDecimalPrecisionTest.scala
index 90fcd0cc..b6e7937a 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/BigDecimalPrecisionTest.scala
+++ b/salat-core/src/test/scala/salat/test/BigDecimalPrecisionTest.scala
@@ -25,14 +25,14 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import java.math.{MathContext, RoundingMode}
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
import scala.math.{BigDecimal => ScalaBigDecimal}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/BigIntSpec.scala b/salat-core/src/test/scala/salat/test/BigIntSpec.scala
similarity index 91%
rename from salat-core/src/test/scala/com/novus/salat/test/BigIntSpec.scala
rename to salat-core/src/test/scala/salat/test/BigIntSpec.scala
index a6aa74c9..6b4934ad 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/BigIntSpec.scala
+++ b/salat-core/src/test/scala/salat/test/BigIntSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class BigIntSpec extends SalatSpec {
"A grater" should {
@@ -40,7 +40,7 @@ class BigIntSpec extends SalatSpec {
val l = Leo(swallowed = Some(swallowed), tacks = tacks)
val dbo: MongoDBObject = grater[Leo].asDBObject(l)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Leo")
+ dbo must havePair("_typeHint" -> "salat.test.model.Leo")
checkByteArrays(
actual = dbo.expand[Array[Byte]]("swallowed").getOrElse(Array.empty[Byte]),
swallowed.toByteArray
diff --git a/salat-core/src/test/scala/com/novus/salat/test/BinarySpec.scala b/salat-core/src/test/scala/salat/test/BinarySpec.scala
similarity index 94%
rename from salat-core/src/test/scala/com/novus/salat/test/BinarySpec.scala
rename to salat-core/src/test/scala/salat/test/BinarySpec.scala
index 9d7f37af..d028d77d 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/BinarySpec.scala
+++ b/salat-core/src/test/scala/salat/test/BinarySpec.scala
@@ -21,14 +21,14 @@
* Mailing list: http://groups.google.com/group/scala-salat
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.MongoDBObject
-import com.novus.salat._
-import com.novus.salat.dao.SalatDAO
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.dao.SalatDAO
+import salat.test.global._
+import salat.test.model._
import org.junit.runner.RunWith
import org.specs2.runner.JUnitRunner
diff --git a/salat-core/src/test/scala/com/novus/salat/test/CaseObjectSpec.scala b/salat-core/src/test/scala/salat/test/CaseObjectSpec.scala
similarity index 87%
rename from salat-core/src/test/scala/com/novus/salat/test/CaseObjectSpec.scala
rename to salat-core/src/test/scala/salat/test/CaseObjectSpec.scala
index d66a1163..d53e022c 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/CaseObjectSpec.scala
+++ b/salat-core/src/test/scala/salat/test/CaseObjectSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.model.case_object_override._
-import com.novus.salat.test.model.coo._
+import salat._
+import salat.test.model.case_object_override._
+import salat.test.model.coo._
class CaseObjectSpec extends SalatSpec {
"The context" should {
@@ -46,12 +46,12 @@ class CaseObjectSpec extends SalatSpec {
val quxDbo: MongoDBObject = grater[Thingy].asDBObject(qux)
barDbo must havePair("foo" -> "B")
bazDbo must havePair("foo" -> "Z")
- quxDbo must havePair("foo" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.coo.Qux$"))
+ quxDbo must havePair("foo" -> MongoDBObject("_typeHint" -> "salat.test.model.coo.Qux$"))
grater[Thingy].asObject(barDbo) must_== bar
grater[Thingy].asObject(bazDbo) must_== baz
grater[Thingy].asObject(quxDbo) must_== qux
// for backwards compatibility
- grater[Thingy].asObject(MongoDBObject("foo" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.coo.Bar$"))) must_== bar
+ grater[Thingy].asObject(MongoDBObject("foo" -> MongoDBObject("_typeHint" -> "salat.test.model.coo.Bar$"))) must_== bar
}
"for Option containing case object" in {
val bar = Thingy2(Option(Bar))
@@ -62,17 +62,17 @@ class CaseObjectSpec extends SalatSpec {
val quxDbo: MongoDBObject = grater[Thingy2].asDBObject(qux)
barDbo must havePair("foo" -> "B")
bazDbo must havePair("foo" -> "Z")
- quxDbo must havePair("foo" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.coo.Qux$"))
+ quxDbo must havePair("foo" -> MongoDBObject("_typeHint" -> "salat.test.model.coo.Qux$"))
grater[Thingy2].asObject(barDbo) must_== bar
grater[Thingy2].asObject(bazDbo) must_== baz
grater[Thingy2].asObject(quxDbo) must_== qux
// for backwards compatibility
- grater[Thingy2].asObject(MongoDBObject("foo" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.coo.Bar$"))) must_== bar
+ grater[Thingy2].asObject(MongoDBObject("foo" -> MongoDBObject("_typeHint" -> "salat.test.model.coo.Bar$"))) must_== bar
}
"for collection containing case objects" in {
val t = Thingy3(Bar :: Baz :: Qux :: Nil)
val dbo: MongoDBObject = grater[Thingy3].asDBObject(t)
- dbo must havePair("foo" -> MongoDBList("B", "Z", MongoDBObject("_typeHint" -> "com.novus.salat.test.model.coo.Qux$")))
+ dbo must havePair("foo" -> MongoDBList("B", "Z", MongoDBObject("_typeHint" -> "salat.test.model.coo.Qux$")))
}
}
}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/CaseObjectSupport.scala b/salat-core/src/test/scala/salat/test/CaseObjectSupport.scala
similarity index 92%
rename from salat-core/src/test/scala/com/novus/salat/test/CaseObjectSupport.scala
rename to salat-core/src/test/scala/salat/test/CaseObjectSupport.scala
index ebdbe896..cfdd9f25 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/CaseObjectSupport.scala
+++ b/salat-core/src/test/scala/salat/test/CaseObjectSupport.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.always._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.always._
+import salat.test.model._
class CaseObjectSupport extends SalatSpec {
"a grater" should {
@@ -66,7 +66,7 @@ class CaseObjectSupport extends SalatSpec {
"handle case objects whose top-level trait is not annotated with @Salat" in {
val u = SlippedDownADrain
val dbo: MongoDBObject = grater[Una].asDBObject(u)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.SlippedDownADrain$")
+ dbo must havePair("_typeHint" -> "salat.test.model.SlippedDownADrain$")
val u_* = grater[Una].asObject(dbo)
u must_== u
}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/CharacterSpec.scala b/salat-core/src/test/scala/salat/test/CharacterSpec.scala
similarity index 89%
rename from salat-core/src/test/scala/com/novus/salat/test/CharacterSpec.scala
rename to salat-core/src/test/scala/salat/test/CharacterSpec.scala
index 56d3f497..8ef0cc91 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/CharacterSpec.scala
+++ b/salat-core/src/test/scala/salat/test/CharacterSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class CharacterSpec extends SalatSpec {
@@ -39,7 +39,7 @@ class CharacterSpec extends SalatSpec {
val k = Kate(axe = 'A', struckWith = 'S')
val dbo: MongoDBObject = grater[Kate].asDBObject(k)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Kate")
+ dbo must havePair("_typeHint" -> "salat.test.model.Kate")
dbo must havePair("axe" -> "A")
dbo must havePair("struckWith" -> "S")
diff --git a/salat-core/src/test/scala/com/novus/salat/test/CollectionSupportSpec.scala b/salat-core/src/test/scala/salat/test/CollectionSupportSpec.scala
similarity index 77%
rename from salat-core/src/test/scala/com/novus/salat/test/CollectionSupportSpec.scala
rename to salat-core/src/test/scala/salat/test/CollectionSupportSpec.scala
index d7cf0345..01d62d7f 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/CollectionSupportSpec.scala
+++ b/salat-core/src/test/scala/salat/test/CollectionSupportSpec.scala
@@ -25,14 +25,14 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.MongoDBObject
-import com.novus.salat._
-import com.novus.salat.dao.SalatDAO
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.dao.SalatDAO
+import salat.test.global._
+import salat.test.model._
class CollectionSupportSpec extends SalatSpec {
@@ -46,8 +46,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Omphalos].asDBObject(omphalos)
dbo must havePair("coll" -> {
val builder = MongoDBObject.newBuilder
- builder += "a" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += "b" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += "a" -> MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += "b" -> MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -63,8 +63,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Able].asDBObject(able)
dbo must havePair("coll" -> {
val builder = MongoDBObject.newBuilder
- builder += "a" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += "b" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += "a" -> MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += "b" -> MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -80,8 +80,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Baker].asDBObject(baker)
dbo must havePair("coll" -> {
val builder = MongoDBObject.newBuilder
- builder += "a" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += "b" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += "a" -> MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += "b" -> MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -100,8 +100,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Charlie].asDBObject(charlie)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -117,8 +117,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Dog].asDBObject(dog)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -134,8 +134,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Easy].asDBObject(easy)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -152,8 +152,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Fox].asDBObject(fox)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -171,8 +171,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Gee].asDBObject(gee)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -188,8 +188,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[How].asDBObject(how)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -205,8 +205,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Item].asDBObject(item)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -225,8 +225,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Jig].asDBObject(jig)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -242,8 +242,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[King].asDBObject(king)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -260,8 +260,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Mike].asDBObject(mike)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -279,8 +279,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Nab].asDBObject(nab)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -296,8 +296,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Oboe].asDBObject(oboe)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -313,8 +313,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Prep].asDBObject(prep)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -332,8 +332,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Queen].asDBObject(queen)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
@@ -348,8 +348,8 @@ class CollectionSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[Roger].asDBObject(roger)
dbo must havePair("coll" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "A")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Thingy", "t" -> "B")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "A")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Thingy", "t" -> "B")
builder.result()
})
diff --git a/salat-core/src/test/scala/com/novus/salat/test/ContextLifecycleSpec.scala b/salat-core/src/test/scala/salat/test/ContextLifecycleSpec.scala
similarity index 95%
rename from salat-core/src/test/scala/com/novus/salat/test/ContextLifecycleSpec.scala
rename to salat-core/src/test/scala/salat/test/ContextLifecycleSpec.scala
index 33ae30dc..95d4ee3c 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/ContextLifecycleSpec.scala
+++ b/salat-core/src/test/scala/salat/test/ContextLifecycleSpec.scala
@@ -25,10 +25,10 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
-import com.novus.salat._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.model._
class ContextLifecycleSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/ContextSpec.scala b/salat-core/src/test/scala/salat/test/ContextSpec.scala
similarity index 95%
rename from salat-core/src/test/scala/com/novus/salat/test/ContextSpec.scala
rename to salat-core/src/test/scala/salat/test/ContextSpec.scala
index 813086e9..f8bd4d73 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/ContextSpec.scala
+++ b/salat-core/src/test/scala/salat/test/ContextSpec.scala
@@ -25,20 +25,20 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.model._
class ContextSpec extends SalatSpec {
val caseClazz = classOf[James]
- val caseObjectClazz = Class.forName("com.novus.salat.test.model.Zoot$")
- val annotatedAbstractClazz = Class.forName("com.novus.salat.test.model.AbstractMaud")
- val abstractClazz = Class.forName("com.novus.salat.test.model.UnannotatedAbstractMaud")
- val annotatedTraitClazz = Class.forName("com.novus.salat.test.model.AnnotatedMaud")
- val traitClazz = Class.forName("com.novus.salat.test.model.UnannotatedMaud")
+ val caseObjectClazz = Class.forName("salat.test.model.Zoot$")
+ val annotatedAbstractClazz = Class.forName("salat.test.model.AbstractMaud")
+ val abstractClazz = Class.forName("salat.test.model.UnannotatedAbstractMaud")
+ val annotatedTraitClazz = Class.forName("salat.test.model.AnnotatedMaud")
+ val traitClazz = Class.forName("salat.test.model.UnannotatedMaud")
"The context classloader handling" should {
"provide a classloader collection populated with its own classloader" in new testContext {
@@ -227,7 +227,7 @@ class ContextSpec extends SalatSpec {
ctx.graters must beEmpty
val g_* = ctx.lookup(caseObjectClazz.getName)
log.debug(g_*.toString)
- // TODO: can't get type for com.novus.salat.test.model.Zoot$
+ // TODO: can't get type for salat.test.model.Zoot$
// g_*.clazz.getName must_== (new ProxyGrater[Zoot](caseObjectClazz)(ctx) {}).clazz.getName
ctx.graters must have size (1)
}
@@ -334,8 +334,8 @@ class ContextSpec extends SalatSpec {
"The context" should {
"support suppressing default args" in {
- import com.novus.salat.test.model.sda._
- import com.novus.salat.test.model.suppress_default_args._
+ import salat.test.model.sda._
+ import salat.test.model.suppress_default_args._
grater[Bar].asDBObject(Bar()) must beEmpty
}
}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/CustomContextSpec.scala b/salat-core/src/test/scala/salat/test/CustomContextSpec.scala
similarity index 90%
rename from salat-core/src/test/scala/com/novus/salat/test/CustomContextSpec.scala
rename to salat-core/src/test/scala/salat/test/CustomContextSpec.scala
index 68ebe797..5ff296e3 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/CustomContextSpec.scala
+++ b/salat-core/src/test/scala/salat/test/CustomContextSpec.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-//package com.novus.salat.test
+//package salat.test
//
-//import com.novus.salat._
+//import salat._
//import scala.tools.nsc.util.ScalaClassLoader
//import com.mongodb.casbah.Imports._
-//import com.novus.salat.util.MapPrettyPrinter
-//import com.novus.salat.test.model._
+//import salat.util.MapPrettyPrinter
+//import salat.test.model._
//
//class CustomContextSpec extends SalatSpec {
//
@@ -47,7 +47,7 @@
// ctx.classLoaders must have size (1)
// ctx.classLoaders(0) must_== ctx.getClass.getClassLoader
//
-// // members of com.novus.salat.test.model can be resolved as expected
+// // members of salat.test.model can be resolved as expected
// ctx.classLoaders(0) must_== Alice.getClass.getClassLoader
// getClassNamed(Alice.getClass.getName)(ctx) must beSome(Alice.getClass)
// }
@@ -55,7 +55,7 @@
// "provide flexible classloader handling" in {
//
// // TODO: somewhat contrived but...
-// val TestClassName = "com.novus.salat.test.CustomContextSpec$$anonfun$1$$anonfun$apply$15$$anon$2$Ida"
+// val TestClassName = "salat.test.CustomContextSpec$$anonfun$1$$anonfun$apply$15$$anon$2$Ida"
//
// val customCl = new ScalaClassLoader() {
// case class Ida(lake: Int = 10, drowned: Boolean = true)
@@ -194,21 +194,21 @@
//
// "allow registering a per-class key override" in {
//
-// // a context where com.novus.salat.test.model.Rhoda has a key remapping
-// import com.novus.salat.test.per_class_key_remapping._
+// // a context where salat.test.model.Rhoda has a key remapping
+// import salat.test.per_class_key_remapping._
//
-// ctx.perClassKeyOverrides must haveKey(("com.novus.salat.test.model.Rhoda", "consumed"))
-// ctx.perClassKeyOverrides.get(("com.novus.salat.test.model.Rhoda", "consumed")) must beSome("fire")
+// ctx.perClassKeyOverrides must haveKey(("salat.test.model.Rhoda", "consumed"))
+// ctx.perClassKeyOverrides.get(("salat.test.model.Rhoda", "consumed")) must beSome("fire")
//
// val rhoda = Rhoda(consumed = Some("indeed"))
// val dbo: MongoDBObject = grater[Rhoda].asDBObject(rhoda)
-// dbo must havePair("_typeHint", "com.novus.salat.test.model.Rhoda")
+// dbo must havePair("_typeHint", "salat.test.model.Rhoda")
// dbo must havePair("fire", "indeed") // per class keymapping turns "consumed" into "fire" for Rhoda
// grater[Rhoda].asObject(dbo) must_== rhoda
//
// val rhoda3 = Rhoda3(consumed = Some("indeed"))
// val dbo2: MongoDBObject = grater[Rhoda3].asDBObject(rhoda3)
-// dbo2 must havePair("_typeHint", "com.novus.salat.test.model.Rhoda3")
+// dbo2 must havePair("_typeHint", "salat.test.model.Rhoda3")
// dbo2 must havePair("consumed", "indeed") // per class keymapping DOES NOT turn "consumed" into "fire" for Rhoda3
// grater[Rhoda3].asObject(dbo2) must_== rhoda3
// }
diff --git a/salat-core/src/test/scala/com/novus/salat/test/CustomTransformerSpec.scala b/salat-core/src/test/scala/salat/test/CustomTransformerSpec.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/CustomTransformerSpec.scala
rename to salat-core/src/test/scala/salat/test/CustomTransformerSpec.scala
index a15b48de..63276994 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/CustomTransformerSpec.scala
+++ b/salat-core/src/test/scala/salat/test/CustomTransformerSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.custom.Bicycle
-import com.novus.salat.test.custom._
+import salat._
+import salat.custom.Bicycle
+import salat.test.custom._
class CustomTransformerSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/DateTimeSpec.scala b/salat-core/src/test/scala/salat/test/DateTimeSpec.scala
similarity index 89%
rename from salat-core/src/test/scala/com/novus/salat/test/DateTimeSpec.scala
rename to salat-core/src/test/scala/salat/test/DateTimeSpec.scala
index d5396646..4846c3f6 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/DateTimeSpec.scala
+++ b/salat-core/src/test/scala/salat/test/DateTimeSpec.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
import com.mongodb.util.JSON.parse
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
import org.joda.time.{DateTime, LocalDateTime}
class DateTimeSpec extends SalatSpec {
@@ -41,7 +41,7 @@ class DateTimeSpec extends SalatSpec {
val n = Neville(asOf = dt)
val dbo: MongoDBObject = grater[Neville].asDBObject(n)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Neville")
+ dbo must havePair("_typeHint" -> "salat.test.model.Neville")
dbo must havePair("ennui" -> true)
dbo must havePair("asOf" -> dt)
@@ -56,7 +56,7 @@ class DateTimeSpec extends SalatSpec {
val v = Victor(departureTime = ldt)
val dbo: MongoDBObject = grater[Victor].asDBObject(v)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Victor")
+ dbo must havePair("_typeHint" -> "salat.test.model.Victor")
dbo must havePair("departureTime" -> ldt)
val coll = MongoConnection()(SalatSpecDb)("scala_date_test_2")
@@ -70,7 +70,7 @@ class DateTimeSpec extends SalatSpec {
val n = Neville(asOf = dt)
val dbo: MongoDBObject = grater[Neville].asDBObject(n)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Neville")
+ dbo must havePair("_typeHint" -> "salat.test.model.Neville")
dbo must havePair("ennui" -> true)
dbo must havePair("asOf" -> dt)
@@ -85,7 +85,7 @@ class DateTimeSpec extends SalatSpec {
val v = Victor(departureTime = ldt)
val dbo: MongoDBObject = grater[Victor].asDBObject(v)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Victor")
+ dbo must havePair("_typeHint" -> "salat.test.model.Victor")
dbo must havePair("departureTime" -> ldt)
val coll = MongoConnection()(SalatSpecDb)("scala_date_test_4")
diff --git a/salat-core/src/test/scala/com/novus/salat/test/DateTimeZoneSpec.scala b/salat-core/src/test/scala/salat/test/DateTimeZoneSpec.scala
similarity index 90%
rename from salat-core/src/test/scala/com/novus/salat/test/DateTimeZoneSpec.scala
rename to salat-core/src/test/scala/salat/test/DateTimeZoneSpec.scala
index a8b8f1c2..519a0b12 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/DateTimeZoneSpec.scala
+++ b/salat-core/src/test/scala/salat/test/DateTimeZoneSpec.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
import com.mongodb.util.JSON.parse
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
import org.joda.time.DateTimeZone
class DateTimeZoneSpec extends SalatSpec {
@@ -41,7 +41,7 @@ class DateTimeZoneSpec extends SalatSpec {
val n = Prue(zone = tz)
val dbo: MongoDBObject = grater[Prue].asDBObject(n)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Prue")
+ dbo must havePair("_typeHint" -> "salat.test.model.Prue")
dbo must havePair("brawl" -> true)
dbo must havePair("zone" -> tz.getID)
@@ -56,7 +56,7 @@ class DateTimeZoneSpec extends SalatSpec {
val n = Prue(zone = tz)
val dbo: MongoDBObject = grater[Prue].asDBObject(n)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Prue")
+ dbo must havePair("_typeHint" -> "salat.test.model.Prue")
dbo must havePair("brawl" -> true)
dbo must havePair("zone" -> tz.getID)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/DoubleSpec.scala b/salat-core/src/test/scala/salat/test/DoubleSpec.scala
similarity index 92%
rename from salat-core/src/test/scala/com/novus/salat/test/DoubleSpec.scala
rename to salat-core/src/test/scala/salat/test/DoubleSpec.scala
index 18c729cb..3309b4d7 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/DoubleSpec.scala
+++ b/salat-core/src/test/scala/salat/test/DoubleSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class DoubleSpec extends SalatSpec {
"Salat" should {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/EnumSupportSpec.scala b/salat-core/src/test/scala/salat/test/EnumSupportSpec.scala
similarity index 94%
rename from salat-core/src/test/scala/com/novus/salat/test/EnumSupportSpec.scala
rename to salat-core/src/test/scala/salat/test/EnumSupportSpec.scala
index 7566b2d3..183b5f4d 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/EnumSupportSpec.scala
+++ b/salat-core/src/test/scala/salat/test/EnumSupportSpec.scala
@@ -25,17 +25,17 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.annotations._
-import com.novus.salat.test.model._
+import salat._
+import salat.annotations._
+import salat.test.model._
class EnumSupportSpec extends SalatSpec {
"a grater" should {
- import com.novus.salat.test.always._
+ import salat.test.always._
"work with Scala enums" in {
"be able to serialize Scala enums" in {
val me = Me("max")
@@ -60,7 +60,7 @@ class EnumSupportSpec extends SalatSpec {
val h = Hector(thug = ThugLevel.Three, doneIn = DoneIn.OhDear)
"provide a default enum handling strategy of toString" in {
- import com.novus.salat.test.global._
+ import salat.test.global._
ctx.defaultEnumStrategy must_== EnumStrategy.BY_VALUE
@@ -91,7 +91,7 @@ class EnumSupportSpec extends SalatSpec {
"allow an individual enum annotated with EnumAs to override default enum handling strategy" in {
- import com.novus.salat.test.global._
+ import salat.test.global._
ctx.defaultEnumStrategy must_== EnumStrategy.BY_VALUE
DoneInById.getClass.getAnnotation(classOf[EnumAs]).asInstanceOf[EnumAs].strategy must_== EnumStrategy.BY_ID
diff --git a/salat-core/src/test/scala/com/novus/salat/test/FloatSpec.scala b/salat-core/src/test/scala/salat/test/FloatSpec.scala
similarity index 89%
rename from salat-core/src/test/scala/com/novus/salat/test/FloatSpec.scala
rename to salat-core/src/test/scala/salat/test/FloatSpec.scala
index e3cefd46..47bc2c16 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/FloatSpec.scala
+++ b/salat-core/src/test/scala/salat/test/FloatSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class FloatSpec extends SalatSpec {
"A grater" should {
@@ -38,7 +38,7 @@ class FloatSpec extends SalatSpec {
val q = Quentin(mire = 3.14f)
val dbo: MongoDBObject = grater[Quentin].asDBObject(q)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Quentin")
+ dbo must havePair("_typeHint" -> "salat.test.model.Quentin")
dbo must havePair("mire" -> 3.14f)
val coll = MongoConnection()(SalatSpecDb)("salat_float_test_1")
diff --git a/salat-core/src/test/scala/com/novus/salat/test/GraterSpec.scala b/salat-core/src/test/scala/salat/test/GraterSpec.scala
similarity index 89%
rename from salat-core/src/test/scala/com/novus/salat/test/GraterSpec.scala
rename to salat-core/src/test/scala/salat/test/GraterSpec.scala
index 0ae0e024..9ac5a467 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/GraterSpec.scala
+++ b/salat-core/src/test/scala/salat/test/GraterSpec.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
-import com.novus.salat.test.model.useful._
+import salat._
+import salat.test.global._
+import salat.test.model._
+import salat.test.model.useful._
class GraterSpec extends SalatSpec {
@@ -52,7 +52,7 @@ class GraterSpec extends SalatSpec {
"case class <-> map" in {
val aural = Aural(_id = _id, a = a, b = b, c = c, d = d, e = e, f = f, g = g, h = h, i = i)
val map = grater[Aural].toMap(aural)
- map must havePair(ctx.typeHintStrategy.typeHint -> "com.novus.salat.test.model.Aural")
+ map must havePair(ctx.typeHintStrategy.typeHint -> "salat.test.model.Aural")
map must havePair("_id" -> _id)
map must havePair("a" -> a)
map must havePair("b" -> b)
@@ -69,7 +69,7 @@ class GraterSpec extends SalatSpec {
"concrete trait impl <-> map" in {
val ctenoid = Ctenoid(a = a, b = b, c = c)
val map = grater[Bdellatomy].toMap(ctenoid)
- map must havePair(ctx.typeHintStrategy.typeHint -> "com.novus.salat.test.model.Ctenoid")
+ map must havePair(ctx.typeHintStrategy.typeHint -> "salat.test.model.Ctenoid")
map must havePair("a" -> a)
map must havePair("b" -> b)
map must havePair("c" -> c)
@@ -86,7 +86,7 @@ class GraterSpec extends SalatSpec {
djinn.b must_== defaultArgB
val map = grater[Djinn].toMap(djinn)
- map must havePair(ctx.typeHintStrategy.typeHint -> "com.novus.salat.test.model.Djinn")
+ map must havePair(ctx.typeHintStrategy.typeHint -> "salat.test.model.Djinn")
map must havePair("_id" -> _id)
map must havePair("a" -> defaultArgA)
map must havePair("b" -> defaultArgB)
@@ -105,7 +105,7 @@ class GraterSpec extends SalatSpec {
"respect @Key when serializing case class -> map" in {
val ewe = Ewe(fat = true)
val map = grater[Ewe].toMap(ewe)
- map must havePair(ctx.typeHintStrategy.typeHint -> "com.novus.salat.test.model.Ewe")
+ map must havePair(ctx.typeHintStrategy.typeHint -> "salat.test.model.Ewe")
map must havePair("fluffy" -> true)
val ewe_* = grater[Ewe].fromMap(map)
ewe_* must_== ewe
@@ -118,7 +118,7 @@ class GraterSpec extends SalatSpec {
"respect @Ignore when serializing case class -> map" in {
val fantasm = Fantasm(_id = _id, which = "spectre", rationalExplanation = Some("just a passing breeze"))
val map = grater[Fantasm].toMap(fantasm)
- map must havePair(ctx.typeHintStrategy.typeHint -> "com.novus.salat.test.model.Fantasm")
+ map must havePair(ctx.typeHintStrategy.typeHint -> "salat.test.model.Fantasm")
map must havePair("_id" -> _id)
map must havePair("which" -> "spectre")
map must haveKey("rationalExplanation").not // TODO: for some reason, not haveKey is unhappy here
@@ -140,7 +140,7 @@ class GraterSpec extends SalatSpec {
val gneiss = Gneiss(igneous = true)
gneiss.classification must_== "orthogneiss"
val map = grater[Gneiss].toMap(gneiss)
- map must havePair(ctx.typeHintStrategy.typeHint -> "com.novus.salat.test.model.Gneiss")
+ map must havePair(ctx.typeHintStrategy.typeHint -> "salat.test.model.Gneiss")
map must havePair("igneous" -> true)
map must havePair("classification" -> "orthogneiss")
val gneiss_* = grater[Gneiss].fromMap(map)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/IgnoreAnnotationSpec.scala b/salat-core/src/test/scala/salat/test/IgnoreAnnotationSpec.scala
similarity index 89%
rename from salat-core/src/test/scala/com/novus/salat/test/IgnoreAnnotationSpec.scala
rename to salat-core/src/test/scala/salat/test/IgnoreAnnotationSpec.scala
index 95097572..285f3e38 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/IgnoreAnnotationSpec.scala
+++ b/salat-core/src/test/scala/salat/test/IgnoreAnnotationSpec.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
-import com.novus.salat.util.MapPrettyPrinter
+import salat._
+import salat.test.global._
+import salat.test.model._
+import salat.util.MapPrettyPrinter
import org.joda.time.DateTime
class IgnoreAnnotationSpec extends SalatSpec {
@@ -42,7 +42,7 @@ class IgnoreAnnotationSpec extends SalatSpec {
val t = Titus(ignoreMe = "look", dontIgnoreMe = -999)
val dbo: MongoDBObject = grater[Titus].asDBObject(t)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Titus")
+ dbo must havePair("_typeHint" -> "salat.test.model.Titus")
dbo must havePair("dontIgnoreMe" -> -999)
dbo.getAs[String]("ignoreMe") must beNone
val t_* = grater[Titus].asObject(dbo)
@@ -57,7 +57,7 @@ class IgnoreAnnotationSpec extends SalatSpec {
val t = Titus2(ignoreMe = "look", dontIgnoreMe = -999)
val dbo: MongoDBObject = grater[Titus2].asDBObject(t)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Titus2")
+ dbo must havePair("_typeHint" -> "salat.test.model.Titus2")
dbo must havePair("dontIgnoreMe" -> -999)
dbo.getAs[String]("ignoreMe") must beNone
val t_* = grater[Titus2].asObject(dbo)
@@ -72,7 +72,7 @@ class IgnoreAnnotationSpec extends SalatSpec {
val s = SomeClassWithUnsupportedField(id = _id, unsupportedType = new java.io.File("."))
val dbo: MongoDBObject = grater[SomeClassWithUnsupportedField].asDBObject(s)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.SomeClassWithUnsupportedField")
+ dbo must havePair("_typeHint" -> "salat.test.model.SomeClassWithUnsupportedField")
dbo must havePair("_id" -> _id)
dbo.getAs[String]("text") must beNone
dbo.getAs[java.io.File]("unsupportedType") must beNone
@@ -96,10 +96,10 @@ class IgnoreAnnotationSpec extends SalatSpec {
)
val dbo: MongoDBObject = grater[SomeClassWithUnsupportedField2].asDBObject(s)
println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.SomeClassWithUnsupportedField2")
+ dbo must havePair("_typeHint" -> "salat.test.model.SomeClassWithUnsupportedField2")
dbo must havePair("_id" -> _id)
dbo must havePair("email" -> "nobody@something.org")
- dbo must havePair("status" -> MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Borked$"))
+ dbo must havePair("status" -> MongoDBObject("_typeHint" -> "salat.test.model.Borked$"))
dbo.getAs[Map[Int, Set[Int]]]("cascade") must beNone // serialization of cascade has been suppressed, as expected
dbo must havePair("thingy" -> 9)
dbo must havePair("created" -> now)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/KeyAnnotationSpec.scala b/salat-core/src/test/scala/salat/test/KeyAnnotationSpec.scala
similarity index 92%
rename from salat-core/src/test/scala/com/novus/salat/test/KeyAnnotationSpec.scala
rename to salat-core/src/test/scala/salat/test/KeyAnnotationSpec.scala
index 67739ed1..60ed9d05 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/KeyAnnotationSpec.scala
+++ b/salat-core/src/test/scala/salat/test/KeyAnnotationSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
import org.joda.time.DateTime
class KeyAnnotationSpec extends SalatSpec {
@@ -71,7 +71,7 @@ class KeyAnnotationSpec extends SalatSpec {
}
"work with a field whose type is handled by a custom BSON encoding hook" in {
- com.novus.salat.test.util.RegisterURIConversionHelpers()
+ salat.test.util.RegisterURIConversionHelpers()
val date = new DateTime(2011, 3, 26, 11, 45, 22, 5)
val uri = new java.net.URI("http://slashdot.org")
val p = Page(
@@ -83,7 +83,7 @@ class KeyAnnotationSpec extends SalatSpec {
keywords = Some("very clever minus two")
)
val dbo: MongoDBObject = grater[Page].asDBObject(p)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Page")
+ dbo must havePair("_typeHint" -> "salat.test.model.Page")
// @Key overrides field name "uri" with "_id"
// the value will be serialized as a String using our custom java.net.URI -> String BSON encoding hook
dbo must havePair("_id" -> uri)
@@ -99,7 +99,7 @@ class KeyAnnotationSpec extends SalatSpec {
val dbo_* : MongoDBObject = coll.findOne().get
// log.info(MapPrettyPrinter(dbo_*))
val p_* = grater[Page].asObject(dbo_*)
- com.novus.salat.test.util.DeregisterURIConversionHelpers()
+ salat.test.util.DeregisterURIConversionHelpers()
p_* must_== p // our custom BSON encoding for URI is crunk e pur si muove
}
}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/LazyValSpec.scala b/salat-core/src/test/scala/salat/test/LazyValSpec.scala
similarity index 94%
rename from salat-core/src/test/scala/com/novus/salat/test/LazyValSpec.scala
rename to salat-core/src/test/scala/salat/test/LazyValSpec.scala
index 203c6087..ea98095c 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/LazyValSpec.scala
+++ b/salat-core/src/test/scala/salat/test/LazyValSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class LazyValSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/ListOfCommonTraitSpec.scala b/salat-core/src/test/scala/salat/test/ListOfCommonTraitSpec.scala
similarity index 73%
rename from salat-core/src/test/scala/com/novus/salat/test/ListOfCommonTraitSpec.scala
rename to salat-core/src/test/scala/salat/test/ListOfCommonTraitSpec.scala
index 13921ee3..04e5d04c 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/ListOfCommonTraitSpec.scala
+++ b/salat-core/src/test/scala/salat/test/ListOfCommonTraitSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class ListOfCommonTraitSpec extends SalatSpec {
@@ -51,13 +51,13 @@ class ListOfCommonTraitSpec extends SalatSpec {
)
val dbo: MongoDBObject = grater[SomeContainerClass].asDBObject(scc)
- // Map(_typeHint -> com.novus.salat.test.model.SomeContainerClass, e -> Tergiversation,
+ // Map(_typeHint -> salat.test.model.SomeContainerClass, e -> Tergiversation,
// theListWhichNeedsToBeTested -> [
- // { "_typeHint" : "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 1} ,
- // { "_typeHint" : "com.novus.salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 2.0} ,
- // { "_typeHint" : "com.novus.salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 3.0} ,
- // { "_typeHint" : "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 4} ,
- // { "_typeHint" : "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 5}
+ // { "_typeHint" : "salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 1} ,
+ // { "_typeHint" : "salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 2.0} ,
+ // { "_typeHint" : "salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 3.0} ,
+ // { "_typeHint" : "salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 4} ,
+ // { "_typeHint" : "salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 5}
// ])
dbo must havePair("e" -> scc.e)
@@ -91,14 +91,14 @@ class ListOfCommonTraitSpec extends SalatSpec {
val scc = SomeContainerClass(e = "Neurotic", theListWhichNeedsToBeTested = List(sct1, sct2, sct3, sct4, sct5))
val dbo: MongoDBObject = grater[SomeContainerClass].asDBObject(scc)
- // Map(_typeHint -> com.novus.salat.test.model.SomeContainerClass,
+ // Map(_typeHint -> salat.test.model.SomeContainerClass,
// e -> Neurotic,
// theListWhichNeedsToBeTested -> [
- // { "_typeHint" : "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 1} ,
- // { "_typeHint" : "com.novus.salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 2.0} ,
- // { "_typeHint" : "com.novus.salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 3.0} ,
- // { "_typeHint" : "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 4} ,
- // { "_typeHint" : "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 5}
+ // { "_typeHint" : "salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 1} ,
+ // { "_typeHint" : "salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 2.0} ,
+ // { "_typeHint" : "salat.test.model.AnotherSubclassExtendingSaidTrait" , "d" : 3.0} ,
+ // { "_typeHint" : "salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 4} ,
+ // { "_typeHint" : "salat.test.model.SomeSubclassExtendingSaidTrait" , "b" : 5}
// ])
dbo must havePair("e" -> scc.e)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/LongSpec.scala b/salat-core/src/test/scala/salat/test/LongSpec.scala
similarity index 88%
rename from salat-core/src/test/scala/com/novus/salat/test/LongSpec.scala
rename to salat-core/src/test/scala/salat/test/LongSpec.scala
index d6699f20..065b095f 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/LongSpec.scala
+++ b/salat-core/src/test/scala/salat/test/LongSpec.scala
@@ -25,19 +25,19 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class LongSpec extends SalatSpec {
"A grater" should {
"support longs" in {
val a = LongSpecExample(timestamp = 1356048000000L, value = 26)
val dbo: MongoDBObject = grater[LongSpecExample].asDBObject(a)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.LongSpecExample")
+ dbo must havePair("_typeHint" -> "salat.test.model.LongSpecExample")
dbo must havePair("timestamp" -> 1356048000000L)
dbo must havePair("value" -> 26)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/MapSupportSpec.scala b/salat-core/src/test/scala/salat/test/MapSupportSpec.scala
similarity index 89%
rename from salat-core/src/test/scala/com/novus/salat/test/MapSupportSpec.scala
rename to salat-core/src/test/scala/salat/test/MapSupportSpec.scala
index 60b4312a..dc8f8f90 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/MapSupportSpec.scala
+++ b/salat-core/src/test/scala/salat/test/MapSupportSpec.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model.{AttributeObject, _}
-import com.novus.salat.util.MapPrettyPrinter
+import salat._
+import salat.test.global._
+import salat.test.model.{AttributeObject, _}
+import salat.util.MapPrettyPrinter
import org.bson.types.ObjectId
import scala.collection.immutable.{Map => IMap}
@@ -50,7 +50,7 @@ class MapSupportSpec extends SalatSpec {
val dbo: MongoDBObject = grater[AttributeObject].asDBObject(ao)
log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.AttributeObject")
+ dbo must havePair("_typeHint" -> "salat.test.model.AttributeObject")
dbo must havePair("_id" -> 42L)
dbo must havePair("key" -> "testKey1")
dbo must havePair("bestDef" -> "bestDef1")
@@ -58,14 +58,14 @@ class MapSupportSpec extends SalatSpec {
val builder = MongoDBObject.newBuilder
builder += "foo" -> {
val u = MongoDBObject.newBuilder
- u += "_typeHint" -> "com.novus.salat.test.model.UrlID"
+ u += "_typeHint" -> "salat.test.model.UrlID"
u += "dh" -> 1L
u += "ph" -> 2L
u.result
}
builder += "bar" -> {
val u = MongoDBObject.newBuilder
- u += "_typeHint" -> "com.novus.salat.test.model.UrlID"
+ u += "_typeHint" -> "salat.test.model.UrlID"
u += "dh" -> 3L
u += "ph" -> 4L
u.result
diff --git a/salat-core/src/test/scala/com/novus/salat/test/MetadataRecordSpec.scala b/salat-core/src/test/scala/salat/test/MetadataRecordSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/MetadataRecordSpec.scala
rename to salat-core/src/test/scala/salat/test/MetadataRecordSpec.scala
index ebaf7a74..d07ff5bc 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/MetadataRecordSpec.scala
+++ b/salat-core/src/test/scala/salat/test/MetadataRecordSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class MetadataRecordSpec extends SalatSpec {
"Metadata record" should {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/MongoJavaDriver252IntLongBugSpec.scala b/salat-core/src/test/scala/salat/test/MongoJavaDriver252IntLongBugSpec.scala
similarity index 81%
rename from salat-core/src/test/scala/com/novus/salat/test/MongoJavaDriver252IntLongBugSpec.scala
rename to salat-core/src/test/scala/salat/test/MongoJavaDriver252IntLongBugSpec.scala
index d6047179..489c00db 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/MongoJavaDriver252IntLongBugSpec.scala
+++ b/salat-core/src/test/scala/salat/test/MongoJavaDriver252IntLongBugSpec.scala
@@ -25,26 +25,26 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
import com.mongodb.util.JSON.parse
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class MongoJavaDriver252IntLongBugSpec extends SalatSpec {
"mongo-java-driver 2.5.2" should {
"not be confused about the difference between Int and Long when parsing from stringified JSON" in {
// BACKGROUND: mongo-java-driver used to read bare numbers as Int but 2.5.x treats them as Long
- // See https://github.com/novus/salat/issues/7
+ // See https://github.com/salat/salat/issues/7
//[error] argument type mismatch
//[error]
- //[error] Grater(class com.novus.salat.test.model.Company @ com.novus.salat.global.package$$anon$1@222380e2) toObject failed on:
- //[error] SYM: com.novus.salat.test.model.Company
- //[error] CONSTRUCTOR: public com.novus.salat.test.model.Company(java.lang.String,int,scala.collection.immutable.Map)
+ //[error] Grater(class salat.test.model.Company @ salat.global.package$$anon$1@222380e2) toObject failed on:
+ //[error] SYM: salat.test.model.Company
+ //[error] CONSTRUCTOR: public salat.test.model.Company(java.lang.String,int,scala.collection.immutable.Map)
//[error] ARGS:
//[error] [0] class java.lang.String
//[error] Novus
diff --git a/salat-core/src/test/scala/com/novus/salat/test/OptionSpec.scala b/salat-core/src/test/scala/salat/test/OptionSpec.scala
similarity index 87%
rename from salat-core/src/test/scala/com/novus/salat/test/OptionSpec.scala
rename to salat-core/src/test/scala/salat/test/OptionSpec.scala
index 3d198ec1..672269b0 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/OptionSpec.scala
+++ b/salat-core/src/test/scala/salat/test/OptionSpec.scala
@@ -25,19 +25,19 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class OptionSpec extends SalatSpec {
"A grater" should {
"support Option[Int] and Option[float]" in {
val a = OptionSpecExample(timestamp = Some(1356048000000L), valueInt = Some(26), valueDouble = Some(1337.0), valueFloat = Some(31047.0f))
val dbo: MongoDBObject = grater[OptionSpecExample].asDBObject(a)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.OptionSpecExample")
+ dbo must havePair("_typeHint" -> "salat.test.model.OptionSpecExample")
dbo must havePair("timestamp" -> 1356048000000L)
dbo must havePair("valueInt" -> 26)
dbo must havePair("valueDouble" -> 1337.0)
@@ -49,7 +49,7 @@ class OptionSpec extends SalatSpec {
"support option not there" in {
val a = OptionSpecExample(None, None)
val dbo: MongoDBObject = grater[OptionSpecExample].asDBObject(a)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.OptionSpecExample")
+ dbo must havePair("_typeHint" -> "salat.test.model.OptionSpecExample")
val json = dbo.toString()
grater[OptionSpecExample].fromJSON(json) must_== a
diff --git a/salat-core/src/test/scala/com/novus/salat/test/OptionSupportSpec.scala b/salat-core/src/test/scala/salat/test/OptionSupportSpec.scala
similarity index 85%
rename from salat-core/src/test/scala/com/novus/salat/test/OptionSupportSpec.scala
rename to salat-core/src/test/scala/salat/test/OptionSupportSpec.scala
index 8b62cd8a..620a7cdb 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/OptionSupportSpec.scala
+++ b/salat-core/src/test/scala/salat/test/OptionSupportSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class OptionSupportSpec extends SalatSpec {
"a grater" should {
@@ -39,7 +39,7 @@ class OptionSupportSpec extends SalatSpec {
"with value" in {
val r = Rhoda(consumed = Some("flames"))
val dbo: MongoDBObject = grater[Rhoda].asDBObject(r)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Rhoda")
+ dbo must havePair("_typeHint" -> "salat.test.model.Rhoda")
dbo must havePair("consumed" -> "flames")
val r_* = grater[Rhoda].asObject(dbo)
@@ -49,7 +49,7 @@ class OptionSupportSpec extends SalatSpec {
"with no value" in {
val r = Rhoda(consumed = None)
val dbo: MongoDBObject = grater[Rhoda].asDBObject(r)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Rhoda")
+ dbo must havePair("_typeHint" -> "salat.test.model.Rhoda")
// TODO: what happened to must not haveKey
val r_* = grater[Rhoda].asObject(dbo)
@@ -62,7 +62,7 @@ class OptionSupportSpec extends SalatSpec {
val temp = BigDecimal("451")
val r = Rhoda2(howHot = Some(temp))
val dbo: MongoDBObject = grater[Rhoda2].asDBObject(r)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Rhoda2")
+ dbo must havePair("_typeHint" -> "salat.test.model.Rhoda2")
dbo must havePair("howHot" -> 451.0)
val r_* = grater[Rhoda2].asObject(dbo)
@@ -72,7 +72,7 @@ class OptionSupportSpec extends SalatSpec {
"with no value" in {
val r = Rhoda2(howHot = None)
val dbo: MongoDBObject = grater[Rhoda2].asDBObject(r)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Rhoda2")
+ dbo must havePair("_typeHint" -> "salat.test.model.Rhoda2")
// TODO: what happened to must not haveKey
val r_* = grater[Rhoda2].asObject(dbo)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/PersistAnnotationSpec.scala b/salat-core/src/test/scala/salat/test/PersistAnnotationSpec.scala
similarity index 85%
rename from salat-core/src/test/scala/com/novus/salat/test/PersistAnnotationSpec.scala
rename to salat-core/src/test/scala/salat/test/PersistAnnotationSpec.scala
index f5af582c..e2c78fcd 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/PersistAnnotationSpec.scala
+++ b/salat-core/src/test/scala/salat/test/PersistAnnotationSpec.scala
@@ -25,16 +25,16 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class PersistAnnotationSpec extends SalatSpec {
- "com.novus.salat.annotations.Persist" should {
+ "salat.annotations.Persist" should {
"allow a field inside a case class to be persisted" in {
@@ -56,12 +56,12 @@ class PersistAnnotationSpec extends SalatSpec {
val m = Maud2(swept = "swept", out = "out")
val dbo: MongoDBObject = grater[Maud2].asDBObject(m)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Maud2")
+ dbo must havePair("_typeHint" -> "salat.test.model.Maud2")
dbo must havePair("swept" -> "swept")
dbo must havePair("out" -> "out")
dbo must havePair("ida" -> {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Ida"
+ builder += "_typeHint" -> "salat.test.model.Ida"
builder += "lake" -> 8.0
builder.result
})
@@ -75,13 +75,13 @@ class PersistAnnotationSpec extends SalatSpec {
val m = Maud3(swept = "swept", out = "out")
val dbo: MongoDBObject = grater[Maud3].asDBObject(m)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Maud3")
+ dbo must havePair("_typeHint" -> "salat.test.model.Maud3")
dbo must havePair("swept" -> "swept")
dbo must havePair("out" -> "out")
// ida is a var but gets persisted anyway
dbo must havePair("ida" -> {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Ida"
+ builder += "_typeHint" -> "salat.test.model.Ida"
builder += "lake" -> 8.0
builder.result
})
@@ -111,7 +111,7 @@ class PersistAnnotationSpec extends SalatSpec {
"respect @Persist declared in a trait" in {
val m = Maud8(swept = "swept", out = "out")
val dbo: MongoDBObject = grater[Maud8].asDBObject(m)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Maud8")
+ dbo must havePair("_typeHint" -> "salat.test.model.Maud8")
dbo must havePair("swept" -> "swept")
dbo must havePair("out" -> "out")
dbo must havePair("toSea" -> "tuo tpews") // persisted from Maud8 itself
@@ -123,7 +123,7 @@ class PersistAnnotationSpec extends SalatSpec {
"respect @Persist declared in immediate superclass" in {
val m = Maud11(swept = "swept", out = "out")
val dbo: MongoDBObject = grater[Maud11].asDBObject(m)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Maud11")
+ dbo must havePair("_typeHint" -> "salat.test.model.Maud11")
dbo must havePair("swept" -> "swept")
dbo must havePair("out" -> "out")
dbo must havePair("toSea" -> "tuo tpews") // persisted from Maud11 itself
@@ -142,12 +142,12 @@ class PersistAnnotationSpec extends SalatSpec {
))
val dbo: MongoDBObject = grater[ManyMauds].asDBObject(m)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.ManyMauds")
+ dbo must havePair("_typeHint" -> "salat.test.model.ManyMauds")
dbo must havePair("mauds" -> {
val listBuilder = MongoDBList.newBuilder
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Maud5"
+ builder += "_typeHint" -> "salat.test.model.Maud5"
builder += "swept" -> "swept"
builder += "out" -> "out"
builder += "toSea" -> "tuo tpews"
@@ -155,12 +155,12 @@ class PersistAnnotationSpec extends SalatSpec {
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Maud6"
+ builder += "_typeHint" -> "salat.test.model.Maud6"
builder += "swept" -> "swept"
builder += "out" -> "out"
builder += "ida" -> {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Ida"
+ builder += "_typeHint" -> "salat.test.model.Ida"
builder += "lake" -> 8.0
builder.result
}
@@ -168,7 +168,7 @@ class PersistAnnotationSpec extends SalatSpec {
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Maud7"
+ builder += "_typeHint" -> "salat.test.model.Maud7"
builder += "swept" -> "swept"
builder += "out" -> "out"
// notWaving does not have @Persist so does not appear here
@@ -190,12 +190,12 @@ class PersistAnnotationSpec extends SalatSpec {
))
val dbo: MongoDBObject = grater[Maudelic].asDBObject(m)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Maudelic")
+ dbo must havePair("_typeHint" -> "salat.test.model.Maudelic")
dbo must havePair("mauds" -> {
val listBuilder = MongoDBList.newBuilder
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Maud8"
+ builder += "_typeHint" -> "salat.test.model.Maud8"
builder += "swept" -> "swept"
builder += "out" -> "out"
builder += "toSea" -> "tuo tpews"
@@ -204,12 +204,12 @@ class PersistAnnotationSpec extends SalatSpec {
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Maud9"
+ builder += "_typeHint" -> "salat.test.model.Maud9"
builder += "swept" -> "swept"
builder += "out" -> "out"
builder += "ida" -> {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Ida"
+ builder += "_typeHint" -> "salat.test.model.Ida"
builder += "lake" -> 8.0
builder.result
}
@@ -218,7 +218,7 @@ class PersistAnnotationSpec extends SalatSpec {
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Maud10"
+ builder += "_typeHint" -> "salat.test.model.Maud10"
builder += "swept" -> "swept"
builder += "out" -> "out"
// notWaving does not have @Persist so does not appear here
diff --git a/salat-core/src/test/scala/com/novus/salat/test/ProxySpec.scala b/salat-core/src/test/scala/salat/test/ProxySpec.scala
similarity index 93%
rename from salat-core/src/test/scala/com/novus/salat/test/ProxySpec.scala
rename to salat-core/src/test/scala/salat/test/ProxySpec.scala
index 11d2aff8..25226a71 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/ProxySpec.scala
+++ b/salat-core/src/test/scala/salat/test/ProxySpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
import org.specs2.execute.PendingUntilFixed
class ProxySpec extends SalatSpec with PendingUntilFixed {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/RichDuration.scala b/salat-core/src/test/scala/salat/test/RichDuration.scala
similarity index 99%
rename from salat-core/src/test/scala/com/novus/salat/test/RichDuration.scala
rename to salat-core/src/test/scala/salat/test/RichDuration.scala
index 9dc9b44c..1e8c3134 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/RichDuration.scala
+++ b/salat-core/src/test/scala/salat/test/RichDuration.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.test
+package salat.test
import org.joda.time.format.{PeriodFormat, PeriodFormatterBuilder}
import org.joda.time.{DateTime, DateTimeZone, Period}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/SalatSpec.scala b/salat-core/src/test/scala/salat/test/SalatSpec.scala
similarity index 94%
rename from salat-core/src/test/scala/com/novus/salat/test/SalatSpec.scala
rename to salat-core/src/test/scala/salat/test/SalatSpec.scala
index 11e50210..fc5ce20e 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/SalatSpec.scala
+++ b/salat-core/src/test/scala/salat/test/SalatSpec.scala
@@ -25,11 +25,11 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat.conversions.RegisterJodaTimeZoneConversionHelpers
-import com.novus.salat.{BigDecimalStrategy, Context}
+import salat.conversions.RegisterJodaTimeZoneConversionHelpers
+import salat.{BigDecimalStrategy, Context}
import org.specs2.specification.{Scope, Step}
trait SalatSpec extends org.specs2.mutable.Specification with com.mongodb.casbah.commons.test.CasbahSpecificationBase {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/SalatTraitSpec.scala b/salat-core/src/test/scala/salat/test/SalatTraitSpec.scala
similarity index 77%
rename from salat-core/src/test/scala/com/novus/salat/test/SalatTraitSpec.scala
rename to salat-core/src/test/scala/salat/test/SalatTraitSpec.scala
index f39f1def..1071d44d 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/SalatTraitSpec.scala
+++ b/salat-core/src/test/scala/salat/test/SalatTraitSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class SalatTraitSpec extends SalatSpec {
@@ -43,19 +43,19 @@ class SalatTraitSpec extends SalatSpec {
val container = SomeContainerClass("tally ho", theListWhichNeedsToBeTested = List[SomeCommonTrait](s1, s2))
val dbo: MongoDBObject = grater[SomeContainerClass].asDBObject(container)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.SomeContainerClass")
+ dbo must havePair("_typeHint" -> "salat.test.model.SomeContainerClass")
dbo must havePair("e" -> "tally ho")
dbo must havePair("theListWhichNeedsToBeTested" -> {
val listBuilder = MongoDBList.newBuilder
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait"
+ builder += "_typeHint" -> "salat.test.model.SomeSubclassExtendingSaidTrait"
builder += "b" -> 7
builder.result
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.AnotherSubclassExtendingSaidTrait"
+ builder += "_typeHint" -> "salat.test.model.AnotherSubclassExtendingSaidTrait"
builder += "d" -> 8.0
builder.result
}
@@ -76,33 +76,33 @@ class SalatTraitSpec extends SalatSpec {
// println(MapPrettyPrinter(container))
val dbo: MongoDBObject = grater[VertebrateList].asDBObject(container)
// println(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.VertebrateList")
+ dbo must havePair("_typeHint" -> "salat.test.model.VertebrateList")
dbo must havePair("vList" -> {
val listBuilder = MongoDBList.newBuilder
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Bird"
+ builder += "_typeHint" -> "salat.test.model.Bird"
builder += "name" -> "Sammy Sparrow"
builder += "canFly" -> true
builder.result
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Bird"
+ builder += "_typeHint" -> "salat.test.model.Bird"
builder += "name" -> "Oscar Ostrich"
builder += "canFly" -> false
builder.result
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Squirrel"
+ builder += "_typeHint" -> "salat.test.model.Squirrel"
builder += "name" -> "Joe"
builder += "canFly" -> false
builder.result
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.Squirrel"
+ builder += "_typeHint" -> "salat.test.model.Squirrel"
builder += "name" -> "Rocky"
builder += "canFly" -> true
builder.result
@@ -119,20 +119,20 @@ class SalatTraitSpec extends SalatSpec {
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.SomeSubclassExtendingSaidTrait"
+ builder += "_typeHint" -> "salat.test.model.SomeSubclassExtendingSaidTrait"
builder += "b" -> 2
builder.result
}
listBuilder += {
val builder = MongoDBObject.newBuilder
- builder += "_typeHint" -> "com.novus.salat.test.model.AnotherSubclassExtendingSaidTrait"
+ builder += "_typeHint" -> "salat.test.model.AnotherSubclassExtendingSaidTrait"
builder += "d" -> 3.0
builder.result
}
val containerClassBuilder = MongoDBObject.newBuilder
- containerClassBuilder += "_typeHint" -> "com.novus.salat.test.model.SomeContainerClass"
+ containerClassBuilder += "_typeHint" -> "salat.test.model.SomeContainerClass"
containerClassBuilder += "e" -> "some value for e"
containerClassBuilder += "theListWhichNeedsToBeTested" -> listBuilder.result
@@ -156,11 +156,11 @@ class SalatTraitSpec extends SalatSpec {
// the "someTrait" field is typed to SomeTrait, which is annotated with @Salat
val container1 = ContainsFieldTypedToTrait(someTrait = SomeTraitImpl1(x = "Hello"))
val dbo1: MongoDBObject = grater[ContainsFieldTypedToTrait].asDBObject(container1)
- dbo1 must havePair("_typeHint" -> "com.novus.salat.test.model.ContainsFieldTypedToTrait")
+ dbo1 must havePair("_typeHint" -> "salat.test.model.ContainsFieldTypedToTrait")
dbo1 must havePair("someTrait" -> {
// _typeHint shows that @Salat annotation on SomeTrait is working
MongoDBObject(
- "_typeHint" -> "com.novus.salat.test.model.SomeTraitImpl1",
+ "_typeHint" -> "salat.test.model.SomeTraitImpl1",
"x" -> "Hello"
)
})
@@ -168,11 +168,11 @@ class SalatTraitSpec extends SalatSpec {
val container2 = ContainsFieldTypedToTrait(someTrait = SomeTraitImpl2(y = 33))
val dbo2: MongoDBObject = grater[ContainsFieldTypedToTrait].asDBObject(container2)
- dbo2 must havePair("_typeHint" -> "com.novus.salat.test.model.ContainsFieldTypedToTrait")
+ dbo2 must havePair("_typeHint" -> "salat.test.model.ContainsFieldTypedToTrait")
dbo2 must havePair("someTrait" -> {
// _typeHint shows that @Salat annotation on SomeTrait is working
MongoDBObject(
- "_typeHint" -> "com.novus.salat.test.model.SomeTraitImpl2",
+ "_typeHint" -> "salat.test.model.SomeTraitImpl2",
"y" -> 33
)
})
@@ -186,12 +186,12 @@ class SalatTraitSpec extends SalatSpec {
Index(name = "FTSE 100")
))
val dbo: MongoDBObject = grater[Investments].asDBObject(investments)
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Investments")
+ dbo must havePair("_typeHint" -> "salat.test.model.Investments")
dbo must havePair("contracts" -> {
val builder = MongoDBList.newBuilder
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Stock", "name" -> "Apple", "ticker" -> "AAPL")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Turbo", "name" -> "Knock out", "ticker" -> "ASX")
- builder += MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Index", "name" -> "FTSE 100")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Stock", "name" -> "Apple", "ticker" -> "AAPL")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Turbo", "name" -> "Knock out", "ticker" -> "ASX")
+ builder += MongoDBObject("_typeHint" -> "salat.test.model.Index", "name" -> "FTSE 100")
builder.result()
})
diff --git a/salat-core/src/test/scala/com/novus/salat/test/SetSpec.scala b/salat-core/src/test/scala/salat/test/SetSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/SetSpec.scala
rename to salat-core/src/test/scala/salat/test/SetSpec.scala
index 259c38a0..0e16b425 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/SetSpec.scala
+++ b/salat-core/src/test/scala/salat/test/SetSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class SetSpec extends SalatSpec {
"a grater" should {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/SortedSeqSpec.scala b/salat-core/src/test/scala/salat/test/SortedSeqSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/SortedSeqSpec.scala
rename to salat-core/src/test/scala/salat/test/SortedSeqSpec.scala
index 5093a165..6fc6dccf 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/SortedSeqSpec.scala
+++ b/salat-core/src/test/scala/salat/test/SortedSeqSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class SortedSeqSpec extends SalatSpec {
"a grater" should {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/SuppressDefaultArgsSpec.scala b/salat-core/src/test/scala/salat/test/SuppressDefaultArgsSpec.scala
similarity index 84%
rename from salat-core/src/test/scala/com/novus/salat/test/SuppressDefaultArgsSpec.scala
rename to salat-core/src/test/scala/salat/test/SuppressDefaultArgsSpec.scala
index 764c6911..655be9e7 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/SuppressDefaultArgsSpec.scala
+++ b/salat-core/src/test/scala/salat/test/SuppressDefaultArgsSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.MongoDBList
-import com.novus.salat._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.model._
class SuppressDefaultArgsSpec extends SalatSpec {
@@ -48,7 +48,7 @@ class SuppressDefaultArgsSpec extends SalatSpec {
s.about must_== SuppressDefaults.AboutDefault
val dbo: MongoDBObject = grater[Susan].asDBObject(s)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Susan")
+ dbo must havePair("_typeHint" -> "salat.test.model.Susan")
dbo.get("how") must beNone
dbo.get("perished") must beNone
dbo.get("fits") must beNone
@@ -69,14 +69,14 @@ class SuppressDefaultArgsSpec extends SalatSpec {
s.about must_!= SuppressDefaults.AboutDefault
val dbo: MongoDBObject = grater[Susan].asDBObject(s)
// log.info(MapPrettyPrinter(dbo))
- dbo must havePair("_typeHint" -> "com.novus.salat.test.model.Susan")
+ dbo must havePair("_typeHint" -> "salat.test.model.Susan")
dbo must havePair("how" -> "why")
dbo must havePair("perished" -> false)
dbo must havePair("about" -> MongoDBObject("a" -> "ants", "b" -> "bears"))
dbo must havePair("fits" -> MongoDBList(
- MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Fit", "length" -> 1),
- MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Fit", "length" -> 2),
- MongoDBObject("_typeHint" -> "com.novus.salat.test.model.Fit") // 3 is a default arg for Fit: suppressed
+ MongoDBObject("_typeHint" -> "salat.test.model.Fit", "length" -> 1),
+ MongoDBObject("_typeHint" -> "salat.test.model.Fit", "length" -> 2),
+ MongoDBObject("_typeHint" -> "salat.test.model.Fit") // 3 is a default arg for Fit: suppressed
))
grater[Susan].asObject(dbo) must_== s
}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/TimingSpec.scala b/salat-core/src/test/scala/salat/test/TimingSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/TimingSpec.scala
rename to salat-core/src/test/scala/salat/test/TimingSpec.scala
index 56064da4..e300c164 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/TimingSpec.scala
+++ b/salat-core/src/test/scala/salat/test/TimingSpec.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
-import com.novus.salat.util.Logging
+import salat._
+import salat.test.global._
+import salat.test.model._
+import salat.util.Logging
import org.apache.commons.lang.RandomStringUtils.{randomAscii => rs}
import org.apache.commons.lang.math.RandomUtils.{nextInt => rn}
import org.specs2.execute.{PendingUntilFixed, Success}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/TypeHintStrategySpec.scala b/salat-core/src/test/scala/salat/test/TypeHintStrategySpec.scala
similarity index 85%
rename from salat-core/src/test/scala/com/novus/salat/test/TypeHintStrategySpec.scala
rename to salat-core/src/test/scala/salat/test/TypeHintStrategySpec.scala
index e4dbad97..907cf8b2 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/TypeHintStrategySpec.scala
+++ b/salat-core/src/test/scala/salat/test/TypeHintStrategySpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
-import com.novus.salat.{BinaryTypeHintStrategy, _}
-import com.novus.salat.test.model._
-import com.novus.salat.util.Logging
-import com.novus.salat.util.encoding.TypeHintEncoding
+import salat.{BinaryTypeHintStrategy, _}
+import salat.test.model._
+import salat.util.Logging
+import salat.util.encoding.TypeHintEncoding
import org.specs2.mutable.Specification
class TypeHintStrategySpec extends Specification with Logging {
@@ -39,7 +39,9 @@ class TypeHintStrategySpec extends Specification with Logging {
val bths = BinaryTypeHintStrategy(when = TypeHintFrequency.WhenNecessary, typeHint = "t", encoding = TypeHintEncoding.UsAsciiEncoding)
"handle a class name" in {
val clazzName = classOf[SomeSubclassExtendingSaidTrait].getName
- val expected = BigInt("692984074727956783039651647384290191570936777613175552267852671289279014922270519922204214854615810047")
+ // http://stackoverflow.com/questions/4182029/how-to-convert-byte-array-to-biginteger-in-java
+ val expected = BigInt("514742097497111975556240938723917692093828340540365521870232755356320865506384270702")
+
"encode class name as BitInt" in {
bths.encode(clazzName) must_== expected.toByteArray
}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/TypeParamSpec.scala b/salat-core/src/test/scala/salat/test/TypeParamSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/TypeParamSpec.scala
rename to salat-core/src/test/scala/salat/test/TypeParamSpec.scala
index af25b0b0..79f17bba 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/TypeParamSpec.scala
+++ b/salat-core/src/test/scala/salat/test/TypeParamSpec.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
import org.specs2.matcher.Matcher
// @author akraievoy@gmail.com
diff --git a/salat-core/src/test/scala/com/novus/salat/test/UUIDSupportSpec.scala b/salat-core/src/test/scala/salat/test/UUIDSupportSpec.scala
similarity index 95%
rename from salat-core/src/test/scala/com/novus/salat/test/UUIDSupportSpec.scala
rename to salat-core/src/test/scala/salat/test/UUIDSupportSpec.scala
index 32013884..c2caa5f1 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/UUIDSupportSpec.scala
+++ b/salat-core/src/test/scala/salat/test/UUIDSupportSpec.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.global._
+import salat.test.model._
class UUIDSupportSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/bson/BsonSpec.scala b/salat-core/src/test/scala/salat/test/bson/BsonSpec.scala
similarity index 91%
rename from salat-core/src/test/scala/com/novus/salat/test/bson/BsonSpec.scala
rename to salat-core/src/test/scala/salat/test/bson/BsonSpec.scala
index 9ab8710a..77325c39 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/bson/BsonSpec.scala
+++ b/salat-core/src/test/scala/salat/test/bson/BsonSpec.scala
@@ -26,11 +26,11 @@
*
*/
-package com.novus.salat.test.bson
+package salat.test.bson
-import com.novus.salat._
-import com.novus.salat.test.SalatSpec
-import com.novus.salat.test.global._
+import salat._
+import salat.test.SalatSpec
+import salat.test.global._
class BsonSpec extends SalatSpec {
"Grater should handle BSON encoding round-trip" in {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/bson/model.scala b/salat-core/src/test/scala/salat/test/bson/model.scala
similarity index 95%
rename from salat-core/src/test/scala/com/novus/salat/test/bson/model.scala
rename to salat-core/src/test/scala/salat/test/bson/model.scala
index c1e678c9..a6b8aba7 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/bson/model.scala
+++ b/salat-core/src/test/scala/salat/test/bson/model.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.test.bson
+package salat.test.bson
case class People(country: String, residents: List[Person])
diff --git a/salat-core/src/test/scala/com/novus/salat/test/custom/model.scala b/salat-core/src/test/scala/salat/test/custom/model.scala
similarity index 93%
rename from salat-core/src/test/scala/com/novus/salat/test/custom/model.scala
rename to salat-core/src/test/scala/salat/test/custom/model.scala
index 98296502..5dcac22c 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/custom/model.scala
+++ b/salat-core/src/test/scala/salat/test/custom/model.scala
@@ -26,16 +26,16 @@
*
*/
-package com.novus.salat.test.custom
+package salat.test.custom
import com.mongodb.DBObject
import com.mongodb.casbah.MongoConnection
import com.mongodb.casbah.commons.Implicits._
import com.mongodb.casbah.commons.MongoDBObject
-import com.novus.salat.custom.Bicycle
-import com.novus.salat.dao.SalatDAO
-import com.novus.salat.test._
-import com.novus.salat.transformers.CustomTransformer
+import salat.custom.Bicycle
+import salat.dao.SalatDAO
+import salat.test._
+import salat.transformers.CustomTransformer
import org.bson.types.ObjectId
case class Bar(x: String)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/custom/package.scala b/salat-core/src/test/scala/salat/test/custom/package.scala
similarity index 93%
rename from salat-core/src/test/scala/com/novus/salat/test/custom/package.scala
rename to salat-core/src/test/scala/salat/test/custom/package.scala
index dac237d2..d1124bd0 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/custom/package.scala
+++ b/salat-core/src/test/scala/salat/test/custom/package.scala
@@ -26,9 +26,9 @@
*
*/
-package com.novus.salat.test
+package salat.test
-import com.novus.salat.{Context, StringTypeHintStrategy, TypeHintFrequency}
+import salat.{Context, StringTypeHintStrategy, TypeHintFrequency}
package object custom {
implicit val ctx = new Context() {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/AlphaDAO.scala b/salat-core/src/test/scala/salat/test/dao/AlphaDAO.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/AlphaDAO.scala
rename to salat-core/src/test/scala/salat/test/dao/AlphaDAO.scala
index 598c9247..5d396f1a 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/AlphaDAO.scala
+++ b/salat-core/src/test/scala/salat/test/dao/AlphaDAO.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.Imports._
-import com.novus.salat.annotations._
-import com.novus.salat.dao._
-import com.novus.salat.test._
-import com.novus.salat.test.global._
+import salat.annotations._
+import salat.dao._
+import salat.test._
+import salat.test.global._
import org.joda.time.{DateMidnight, DateTime}
@Salat
@@ -44,7 +44,7 @@ case class Alpha(@Key("_id") id: Int, beta: List[Beta] = Nil)
//
// Instant Salat DAO in under two minutes:
-// 1. extend com.novus.salat.dao.SalatDAO
+// 1. extend salat.dao.SalatDAO
// 2. define a grater for the class
// 3. specify a collection
//
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/ChildCollectionSpec.scala b/salat-core/src/test/scala/salat/test/dao/ChildCollectionSpec.scala
similarity index 98%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/ChildCollectionSpec.scala
rename to salat-core/src/test/scala/salat/test/dao/ChildCollectionSpec.scala
index c765051b..327a5a56 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/ChildCollectionSpec.scala
+++ b/salat-core/src/test/scala/salat/test/dao/ChildCollectionSpec.scala
@@ -25,11 +25,11 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.commons.MongoDBObject
-import com.novus.salat.test._
-import com.novus.salat.test.global._
+import salat.test._
+import salat.test.global._
import org.joda.time.DateMidnight
import org.joda.time.DateTimeConstants._
import org.specs2.specification.Scope
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/FooDAO.scala b/salat-core/src/test/scala/salat/test/dao/FooDAO.scala
similarity index 88%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/FooDAO.scala
rename to salat-core/src/test/scala/salat/test/dao/FooDAO.scala
index 3cafec89..069a76d2 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/FooDAO.scala
+++ b/salat-core/src/test/scala/salat/test/dao/FooDAO.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.Imports._
-import com.novus.salat.annotations._
-import com.novus.salat.dao.{ConcreteSubclassDAO, SalatDAO}
-import com.novus.salat.test._
-import com.novus.salat.{Context, StringTypeHintStrategy, TypeHintFrequency}
+import salat.annotations._
+import salat.dao.{ConcreteSubclassDAO, SalatDAO}
+import salat.test._
+import salat.{Context, StringTypeHintStrategy, TypeHintFrequency}
import org.bson.types.ObjectId
package object when_necessary {
@@ -42,7 +42,7 @@ package object when_necessary {
}
}
-import com.novus.salat.test.dao.when_necessary._
+import salat.test.dao.when_necessary._
@Salat
sealed trait Foo {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/ModelCompanionSpec.scala b/salat-core/src/test/scala/salat/test/dao/ModelCompanionSpec.scala
similarity index 93%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/ModelCompanionSpec.scala
rename to salat-core/src/test/scala/salat/test/dao/ModelCompanionSpec.scala
index 33b87b09..7592c3f0 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/ModelCompanionSpec.scala
+++ b/salat-core/src/test/scala/salat/test/dao/ModelCompanionSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.Imports._
-import com.novus.salat.json.JSONConfig
-import com.novus.salat.test._
-import com.novus.salat.test.global._
+import salat.json.JSONConfig
+import salat.test._
+import salat.test.global._
import org.joda.time._
import org.json4s.JsonAST._
import org.specs2.specification.Scope
@@ -62,7 +62,7 @@ class ModelCompanionSpec extends SalatSpec {
"toPrettyJson" in new myModelScope {
MyModel.toPrettyJson(m) must_== """{
- "_typeHint":"com.novus.salat.test.dao.MyModel",
+ "_typeHint":"salat.test.dao.MyModel",
"_id":{
"$oid":"%s"
},
@@ -74,7 +74,7 @@ class ModelCompanionSpec extends SalatSpec {
}
"toCompactJson" in new myModelScope {
- val expected = "{\"_typeHint\":\"com.novus.salat.test.dao.MyModel\",\"_id\":{\"$oid\":\"" +
+ val expected = "{\"_typeHint\":\"salat.test.dao.MyModel\",\"_id\":{\"$oid\":\"" +
_id.toString +
"\"},\"x\":\"Test\",\"y\":99,\"z\":[1.0,2.0,3.0],\"d\":\"" +
JSONConfig.ISO8601.print(d.getMillis) +
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/MyModel.scala b/salat-core/src/test/scala/salat/test/dao/MyModel.scala
similarity index 89%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/MyModel.scala
rename to salat-core/src/test/scala/salat/test/dao/MyModel.scala
index a040120c..bab3eb16 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/MyModel.scala
+++ b/salat-core/src/test/scala/salat/test/dao/MyModel.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.Imports._
-import com.novus.salat.annotations._
-import com.novus.salat.dao.{ModelCompanion, SalatDAO}
-import com.novus.salat.test._
-import com.novus.salat.test.global._
+import salat.annotations._
+import salat.dao.{ModelCompanion, SalatDAO}
+import salat.test._
+import salat.test.global._
import org.joda.time._
object MyModel extends ModelCompanion[MyModel, ObjectId] {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/PolymorphicSalatDAOSpec.scala b/salat-core/src/test/scala/salat/test/dao/PolymorphicSalatDAOSpec.scala
similarity index 98%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/PolymorphicSalatDAOSpec.scala
rename to salat-core/src/test/scala/salat/test/dao/PolymorphicSalatDAOSpec.scala
index 6ecf1c62..a6ecf364 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/PolymorphicSalatDAOSpec.scala
+++ b/salat-core/src/test/scala/salat/test/dao/PolymorphicSalatDAOSpec.scala
@@ -25,13 +25,13 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.MongoDBObject
-import com.novus.salat.ConcreteGrater
-import com.novus.salat.test._
-import com.novus.salat.test.dao.when_necessary._
+import salat.ConcreteGrater
+import salat.test._
+import salat.test.dao.when_necessary._
import org.specs2.specification.Scope
class PolymorphicSalatDAOSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/ReadPreferenceSpec.scala b/salat-core/src/test/scala/salat/test/dao/ReadPreferenceSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/ReadPreferenceSpec.scala
rename to salat-core/src/test/scala/salat/test/dao/ReadPreferenceSpec.scala
index 8d48df03..816d1afd 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/ReadPreferenceSpec.scala
+++ b/salat-core/src/test/scala/salat/test/dao/ReadPreferenceSpec.scala
@@ -26,12 +26,12 @@
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test._
-import com.novus.salat.test.global._
+import salat._
+import salat.test._
+import salat.test.global._
import org.specs2.specification.Scope
class ReadPreferenceSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/SalatDAOSpec.scala b/salat-core/src/test/scala/salat/test/dao/SalatDAOSpec.scala
similarity index 98%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/SalatDAOSpec.scala
rename to salat-core/src/test/scala/salat/test/dao/SalatDAOSpec.scala
index 08c7674b..078f207c 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/SalatDAOSpec.scala
+++ b/salat-core/src/test/scala/salat/test/dao/SalatDAOSpec.scala
@@ -25,15 +25,15 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.MongoDBObject
import com.mongodb.{DuplicateKeyException, WriteConcernException}
-import com.novus.salat._
-import com.novus.salat.dao.{SalatDAOUpdateError, SalatInsertError}
-import com.novus.salat.test._
-import com.novus.salat.test.global._
+import salat._
+import salat.dao.{SalatDAOUpdateError, SalatInsertError}
+import salat.test._
+import salat.test.global._
import org.specs2.specification.Scope
class SalatDAOSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/dao/ValidatingSalatDAOSpec.scala b/salat-core/src/test/scala/salat/test/dao/ValidatingSalatDAOSpec.scala
similarity index 95%
rename from salat-core/src/test/scala/com/novus/salat/test/dao/ValidatingSalatDAOSpec.scala
rename to salat-core/src/test/scala/salat/test/dao/ValidatingSalatDAOSpec.scala
index 220f8d0e..7e6158b9 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/dao/ValidatingSalatDAOSpec.scala
+++ b/salat-core/src/test/scala/salat/test/dao/ValidatingSalatDAOSpec.scala
@@ -26,10 +26,10 @@
*
*/
-package com.novus.salat.test.dao
+package salat.test.dao
-import com.novus.salat.dao.ValidationError
-import com.novus.salat.test.SalatSpec
+import salat.dao.ValidationError
+import salat.test.SalatSpec
import org.bson.types.ObjectId
class ValidatingSalatDAOSpec extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/global.scala b/salat-core/src/test/scala/salat/test/global.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/global.scala
rename to salat-core/src/test/scala/salat/test/global.scala
index 8d02cbba..fa165536 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/global.scala
+++ b/salat-core/src/test/scala/salat/test/global.scala
@@ -26,9 +26,9 @@
*
*/
-package com.novus.salat.test
+package salat.test
-import com.novus.salat._
+import salat._
package object global {
implicit val ctx = new Context {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/BSTimestampStrategySpec.scala b/salat-core/src/test/scala/salat/test/json/BSTimestampStrategySpec.scala
similarity index 93%
rename from salat-core/src/test/scala/com/novus/salat/test/json/BSTimestampStrategySpec.scala
rename to salat-core/src/test/scala/salat/test/json/BSTimestampStrategySpec.scala
index 259f0208..7e90fdab 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/BSTimestampStrategySpec.scala
+++ b/salat-core/src/test/scala/salat/test/json/BSTimestampStrategySpec.scala
@@ -26,10 +26,10 @@
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat.json.StrictBSONTimestampStrategy
-import com.novus.salat.util.Logging
+import salat.json.StrictBSONTimestampStrategy
+import salat.util.Logging
import org.bson.types.BSONTimestamp
import org.json4s.JsonAST._
import org.specs2.mutable.Specification
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/DateStrategySpec.scala b/salat-core/src/test/scala/salat/test/json/DateStrategySpec.scala
similarity index 95%
rename from salat-core/src/test/scala/com/novus/salat/test/json/DateStrategySpec.scala
rename to salat-core/src/test/scala/salat/test/json/DateStrategySpec.scala
index ad6670d6..17f7d7b7 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/DateStrategySpec.scala
+++ b/salat-core/src/test/scala/salat/test/json/DateStrategySpec.scala
@@ -26,10 +26,10 @@
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat.json.{StrictJSONDateStrategy, StringDateStrategy, TimestampDateStrategy}
-import com.novus.salat.util.Logging
+import salat.json.{StrictJSONDateStrategy, StringDateStrategy, TimestampDateStrategy}
+import salat.util.Logging
import org.joda.time.format.ISODateTimeFormat
import org.joda.time.{DateTime, DateTimeZone}
import org.json4s.JsonAST._
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/JsonDefaultValuesSpec.scala b/salat-core/src/test/scala/salat/test/json/JsonDefaultValuesSpec.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/json/JsonDefaultValuesSpec.scala
rename to salat-core/src/test/scala/salat/test/json/JsonDefaultValuesSpec.scala
index 78b2b1d2..34c30c45 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/JsonDefaultValuesSpec.scala
+++ b/salat-core/src/test/scala/salat/test/json/JsonDefaultValuesSpec.scala
@@ -26,11 +26,11 @@
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat._
-import com.novus.salat.json._
-import com.novus.salat.util._
+import salat._
+import salat.json._
+import salat.util._
import org.bson.types.ObjectId
import org.specs2.matcher.JsonMatchers
import org.specs2.mutable.Specification
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/JsonMapSupport.scala b/salat-core/src/test/scala/salat/test/json/JsonMapSupport.scala
similarity index 98%
rename from salat-core/src/test/scala/com/novus/salat/test/json/JsonMapSupport.scala
rename to salat-core/src/test/scala/salat/test/json/JsonMapSupport.scala
index b749547d..1a68ad27 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/JsonMapSupport.scala
+++ b/salat-core/src/test/scala/salat/test/json/JsonMapSupport.scala
@@ -26,10 +26,10 @@
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat.json.MapToJSON
-import com.novus.salat.test.SalatSpec
+import salat.json.MapToJSON
+import salat.test.SalatSpec
class JsonMapSupport extends SalatSpec {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/JsonModel.scala b/salat-core/src/test/scala/salat/test/json/JsonModel.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/json/JsonModel.scala
rename to salat-core/src/test/scala/salat/test/json/JsonModel.scala
index 68a6674c..432baebc 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/JsonModel.scala
+++ b/salat-core/src/test/scala/salat/test/json/JsonModel.scala
@@ -25,9 +25,9 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat.annotations._
+import salat.annotations._
import org.bson.types.ObjectId
import org.joda.time.DateTime
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/JsonSpec.scala b/salat-core/src/test/scala/salat/test/json/JsonSpec.scala
similarity index 92%
rename from salat-core/src/test/scala/com/novus/salat/test/json/JsonSpec.scala
rename to salat-core/src/test/scala/salat/test/json/JsonSpec.scala
index 7d43eae3..dd37b84e 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/JsonSpec.scala
+++ b/salat-core/src/test/scala/salat/test/json/JsonSpec.scala
@@ -25,11 +25,11 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat._
-import com.novus.salat.json.{StrictJSONDateStrategy, StringDateStrategy, TimestampDateStrategy, _}
-import com.novus.salat.util._
+import salat._
+import salat.json.{StrictJSONDateStrategy, StringDateStrategy, TimestampDateStrategy, _}
+import salat.util._
import org.bson.types.ObjectId
import org.joda.time.DateTimeConstants._
import org.joda.time.format.ISODateTimeFormat
@@ -220,22 +220,22 @@ class JsonSpec extends Specification with Logging with JsonMatchers {
"with a top-level trait" in {
val i = Ivar(s = "Hello")
val i_* = grater[Helge].toPrettyJSON(i)
- i_* must /("_t" -> "com.novus.salat.test.json.Ivar")
+ i_* must /("_t" -> "salat.test.json.Ivar")
i_* must /("s" -> "Hello")
val j = Johan(s = "Hello", d = 3.14)
val j_* = grater[Helge].toPrettyJSON(j)
- j_* must /("_t" -> "com.novus.salat.test.json.Johan")
+ j_* must /("_t" -> "salat.test.json.Johan")
j_* must /("s" -> "Hello")
j_* must /("d" -> 3.14)
}
"with an abstract superclass" in {
val l = Ludvig(s = "Hello")
val l_* = grater[Kalle].toPrettyJSON(l)
- l_* must /("_t" -> "com.novus.salat.test.json.Ludvig")
+ l_* must /("_t" -> "salat.test.json.Ludvig")
l_* must /("s" -> "Hello")
val m = Martin(s = "Hello", d = 3.14)
val m_* = grater[Kalle].toPrettyJSON(m)
- m_* must /("_t" -> "com.novus.salat.test.json.Martin")
+ m_* must /("_t" -> "salat.test.json.Martin")
m_* must /("s" -> "Hello")
m_* must /("d" -> 3.14)
}
@@ -246,9 +246,9 @@ class JsonSpec extends Specification with Logging with JsonMatchers {
val jarr = grater[Kalle].toJSONArray(List(Martin("one", 1.1), Martin("two", 2.2), Martin("three", 3.3)))
jarr.arr must have size (3)
jarr.arr must contain(exactly(
- JObject(JField("_t", JString("com.novus.salat.test.json.Martin")) :: JField("s", JString("one")) :: JField("d", JDouble(1.1)) :: Nil).asInstanceOf[JValue],
- JObject(JField("_t", JString("com.novus.salat.test.json.Martin")) :: JField("s", JString("two")) :: JField("d", JDouble(2.2)) :: Nil).asInstanceOf[JValue],
- JObject(JField("_t", JString("com.novus.salat.test.json.Martin")) :: JField("s", JString("three")) :: JField("d", JDouble(3.3)) :: Nil).asInstanceOf[JValue]
+ JObject(JField("_t", JString("salat.test.json.Martin")) :: JField("s", JString("one")) :: JField("d", JDouble(1.1)) :: Nil).asInstanceOf[JValue],
+ JObject(JField("_t", JString("salat.test.json.Martin")) :: JField("s", JString("two")) :: JField("d", JDouble(2.2)) :: Nil).asInstanceOf[JValue],
+ JObject(JField("_t", JString("salat.test.json.Martin")) :: JField("s", JString("three")) :: JField("d", JDouble(3.3)) :: Nil).asInstanceOf[JValue]
)).inOrder
}
@@ -450,12 +450,12 @@ class JsonSpec extends Specification with Logging with JsonMatchers {
"deserialize JObjects containing class hierarchies" in {
"with a top-level trait" in {
grater[Helge].fromJSON(JObject(
- JField("_t", JString("com.novus.salat.test.json.Ivar")) ::
+ JField("_t", JString("salat.test.json.Ivar")) ::
JField("s", JString("Hello")) ::
Nil
)) must_== Ivar(s = "Hello")
grater[Helge].fromJSON(JObject(
- JField("_t", JString("com.novus.salat.test.json.Johan")) ::
+ JField("_t", JString("salat.test.json.Johan")) ::
JField("s", JString("Hello")) ::
JField("d", JDouble(3.14)) ::
Nil
@@ -463,12 +463,12 @@ class JsonSpec extends Specification with Logging with JsonMatchers {
}
"with an abstract superclass" in {
grater[Kalle].fromJSON(JObject(
- JField("_t", JString("com.novus.salat.test.json.Ludvig")) ::
+ JField("_t", JString("salat.test.json.Ludvig")) ::
JField("s", JString("Hello")) ::
Nil
)) must_== Ludvig(s = "Hello")
grater[Kalle].fromJSON(JObject(
- JField("_t", JString("com.novus.salat.test.json.Martin")) ::
+ JField("_t", JString("salat.test.json.Martin")) ::
JField("s", JString("Hello")) ::
JField("d", JDouble(3.14)) ::
Nil
@@ -483,7 +483,7 @@ class JsonSpec extends Specification with Logging with JsonMatchers {
grater[Niklas].fromJSON("""{"g":{"o":"OG"}}""") must_== n
}
"a string that can be parsed to a JSON array" in {
- val arr = """[{"_t":"com.novus.salat.test.json.Martin","s":"one","d":1.1},{"_t":"com.novus.salat.test.json.Martin","s":"two","d":2.2},{"_t":"com.novus.salat.test.json.Martin","s":"three","d":3.3}]"""
+ val arr = """[{"_t":"salat.test.json.Martin","s":"one","d":1.1},{"_t":"salat.test.json.Martin","s":"two","d":2.2},{"_t":"salat.test.json.Martin","s":"three","d":3.3}]"""
grater[Kalle].fromJSONArray(arr) must_== List(Martin("one", 1.1), Martin("two", 2.2), Martin("three", 3.3))
}
"throw an exception when string cannot be parsed to valid JSON" in {
@@ -496,9 +496,9 @@ class JsonSpec extends Specification with Logging with JsonMatchers {
}
"JArray" in {
val j = JArray(
- JObject(JField("_t", JString("com.novus.salat.test.json.Martin")) :: JField("s", JString("one")) :: JField("d", JDouble(1.1)) :: Nil) ::
- JObject(JField("_t", JString("com.novus.salat.test.json.Martin")) :: JField("s", JString("two")) :: JField("d", JDouble(2.2)) :: Nil) ::
- JObject(JField("_t", JString("com.novus.salat.test.json.Martin")) :: JField("s", JString("three")) :: JField("d", JDouble(3.3)) :: Nil) ::
+ JObject(JField("_t", JString("salat.test.json.Martin")) :: JField("s", JString("one")) :: JField("d", JDouble(1.1)) :: Nil) ::
+ JObject(JField("_t", JString("salat.test.json.Martin")) :: JField("s", JString("two")) :: JField("d", JDouble(2.2)) :: Nil) ::
+ JObject(JField("_t", JString("salat.test.json.Martin")) :: JField("s", JString("three")) :: JField("d", JDouble(3.3)) :: Nil) ::
Nil
)
grater[Kalle].fromJSONArray(j) must_== List(Martin("one", 1.1), Martin("two", 2.2), Martin("three", 3.3))
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/ObjectIdSpec.scala b/salat-core/src/test/scala/salat/test/json/ObjectIdSpec.scala
similarity index 92%
rename from salat-core/src/test/scala/com/novus/salat/test/json/ObjectIdSpec.scala
rename to salat-core/src/test/scala/salat/test/json/ObjectIdSpec.scala
index 7199e835..9a7e4cea 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/ObjectIdSpec.scala
+++ b/salat-core/src/test/scala/salat/test/json/ObjectIdSpec.scala
@@ -26,10 +26,10 @@
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat.json.{StrictJSONObjectIdStrategy, StringObjectIdStrategy}
-import com.novus.salat.util.Logging
+import salat.json.{StrictJSONObjectIdStrategy, StringObjectIdStrategy}
+import salat.util.Logging
import org.bson.types.ObjectId
import org.json4s.JsonAST._
import org.specs2.mutable.Specification
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/TimeZoneStrategySpec.scala b/salat-core/src/test/scala/salat/test/json/TimeZoneStrategySpec.scala
similarity index 94%
rename from salat-core/src/test/scala/com/novus/salat/test/json/TimeZoneStrategySpec.scala
rename to salat-core/src/test/scala/salat/test/json/TimeZoneStrategySpec.scala
index 4f3e16ec..ba5319f3 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/TimeZoneStrategySpec.scala
+++ b/salat-core/src/test/scala/salat/test/json/TimeZoneStrategySpec.scala
@@ -26,10 +26,10 @@
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat.json.StringTimeZoneStrategy
-import com.novus.salat.util.Logging
+import salat.json.StringTimeZoneStrategy
+import salat.util.Logging
import org.joda.time.DateTimeZone
import org.json4s.JsonAST.{JInt, JString}
import org.specs2.mutable.Specification
diff --git a/salat-core/src/test/scala/com/novus/salat/test/json/json.scala b/salat-core/src/test/scala/salat/test/json/json.scala
similarity index 94%
rename from salat-core/src/test/scala/com/novus/salat/test/json/json.scala
rename to salat-core/src/test/scala/salat/test/json/json.scala
index bcfe6a54..abce8293 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/json/json.scala
+++ b/salat-core/src/test/scala/salat/test/json/json.scala
@@ -25,10 +25,10 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.json
+package salat.test.json
-import com.novus.salat._
-import com.novus.salat.json.{JSONConfig, StringDateStrategy}
+import salat._
+import salat.json.{JSONConfig, StringDateStrategy}
import org.joda.time.DateTimeConstants._
import org.joda.time.format.ISODateTimeFormat
import org.joda.time.{DateTime, DateTimeZone}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/model/CollectionSupportModel.scala b/salat-core/src/test/scala/salat/test/model/CollectionSupportModel.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/model/CollectionSupportModel.scala
rename to salat-core/src/test/scala/salat/test/model/CollectionSupportModel.scala
index 5584fe4a..af491a29 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/model/CollectionSupportModel.scala
+++ b/salat-core/src/test/scala/salat/test/model/CollectionSupportModel.scala
@@ -25,10 +25,10 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.model
+package salat.test.model
import com.mongodb.casbah.Imports._
-import com.novus.salat.annotations._
+import salat.annotations._
case class Thingy(t: String)
diff --git a/salat-core/src/test/scala/com/novus/salat/test/model/TestModel.scala b/salat-core/src/test/scala/salat/test/model/TestModel.scala
similarity index 99%
rename from salat-core/src/test/scala/com/novus/salat/test/model/TestModel.scala
rename to salat-core/src/test/scala/salat/test/model/TestModel.scala
index f8d18326..11bdaacd 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/model/TestModel.scala
+++ b/salat-core/src/test/scala/salat/test/model/TestModel.scala
@@ -25,14 +25,14 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.model
+package salat.test.model
// Just a dummy data model. It's totally contrived, so don't hold it
// against me, neh?
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.annotations._
+import salat._
+import salat.annotations._
import org.joda.time.{DateTime, DateTimeZone, LocalDateTime}
import scala.collection.immutable.{Map => IMap}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/model/TestModel2.scala b/salat-core/src/test/scala/salat/test/model/TestModel2.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/model/TestModel2.scala
rename to salat-core/src/test/scala/salat/test/model/TestModel2.scala
index d1b77343..1e1f0e79 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/model/TestModel2.scala
+++ b/salat-core/src/test/scala/salat/test/model/TestModel2.scala
@@ -26,9 +26,9 @@
*
*/
-package com.novus.salat.test.model
+package salat.test.model
-import com.novus.salat.annotations._
+import salat.annotations._
import org.bson.types.ObjectId
import org.joda.time.{DateTime, DateTimeZone}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/model/TestModel3.scala b/salat-core/src/test/scala/salat/test/model/TestModel3.scala
similarity index 93%
rename from salat-core/src/test/scala/com/novus/salat/test/model/TestModel3.scala
rename to salat-core/src/test/scala/salat/test/model/TestModel3.scala
index d0471516..686b04c6 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/model/TestModel3.scala
+++ b/salat-core/src/test/scala/salat/test/model/TestModel3.scala
@@ -26,10 +26,10 @@
*
*/
-package com.novus.salat.test.model
+package salat.test.model
-import com.novus.salat.Context
-import com.novus.salat.annotations._
+import salat.Context
+import salat.annotations._
package object suppress_default_args {
implicit val ctx = new Context {
@@ -67,7 +67,7 @@ package sda {
}
package object case_object_override {
- import com.novus.salat.test.model.coo._
+ import salat.test.model.coo._
implicit val ctx = {
val ctx = new Context {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/model/TypeParamsModel.scala b/salat-core/src/test/scala/salat/test/model/TypeParamsModel.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/model/TypeParamsModel.scala
rename to salat-core/src/test/scala/salat/test/model/TypeParamsModel.scala
index bde0c4f0..dc6d2eda 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/model/TypeParamsModel.scala
+++ b/salat-core/src/test/scala/salat/test/model/TypeParamsModel.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.test.model
+package salat.test.model
// @author akraievoy@gmail.com
diff --git a/salat-core/src/test/scala/com/novus/salat/test/model/package.scala b/salat-core/src/test/scala/salat/test/model/package.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/model/package.scala
rename to salat-core/src/test/scala/salat/test/model/package.scala
index 7c99c21b..eb93a87d 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/model/package.scala
+++ b/salat-core/src/test/scala/salat/test/model/package.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.test
+package salat.test
package object model {
diff --git a/salat-core/src/test/scala/com/novus/salat/test/model/useful.scala b/salat-core/src/test/scala/salat/test/model/useful.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/model/useful.scala
rename to salat-core/src/test/scala/salat/test/model/useful.scala
index 111caaa3..9caa917f 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/model/useful.scala
+++ b/salat-core/src/test/scala/salat/test/model/useful.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.test.model
+package salat.test.model
import org.joda.time.DateTimeConstants._
import org.joda.time.{DateTime, DateTimeZone}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/performance/BigDecimalStrategyPerformanceSpec.scala b/salat-core/src/test/scala/salat/test/performance/BigDecimalStrategyPerformanceSpec.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/performance/BigDecimalStrategyPerformanceSpec.scala
rename to salat-core/src/test/scala/salat/test/performance/BigDecimalStrategyPerformanceSpec.scala
index acdde089..143f549d 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/performance/BigDecimalStrategyPerformanceSpec.scala
+++ b/salat-core/src/test/scala/salat/test/performance/BigDecimalStrategyPerformanceSpec.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat.test.performance
+package salat.test.performance
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.dao.SalatDAO
-import com.novus.salat.test.RichDuration._
-import com.novus.salat.util.Logging
+import salat._
+import salat.dao.SalatDAO
+import salat.test.RichDuration._
+import salat.util.Logging
import org.specs2.mutable._
import org.specs2.specification.Scope
diff --git a/salat-core/src/test/scala/com/novus/salat/test/performance/model.scala b/salat-core/src/test/scala/salat/test/performance/model.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/performance/model.scala
rename to salat-core/src/test/scala/salat/test/performance/model.scala
index d4e34cd6..1d14264b 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/performance/model.scala
+++ b/salat-core/src/test/scala/salat/test/performance/model.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.test.performance
+package salat.test.performance
import com.mongodb.casbah.Imports._
diff --git a/salat-core/src/test/scala/com/novus/salat/test/test.scala b/salat-core/src/test/scala/salat/test/test.scala
similarity index 97%
rename from salat-core/src/test/scala/com/novus/salat/test/test.scala
rename to salat-core/src/test/scala/salat/test/test.scala
index 386e5bd8..5a5b3c78 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/test.scala
+++ b/salat-core/src/test/scala/salat/test/test.scala
@@ -25,10 +25,10 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat.test.global._
+import salat.test.model._
import scala.collection.immutable.{Map => IMap}
import scala.collection.mutable.{Map => MMap}
diff --git a/salat-core/src/test/scala/com/novus/salat/test/testctx.scala b/salat-core/src/test/scala/salat/test/testctx.scala
similarity index 96%
rename from salat-core/src/test/scala/com/novus/salat/test/testctx.scala
rename to salat-core/src/test/scala/salat/test/testctx.scala
index 452d6907..10f6076d 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/testctx.scala
+++ b/salat-core/src/test/scala/salat/test/testctx.scala
@@ -25,12 +25,12 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test
+package salat.test
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.model.Rhoda
-import com.novus.salat.util.encoding.TypeHintEncoding
+import salat._
+import salat.test.model.Rhoda
+import salat.util.encoding.TypeHintEncoding
package object always {
diff --git a/salat-core/src/test/scala/salat/test/util/MissingGraterExplanationSpec.scala b/salat-core/src/test/scala/salat/test/util/MissingGraterExplanationSpec.scala
new file mode 100644
index 00000000..8e9b9c46
--- /dev/null
+++ b/salat-core/src/test/scala/salat/test/util/MissingGraterExplanationSpec.scala
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010 - 2015 Novus Partners, Inc. (http://www.novus.com)
+ * Copyright (c) 2015 - 2016 Rose Toomey (https://github.com/rktoomey) and other individual contributors where noted
+ *
+ * Module: salat-core
+ * Class: MissingGraterExplanationSpec.scala
+ * Last modified: 2016-07-10 23:42:23 EDT
+ *
+ * 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.
+ *
+ * Project: http://github.com/salat/salat
+ * Wiki: http://github.com/salat/salat/wiki
+ * Slack: https://scala-salat.slack.com
+ * Mailing list: http://groups.google.com/group/scala-salat
+ * StackOverflow: http://stackoverflow.com/questions/tagged/salat
+ *
+ */
+//package salat.test.util
+//
+//import salat._
+//import salat.test.global._
+//import salat.test.model._
+//import com.mongodb.casbah.Imports._
+//import salat.test._
+//import com.mongodb.util.JSON
+//import salat.util.{GraterGlitch, GraterFromDboGlitch}
+//
+//class MissingGraterExplanationSpec extends SalatSpec {
+// "Missing grater explanation" should {
+// "handle type hint glitches in DBOs" in {
+// "explain when a type hint refers to a class that can't be found" in {
+// // type hint "salat.test.model.DoesNotExist" refers to non-existent class
+// val badCandy = """{ "_typeHint" : "salat.test.model.ManyMauds" ,
+// "mauds" : [ { "_typeHint" : "salat.test.model.DoesNotExist" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
+// { "_typeHint" : "salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "salat.test.model.Ida" , "lake" : 8.0}}]}"""
+// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterGlitch]
+// }
+//// "explain when a type hint refers to a trait" in {
+//// // type hint "salat.test.model.MaudLike" refers to trait
+//// val badCandy = """{ "_typeHint" : "salat.test.model.ManyMauds" ,
+//// "mauds" : [ { "_typeHint" : "salat.test.model.MaudLike" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
+//// { "_typeHint" : "salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "salat.test.model.Ida" , "lake" : 8.0}}]}"""
+//// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterFromDboGlitch]
+//// }
+//// "explain when a type hint refers to an abstract class" in {
+//// // type hint "salat.test.model.Vertebrate" refers to abstract class
+//// val badCandy = """{ "_typeHint" : "salat.test.model.ManyMauds" ,
+//// "mauds" : [ { "_typeHint" : "salat.test.model.Vertebrate" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
+//// { "_typeHint" : "salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "salat.test.model.Ida" , "lake" : 8.0}}]}"""
+//// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterFromDboGlitch]
+//// }
+// "explain when a type hint refers to a class that is not a case class" in {
+// // type hint "salat.test.model.NotACaseClass" refers to something that is... not a case class!
+// val badCandy = """{ "_typeHint" : "salat.test.model.NotACaseClass" ,
+// "mauds" : [ { "_typeHint" : "salat.test.model.Vertebrate" , "swept" : "swept" , "out" : "out" , "toSea" : "tuo tpews"} ,
+// { "_typeHint" : "salat.test.model.Maud6" , "swept" : "swept" , "out" : "out" , "ida" : { "_typeHint" : "salat.test.model.Ida" , "lake" : 8.0}}]}"""
+// grater[ManyMauds].asObject(JSON.parse(badCandy).asInstanceOf[DBObject]) must throwA[GraterFromDboGlitch]
+// }
+// }
+// }
+//}
\ No newline at end of file
diff --git a/salat-core/src/test/scala/com/novus/salat/test/util/UriConversionHelper.scala b/salat-core/src/test/scala/salat/test/util/UriConversionHelper.scala
similarity index 99%
rename from salat-core/src/test/scala/com/novus/salat/test/util/UriConversionHelper.scala
rename to salat-core/src/test/scala/salat/test/util/UriConversionHelper.scala
index fbdfc42e..40d75691 100644
--- a/salat-core/src/test/scala/com/novus/salat/test/util/UriConversionHelper.scala
+++ b/salat-core/src/test/scala/salat/test/util/UriConversionHelper.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.test.util
+package salat.test.util
import com.mongodb.casbah.commons.conversions.MongoConversionHelper
import org.bson.{BSON, Transformer}
diff --git a/salat-core/src/test/scala/com/novus/salat/util/PrettyPrinterSpec.scala b/salat-core/src/test/scala/salat/util/PrettyPrinterSpec.scala
similarity index 92%
rename from salat-core/src/test/scala/com/novus/salat/util/PrettyPrinterSpec.scala
rename to salat-core/src/test/scala/salat/util/PrettyPrinterSpec.scala
index 6371bfe4..68a30465 100644
--- a/salat-core/src/test/scala/com/novus/salat/util/PrettyPrinterSpec.scala
+++ b/salat-core/src/test/scala/salat/util/PrettyPrinterSpec.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat.util
+package salat.util
import com.mongodb.casbah.Imports._
-import com.novus.salat._
-import com.novus.salat.test.SalatSpec
-import com.novus.salat.test.global._
-import com.novus.salat.test.model._
+import salat._
+import salat.test.SalatSpec
+import salat.test.global._
+import salat.test.model._
class PrettyPrinterSpec extends SalatSpec {
"Constructor/input pretty printer" should {
diff --git a/salat-util/src/main/java/com/novus/salat/EnumStrategy.java b/salat-util/src/main/java/salat/EnumStrategy.java
similarity index 98%
rename from salat-util/src/main/java/com/novus/salat/EnumStrategy.java
rename to salat-util/src/main/java/salat/EnumStrategy.java
index 7e609042..f35a565d 100644
--- a/salat-util/src/main/java/com/novus/salat/EnumStrategy.java
+++ b/salat-util/src/main/java/salat/EnumStrategy.java
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat;
+package salat;
/**
* Supported strategies for serializing enums.
diff --git a/salat-util/src/main/java/com/novus/salat/annotations/raw/EnumAs.java b/salat-util/src/main/java/salat/annotations/raw/EnumAs.java
similarity index 93%
rename from salat-util/src/main/java/com/novus/salat/annotations/raw/EnumAs.java
rename to salat-util/src/main/java/salat/annotations/raw/EnumAs.java
index 76f4dce0..ceb41838 100644
--- a/salat-util/src/main/java/com/novus/salat/annotations/raw/EnumAs.java
+++ b/salat-util/src/main/java/salat/annotations/raw/EnumAs.java
@@ -25,9 +25,9 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.annotations.raw;
+package salat.annotations.raw;
-import com.novus.salat.EnumStrategy;
+import salat.EnumStrategy;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -39,7 +39,7 @@
*
* To force an individual enum to be serialized using its ordinal values:
* {@code
- * import com.novus.salat.annotations._
+ * import salat.annotations._
*
* @EnumAs(strategy = EnumStrategy.BY_ID)
* object BabyAnimalsById extends Enumeration {
@@ -49,7 +49,7 @@
*
* To force an individual enum to be serialized using the toString representation of each value:
* {@code
- * import com.novus.salat.annotations._
+ * import salat.annotations._
*
* @EnumAs(strategy = EnumStrategy.BY_VALUE)
* object BabyAnimalsByValue extends Enumeration {
diff --git a/salat-util/src/main/java/com/novus/salat/annotations/raw/Ignore.java b/salat-util/src/main/java/salat/annotations/raw/Ignore.java
similarity index 93%
rename from salat-util/src/main/java/com/novus/salat/annotations/raw/Ignore.java
rename to salat-util/src/main/java/salat/annotations/raw/Ignore.java
index 34c7a9b3..84936686 100644
--- a/salat-util/src/main/java/com/novus/salat/annotations/raw/Ignore.java
+++ b/salat-util/src/main/java/salat/annotations/raw/Ignore.java
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.annotations.raw;
+package salat.annotations.raw;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -38,14 +38,14 @@
*
* Good:
* {@code
- * import com.novus.salat.annotations._
+ * import salat.annotations._
*
* case class Foo(@Ignore ignoreMe: String = "bar", dontIgnoreMe: Int)
* }
*
* Bad:
* {@code
- * import com.novus.salat.annotations._
+ * import salat.annotations._
*
* case class Foo(@Ignore ignoreMe: String, dontIgnoreMe: Int)
* }
diff --git a/salat-util/src/main/java/com/novus/salat/annotations/raw/Key.java b/salat-util/src/main/java/salat/annotations/raw/Key.java
similarity index 95%
rename from salat-util/src/main/java/com/novus/salat/annotations/raw/Key.java
rename to salat-util/src/main/java/salat/annotations/raw/Key.java
index b59c6bd6..8cc7dfe6 100644
--- a/salat-util/src/main/java/com/novus/salat/annotations/raw/Key.java
+++ b/salat-util/src/main/java/salat/annotations/raw/Key.java
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.annotations.raw;
+package salat.annotations.raw;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -37,7 +37,7 @@
*
* In this example, when Foo is serialized, the "bar" field will be called "baz".
* {@code
- * import com.novus.salat.annotations._
+ * import salat.annotations._
*
* case class Foo(@Key("baz") bar: String)
* }
diff --git a/salat-util/src/main/java/com/novus/salat/annotations/raw/Persist.java b/salat-util/src/main/java/salat/annotations/raw/Persist.java
similarity index 93%
rename from salat-util/src/main/java/com/novus/salat/annotations/raw/Persist.java
rename to salat-util/src/main/java/salat/annotations/raw/Persist.java
index 9ae9dff0..f33105bb 100644
--- a/salat-util/src/main/java/com/novus/salat/annotations/raw/Persist.java
+++ b/salat-util/src/main/java/salat/annotations/raw/Persist.java
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.annotations.raw;
+package salat.annotations.raw;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -37,7 +37,7 @@
*
* In the example below, when Foo is serialized, field "goodbye" will appear in the serialized output.
* {@code
- * import com.novus.salat.annotations._
+ * import salat.annotations._
*
* case class Foo(hello: String) {
* @Persist val goodbye = hello.reverse
diff --git a/salat-util/src/main/java/com/novus/salat/annotations/raw/Salat.java b/salat-util/src/main/java/salat/annotations/raw/Salat.java
similarity index 95%
rename from salat-util/src/main/java/com/novus/salat/annotations/raw/Salat.java
rename to salat-util/src/main/java/salat/annotations/raw/Salat.java
index 87e5cb5d..46e0d710 100644
--- a/salat-util/src/main/java/com/novus/salat/annotations/raw/Salat.java
+++ b/salat-util/src/main/java/salat/annotations/raw/Salat.java
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.annotations.raw;
+package salat.annotations.raw;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -38,7 +38,7 @@
* out via class introspection.
*
* {@code
- * import com.novus.salat.annotations._
+ * import salat.annotations._
*
* @Salat
* trait BabyAnimal
diff --git a/salat-util/src/main/scala/com/novus/salat/ClassAnalyzer.scala b/salat-util/src/main/scala/salat/ClassAnalyzer.scala
similarity index 97%
rename from salat-util/src/main/scala/com/novus/salat/ClassAnalyzer.scala
rename to salat-util/src/main/scala/salat/ClassAnalyzer.scala
index 2e0440cb..47e43fb3 100644
--- a/salat-util/src/main/scala/com/novus/salat/ClassAnalyzer.scala
+++ b/salat-util/src/main/scala/salat/ClassAnalyzer.scala
@@ -26,13 +26,13 @@
*
*/
-package com.novus.salat
+package salat
import java.lang.reflect.{Constructor, Method}
-import com.novus.salat.annotations.raw._
-import com.novus.salat.annotations.util._
-import com.novus.salat.util.{MissingExpectedType, MissingPickledSig, _}
+import salat.annotations.raw._
+import salat.annotations.util._
+import salat.util.{MissingExpectedType, MissingPickledSig, _}
import scala.tools.scalap.scalax.rules.scalasig.{MethodSymbol, NullaryMethodType, PolyType, TypeRefType, _}
diff --git a/salat-util/src/main/scala/com/novus/salat/TypeMatchers.scala b/salat-util/src/main/scala/salat/TypeMatchers.scala
similarity index 99%
rename from salat-util/src/main/scala/com/novus/salat/TypeMatchers.scala
rename to salat-util/src/main/scala/salat/TypeMatchers.scala
index 8bee80fd..bbcea2a0 100644
--- a/salat-util/src/main/scala/com/novus/salat/TypeMatchers.scala
+++ b/salat-util/src/main/scala/salat/TypeMatchers.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat
+package salat
import scala.math.{BigDecimal => SBigDecimal}
import scala.tools.scalap.scalax.rules.scalasig.{Symbol, Type, TypeRefType}
diff --git a/salat-util/src/main/scala/com/novus/salat/annotations.scala b/salat-util/src/main/scala/salat/annotations.scala
similarity index 87%
rename from salat-util/src/main/scala/com/novus/salat/annotations.scala
rename to salat-util/src/main/scala/salat/annotations.scala
index 88052be7..a689c829 100644
--- a/salat-util/src/main/scala/com/novus/salat/annotations.scala
+++ b/salat-util/src/main/scala/salat/annotations.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat
+package salat
import java.lang.annotation.Annotation
import java.lang.reflect.AnnotatedElement
@@ -34,11 +34,11 @@ import java.lang.reflect.AnnotatedElement
import scala.annotation.meta.getter
package object annotations {
- type Key = com.novus.salat.annotations.raw.Key @getter
- type Salat = com.novus.salat.annotations.raw.Salat @getter
- type EnumAs = com.novus.salat.annotations.raw.EnumAs @getter
- type Persist = com.novus.salat.annotations.raw.Persist @getter
- type Ignore = com.novus.salat.annotations.raw.Ignore @getter
+ type Key = salat.annotations.raw.Key @getter
+ type Salat = salat.annotations.raw.Salat @getter
+ type EnumAs = salat.annotations.raw.EnumAs @getter
+ type Persist = salat.annotations.raw.Persist @getter
+ type Ignore = salat.annotations.raw.Ignore @getter
}
package annotations {
@@ -48,6 +48,7 @@ package annotations {
/**
* PML class that allows an element typed to Any to be checked for an arbitrary annotation.
+ *
* @param x an arbitrary input element
*/
class PimpedAnnotatedElement(x: Any) {
diff --git a/salat-util/src/main/scala/com/novus/salat/util/AsyncSalat.scala b/salat-util/src/main/scala/salat/util/AsyncSalat.scala
similarity index 98%
rename from salat-util/src/main/scala/com/novus/salat/util/AsyncSalat.scala
rename to salat-util/src/main/scala/salat/util/AsyncSalat.scala
index 9674a710..4ca7545b 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/AsyncSalat.scala
+++ b/salat-util/src/main/scala/salat/util/AsyncSalat.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
/**
* Helper class for running Salat with Android.
diff --git a/salat-util/src/main/scala/com/novus/salat/util/BestAvailableConstructor.scala b/salat-util/src/main/scala/salat/util/BestAvailableConstructor.scala
similarity index 98%
rename from salat-util/src/main/scala/com/novus/salat/util/BestAvailableConstructor.scala
rename to salat-util/src/main/scala/salat/util/BestAvailableConstructor.scala
index 2278cd3f..cc03e57d 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/BestAvailableConstructor.scala
+++ b/salat-util/src/main/scala/salat/util/BestAvailableConstructor.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
import java.lang.reflect.Constructor
diff --git a/salat-util/src/main/scala/com/novus/salat/util/Logging.scala b/salat-util/src/main/scala/salat/util/Logging.scala
similarity index 99%
rename from salat-util/src/main/scala/com/novus/salat/util/Logging.scala
rename to salat-util/src/main/scala/salat/util/Logging.scala
index 69dd4884..51369fd4 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/Logging.scala
+++ b/salat-util/src/main/scala/salat/util/Logging.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
/**
* Derived from work Copyright (C) 2009-2010 Scalable Solutions AB
diff --git a/salat-util/src/main/scala/com/novus/salat/util/SalatDAOUtils.scala b/salat-util/src/main/scala/salat/util/SalatDAOUtils.scala
similarity index 98%
rename from salat-util/src/main/scala/com/novus/salat/util/SalatDAOUtils.scala
rename to salat-util/src/main/scala/salat/util/SalatDAOUtils.scala
index fb80f52a..78b936d3 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/SalatDAOUtils.scala
+++ b/salat-util/src/main/scala/salat/util/SalatDAOUtils.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
/**
* Some useful utilities for extracting a single result from a list of results.
diff --git a/salat-util/src/main/scala/com/novus/salat/util/ScalaSigUtil.scala b/salat-util/src/main/scala/salat/util/ScalaSigUtil.scala
similarity index 97%
rename from salat-util/src/main/scala/com/novus/salat/util/ScalaSigUtil.scala
rename to salat-util/src/main/scala/salat/util/ScalaSigUtil.scala
index 66c594bd..d4b8e11d 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/ScalaSigUtil.scala
+++ b/salat-util/src/main/scala/salat/util/ScalaSigUtil.scala
@@ -25,9 +25,9 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
-import com.novus.salat.annotations.util._
+import salat.annotations.util._
import scala.reflect.ScalaSignature
import scala.reflect.internal.pickling.ByteCodecs
diff --git a/salat-util/src/main/scala/com/novus/salat/util/encoding/TypeHintEncoding.scala b/salat-util/src/main/scala/salat/util/encoding/TypeHintEncoding.scala
similarity index 98%
rename from salat-util/src/main/scala/com/novus/salat/util/encoding/TypeHintEncoding.scala
rename to salat-util/src/main/scala/salat/util/encoding/TypeHintEncoding.scala
index cf74067e..ae7c06ea 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/encoding/TypeHintEncoding.scala
+++ b/salat-util/src/main/scala/salat/util/encoding/TypeHintEncoding.scala
@@ -25,9 +25,9 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util.encoding
+package salat.util.encoding
-import com.novus.salat.util.Logging
+import salat.util.Logging
/**
*/
diff --git a/salat-util/src/main/scala/com/novus/salat/util/glitch.scala b/salat-util/src/main/scala/salat/util/glitch.scala
similarity index 99%
rename from salat-util/src/main/scala/com/novus/salat/util/glitch.scala
rename to salat-util/src/main/scala/salat/util/glitch.scala
index e0c5cd39..2bb3275f 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/glitch.scala
+++ b/salat-util/src/main/scala/salat/util/glitch.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.util
+package salat.util
import java.lang.reflect.Constructor
diff --git a/salat-util/src/main/scala/com/novus/salat/util/util.scala b/salat-util/src/main/scala/salat/util/util.scala
similarity index 99%
rename from salat-util/src/main/scala/com/novus/salat/util/util.scala
rename to salat-util/src/main/scala/salat/util/util.scala
index 452031f0..5769986a 100644
--- a/salat-util/src/main/scala/com/novus/salat/util/util.scala
+++ b/salat-util/src/main/scala/salat/util/util.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util
+package salat.util
object `package` {
diff --git a/salat-util/src/test/resources/logback-test.xml b/salat-util/src/test/resources/logback-test.xml
index c20a820d..313c9689 100644
--- a/salat-util/src/test/resources/logback-test.xml
+++ b/salat-util/src/test/resources/logback-test.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/salat-util/src/test/scala/com/novus/salat/util/BestAvailableConstructorSpec.scala b/salat-util/src/test/scala/salat/util/BestAvailableConstructorSpec.scala
similarity index 97%
rename from salat-util/src/test/scala/com/novus/salat/util/BestAvailableConstructorSpec.scala
rename to salat-util/src/test/scala/salat/util/BestAvailableConstructorSpec.scala
index b9c0e8f2..f5b1c8cb 100644
--- a/salat-util/src/test/scala/com/novus/salat/util/BestAvailableConstructorSpec.scala
+++ b/salat-util/src/test/scala/salat/util/BestAvailableConstructorSpec.scala
@@ -26,9 +26,9 @@
*
*/
-package com.novus.salat.util
+package salat.util
-import com.novus.salat.util.model._
+import salat.util.model._
import org.specs2.mutable.Specification
class BestAvailableConstructorSpec extends Specification with Logging {
diff --git a/salat-util/src/test/scala/com/novus/salat/util/ObjectIdSpec.scala b/salat-util/src/test/scala/salat/util/ObjectIdSpec.scala
similarity index 96%
rename from salat-util/src/test/scala/com/novus/salat/util/ObjectIdSpec.scala
rename to salat-util/src/test/scala/salat/util/ObjectIdSpec.scala
index bbfed1e6..8f3ef0b0 100644
--- a/salat-util/src/test/scala/com/novus/salat/util/ObjectIdSpec.scala
+++ b/salat-util/src/test/scala/salat/util/ObjectIdSpec.scala
@@ -26,11 +26,11 @@
*
*/
-package com.novus.salat.test.util
+package salat.test.util
/*
-import com.novus.salat.util._
+import salat.util._
import org.specs2.mutable.Specification
import org.bson.types.ObjectId
diff --git a/salat-util/src/test/scala/com/novus/salat/util/SalatDAOUtilSpec.scala b/salat-util/src/test/scala/salat/util/SalatDAOUtilSpec.scala
similarity index 98%
rename from salat-util/src/test/scala/com/novus/salat/util/SalatDAOUtilSpec.scala
rename to salat-util/src/test/scala/salat/util/SalatDAOUtilSpec.scala
index e0690f4e..eae59f99 100644
--- a/salat-util/src/test/scala/com/novus/salat/util/SalatDAOUtilSpec.scala
+++ b/salat-util/src/test/scala/salat/util/SalatDAOUtilSpec.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.util
+package salat.util
import org.specs2.mutable.Specification
diff --git a/salat-util/src/test/scala/com/novus/salat/util/encoding/TypeHintEncodingSpec.scala b/salat-util/src/test/scala/salat/util/encoding/TypeHintEncodingSpec.scala
similarity index 97%
rename from salat-util/src/test/scala/com/novus/salat/util/encoding/TypeHintEncodingSpec.scala
rename to salat-util/src/test/scala/salat/util/encoding/TypeHintEncodingSpec.scala
index f51e8651..3b95fec1 100644
--- a/salat-util/src/test/scala/com/novus/salat/util/encoding/TypeHintEncodingSpec.scala
+++ b/salat-util/src/test/scala/salat/util/encoding/TypeHintEncodingSpec.scala
@@ -25,10 +25,10 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util.encoding
+package salat.util.encoding
-import com.novus.salat.util.Logging
-import com.novus.salat.util.model._
+import salat.util.Logging
+import salat.util.model._
import org.specs2.mutable.Specification
class TypeHintEncodingSpec extends Specification with Logging {
diff --git a/salat-util/src/test/scala/com/novus/salat/util/model/UtilModel.scala b/salat-util/src/test/scala/salat/util/model/UtilModel.scala
similarity index 94%
rename from salat-util/src/test/scala/com/novus/salat/util/model/UtilModel.scala
rename to salat-util/src/test/scala/salat/util/model/UtilModel.scala
index 62f60fc5..3f55875a 100644
--- a/salat-util/src/test/scala/com/novus/salat/util/model/UtilModel.scala
+++ b/salat-util/src/test/scala/salat/util/model/UtilModel.scala
@@ -25,7 +25,7 @@
* StackOverflow: http://stackoverflow.com/questions/tagged/salat
*
*/
-package com.novus.salat.util.model
+package salat.util.model
case class OneConstructorWithArgs(x: String)
diff --git a/salat-util/src/test/scala/com/novus/salat/util/model/foo_bar/ClassInsidePackageWithUnderscore.scala b/salat-util/src/test/scala/salat/util/model/foo_bar/ClassInsidePackageWithUnderscore.scala
similarity index 96%
rename from salat-util/src/test/scala/com/novus/salat/util/model/foo_bar/ClassInsidePackageWithUnderscore.scala
rename to salat-util/src/test/scala/salat/util/model/foo_bar/ClassInsidePackageWithUnderscore.scala
index 897ed9a1..331287e9 100644
--- a/salat-util/src/test/scala/com/novus/salat/util/model/foo_bar/ClassInsidePackageWithUnderscore.scala
+++ b/salat-util/src/test/scala/salat/util/model/foo_bar/ClassInsidePackageWithUnderscore.scala
@@ -26,7 +26,7 @@
*
*/
-package com.novus.salat.util.model.foo_bar
+package salat.util.model.foo_bar
case class ClassInsidePackageWithUnderscore(x: String)