From a232264d7ab2c8ba8c16fa232c387bb2c3a5ad33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?=
 <ilgrosso@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:19:54 +0100
Subject: [PATCH] fix: Check for `Pageable.unpaged` when requesting pages.

---
 .../repository/query/QueryFragmentsAndParameters.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java b/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java
index 0215e419b..0c66ac796 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java
@@ -242,10 +242,14 @@ public final class QueryFragmentsAndParameters {
 			Pageable pageable,
 			QueryFragments queryFragments
 	) {
+		if (pageable.isPaged()) {
+			queryFragments.setSkip(pageable.getOffset());
+			queryFragments.setLimit(pageable.getPageSize());
+		}
 		Sort pageableSort = pageable.getSort();
-		queryFragments.setSkip(pageable.getOffset());
-		queryFragments.setLimit(pageable.getPageSize());
-		queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
+		if (pageableSort.isSorted()) {
+			queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
+		}
 	}
 
 	static QueryFragmentsAndParameters forExample(Neo4jMappingContext mappingContext, Example<?> example,