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

[topia] branch develop updated (8029b8a -> 8d9ae23)
by nuiton.org scm Aug. 26, 2014

Aug. 26, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from 8029b8a fixes #3283 Update TopiaMetaTransformer with most commonly used values new 8d9ae23 Update versions H2 1.4.181 Guava 18.0 nuiton-utils 3.0-rc-7 nuiton-csv 3.0-rc-4 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8d9ae232d5ac3b533a24d1ad745ce10606cbed0d Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Tue Aug 26 18:17:57 2014 +0200 Update versions H2 1.4.181 Guava 18.0 nuiton-utils 3.0-rc-7 nuiton-csv 3.0-rc-4 Summary of changes: pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

[topia] branch develop-2.x updated (ecd21ca -> b3eb939)
by nuiton.org scm Aug. 25, 2014

Aug. 25, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository topia. See http://git.nuiton.org/topia.git from ecd21ca fixes #3467: Use new Version API from org.nuiton.utils.version package refs #3466: Updates to nuiton-utils 3.0-rc-6 new b3eb939 fixes #3472: Remove TopiaGeneratorUtil#getDbSchemaNameTagValue(ObjectModelAttribute, ObjectModel) method fixes #3473: Can specifiy dbSchema tag value at package level The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b3eb9392c82165c9507df078b9a8e51011f37789 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 24 16:06:51 2014 +0200 fixes #3472: Remove TopiaGeneratorUtil#getDbSchemaNameTagValue(ObjectModelAttribute, ObjectModel) method fixes #3473: Can specifiy dbSchema tag value at package level Summary of changes: .../generator/EntityHibernateMappingGenerator.java | 4 ++-- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 27 ++++++---------------- .../org/nuiton/topia/generator/TopiaTagValues.java | 4 ++-- 3 files changed, 11 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

[topia] branch develop updated (59c19b0 -> 8029b8a)
by nuiton.org scm Aug. 25, 2014

Aug. 25, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from 59c19b0 fixes #3475 Default value for 'useEnumerationName' tag value should be 'true' new 8029b8a fixes #3283 Update TopiaMetaTransformer with most commonly used values The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8029b8a221fb76a68756a50a17d5e29f6874b7df Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Tue Aug 26 01:12:40 2014 +0200 fixes #3283 Update TopiaMetaTransformer with most commonly used values Summary of changes: topia-it/pom.xml | 6 ----- .../topia/templates/BinderHelperTransformer.java | 3 +-- .../topia/templates/TopiaMetaTransformer.java | 27 +++++++++------------- 3 files changed, 12 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

[topia] branch develop updated (b7a1593 -> 59c19b0)
by nuiton.org scm Aug. 25, 2014

Aug. 25, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from b7a1593 Merge branch 'develop' of https://git.nuiton.org/topia into develop new 59c19b0 fixes #3475 Default value for 'useEnumerationName' tag value should be 'true' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 59c19b0f30cc5b083dfe9946629ac136db3118c8 Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Tue Aug 26 00:23:08 2014 +0200 fixes #3475 Default value for 'useEnumerationName' tag value should be 'true' Summary of changes: .../src/main/java/org/nuiton/topia/templates/TopiaTagValues.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

[topia] branch develop-2.x updated (22af2c3 -> ecd21ca)
by nuiton.org scm Aug. 24, 2014

Aug. 24, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository topia. See http://git.nuiton.org/topia.git from 22af2c3 fix site descriptors new ecd21ca fixes #3467: Use new Version API from org.nuiton.utils.version package refs #3466: Updates to nuiton-utils 3.0-rc-6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ecd21ca66ccbbda2d61f0ccf57641042dcf3082b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 24 13:20:55 2014 +0200 fixes #3467: Use new Version API from org.nuiton.utils.version package refs #3466: Updates to nuiton-utils 3.0-rc-6 Summary of changes: pom.xml | 4 +- .../migration/AbstractTopiaMigrationCallback.java | 2 +- .../migration/TopiaMigrationCallbackByClass.java | 2 +- .../migration/TopiaMigrationCallbackByClassNG.java | 8 ++- .../migration/TopiaMigrationCallbackByMethod.java | 2 +- .../topia/migration/TopiaMigrationEngine.java | 59 +++++++++++++++++----- .../topia/migration/mappings/TMSVersion.java | 6 +-- .../topia/migration/mappings/TMSVersionDAO.java | 6 +-- 8 files changed, 60 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

[topia] branch develop updated (d3a0534 -> b7a1593)
by nuiton.org scm Aug. 20, 2014

Aug. 20, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from d3a0534 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ed5bca0 fixes #3453: Non compilabel code generated when using custom type with generics new b7a1593 Merge branch 'develop' of https://git.nuiton.org/topia into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b7a1593e40f0c0856b1e71b9556649181f217a44 Merge: ed5bca0 d3a0534 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Aug 20 19:25:02 2014 +0200 Merge branch 'develop' of https://git.nuiton.org/topia into develop commit ed5bca00b9abca680820e8c380eb2b9c6435b83d Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Aug 20 19:22:07 2014 +0200 fixes #3453: Non compilabel code generated when using custom type with generics Summary of changes: .../src/main/java/org/nuiton/topia/templates/EntityTransformer.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 2

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

May 23, 2014

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 May 23, 2014

May 23, 2014

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 May 23, 2014

May 23, 2014

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 May 23, 2014

May 23, 2014

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