May 2014 - Topia-commits - mailman.cloud.codelutin.com

r3136 - in trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence: . internal
by tchemit＠users.nuiton.org 23 May '14

23 May '14

Author: tchemit Date: 2014-05-23 17:26:15 +0200 (Fri, 23 May 2014) New Revision: 3136 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3136 Log: fixes #3215 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/LegacyTopiaIdFactory.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java 2014-05-23 15:10:22 UTC (rev 3135) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java 2014-05-23 15:26:15 UTC (rev 3136) @@ -53,6 +53,17 @@ <E extends TopiaEntity> String newTopiaId(Class<E> entityClass, TopiaEntity topiaEntity); /** + * Builds a new topiaId for the given entity type and the given random part. + * + * @param entityClass type of entity (must be a not null interface) + * @param randomPart the random part of the topiaId + * @param <E> type of entity + * @return the new topiaId + */ + <E extends TopiaEntity> String newTopiaId(Class<E> entityClass, String randomPart); + + + /** * @param topiaId the topiaId to inspect * @param <E> type of the entity * @return the FQN part of the topiaId @@ -61,7 +72,7 @@ /** * @param topiaId the topiaId to inspect - * @return the random part of the topiaId. + * @return the random part of the topiaId */ String getRandomPart(String topiaId); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java 2014-05-23 15:10:22 UTC (rev 3135) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java 2014-05-23 15:26:15 UTC (rev 3136) @@ -54,6 +54,16 @@ } @Override + public <E extends TopiaEntity> String newTopiaId(Class<E> entityClass, String randomPart) { + if (!entityClass.isInterface()) { + throw new IllegalArgumentException( + "Only interface is permit to create id: " + entityClass); + } + String result = entityClass.getName() + getSeparator() + randomPart; + return result; + } + + @Override public <E extends TopiaEntity> Class<E> getClassName(String topiaId) { String className = StringUtils.substringBefore(topiaId, getSeparator()); try { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/LegacyTopiaIdFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/LegacyTopiaIdFactory.java 2014-05-23 15:10:22 UTC (rev 3135) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/LegacyTopiaIdFactory.java 2014-05-23 15:26:15 UTC (rev 3136) @@ -55,14 +55,12 @@ return entityClass.getName() + getSeparator() + System.currentTimeMillis() + '#' + random; } - /** - * Extrait la classe du topiaId. - * - * @param topiaId - * @return class - * @throws TopiaNotFoundException - */ @Override + public <E extends TopiaEntity> String newTopiaId(Class<E> entityClass, String randomPart) { + return entityClass.getName() + getSeparator() + System.currentTimeMillis() + '#' + randomPart; + } + + @Override public <E extends TopiaEntity> Class<E> getClassName(String topiaId) { String className = StringUtils.substringBefore(topiaId, getSeparator()); try {

1 0

r3135 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by sbavencoff＠users.nuiton.org 23 May '14

23 May '14

Author: sbavencoff Date: 2014-05-23 17:10:22 +0200 (Fri, 23 May 2014) New Revision: 3135 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3135 Log: fixes #3214 : In HqlAndParameterBuilder, add alias getter Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-05-23 13:44:31 UTC (rev 3134) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-05-23 15:10:22 UTC (rev 3135) @@ -64,6 +64,10 @@ this.alias = alias; } + public String getAlias() { + return alias; + } + public HqlAndParametersBuilder(Class<E> entityClass) { this.entityClass = entityClass; }

1 0

r3134 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by sbavencoff＠users.nuiton.org 23 May '14

23 May '14

Author: sbavencoff Date: 2014-05-23 15:44:31 +0200 (Fri, 23 May 2014) New Revision: 3134 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3134 Log: fixes #3213 : Allow to pass a String as parameter in HqlAndParameterBuilder addGreater|Less[Equals] methods Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-05-23 12:07:39 UTC (rev 3133) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-05-23 13:44:31 UTC (rev 3134) @@ -234,6 +234,22 @@ doAddGreaterOrEquals(property, number); } + public void addLowerThan(String property, String string) { + doAddLowerThan(property, string); + } + + public void addLowerOrEquals(String property, String string) { + doAddLowerOrEquals(property, string); + } + + public void addGreaterThan(String property, String string) { + doAddGreaterThan(property, string); + } + + public void addGreaterOrEquals(String property, String string) { + doAddGreaterOrEquals(property, string); + } + protected void doAddLowerThan(String property, Object value) { Preconditions.checkNotNull(value); String hqlParameterName = putHqlParameterWithAvailableName(property, value);

1 0

r3133 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal
by athimel＠users.nuiton.org 23 May '14

23 May '14

Author: athimel Date: 2014-05-23 14:07:39 +0200 (Fri, 23 May 2014) New Revision: 3133 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3133 Log: Replace some <K> generics where <O> fits better Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-23 10:29:45 UTC (rev 3132) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-23 12:07:39 UTC (rev 3133) @@ -451,111 +451,111 @@ return result; } - protected <K> K findUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException, TopiaNonUniqueResultException { - K result = findUniqueOrNull(hql, hqlParameters); + protected <O> O findUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException, TopiaNonUniqueResultException { + O result = findUniqueOrNull(hql, hqlParameters); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); } return result; } - protected <K> Optional<K> tryFindUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { - K uniqueOrNull = findUniqueOrNull(hql, hqlParameters); - Optional<K> result = Optional.fromNullable(uniqueOrNull); + protected <O> Optional<O> tryFindUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { + O uniqueOrNull = findUniqueOrNull(hql, hqlParameters); + Optional<O> result = Optional.fromNullable(uniqueOrNull); return result; } - protected <K> K findUniqueOrNull(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { - List<K> results = find(hql, hqlParameters, 0, 1); + protected <O> O findUniqueOrNull(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { + List<O> results = find(hql, hqlParameters, 0, 1); // If there is more than 1 result, throw an exception if (results.size() > 1) { throw new TopiaNonUniqueResultException(hql, hqlParameters); } // otherwise return the first one, or null - K result = Iterables.getOnlyElement(results, null); + O result = Iterables.getOnlyElement(results, null); return result; } - protected <K> K findFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { - K result = findFirstOrNull(hql, hqlParameters); + protected <O> O findFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { + O result = findFirstOrNull(hql, hqlParameters); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); } return result; } - protected <K> Optional<K> tryFindFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { - K firstOrNull = findFirstOrNull(hql, hqlParameters); - Optional<K> result = Optional.fromNullable(firstOrNull); + protected <O> Optional<O> tryFindFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { + O firstOrNull = findFirstOrNull(hql, hqlParameters); + Optional<O> result = Optional.fromNullable(firstOrNull); return result; } - protected <K> K findFirstOrNull(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { + protected <O> O findFirstOrNull(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { if (!hqlContainsOrderBy(hql)) { throw new QueryMissingOrderException(hql, hqlParameters); } - K result = findAnyOrNull(hql, hqlParameters); + O result = findAnyOrNull(hql, hqlParameters); return result; } - protected <K> K findAny(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { - K result = findAnyOrNull(hql, hqlParameters); + protected <O> O findAny(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { + O result = findAnyOrNull(hql, hqlParameters); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); } return result; } - protected <K> Optional<K> tryFindAny(String hql, Map<String, Object> hqlParameters) { - K anyOrNull = findAnyOrNull(hql, hqlParameters); - Optional<K> result = Optional.fromNullable(anyOrNull); + protected <O> Optional<O> tryFindAny(String hql, Map<String, Object> hqlParameters) { + O anyOrNull = findAnyOrNull(hql, hqlParameters); + Optional<O> result = Optional.fromNullable(anyOrNull); return result; } - protected <K> K findAnyOrNull(String hql) { + protected <O> O findAnyOrNull(String hql) { Preconditions.checkNotNull(hql); Map<String, Object> hqlParameters = Collections.emptyMap(); - K result = findAnyOrNull(hql, hqlParameters); + O result = findAnyOrNull(hql, hqlParameters); return result; } - protected <K> K findAnyOrNull(String hql, Map<String, Object> hqlParameters) { + protected <O> O findAnyOrNull(String hql, Map<String, Object> hqlParameters) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - List<K> results = find(hql, hqlParameters, 0, 0); - K result = Iterables.getOnlyElement(results, null); + List<O> results = find(hql, hqlParameters, 0, 0); + O result = Iterables.getOnlyElement(results, null); return result; } - protected <K> List<K> findAll(String hql) { + protected <O> List<O> findAll(String hql) { Preconditions.checkNotNull(hql); Map<String, Object> hqlParameters = Collections.emptyMap(); - List<K> result = findAll(hql, hqlParameters); + List<O> result = findAll(hql, hqlParameters); return result; } - protected <K> List<K> findAll(String hql, Map<String, Object> hqlParameters) { + protected <O> List<O> findAll(String hql, Map<String, Object> hqlParameters) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - List<K> result = topiaJpaSupport.findAll(hql, hqlParameters); + List<O> result = topiaJpaSupport.findAll(hql, hqlParameters); return result; } - protected <K> List<K> find(String hql, int startIndex, int endIndex) { + protected <O> List<O> find(String hql, int startIndex, int endIndex) { Preconditions.checkNotNull(hql); Map<String, Object> hqlParameters = Collections.emptyMap(); - List<K> result = find(hql, hqlParameters, startIndex, endIndex); + List<O> result = find(hql, hqlParameters, startIndex, endIndex); return result; } - protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { + protected <O> List<O> find(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - List<K> result = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); + List<O> result = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); return result; } - protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, PaginationParameter page) { + protected <O> List<O> find(String hql, Map<String, Object> hqlParameters, PaginationParameter page) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); Preconditions.checkNotNull(page); @@ -572,7 +572,7 @@ hql += Joiner.on(", ").join(orderClauses); } - List<K> result = topiaJpaSupport.find( + List<O> result = topiaJpaSupport.find( hql, (int) page.getStartIndex(), (int) page.getEndIndex(), @@ -581,37 +581,37 @@ return result; } - protected <K> Iterable<K> findAllLazy(String hql) { + protected <O> Iterable<O> findAllLazy(String hql) { Map<String, Object> hqlParameters = Collections.emptyMap(); - Iterable<K> result= findAllLazy(hql, hqlParameters); + Iterable<O> result= findAllLazy(hql, hqlParameters); return result; } - protected <K> Iterable<K> findAllLazy(String hql, Map<String, Object> hqlParameters) { + protected <O> Iterable<O> findAllLazy(String hql, Map<String, Object> hqlParameters) { - Iterable<K> result= findAllLazy(hql, hqlParameters, batchSize); + Iterable<O> result= findAllLazy(hql, hqlParameters, batchSize); return result; } - protected <K> Iterable<K> findAllLazy(String hql, int batchSize) { + protected <O> Iterable<O> findAllLazy(String hql, int batchSize) { Map<String, Object> hqlParameters = Collections.emptyMap(); - Iterable<K> result = findAllLazy(hql, hqlParameters, batchSize); + Iterable<O> result = findAllLazy(hql, hqlParameters, batchSize); return result; } - protected <K> Iterable<K> findAllLazy(String hql, Map<String, Object> hqlParameters, int batchSize) { + protected <O> Iterable<O> findAllLazy(String hql, Map<String, Object> hqlParameters, int batchSize) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - final Iterator<K> iterator = new FindAllIterator<E, K>(this, + final Iterator<O> iterator = new FindAllIterator<E, O>(this, batchSize, hql, hqlParameters); - Iterable<K> result = new Iterable<K>() { + Iterable<O> result = new Iterable<O>() { @Override - public Iterator<K> iterator() { + public Iterator<O> iterator() { return iterator; } }; @@ -715,9 +715,9 @@ // return meta; // } - public static class FindAllIterator<E extends TopiaEntity, K> implements Iterator<K> { + public static class FindAllIterator<E extends TopiaEntity, O> implements Iterator<O> { - protected Iterator<K> data; + protected Iterator<O> data; protected final AbstractTopiaDao<E> dao; @@ -755,7 +755,7 @@ return result; } - public K next() { + public O next() { if (!hasNext()) { throw new NoSuchElementException(); } @@ -773,7 +773,7 @@ } // load new window of data - List<K> values = dao.find(hql, params, pageToLoad); + List<O> values = dao.find(hql, params, pageToLoad); data = values.iterator(); // Create a new pager on the next page @@ -781,7 +781,7 @@ } - K next = data.next(); + O next = data.next(); return next; }

1 0

r3132 - in trunk: topia-it/src/test/java/org/nuiton/topia/persistence/internal topia-persistence/src/main/java/org/nuiton/topia/persistence/internal
by athimel＠users.nuiton.org 23 May '14

23 May '14

Author: athimel Date: 2014-05-23 12:29:45 +0200 (Fri, 23 May 2014) New Revision: 3132 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3132 Log: refs #3208 Prevent exception when using findAllLazy together with a SELECT clause Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-23 08:28:43 UTC (rev 3131) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-23 10:29:45 UTC (rev 3132) @@ -181,8 +181,27 @@ } @Test - public void iterateOnTopiaDAO() throws TopiaException { + public void findAllLazyWithSelect() throws TopiaException { + Assert.assertEquals(dao.count(), 0); + + createPersons(25); + + Map<String, Object> emptyArgs = Maps.newHashMap(); + + dao.setBatchSize(10); + + String hql = "SELECT DISTINCT(" + Person.PROPERTY_NAME + ") " + + "FROM " + dao.getTopiaEntityEnum().getImplementationFQN() + " " + + "ORDER BY " + Person.PROPERTY_NAME; + Iterable<String> allByLazy = dao.findAllLazy(hql, emptyArgs); + + Assert.assertEquals(25, Iterables.size(allByLazy)); + } + + @Test + public void iterateOnTopiaDao() throws TopiaException { + createPersons(1999); List<Person> excepted = dao.findAll(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-23 08:28:43 UTC (rev 3131) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-23 10:29:45 UTC (rev 3132) @@ -209,12 +209,17 @@ PaginationParameter firstPage = PaginationParameter.of(0, pageSize); if (hqlContainsOrderBy(hql)) { - // must remove the order by clause, otherwise some sql queries won't work. hql = hql.substring(0, hql.toLowerCase().indexOf("order by")); } + + if (hqlStartsWithSelect(hql)) { + // must remove the select, otherwise some sql queries won't work. + hql = hql.substring(hql.toLowerCase().indexOf("from")); + } + long count = count("SELECT COUNT(*) " + hql, params); - List<E> emptyList = Lists.newArrayList(); // XXX AThimel 22/05/14 To keep the old behavior, we do not load the elements. Is it correct ? + List<E> emptyList = Lists.newArrayList(); // AThimel 22/05/14 To keep the old behavior, we do not load the elements PaginationResult<E> result = PaginationResult.of(emptyList, count, firstPage); return result; } @@ -686,6 +691,10 @@ return hql.toLowerCase().contains("order by"); } + protected boolean hqlStartsWithSelect(String hql) { + return hql.toLowerCase().trim().startsWith("select "); + } + protected boolean hqlContainsCount(String hql) { return hql.toLowerCase().contains("count("); } @@ -1077,7 +1086,7 @@ @Override public Iterable<E> findAllLazy() { - return topiaDAO.findAllLazy(hql +(fromHql?"":" ORDER BY id") , hqlParameters); + return topiaDAO.findAllLazy(hql + (fromHql ? "" : " ORDER BY id"), hqlParameters); } @Override

1 0

r3131 - in trunk: topia-it/src/test/java/org/nuiton/topia/persistence/internal topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/internal topia-persistence/src/test/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 23 May '14

23 May '14

Author: athimel Date: 2014-05-23 10:28:43 +0200 (Fri, 23 May 2014) New Revision: 3131 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3131 Log: refs-80 #3208 Introduce findPage(...) methods Removed: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/ Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-23 07:31:13 UTC (rev 3130) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-23 08:28:43 UTC (rev 3131) @@ -42,6 +42,7 @@ import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import com.google.common.base.Function; import com.google.common.base.Strings; @@ -208,9 +209,7 @@ @Test public void iterateOnEmptyTopiaDAO() throws TopiaException { - for (Person person : dao) { - Assert.fail("No person has been created"); - } + Assert.assertFalse("No person has been created, hasNext should return false", dao.iterator().hasNext()); } protected void createPersons(int number) throws TopiaException { @@ -339,4 +338,78 @@ Assert.assertTrue(intersection.contains("toto07")); } + @Test + public void testFindPage() throws TopiaException { + + createPersons(19); + + String hql = dao.newFromClause("p") + " WHERE p." + Person.PROPERTY_NAME + " LIKE 'toto%' "; + PaginationResult<Person> page = dao.forHql(hql).findPage(PaginationParameter.of(0, 5)); + + Assert.assertEquals(5, page.getElements().size()); + Assert.assertEquals(0, page.getCurrentPage().getStartIndex()); + Assert.assertEquals(4, page.getCurrentPage().getEndIndex()); + Assert.assertEquals(19, page.getCount()); + Assert.assertEquals(4, page.getPageCount()); + + while (page.hasNextPage()) { + PaginationParameter nextPage = page.getNextPage(); + page = dao.forHql(hql).findPage(nextPage); + + if (page.hasNextPage()) { + Assert.assertEquals(5, page.getElements().size()); + } else { + // last page only has 4 elements + Assert.assertEquals(4, page.getElements().size()); + } + Assert.assertEquals(19, page.getCount()); + Assert.assertEquals(4, page.getPageCount()); + } + } + + @Test + public void testFindPageWithOrder() throws TopiaException { + + createPersons(19); + + String hql = dao.newFromClause("p") + " WHERE p." + Person.PROPERTY_NAME + " LIKE 'toto%' "; + PaginationResult<Person> page = dao.forHql(hql).findPage(PaginationParameter.of(0, 7, Person.PROPERTY_NAME, true)); + + Assert.assertEquals(7, page.getElements().size()); + Assert.assertEquals(0, page.getCurrentPage().getStartIndex()); + Assert.assertEquals(6, page.getCurrentPage().getEndIndex()); + Assert.assertEquals(19, page.getCount()); + Assert.assertEquals(3, page.getPageCount()); + + Assert.assertEquals("toto18", page.getElements().iterator().next().getName()); + Assert.assertEquals("toto12", Iterables.getLast(page.getElements()).getName()); + + PaginationParameter lastPage = page.getLastPage(); + page = dao.forHql(hql).findPage(lastPage); + + Assert.assertEquals(5, page.getElements().size()); + Assert.assertEquals(14, page.getCurrentPage().getStartIndex()); + Assert.assertEquals(20, page.getCurrentPage().getEndIndex()); + Assert.assertEquals(19, page.getCount()); + Assert.assertEquals(3, page.getPageCount()); + Assert.assertFalse(page.hasNextPage()); + + Assert.assertEquals("toto04", page.getElements().iterator().next().getName()); + Assert.assertEquals("toto00", Iterables.getLast(page.getElements()).getName()); + + } + + @Test + public void testFindPageNoData() throws TopiaException { + + String hql = dao.newFromClause("p"); + PaginationResult<Person> page = dao.forHql(hql).findPage(PaginationParameter.of(0, 5)); + + Assert.assertEquals(0, page.getElements().size()); + Assert.assertEquals(0, page.getCount()); + Assert.assertEquals(0, page.getPageCount()); + Assert.assertFalse(page.hasNextPage()); + + } + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-05-23 07:31:13 UTC (rev 3130) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-05-23 08:28:43 UTC (rev 3131) @@ -82,7 +82,9 @@ * @param pageSize size of a page * @return the initialized pager. * @since 3.0 + * @deprecated This method has to be replaced by another clearer method */ + @Deprecated PaginationResult<E> newPager(int pageSize); /** @@ -97,7 +99,9 @@ * @param pageSize size of a page * @return the initialized pager. * @since 3.0 + * @deprecated This method has to be replaced by another clearer method */ + @Deprecated PaginationResult<E> newPager(String hql, Map<String, Object> params, int pageSize); /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2014-05-23 07:31:13 UTC (rev 3130) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2014-05-23 08:28:43 UTC (rev 3131) @@ -27,6 +27,7 @@ import java.util.List; import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import com.google.common.base.Optional; @@ -121,10 +122,14 @@ List<E> find(PaginationParameter page); + PaginationResult<E> findPage(PaginationParameter page); + List<String> findAllIds(); List<String> findIds(int startIndex, int endIndex); List<String> findIds(PaginationParameter page); + PaginationResult<String> findIdsPage(PaginationParameter page); + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-23 07:31:13 UTC (rev 3130) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-23 08:28:43 UTC (rev 3131) @@ -946,6 +946,11 @@ } @Override + public PaginationResult<E> findPage(PaginationParameter page) { + return getNextStep().findPage(page); + } + + @Override public Iterable<E> findAllLazy() { return getNextStep().findAllLazy(); } @@ -971,6 +976,11 @@ } @Override + public PaginationResult<String> findIdsPage(PaginationParameter page) { + return getNextStep().findIdsPage(page); + } + + @Override public List<String> findAllIds() { return getNextStep().findAllIds(); } @@ -1086,6 +1096,14 @@ } @Override + public PaginationResult<E> findPage(PaginationParameter page) { + List<E> elements = find(page); + long count = count(); + PaginationResult<E> result = PaginationResult.of(elements, count, page); + return result; + } + + @Override public List<String> findAllIds() { String hqlWithSelectClause = "select topiaId " + hql; return topiaDAO.findAll(hqlWithSelectClause, hqlParameters); @@ -1102,6 +1120,15 @@ String hqlWithSelectClause = "select topiaId " + hql; return topiaDAO.find(hqlWithSelectClause, hqlParameters, page); } + + @Override + public PaginationResult<String> findIdsPage(PaginationParameter page) { + List<String> elements = findIds(page); + long count = count(); + PaginationResult<String> result = PaginationResult.of(elements, count, page); + return result; + } + } }

1 0

r3130 - in trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence: . internal
by athimel＠users.nuiton.org 23 May '14

23 May '14

Author: athimel Date: 2014-05-23 09:31:13 +0200 (Fri, 23 May 2014) New Revision: 3130 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3130 Log: refs #3208 fix generic used Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-05-22 15:24:46 UTC (rev 3129) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-05-23 07:31:13 UTC (rev 3130) @@ -83,7 +83,7 @@ * @return the initialized pager. * @since 3.0 */ - <K> PaginationResult<K> newPager(int pageSize); + PaginationResult<E> newPager(int pageSize); /** * Creates a new pager initialized for the first page of data of the given @@ -98,7 +98,7 @@ * @return the initialized pager. * @since 3.0 */ - <K> PaginationResult<K> newPager(String hql, Map<String, Object> params, int pageSize); + PaginationResult<E> newPager(String hql, Map<String, Object> params, int pageSize); /** * Creates an entity not created without the DAO using any of the others Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-22 15:24:46 UTC (rev 3129) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-23 07:31:13 UTC (rev 3130) @@ -199,13 +199,13 @@ } @Override - public <K> PaginationResult<K> newPager(int pageSize) { - PaginationResult<K> result = newPager(newFromClause(), null, pageSize); + public PaginationResult<E> newPager(int pageSize) { + PaginationResult<E> result = newPager(newFromClause(), null, pageSize); return result; } @Override - public <K> PaginationResult<K> newPager(String hql, Map<String, Object> params, int pageSize) { + public PaginationResult<E> newPager(String hql, Map<String, Object> params, int pageSize) { PaginationParameter firstPage = PaginationParameter.of(0, pageSize); if (hqlContainsOrderBy(hql)) { @@ -214,8 +214,8 @@ hql = hql.substring(0, hql.toLowerCase().indexOf("order by")); } long count = count("SELECT COUNT(*) " + hql, params); - List<K> emptyList = Lists.newArrayList(); // XXX AThimel 22/05/14 To keep the old behavior, we do not load the elements. Is it correct ? - PaginationResult<K> result = PaginationResult.of(emptyList, count, firstPage); + List<E> emptyList = Lists.newArrayList(); // XXX AThimel 22/05/14 To keep the old behavior, we do not load the elements. Is it correct ? + PaginationResult<E> result = PaginationResult.of(emptyList, count, firstPage); return result; } @@ -716,7 +716,7 @@ protected final Map<String, Object> params; - protected PaginationResult<K> pager; + protected PaginationResult<E> pager; protected boolean firstPageLoaded;

1 0

r3129 - trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal
by athimel＠users.nuiton.org 22 May '14

22 May '14

Author: athimel Date: 2014-05-22 17:24:46 +0200 (Thu, 22 May 2014) New Revision: 3129 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3129 Log: refs #3208 Add tests on PaginationParameter interpretation by ToPIA Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-22 14:53:11 UTC (rev 3128) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-22 15:24:46 UTC (rev 3129) @@ -24,8 +24,10 @@ * #L% */ +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.hamcrest.CoreMatchers; import org.junit.Assert; @@ -36,12 +38,17 @@ import org.nuiton.topia.it.legacy.TopiaItLegacyTopiaPersistenceContext; import org.nuiton.topia.it.legacy.test.entities.Person; import org.nuiton.topia.it.legacy.test.entities.PersonTopiaDao; +import org.nuiton.topia.persistence.TopiaDao; +import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.util.pagination.PaginationParameter; +import com.google.common.base.Function; import com.google.common.base.Strings; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaException; +import com.google.common.collect.Sets; /** * Test on {@link TopiaDao}. @@ -103,7 +110,7 @@ createPersons(1); - Iterable<Person> persons = dao.forNameEquals("toto0").findAllLazy(); + Iterable<Person> persons = dao.forNameEquals("toto00").findAllLazy(); Assert.assertTrue(persons.iterator().hasNext()); } @@ -208,7 +215,8 @@ protected void createPersons(int number) throws TopiaException { for (int i = 0; i < number; i++) { - createPerson("toto" + i); + String name = "toto" + Strings.padStart(String.valueOf(i), 2, '0'); + createPerson(name); } context.commit(); @@ -232,4 +240,103 @@ Assert.assertTrue(!Strings.isNullOrEmpty(person.getTopiaId())); } + @Test + public void testFindUsingPagination() throws TopiaException { + + createPersons(17); + + List<Person> excepted = dao.findAll(); + Assert.assertEquals(17, excepted.size()); + + { + PaginationParameter page = PaginationParameter.of(0, -1); + List<Person> list = dao.find(dao.newFromClause(), new HashMap<String, Object>(), page); + Assert.assertEquals(17, list.size()); + } + + Set<String> alreadyLoaded = Sets.newHashSet(); + { + PaginationParameter page = PaginationParameter.of(0, 6); + List<Person> list = dao.find(dao.newFromClause(), new HashMap<String, Object>(), page); + Assert.assertEquals(6, list.size()); + + // Now make sure that a same entity is not in several pages + Set<String> newlyLoaded = Sets.newHashSet(Iterables.transform(list, TopiaEntities.getTopiaIdFunction())); + Assert.assertTrue(Sets.intersection(alreadyLoaded, newlyLoaded).isEmpty()); + alreadyLoaded.addAll(newlyLoaded); + } + + { + PaginationParameter page = PaginationParameter.of(1, 6); + List<Person> list = dao.find(dao.newFromClause(), new HashMap<String, Object>(), page); + Assert.assertEquals(6, list.size()); + + // Now make sure that a same entity is not in several pages + Set<String> newlyLoaded = Sets.newHashSet(Iterables.transform(list, TopiaEntities.getTopiaIdFunction())); + Assert.assertTrue(Sets.intersection(alreadyLoaded, newlyLoaded).isEmpty()); + alreadyLoaded.addAll(newlyLoaded); + } + + { + PaginationParameter page = PaginationParameter.of(2, 6); + List<Person> list = dao.find(dao.newFromClause(), new HashMap<String, Object>(), page); + Assert.assertEquals(5, list.size()); + + // Now make sure that a same entity is not in several pages + Set<String> newlyLoaded = Sets.newHashSet(Iterables.transform(list, TopiaEntities.getTopiaIdFunction())); + Assert.assertTrue(Sets.intersection(alreadyLoaded, newlyLoaded).isEmpty()); + alreadyLoaded.addAll(newlyLoaded); + } + + Assert.assertEquals(17, alreadyLoaded.size()); + + } + + @Test + public void testFindUsingPaginationOrderClauses() throws TopiaException { + + createPersons(15); + + List<Person> excepted = dao.findAll(); + Assert.assertEquals(15, excepted.size()); + + Set<String> setAsc = Sets.newHashSet(); + Set<String> setDesc = Sets.newHashSet(); + + Function<Person, String> getNameFunction = new Function<Person, String>() { + @Override + public String apply(Person input) { + return input.getName(); + } + }; + + { + PaginationParameter page = PaginationParameter.of(0, 8, Person.PROPERTY_NAME, false); + List<Person> list = dao.find(dao.newFromClause(), new HashMap<String, Object>(), page); + Assert.assertEquals(8, list.size()); + + Set<String> newlyLoaded = Sets.newHashSet(Iterables.transform(list, getNameFunction)); + setAsc.addAll(newlyLoaded); + } + + { + PaginationParameter page = PaginationParameter.of(0, 8, Person.PROPERTY_NAME, true); + List<Person> list = dao.find(dao.newFromClause(), new HashMap<String, Object>(), page); + Assert.assertEquals(8, list.size()); + + Set<String> newlyLoaded = Sets.newHashSet(Iterables.transform(list, getNameFunction)); + setDesc.addAll(newlyLoaded); + } + + Sets.SetView<String> intersection = Sets.intersection(setAsc, setDesc); + + // Sorting a list of 15 elements asc and desc by 8-elements pages, intersection will be the middle one (toto7) + // <---------ASC-page-0----------><-------ASC-page-1----------> + // 00 01 02 03 04 05 06 |7| 8 9 10 11 12 13 14 + // <---------DESC-page-1--------><--------DESC-page-0--------> + + Assert.assertEquals(1, intersection.size()); + Assert.assertTrue(intersection.contains("toto07")); + } + }

1 0

r3128 - in trunk: topia-it/src/test/java/org/nuiton/topia/persistence/internal topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/internal
by athimel＠users.nuiton.org 22 May '14

22 May '14

Author: athimel Date: 2014-05-22 16:53:11 +0200 (Thu, 22 May 2014) New Revision: 3128 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3128 Log: refs-50 #3208 use nuiton-utils refactored pagination classes Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-22 08:43:16 UTC (rev 3127) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-05-22 14:53:11 UTC (rev 3128) @@ -199,6 +199,13 @@ } + @Test + public void iterateOnEmptyTopiaDAO() throws TopiaException { + for (Person person : dao) { + Assert.fail("No person has been created"); + } + } + protected void createPersons(int number) throws TopiaException { for (int i = 0; i < number; i++) { createPerson("toto" + i); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-05-22 08:43:16 UTC (rev 3127) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-05-22 14:53:11 UTC (rev 3128) @@ -27,7 +27,7 @@ import com.google.common.base.Optional; import org.nuiton.topia.persistence.event.TopiaEntityListener; import org.nuiton.topia.persistence.event.TopiaEntityVetoable; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationResult; import java.util.Collection; import java.util.List; @@ -83,7 +83,7 @@ * @return the initialized pager. * @since 3.0 */ - TopiaPagerBean newPager(int pageSize); + <K> PaginationResult<K> newPager(int pageSize); /** * Creates a new pager initialized for the first page of data of the given @@ -98,7 +98,7 @@ * @return the initialized pager. * @since 3.0 */ - TopiaPagerBean newPager(String hql, Map<String, Object> params, int pageSize); + <K> PaginationResult<K> newPager(String hql, Map<String, Object> params, int pageSize); /** * Creates an entity not created without the DAO using any of the others Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2014-05-22 08:43:16 UTC (rev 3127) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2014-05-22 14:53:11 UTC (rev 3128) @@ -26,7 +26,7 @@ import java.util.List; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; import com.google.common.base.Optional; @@ -119,12 +119,12 @@ List<E> find(int startIndex, int endIndex); - List<E> find(TopiaPagerBean pager); + List<E> find(PaginationParameter page); List<String> findAllIds(); List<String> findIds(int startIndex, int endIndex); - List<String> findIds(TopiaPagerBean pager); + List<String> findIds(PaginationParameter page); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-22 08:43:16 UTC (rev 3127) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-05-22 14:53:11 UTC (rev 3128) @@ -24,10 +24,14 @@ * #L% */ +import com.google.common.base.Function; +import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; + import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -55,8 +59,9 @@ import org.nuiton.topia.persistence.event.TopiaEntityVetoable; import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; import org.nuiton.topia.persistence.util.TopiaUtil; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; -import org.nuiton.util.PagerBeanUtil; +import org.nuiton.util.pagination.PaginationOrder; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import java.lang.reflect.InvocationTargetException; import java.util.Collection; @@ -85,6 +90,15 @@ private static Log log = LogFactory.getLog(AbstractTopiaDao.class); + + protected static final Function<PaginationOrder, String> PAGINATION_ORDER_TO_HQL = new Function<PaginationOrder, String>() { + @Override + public String apply(PaginationOrder input) { + String result = String.format("%s %s", input.getClause(), input.isDesc() ? "DESC" : "ASC"); + return result; + } + }; + /** * Default batch size used to iterate on data. * @@ -185,14 +199,14 @@ } @Override - public TopiaPagerBean newPager(int pageSize) { - TopiaPagerBean pager = newPager(newFromClause(), null, pageSize); - return pager; + public <K> PaginationResult<K> newPager(int pageSize) { + PaginationResult<K> result = newPager(newFromClause(), null, pageSize); + return result; } @Override - public TopiaPagerBean newPager(String hql, Map<String, Object> params, int pageSize) { - TopiaPagerBean pager = new TopiaPagerBean(); + public <K> PaginationResult<K> newPager(String hql, Map<String, Object> params, int pageSize) { + PaginationParameter firstPage = PaginationParameter.of(0, pageSize); if (hqlContainsOrderBy(hql)) { @@ -200,10 +214,9 @@ hql = hql.substring(0, hql.toLowerCase().indexOf("order by")); } long count = count("SELECT COUNT(*) " + hql, params); - pager.setRecords(count); - pager.setPageSize(pageSize); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); - return pager; + List<K> emptyList = Lists.newArrayList(); // XXX AThimel 22/05/14 To keep the old behavior, we do not load the elements. Is it correct ? + PaginationResult<K> result = PaginationResult.of(emptyList, count, firstPage); + return result; } @Override @@ -537,28 +550,27 @@ return result; } - protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { + protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, PaginationParameter page) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(pager); + Preconditions.checkNotNull(page); - if (StringUtils.isNotBlank(pager.getSortColumn())) { + if (!page.getOrderClauses().isEmpty()) { // can't have a order by clause in hql query Preconditions.checkState( !hqlContainsOrderBy(hql), "An 'order by' clause was already found in hql, can't use the order of the pager"); - hql += " order by " + pager.getSortColumn(); - if (!pager.isSortAscendant()) { - hql += " desc"; - } + hql += " ORDER BY "; + Iterable<String> orderClauses = Iterables.transform(page.getOrderClauses(), PAGINATION_ORDER_TO_HQL); + hql += Joiner.on(", ").join(orderClauses); } List<K> result = topiaJpaSupport.find( hql, - (int) pager.getRecordStartIndex(), - (int) pager.getRecordEndIndex() - 1, + (int) page.getStartIndex(), + (int) page.getEndIndex(), hqlParameters); return result; @@ -652,7 +664,7 @@ @Override public Iterable<E> findAllLazy() { - String hql = "from " + getTopiaEntityEnum().getImplementationFQN() + " order by id"; + String hql = " FROM " + getTopiaEntityEnum().getImplementationFQN() + " ORDER BY id "; Map<String, Object> hqlParameters = Collections.emptyMap(); Iterable<E> result = findAllLazy(hql, hqlParameters); return result; @@ -704,8 +716,10 @@ protected final Map<String, Object> params; - protected final TopiaPagerBean pager; + protected PaginationResult<K> pager; + protected boolean firstPageLoaded; + public FindAllIterator(AbstractTopiaDao<E> dao, int batchSize, String hql, @@ -722,16 +736,16 @@ // empty iterator (will be changed at first next call) data = Iterators.emptyIterator(); + firstPageLoaded = false; } - public boolean hasNext() { boolean result = data.hasNext() || // no more data - pager.getPageIndex() < pager.getPagesNumber(); + (!firstPageLoaded && pager.getCount() > 0) || // first page not yet loaded and there is data to load + (firstPageLoaded && pager.hasNextPage()); // the first page has been loaded and there is another page return result; } - public K next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -741,14 +755,21 @@ // must load iterator - // increments page index - pager.setPageIndex(pager.getPageIndex() + 1); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); + PaginationParameter pageToLoad; + if (firstPageLoaded) { + pageToLoad = pager.getNextPage(); + } else { + pageToLoad = pager.getCurrentPage(); + firstPageLoaded = true; + } // load new window of data - List<K> values = dao.find(hql, params, pager); + List<K> values = dao.find(hql, params, pageToLoad); data = values.iterator(); + // Create a new pager on the next page + pager = PaginationResult.of(pager.getElements(), pager.getCount(), pageToLoad); + } K next = data.next(); @@ -920,8 +941,8 @@ } @Override - public List<E> find(TopiaPagerBean pager) { - return getNextStep().find(pager); + public List<E> find(PaginationParameter page) { + return getNextStep().find(page); } @Override @@ -945,8 +966,8 @@ } @Override - public List<String> findIds(TopiaPagerBean pager) { - return getNextStep().findIds(pager); + public List<String> findIds(PaginationParameter page) { + return getNextStep().findIds(page); } @Override @@ -1060,8 +1081,8 @@ } @Override - public List<E> find(TopiaPagerBean pager) { - return topiaDAO.find(hql, hqlParameters, pager); + public List<E> find(PaginationParameter page) { + return topiaDAO.find(hql, hqlParameters, page); } @Override @@ -1077,9 +1098,9 @@ } @Override - public List<String> findIds(TopiaPagerBean pager) { + public List<String> findIds(PaginationParameter page) { String hqlWithSelectClause = "select topiaId " + hql; - return topiaDAO.find(hqlWithSelectClause, hqlParameters, pager); + return topiaDAO.find(hqlWithSelectClause, hqlParameters, page); } }

1 0

r3127 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/persistence/pager topia-persistence/src/test/java/org/nuiton/topia/persistence/pager
by athimel＠users.nuiton.org 22 May '14

22 May '14

Author: athimel Date: 2014-05-22 10:43:16 +0200 (Thu, 22 May 2014) New Revision: 3127 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3127 Log: refs #3208 Pagination* classes moved to nuiton-utils Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationOrder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationResult.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationParameterTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationResultTest.java Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-21 22:10:11 UTC (rev 3126) +++ trunk/pom.xml 2014-05-22 08:43:16 UTC (rev 3127) @@ -240,7 +240,7 @@  <eugeneVersion>2.9</eugeneVersion> - <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonCsvVersion>3.0-rc-1</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationOrder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationOrder.java 2014-05-21 22:10:11 UTC (rev 3126) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationOrder.java 2014-05-22 08:43:16 UTC (rev 3127) @@ -1,63 +0,0 @@ -package org.nuiton.topia.persistence.pager; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import java.io.Serializable; - -/** - * This class represents an 'order' information : order clause and asc/desc - * - * @author Arnaud Thimel (Code Lutin) - * @since 3.0 - */ -public class PaginationOrder implements Serializable { - - private static final long serialVersionUID = -1222944258030026951L; - - protected String clause; - protected boolean desc; - - public PaginationOrder(String clause, boolean desc) { - this.clause = clause; - this.desc = desc; - } - - public String getClause() { - return clause; - } - - public void setClause(String clause) { - this.clause = clause; - } - - public boolean isDesc() { - return desc; - } - - public void setDesc(boolean desc) { - this.desc = desc; - } - -} Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java 2014-05-21 22:10:11 UTC (rev 3126) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java 2014-05-22 08:43:16 UTC (rev 3127) @@ -1,182 +0,0 @@ -package org.nuiton.topia.persistence.pager; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import java.io.Serializable; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - -/** - * This class represents the necessary information to do pagination (page number, size, ...). - * - * @author Arnaud Thimel (Code Lutin) - * @since 3.0 - */ -public class PaginationParameter implements Serializable { - - private static final long serialVersionUID = -2564463476779099397L; - - protected int pageNumber; - protected int pageSize; - protected List<PaginationOrder> orderClauses; - - private PaginationParameter(int pageNumber, int pageSize) { - this(pageNumber, pageSize, new LinkedList<PaginationOrder>()); - } - - private PaginationParameter(int pageNumber, int pageSize, List<PaginationOrder> orderClauses) { - this.pageNumber = pageNumber; - this.pageSize = pageSize; - this.orderClauses = Collections.unmodifiableList(orderClauses); - } - - public static PaginationParameter of(int pageNumber, int pageSize) { - PaginationParameter result = new PaginationParameter(pageNumber, pageSize); - return result; - } - - public static PaginationParameter of(int pageNumber, int pageSize, - String orderClause1, boolean orderDesc1) { - return builder(pageNumber, pageSize) - .addOrder(orderClause1, orderDesc1) - .build(); - } - - public static PaginationParameter of(int pageNumber, int pageSize, - String orderClause1, boolean orderDesc1, - String orderClause2, boolean orderDesc2) { - return builder(pageNumber, pageSize) - .addOrder(orderClause1, orderDesc1) - .addOrder(orderClause2, orderDesc2) - .build(); - } - - public static PaginationParameter of(int pageNumber, int pageSize, - String orderClause1, boolean orderDesc1, - String orderClause2, boolean orderDesc2, - String orderClause3, boolean orderDesc3) { - return builder(pageNumber, pageSize) - .addOrder(orderClause1, orderDesc1) - .addOrder(orderClause2, orderDesc2) - .addOrder(orderClause3, orderDesc3) - .build(); - } - - public static PaginationParameter.Builder builder(int pageNumber, int pageSize) { - Builder result = new Builder(pageNumber, pageSize); - return result; - } - - public int getPageNumber() { - return pageNumber; - } - - public int getPageSize() { - return pageSize; - } - - public List<PaginationOrder> getOrderClauses() { - return orderClauses; - } - - public int getStartIndex() { - if (pageNumber != 0) { - Preconditions.checkState(pageSize != -1, "This is non-sense to have pageNumber>1 if pageSize==-1"); - } - int startIndex = pageNumber * pageSize; - return startIndex; - } - - public int getEndIndex() { - int endIndex = Integer.MAX_VALUE; - if (pageSize != -1) { - endIndex = getStartIndex() + pageSize - 1; - } - return endIndex; - } - - /** - * Class used to build an instance of PaginationParameter - */ - public static class Builder { - - protected int pageNumber; - protected int pageSize; - protected List<PaginationOrder> orderClauses; - - public Builder(int pageNumber, int pageSize) { - this.pageNumber = pageNumber; - this.pageSize = pageSize; - } - - public Builder addOrder(String clause, boolean desc) { - if (orderClauses == null) { - orderClauses = Lists.newLinkedList(); - } - PaginationOrder paginationOrder = new PaginationOrder(clause, desc); - orderClauses.add(paginationOrder); - return this; - } - - public Builder addAscOrder(String clause) { - return addOrder(clause, false); - } - - public Builder addDescOrder(String clause) { - return addOrder(clause, true); - } - - public Builder addOrder(String clause) { - boolean desc = false; - String cleanedClause = clause; - int spaceIndex = clause.indexOf(' '); - if (spaceIndex != -1) { - cleanedClause = clause.substring(0, spaceIndex).trim(); - desc = "desc".equalsIgnoreCase(clause.substring(spaceIndex + 1).trim()); - } - return addOrder(cleanedClause, desc); - } - - public Builder addOrderClauses(Iterable<PaginationOrder> clauses) { - if (orderClauses == null) { - orderClauses = Lists.newLinkedList(); - } - if (clauses != null) { - Iterables.addAll(orderClauses, clauses); - } - return this; - } - - public PaginationParameter build() { - PaginationParameter result = new PaginationParameter(pageNumber, pageSize, orderClauses); - return result; - } - } -} Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationResult.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationResult.java 2014-05-21 22:10:11 UTC (rev 3126) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationResult.java 2014-05-22 08:43:16 UTC (rev 3127) @@ -1,127 +0,0 @@ -package org.nuiton.topia.persistence.pager; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import java.io.Serializable; -import java.util.List; - -import com.google.common.base.Preconditions; - -/** - * Represents the result of a pagination request. It contains the result elements together with the - * {code}PaginationParameter{/code} used to compute it. - * - * @author Arnaud Thimel (Code Lutin) - * @since 3.0 - */ -public class PaginationResult<K> implements Serializable { - - private static final long serialVersionUID = -8794603203860852003L; - - protected List<K> elements; - protected long count; - protected PaginationParameter currentPage; - - private PaginationResult(List<K> elements, long count, PaginationParameter currentPage) { - this.elements = elements; - this.count = count; - this.currentPage = currentPage; - } - - public static <E> PaginationResult<E> of(List<E> elements, long count, PaginationParameter currentPage) { - PaginationResult<E> result = new PaginationResult<E>(elements, count, currentPage); - return result; - } - - public List<K> getElements() { - return elements; - } - - public long getCount() { - return count; - } - - public PaginationParameter getCurrentPage() { - return currentPage; - } - - public PaginationParameter getNextPage() { - int nextPageNumber = currentPage.getPageNumber() + 1; - int pageSize = currentPage.getPageSize(); - List<PaginationOrder> orderClauses = currentPage.getOrderClauses(); - PaginationParameter result = PaginationParameter. - builder(nextPageNumber, pageSize). - addOrderClauses(orderClauses). - build(); - return result; - } - - public PaginationParameter getPreviousPage() { - // XXX AThimel 21/05/14 Maybe, do not fail, just return the first page ? - Preconditions.checkState(currentPage.getPageNumber() > 0, "You cannot get a previous page to the first one"); - int previousPageNumber = currentPage.getPageNumber() - 1; - int pageSize = currentPage.getPageSize(); - List<PaginationOrder> orderClauses = currentPage.getOrderClauses(); - PaginationParameter result = PaginationParameter. - builder(previousPageNumber, pageSize). - addOrderClauses(orderClauses). - build(); - return result; - } - - public PaginationParameter getFirstPage() { - int firstPageNumber = 0; - int pageSize = currentPage.getPageSize(); - List<PaginationOrder> orderClauses = currentPage.getOrderClauses(); - PaginationParameter result = PaginationParameter. - builder(firstPageNumber, pageSize). - addOrderClauses(orderClauses). - build(); - return result; - } - - public PaginationParameter getLastPage() { - int lastPageNumber = getPageCount() - 1; - int pageSize = currentPage.getPageSize(); - List<PaginationOrder> orderClauses = currentPage.getOrderClauses(); - PaginationParameter result = PaginationParameter. - builder(lastPageNumber, pageSize). - addOrderClauses(orderClauses). - build(); - return result; - } - - public int getPageCount() { - int pageCount = 1; - int pageSize = currentPage.getPageSize(); - if (pageSize > 1) { - double countDouble = Long.valueOf(count).doubleValue(); - double pageSizeDouble = Integer.valueOf(pageSize).doubleValue(); - double pageNumberDouble = Math.ceil(countDouble / pageSizeDouble); - pageCount = Double.valueOf(pageNumberDouble).intValue(); - } - return pageCount; - } -} Deleted: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationParameterTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationParameterTest.java 2014-05-21 22:10:11 UTC (rev 3126) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationParameterTest.java 2014-05-22 08:43:16 UTC (rev 3127) @@ -1,75 +0,0 @@ -package org.nuiton.topia.persistence.pager; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import org.junit.Assert; -import org.junit.Test; - -/** - * @author Arnaud Thimel (Code Lutin) - */ -public class PaginationParameterTest { - - @Test - public void testIndexes() { - { - PaginationParameter paginationParameter = PaginationParameter.of(0, 50); - Assert.assertEquals(0, paginationParameter.getStartIndex()); - Assert.assertEquals(49, paginationParameter.getEndIndex()); - } - { - PaginationParameter paginationParameter = PaginationParameter.of(2, 50); - Assert.assertEquals(100, paginationParameter.getStartIndex()); - Assert.assertEquals(149, paginationParameter.getEndIndex()); - } - { - PaginationParameter paginationParameter = PaginationParameter.of(0, -1); - Assert.assertEquals(0, paginationParameter.getStartIndex()); - Assert.assertEquals(Integer.MAX_VALUE, paginationParameter.getEndIndex()); - } - { - PaginationParameter paginationParameter = PaginationParameter.of(0, 19); - Assert.assertEquals(0, paginationParameter.getStartIndex()); - Assert.assertEquals(18, paginationParameter.getEndIndex()); - } - { - PaginationParameter paginationParameter = PaginationParameter.of(1, 19); - Assert.assertEquals(19, paginationParameter.getStartIndex()); - Assert.assertEquals(37, paginationParameter.getEndIndex()); - } - { - PaginationParameter paginationParameter = PaginationParameter.of(2, 19); - Assert.assertEquals(38, paginationParameter.getStartIndex()); - Assert.assertEquals(56, paginationParameter.getEndIndex()); - } - } - - @Test(expected = IllegalStateException.class) - public void testInvalidIndex() { - PaginationParameter paginationParameter = PaginationParameter.of(2, -1); - paginationParameter.getStartIndex(); - } - -} Deleted: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationResultTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationResultTest.java 2014-05-21 22:10:11 UTC (rev 3126) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/pager/PaginationResultTest.java 2014-05-22 08:43:16 UTC (rev 3127) @@ -1,90 +0,0 @@ -package org.nuiton.topia.persistence.pager; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import java.util.List; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.google.common.collect.Lists; - -/** - * @author Arnaud Thimel (Code Lutin) - */ -public class PaginationResultTest { - - protected PaginationResult<Object> paginationResult; - - @Before - public void init() { - List<Object> elements = Lists.newArrayList(); - PaginationParameter page = PaginationParameter.of(2, 50); - paginationResult = PaginationResult.of(elements, 204, page); - } - - @Test - public void testGetFirstPage() { - Assert.assertEquals(0, paginationResult.getFirstPage().getPageNumber()); - Assert.assertEquals(50, paginationResult.getFirstPage().getPageSize()); - Assert.assertEquals(0, paginationResult.getFirstPage().getStartIndex()); - Assert.assertEquals(49, paginationResult.getFirstPage().getEndIndex()); - } - - @Test - public void testGetPreviousPage() { - Assert.assertEquals(1, paginationResult.getPreviousPage().getPageNumber()); - Assert.assertEquals(50, paginationResult.getPreviousPage().getPageSize()); - Assert.assertEquals(50, paginationResult.getPreviousPage().getStartIndex()); - Assert.assertEquals(99, paginationResult.getPreviousPage().getEndIndex()); - } - - @Test - public void testCurrentPage() { - Assert.assertEquals(5, paginationResult.getPageCount()); - Assert.assertEquals(2, paginationResult.getCurrentPage().getPageNumber()); - Assert.assertEquals(50, paginationResult.getCurrentPage().getPageSize()); - Assert.assertEquals(100, paginationResult.getCurrentPage().getStartIndex()); - Assert.assertEquals(149, paginationResult.getCurrentPage().getEndIndex()); - } - - @Test - public void testGeNextPage() { - Assert.assertEquals(3, paginationResult.getNextPage().getPageNumber()); - Assert.assertEquals(50, paginationResult.getNextPage().getPageSize()); - Assert.assertEquals(150, paginationResult.getNextPage().getStartIndex()); - Assert.assertEquals(199, paginationResult.getNextPage().getEndIndex()); - } - - @Test - public void testGetLastPage() { - Assert.assertEquals(4, paginationResult.getLastPage().getPageNumber()); - Assert.assertEquals(50, paginationResult.getLastPage().getPageSize()); - Assert.assertEquals(200, paginationResult.getLastPage().getStartIndex()); - Assert.assertEquals(249, paginationResult.getLastPage().getEndIndex()); - } - -}

1 0