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;