From fc4205488b2e3c6ef4e3cb5e1d235760099cd1eb Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Mon, 7 Feb 2011 12:46:40 -0500
Subject: [PATCH] renamed package from builder to query

---
 .../data/document/mongodb/MongoOperations.java            | 4 ++--
 .../data/document/mongodb/MongoTemplate.java              | 4 ++--
 .../document/mongodb/{builder => query}/BasicQuery.java   | 2 +-
 .../document/mongodb/{builder => query}/BasicUpdate.java  | 2 +-
 .../document/mongodb/{builder => query}/Criteria.java     | 2 +-
 .../mongodb/{builder => query}/CriteriaDefinition.java    | 2 +-
 .../data/document/mongodb/{builder => query}/Field.java   | 2 +-
 .../document/mongodb/{builder => query}/OrCriteria.java   | 2 +-
 .../data/document/mongodb/{builder => query}/Query.java   | 2 +-
 .../mongodb/{builder => query}/QueryDefinition.java       | 2 +-
 .../data/document/mongodb/{builder => query}/Sort.java    | 2 +-
 .../data/document/mongodb/{builder => query}/Update.java  | 2 +-
 .../mongodb/{builder => query}/UpdateDefinition.java      | 2 +-
 .../data/document/mongodb/repository/MongoQuery.java      | 2 +-
 .../document/mongodb/repository/MongoQueryCreator.java    | 6 +++---
 .../data/document/mongodb/repository/QueryUtils.java      | 8 ++++----
 .../mongodb/repository/SimpleMongoRepository.java         | 2 +-
 .../data/document/mongodb/MongoTemplateTests.java         | 4 ++--
 .../document/mongodb/analytics/MvcAnalyticsTests.java     | 2 +-
 .../data/document/mongodb/builder/QueryTests.java         | 2 ++
 .../data/document/mongodb/builder/SortTests.java          | 3 ++-
 .../data/document/mongodb/builder/UpdateTests.java        | 4 ++--
 22 files changed, 33 insertions(+), 30 deletions(-)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/BasicQuery.java (96%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/BasicUpdate.java (94%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/Criteria.java (98%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/CriteriaDefinition.java (92%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/Field.java (96%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/OrCriteria.java (95%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/Query.java (97%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/QueryDefinition.java (93%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/Sort.java (95%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/Update.java (97%)
 rename spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/{builder => query}/UpdateDefinition.java (92%)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java
index 0245e89d2..5bad7241f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java
@@ -18,8 +18,8 @@ package org.springframework.data.document.mongodb;
 import java.util.List;
 import java.util.Set;
 
-import org.springframework.data.document.mongodb.builder.QueryDefinition;
-import org.springframework.data.document.mongodb.builder.UpdateDefinition;
+import org.springframework.data.document.mongodb.query.QueryDefinition;
+import org.springframework.data.document.mongodb.query.UpdateDefinition;
 
 import com.mongodb.CommandResult;
 import com.mongodb.DBCollection;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
index 44c73886e..596b1922c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
@@ -30,8 +30,8 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.data.document.mongodb.builder.QueryDefinition;
-import org.springframework.data.document.mongodb.builder.UpdateDefinition;
+import org.springframework.data.document.mongodb.query.QueryDefinition;
+import org.springframework.data.document.mongodb.query.UpdateDefinition;
 import org.springframework.jca.cci.core.ConnectionCallback;
 import org.springframework.util.Assert;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicQuery.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java
index a21055520..5503b0775 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import com.mongodb.DBObject;
 import com.mongodb.util.JSON;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicUpdate.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicUpdate.java
similarity index 94%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicUpdate.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicUpdate.java
index bb7dba149..d4839eadd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicUpdate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicUpdate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import com.mongodb.DBObject;
 import com.mongodb.util.JSON;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Criteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
similarity index 98%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Criteria.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
index 9f942b777..9e91d4631 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Criteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/CriteriaDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaDefinition.java
similarity index 92%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/CriteriaDefinition.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaDefinition.java
index 8a926dbe7..1479ae8cc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/CriteriaDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaDefinition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import com.mongodb.DBObject;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Field.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Field.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Field.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Field.java
index 899bc1584..67e360da2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Field.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Field.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/OrCriteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java
similarity index 95%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/OrCriteria.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java
index 41e69a34c..35e3739a6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/OrCriteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import org.bson.types.BasicBSONList;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java
similarity index 97%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Query.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java
index ab6894ee9..647a7cef3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import java.util.LinkedHashMap;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/QueryDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryDefinition.java
similarity index 93%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/QueryDefinition.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryDefinition.java
index 98b8191ea..940731fc9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/QueryDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryDefinition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import com.mongodb.DBObject;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Sort.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Sort.java
similarity index 95%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Sort.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Sort.java
index 35ffa686e..426dea5c2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Sort.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Sort.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Update.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Update.java
similarity index 97%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Update.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Update.java
index 1afb4291d..439e2f686 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Update.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Update.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/UpdateDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/UpdateDefinition.java
similarity index 92%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/UpdateDefinition.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/UpdateDefinition.java
index 7ccff6389..118a037b8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/UpdateDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/UpdateDefinition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.builder;
+package org.springframework.data.document.mongodb.query;
 
 import com.mongodb.DBObject;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java
index 6708179db..d6db5988a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.springframework.data.document.mongodb.CollectionCallback;
 import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.builder.Query;
+import org.springframework.data.document.mongodb.query.Query;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.query.QueryMethod;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
index 5d061e8d6..8c10eb56b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
@@ -21,9 +21,9 @@ import java.util.regex.Pattern;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.data.document.mongodb.MongoConverter;
-import org.springframework.data.document.mongodb.builder.Criteria;
-import org.springframework.data.document.mongodb.builder.CriteriaDefinition;
-import org.springframework.data.document.mongodb.builder.Query;
+import org.springframework.data.document.mongodb.query.Criteria;
+import org.springframework.data.document.mongodb.query.CriteriaDefinition;
+import org.springframework.data.document.mongodb.query.Query;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.query.SimpleParameterAccessor;
 import org.springframework.data.repository.query.SimpleParameterAccessor.BindableParameterIterator;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryUtils.java
index afdfe0a1f..23cac790b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryUtils.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.document.mongodb.repository;
 
-import org.springframework.data.document.mongodb.builder.Query;
+import org.springframework.data.document.mongodb.query.Query;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
@@ -71,14 +71,14 @@ abstract class QueryUtils {
             return query;
         }
 
-        org.springframework.data.document.mongodb.builder.Sort bSort =
+        org.springframework.data.document.mongodb.query.Sort bSort =
                 query.sort();
 
         for (Order order : sort) {
             bSort.on(
                     order.getProperty(),
-                    order.isAscending() ? org.springframework.data.document.mongodb.builder.Sort.Order.ASCENDING
-                            : org.springframework.data.document.mongodb.builder.Sort.Order.DESCENDING);
+                    order.isAscending() ? org.springframework.data.document.mongodb.query.Sort.Order.ASCENDING
+                            : org.springframework.data.document.mongodb.query.Sort.Order.DESCENDING);
         }
 
         return query;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java
index a7f35d3f8..7e92185ae 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java
@@ -22,7 +22,7 @@ import java.util.List;
 import org.bson.types.ObjectId;
 import org.springframework.data.document.mongodb.MongoConverter;
 import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.builder.Query;
+import org.springframework.data.document.mongodb.query.Query;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
index ab4322e96..7d32c835d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
@@ -29,8 +29,8 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.data.document.mongodb.builder.Query;
-import org.springframework.data.document.mongodb.builder.Update;
+import org.springframework.data.document.mongodb.query.Query;
+import org.springframework.data.document.mongodb.query.Update;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
index f026d358f..f69d2bc35 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
@@ -12,7 +12,7 @@ import org.springframework.data.document.analytics.MvcEvent;
 import org.springframework.data.document.analytics.Parameters;
 import org.springframework.data.document.mongodb.MongoReader;
 import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.builder.BasicQuery;
+import org.springframework.data.document.mongodb.query.BasicQuery;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/QueryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/QueryTests.java
index fd6f49544..65a8d5841 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/QueryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/QueryTests.java
@@ -17,6 +17,8 @@ package org.springframework.data.document.mongodb.builder;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.springframework.data.document.mongodb.query.BasicQuery;
+import org.springframework.data.document.mongodb.query.Query;
 
 public class QueryTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java
index 0f6766d75..53a2a8a13 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java
@@ -17,7 +17,8 @@ package org.springframework.data.document.mongodb.builder;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.springframework.data.document.mongodb.builder.Sort.Order;
+import org.springframework.data.document.mongodb.query.Sort;
+import org.springframework.data.document.mongodb.query.Sort.Order;
 
 public class SortTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java
index 8f21928a5..3098a54f4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java
@@ -20,8 +20,8 @@ import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.springframework.data.document.mongodb.builder.Sort.Order;
-import org.springframework.data.document.mongodb.builder.Update;
+import org.springframework.data.document.mongodb.query.Update;
+import org.springframework.data.document.mongodb.query.Sort.Order;
 
 public class UpdateTests {