renamed package from builder to query

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;

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;
 

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;

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;

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;

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;
 

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;

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;
 

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;
 

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;

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 {
 

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 {
 

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 {