This is an automated email from the git hooks/post-receive script. New commit to branch feature/656_endIndex_-1_returns_all_results in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 0a3e6c4bb789f0bb892dcc9a76604cdf4c487ef1 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Oct 12 15:19:52 2017 +0200 Passing -1 as endIndex now returns all results, not 0 results refs #656 --- .../test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java | 5 ++--- .../topia/persistence/internal/support/HibernateTopiaJpaSupport.java | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java b/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java index f1ac6f35..7c5857aa 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java @@ -153,9 +153,8 @@ public class TopiaJpaSupportTest { Assert.assertFalse(hortense.equals(charlotte)); - // endIndex = -1 not supported in ToPIA 2.6, wait for 3.0 -// females = context.find(query, 0, -1, "g", Gender.FEMALE); -// Assert.assertEquals(2, females.size()); + females = jpaSupport.find(query, 0, -1, args); + Assert.assertEquals(2, females.size()); } @Test diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/HibernateTopiaJpaSupport.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/HibernateTopiaJpaSupport.java index d2b79d73..a2ed8d55 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/HibernateTopiaJpaSupport.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/HibernateTopiaJpaSupport.java @@ -202,7 +202,10 @@ public class HibernateTopiaJpaSupport implements TopiaJpaSupport { // Set bounds query.setFirstResult(startIndex); - query.setMaxResults(endIndex - startIndex + 1); + if (endIndex >= 0) { + Preconditions.checkArgument(startIndex <= endIndex, "startIndex " + startIndex + " > " + "endIndex" + endIndex); + query.setMaxResults(endIndex - startIndex + 1); + } List result = query.list(); result = firesSupport.fireEntitiesLoad(this, result); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.