DATAMONGO-568 - MongoTemplate.find(…) does not throw NullPointerException anymore.

Trigger findAll(…) if the Query object given to a find(…) method is null.

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

@@ -487,8 +487,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	public <T> List<T> find(final Query query, Class<T> entityClass, String collectionName) {
-		CursorPreparer cursorPreparer = query == null ? null : new QueryCursorPreparer(query);
-		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass, cursorPreparer);
+
+		if (query == null) {
+			return findAll(entityClass, collectionName);
+		}
+
+		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
+				new QueryCursorPreparer(query));
 	}
 
 	public <T> T findById(Object id, Class<T> entityClass) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java

@@ -1445,6 +1445,16 @@ public class MongoTemplateTests {
 		assertThat(person.version, is(0));
 	}
 
+	/**
+	 * @see DATAMONGO-568
+	 */
+	@Test
+	public void queryCantBeNull() {
+
+		List<PersonWithIdPropertyOfTypeObjectId> result = template.findAll(PersonWithIdPropertyOfTypeObjectId.class);
+		assertThat(template.find(null, PersonWithIdPropertyOfTypeObjectId.class), is(result));
+	}
+
 	static class MyId {
 
 		String first;