GH-2194 - Pass condition from pagerequest to the query.

This fixes #2194.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/repository/query/CypherdslConditionExecutorImpl.java

@@ -113,7 +113,7 @@ public Page<T> findAll(Condition condition, Pageable pageable) {
 
 		List<T> page = this.neo4jOperations.toExecutableQuery(
 				this.metaData.getType(),
-				QueryFragmentsAndParameters.forCondition(this.metaData, Conditions.noCondition(), pageable, null)
+				QueryFragmentsAndParameters.forCondition(this.metaData, condition, pageable, null)
 		).getResults();
 		LongSupplier totalCountSupplier = () -> this.count(condition);
 		return PageableExecutionUtils.getPage(page, pageable, totalCountSupplier);

src/test/java/org/springframework/data/neo4j/integration/imperative/CypherdslConditionExecutorIT.java

@@ -27,6 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
@@ -151,12 +152,31 @@ void orderedFindAllWithoutPredicateShouldWork(@Autowired PersonRepository reposi
 	@Test
 	void pagedFindAllShouldWork(@Autowired PersonRepository repository) {
 
-		assertThat(
-				repository.findAll(firstName.eq(Cypher.literalOf("Helge")).or(lastName.eq(Cypher.literalOf("B."))),
+		Page<Person> people = repository.findAll(firstName.eq(Cypher.literalOf("Helge")).or(lastName.eq(Cypher.literalOf("B."))),
 						PageRequest.of(1, 1, Sort.by("lastName").descending())
-				))
+				);
+
+		assertThat(people.hasPrevious()).isTrue();
+		assertThat(people.hasNext()).isFalse();
+		assertThat(people.getTotalElements()).isEqualTo(2);
+		assertThat(people)
+				.extracting(Person::getFirstName)
+				.containsExactly("Bela");
+	}
+
+	@Test // GH-2194
+	void pagedFindAllShouldWork2(@Autowired PersonRepository repository) {
+
+		Page<Person> people = repository.findAll(firstName.eq(Cypher.literalOf("Helge")).or(lastName.eq(Cypher.literalOf("B."))),
+				PageRequest.of(0, 20, Sort.by("lastName").descending())
+		);
+
+		assertThat(people.hasPrevious()).isFalse();
+		assertThat(people.hasNext()).isFalse();
+		assertThat(people.getTotalElements()).isEqualTo(2);
+		assertThat(people)
 				.extracting(Person::getFirstName)
-				.containsExactly("B");
+				.containsExactly("Helge", "Bela");
 	}
 
 	@Test

src/test/java/org/springframework/data/neo4j/integration/imperative/QuerydslNeo4jPredicateExecutorIT.java

@@ -24,20 +24,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
 import org.springframework.data.neo4j.integration.shared.common.Person;
-// tag::sdn-mixins.dynamic-conditions.add-mixin[]
 import org.springframework.data.neo4j.repository.Neo4jRepository;
-// end::sdn-mixins.dynamic-conditions.add-mixin[]
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 import org.springframework.data.neo4j.test.Neo4jExtension;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
-// tag::sdn-mixins.dynamic-conditions.add-mixin[]
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
-
-// end::sdn-mixins.dynamic-conditions.add-mixin[]
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.querydsl.core.types.Ops;
@@ -70,7 +66,8 @@ protected static void setupData() {
 			transaction.run("MATCH (n) detach delete n");
 			transaction.run("CREATE (p:Person{firstName: 'A', lastName: 'LA'})");
 			transaction.run("CREATE (p:Person{firstName: 'B', lastName: 'LB'})");
-			transaction.run("CREATE (p:Person{firstName: 'Helge', lastName: 'Schneider'}) -[:LIVES_AT]-> (a:Address {city: 'Mülheim an der Ruhr'})");
+			transaction
+					.run("CREATE (p:Person{firstName: 'Helge', lastName: 'Schneider'}) -[:LIVES_AT]-> (a:Address {city: 'Mülheim an der Ruhr'})");
 			transaction.run("CREATE (p:Person{firstName: 'Bela', lastName: 'B.'})");
 			transaction.commit();
 		}
@@ -127,13 +124,33 @@ void orderedFindAllWithoutPredicateShouldWork(@Autowired QueryDSLPersonRepositor
 	@Test
 	void pagedFindAllShouldWork(@Autowired QueryDSLPersonRepository repository) {
 
-		assertThat(
-				repository.findAll(Expressions.predicate(Ops.EQ, firstName, Expressions.asString("Helge"))
-								.or(Expressions.predicate(Ops.EQ, lastName, Expressions.asString("B."))),
-						PageRequest.of(1, 1, Sort.by("lastName").descending())
-				))
+		Page<Person> people = repository.findAll(Expressions.predicate(Ops.EQ, firstName, Expressions.asString("Helge"))
+						.or(Expressions.predicate(Ops.EQ, lastName, Expressions.asString("B."))),
+				PageRequest.of(1, 1, Sort.by("lastName").descending())
+		);
+
+		assertThat(people.hasPrevious()).isTrue();
+		assertThat(people.hasNext()).isFalse();
+		assertThat(people.getTotalElements()).isEqualTo(2);
+		assertThat(people)
 				.extracting(Person::getFirstName)
-				.containsExactly("B");
+				.containsExactly("Bela");
+	}
+
+	@Test // GH-2194
+	void pagedFindAllShouldWork2(@Autowired QueryDSLPersonRepository repository) {
+
+		Page<Person> people = repository.findAll(Expressions.predicate(Ops.EQ, firstName, Expressions.asString("Helge"))
+						.or(Expressions.predicate(Ops.EQ, lastName, Expressions.asString("B."))),
+				PageRequest.of(0, 20, Sort.by("lastName").descending())
+		);
+
+		assertThat(people.hasPrevious()).isFalse();
+		assertThat(people.hasNext()).isFalse();
+		assertThat(people.getTotalElements()).isEqualTo(2);
+		assertThat(people)
+				.extracting(Person::getFirstName)
+				.containsExactly("Helge", "Bela");
 	}
 
 	@Test
@@ -160,7 +177,6 @@ interface QueryDSLPersonRepository extends
 	}
 	// end::sdn-mixins.dynamic-conditions.add-mixin[]
 
-
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)