DATAMONGO-413 - Fixed bug in MongoQueryCreator.

MongoQueryCreator used the outdated OrQuery class to concatenate parts with OR. Refactored the class to use the Criteria.orOperator(…) method and deprecated the OrQuery class to be removed in the 1.1.x branch.

Author: odrotbohm

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/OrQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @deprecated use {@link Criteria#orOperator(Criteria...)} instead.
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
+@Deprecated
 public class OrQuery extends Query {
 
 	public OrQuery(Query... q) {
@@ -31,5 +37,4 @@ private static Criteria getOrCriteria(Query[] queries) {
 		}
 		return new Criteria(criteriaList, "$or");
 	}
-
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

@@ -31,7 +31,6 @@
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.data.mongodb.core.query.OrQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor.PotentiallyConvertingIterator;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
@@ -45,7 +44,7 @@
  * 
  * @author Oliver Gierke
  */
-class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
+class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 
 	private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class);
 	private final MongoParameterAccessor accessor;
@@ -92,7 +91,7 @@ public MongoQueryCreator(PartTree tree, ConvertingParameterAccessor accessor,
 	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
 	*/
 	@Override
-	protected Query create(Part part, Iterator<Object> iterator) {
+	protected Criteria create(Part part, Iterator<Object> iterator) {
 
 		if (isGeoNearQuery && part.getType().equals(Type.NEAR)) {
 			return null;
@@ -103,15 +102,15 @@ protected Query create(Part part, Iterator<Object> iterator) {
 				where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
 
-		return new Query(criteria);
+		return criteria;
 	}
 
 	/*
 	* (non-Javadoc)
 	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
 	*/
 	@Override
-	protected Query and(Part part, Query base, Iterator<Object> iterator) {
+	protected Criteria and(Part part, Criteria base, Iterator<Object> iterator) {
 
 		if (base == null) {
 			return create(part, iterator);
@@ -122,7 +121,8 @@ protected Query and(Part part, Query base, Iterator<Object> iterator) {
 		Criteria criteria = from(part.getType(),
 				where(path2.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
-		return base.addCriteria(criteria);
+
+		return criteria.andOperator(criteria);
 	}
 
 	/*
@@ -133,8 +133,10 @@ protected Query and(Part part, Query base, Iterator<Object> iterator) {
 	* #or(java.lang.Object, java.lang.Object)
 	*/
 	@Override
-	protected Query or(Query base, Query query) {
-		return new OrQuery(new Query[] { base, query });
+	protected Criteria or(Criteria base, Criteria criteria) {
+
+		Criteria result = new Criteria();
+		return result.orOperator(base, criteria);
 	}
 
 	/*
@@ -145,12 +147,13 @@ protected Query or(Query base, Query query) {
 	* #complete(java.lang.Object, org.springframework.data.domain.Sort)
 	*/
 	@Override
-	protected Query complete(Query query, Sort sort) {
+	protected Query complete(Criteria criteria, Sort sort) {
 
-		if (query == null) {
+		if (criteria == null) {
 			return null;
 		}
 
+		Query query = new Query(criteria);
 		QueryUtils.applySorting(query, sort);
 
 		if (LOG.isDebugEnabled()) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -211,6 +211,20 @@ public void createsFalseClauseCorrectly() {
 		assertThat(creator.createQuery().getQueryObject(), is(query.getQueryObject()));
 	}
 
+	/**
+	 * @see DATAMONGO
+	 */
+	@Test
+	public void createsOrQueryCorrectly() {
+
+		PartTree tree = new PartTree("findByFirstNameOrAge", Person.class);
+		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "Dave", 42), context);
+
+		Query query = creator.createQuery();
+		assertThat(query.getQueryObject(),
+				is(query(new Criteria().orOperator(where("firstName").is("Dave"), where("age").is(42))).getQueryObject()));
+	}
+
 	private void assertBindsDistanceToQuery(Point point, Distance distance, Query reference) throws Exception {
 
 		when(converter.convertToMongoType("Dave")).thenReturn("Dave");