DATAMONGO-1085 - Sort can not use the metamodel classes generated by QueryDSL.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.7.0.BUILD-SNAPSHOT</version>
+	<version>1.7.0.DATAMONGO-1085-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>

spring-data-mongodb-cross-store/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.BUILD-SNAPSHOT</version>
+		<version>1.7.0.DATAMONGO-1085-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.7.0.BUILD-SNAPSHOT</version>
+			<version>1.7.0.DATAMONGO-1085-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.BUILD-SNAPSHOT</version>
+		<version>1.7.0.DATAMONGO-1085-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.BUILD-SNAPSHOT</version>
+		<version>1.7.0.DATAMONGO-1085-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.BUILD-SNAPSHOT</version>
+		<version>1.7.0.DATAMONGO-1085-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -1969,11 +1969,16 @@ private static final MongoConverter getDefaultMongoConverter(MongoDbFactory fact
 
 	private DBObject getMappedSortObject(Query query, Class<?> type) {
 
-		if (query == null || query.getSortObject() == null) {
+		if (query == null) {
+			return null;
+		}
+
+		DBObject sortObject = query.getSortObject();
+		if (sortObject == null) {
 			return null;
 		}
 
-		return queryMapper.getMappedSort(query.getSortObject(), mappingContext.getPersistentEntity(type));
+		return queryMapper.getMappedSort(sortObject, mappingContext.getPersistentEntity(type));
 	}
 
 	// Callback implementations

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QueryDslMongoRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2014 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.
@@ -27,6 +27,7 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.querydsl.EntityPathResolver;
+import org.springframework.data.querydsl.QSort;
 import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 import org.springframework.data.querydsl.SimpleEntityPathResolver;
 import org.springframework.data.repository.core.EntityInformation;
@@ -44,6 +45,7 @@
  * Special QueryDsl based repository implementation that allows execution {@link Predicate}s in various forms.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleMongoRepository<T, ID> implements
 		QueryDslPredicateExecutor<T> {
@@ -105,7 +107,6 @@ public List<T> findAll(Predicate predicate) {
 	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.mysema.query.types.Predicate, com.mysema.query.types.OrderSpecifier<?>[])
 	 */
 	public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
-
 		return createQueryFor(predicate).orderBy(orders).list();
 	}
 
@@ -115,7 +116,7 @@ public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 	 */
 	@Override
 	public Iterable<T> findAll(OrderSpecifier<?>... orders) {
-		return createQueryFor(new Predicate[0]).orderBy(orders).list();
+		return createQuery().orderBy(orders).list();
 	}
 
 	/*
@@ -130,6 +131,25 @@ public Page<T> findAll(Predicate predicate, Pageable pageable) {
 		return new PageImpl<T>(applyPagination(query, pageable).list(), pageable, countQuery.count());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(org.springframework.data.domain.Pageable)
+	 */
+	public Page<T> findAll(Pageable pageable) {
+
+		MongodbQuery<T> countQuery = createQuery();
+		MongodbQuery<T> query = createQuery();
+
+		return new PageImpl<T>(applyPagination(query, pageable).list(), pageable, countQuery.count());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.support.SimpleMongoRepository#findAll(org.springframework.data.domain.Sort)
+	 */
+	public List<T> findAll(Sort sort) {
+		return applySorting(createQuery(), sort).list();
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.mysema.query.types.Predicate)
@@ -144,12 +164,17 @@ public long count(Predicate predicate) {
 	 * @param predicate
 	 * @return
 	 */
-	private MongodbQuery<T> createQueryFor(Predicate... predicate) {
-
-		Class<T> domainType = entityInformation.getJavaType();
+	private MongodbQuery<T> createQueryFor(Predicate predicate) {
+		return createQuery().where(predicate);
+	}
 
-		MongodbQuery<T> query = new SpringDataMongodbQuery<T>(mongoOperations, domainType);
-		return query.where(predicate);
+	/**
+	 * Creates a {@link MongodbQuery}.
+	 * 
+	 * @return
+	 */
+	private MongodbQuery<T> createQuery() {
+		return new SpringDataMongodbQuery<T>(mongoOperations, entityInformation.getJavaType());
 	}
 
 	/**
@@ -182,6 +207,14 @@ private MongodbQuery<T> applySorting(MongodbQuery<T> query, Sort sort) {
 			return query;
 		}
 
+		if (sort instanceof QSort) {
+
+			List<OrderSpecifier<?>> orderSpecifiers = ((QSort) sort).getOrderSpecifiers();
+			query.orderBy(orderSpecifiers.toArray(new OrderSpecifier<?>[orderSpecifiers.size()]));
+
+			return query;
+		}
+
 		for (Order order : sort) {
 			query.orderBy(toOrder(order));
 		}

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

@@ -47,8 +47,11 @@
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.repository.Person.Sex;
+import org.springframework.data.querydsl.QSort;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.google.common.collect.Lists;
+
 /**
  * Base class for tests for {@link PersonRepository}.
  * 
@@ -1071,4 +1074,77 @@ public void returnsOrderedResultsForQuerydslOrderSpecifier() {
 
 		assertThat(result, contains(alicia, boyd, carter, dave, leroi, oliver, stefan));
 	}
+
+	/**
+	 * @see DATAMONGO-1085
+	 */
+	@Test
+	public void shouldSupportSortingByQueryDslOrderSpecifier() {
+
+		repository.deleteAll();
+
+		List<Person> persons = new ArrayList<Person>();
+		for (int i = 0; i < 3; i++) {
+
+			Person pers = new Person(String.format("Siggi %s", i), "Bar", 30);
+			pers.setAddress(new Address(String.format("Street %s", i), "12345", "SinCity"));
+
+			persons.add(pers);
+		}
+
+		repository.save(persons);
+
+		QPerson person = QPerson.person;
+
+		List<Person> result = Lists.newArrayList(repository.findAll(person.firstname.isNotNull(),
+				person.address.street.desc()));
+
+		assertThat(result, hasSize(persons.size()));
+		assertThat(result.get(0).getFirstname(), is(persons.get(2).getFirstname()));
+	}
+
+	/**
+	 * @see DATAMONGO-1085
+	 */
+	@Test
+	public void shouldSupportSortingWithQSortByQueryDslOrderSpecifier() throws Exception {
+
+		repository.deleteAll();
+
+		List<Person> persons = new ArrayList<Person>();
+		for (int i = 0; i < 3; i++) {
+			Person pers = new Person(String.format("Siggi %s", i), "Bar", 30);
+			pers.setAddress(new Address(String.format("Street %s", i), "12345", "SinCity"));
+			persons.add(pers);
+		}
+		repository.save(persons);
+
+		PageRequest pageRequest = new PageRequest(0, 2, new QSort(person.address.street.desc()));
+		List<Person> result = Lists.newArrayList(repository.findAll(pageRequest));
+
+		assertThat(result, hasSize(pageRequest.getPageSize()));
+		assertThat(result.get(0).getFirstname(), is("Siggi 2"));
+	}
+
+	/**
+	 * @see DATAMONGO-1085
+	 */
+	@Test
+	public void shouldSupportSortingWithQSort() throws Exception {
+
+		repository.deleteAll();
+
+		List<Person> persons = new ArrayList<Person>();
+		for (int i = 0; i < 3; i++) {
+			Person pers = new Person(String.format("Siggi %s", i), "Bar", 30);
+			pers.setAddress(new Address(String.format("Street %s", i), "12345", "SinCity"));
+			persons.add(pers);
+		}
+		repository.save(persons);
+
+		List<Person> result = Lists.newArrayList(repository.findAll(new QSort(person.address.street.desc())));
+
+		assertThat(result, hasSize(persons.size()));
+		assertThat(result.get(0).getFirstname(), is("Siggi 2"));
+	}
 }