[Pollen-commits] r3691 - in trunk: . pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/test/java/org/chorem/pollen/business/persistence pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json

Author: tchemit Date: 2012-09-14 18:33:06 +0200 (Fri, 14 Sep 2012) New Revision: 3691 Url: http://chorem.org/repositories/revision/pollen/3691 Log: fixes #806: Updates to nuiton-utils 2.6.2 fixes #807: Updates to topia 2.7 fixes #808: updates to h2 1.3.168 Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java trunk/pom.xml Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -24,13 +24,13 @@ import com.google.common.base.Preconditions; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; public class CommentDAOImpl<E extends Comment> extends CommentDAOAbstract<E> { - public List<E> findComments(TopiaFilterPagerUtil.FilterPagerBean pager, + public List<E> findComments(TopiaPagerBean pager, String pollId) throws TopiaException { Preconditions.checkNotNull(pager); Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -25,25 +25,23 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; public class PersonListDAOImpl<E extends PersonList> extends PersonListDAOAbstract<E> { public List<E> findFavoriteLists(UserAccount user, - TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + TopiaPagerBean pager) throws TopiaException { Preconditions.checkNotNull(user); Preconditions.checkNotNull(pager); - String countHql = "SELECT COUNT(*) FROM PersonListImpl WHERE " + - "owner = :owner"; + String hql = createSimpleQuery("e") + " WHERE e.owner = :owner"; + String countHql = "SELECT COUNT(*) " + hql; computeAndAddRecordsToPager(countHql, pager, "owner", user); - String hql = "FROM PersonListImpl e WHERE e.owner = :owner"; - List<E> result = findAllByQueryAndPager(hql, pager, "owner", user); return result; } @@ -52,7 +50,7 @@ Preconditions.checkNotNull(user); - String hql = "FROM PersonListImpl WHERE owner = :owner"; + String hql = createSimpleQuery("e") + " WHERE e.owner = :owner"; List<E> result = findAllByQuery(hql, "owner", user); return result; Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -168,7 +168,7 @@ } public List<E> findFavoriteListUsers(PersonList favoriteList, - TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + TopiaPagerBean pager) throws TopiaException { Preconditions.checkNotNull(favoriteList); Preconditions.checkNotNull(pager); @@ -176,7 +176,7 @@ int records = favoriteList.sizePollAccount(); pager.setRecords(records); - String hql = "FROM PollAccountImpl e WHERE e.personList = :owner"; + String hql = createSimpleQuery("e") + " WHERE e.personList = :owner"; List<E> result = findAllByQueryAndPager(hql, pager, "owner", favoriteList); return result; @@ -188,7 +188,7 @@ Preconditions.checkNotNull(personListToUpdate); Preconditions.checkNotNull(pollAccount); - String hql = "FROM PollAccountImpl e WHERE " + + String hql = createSimpleQuery("e") + " WHERE " + "e.personList = :person AND " + "e.email = :email"; String pollAccountId = pollAccount.getTopiaId(); Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -28,15 +28,17 @@ import org.apache.commons.lang3.tuple.Pair; import org.chorem.pollen.PollenFunctions; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.PagerBeanUtil; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; public class PollDAOImpl<E extends Poll> extends PollDAOAbstract<E> { - public List<E> getPolls(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + public List<E> getPolls(TopiaPagerBean pager) throws TopiaException { Preconditions.checkNotNull(pager); @@ -50,7 +52,7 @@ return result; } - public List<E> findCreatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, + public List<E> findCreatedPolls(TopiaPagerBean pager, UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); @@ -67,7 +69,7 @@ return result; } - public List<Pair<Poll, PollAccount>> findInvitedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, + public List<Pair<Poll, PollAccount>> findInvitedPolls(TopiaPagerBean pager, UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); @@ -82,7 +84,7 @@ return result; } - public List<Pair<Poll, PollAccount>> findParticipatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, + public List<Pair<Poll, PollAccount>> findParticipatedPolls(TopiaPagerBean pager, UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); @@ -108,7 +110,7 @@ } protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts(String hql, - TopiaFilterPagerUtil.FilterPagerBean pager, Object... params) + TopiaPagerBean pager, Object... params) throws TopiaException { List<Object[]> queryResults = findAllByQuery(Object[].class, hql, params); @@ -121,13 +123,23 @@ } long records = mapResult.size(); pager.setRecords((int) records); - TopiaFilterPagerUtil.computeRecordIndexesAndPagesNumber(pager); + PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); List<Map.Entry<Poll, PollAccount>> entries = Lists.newLinkedList(mapResult.entrySet()); List<Pair<Poll, PollAccount>> result = - Lists.transform(TopiaFilterPagerUtil.getPageFromList(entries, pager), + Lists.transform(getPageFromList(entries, pager), PollenFunctions.MAP_ENTRY_TO_PAIR_FUNCTION); return result; } + public static <E> List<E> getPageFromList(List<E> elements, + TopiaPagerBean pager) { + + PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); + List<E> subList = PagerBeanUtil.getPage(elements, pager.getPageIndex(), pager.getPageSize()); + List<E> result = new ArrayList<E>(subList); + + return result; + } + } Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -48,16 +48,16 @@ return result; } - public List<E> findUsers(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + public List<E> findUsers(TopiaPagerBean pager) throws TopiaException { Preconditions.checkNotNull(pager); - String countHql = "SELECT COUNT(*) FROM UserAccountImpl"; + String hql = createSimpleQuery("e"); + String countHql = "SELECT COUNT(*) " + hql; + computeAndAddRecordsToPager(countHql, pager); - String hql = "FROM UserAccountImpl"; - List<E> result = findAllByQueryAndPager(hql, pager); return result; } Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -45,7 +45,7 @@ } public List<E> findAllVotesByPoll(Poll poll, - TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + TopiaPagerBean pager) throws TopiaException { Preconditions.checkNotNull(poll); Preconditions.checkNotNull(pager); Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -52,9 +52,9 @@ tx.commitTransaction(); List<Comment> actual; - TopiaFilterPagerUtil.FilterPagerBean pager; + TopiaPagerBean pager; - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Comment.PROPERTY_TEXT); pager.setSortAscendant(true); @@ -65,7 +65,7 @@ Assert.assertEquals("comment" + i, actual.get(i).getText()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setPageIndex(2); pager.setSortColumn(Comment.PROPERTY_TEXT); @@ -77,7 +77,7 @@ Assert.assertEquals("comment" + (5 + i), actual.get(i).getText()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Comment.PROPERTY_TEXT); pager.setSortAscendant(false); @@ -88,7 +88,7 @@ Assert.assertEquals("comment" + (8 - i), actual.get(i).getText()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Comment.PROPERTY_TEXT); pager.setSortAscendant(false); Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -85,9 +85,9 @@ tx.commitTransaction(); List<PersonList> actual; - TopiaFilterPagerUtil.FilterPagerBean pager; + TopiaPagerBean pager; - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(PersonList.PROPERTY_NAME); pager.setSortAscendant(true); @@ -99,7 +99,7 @@ Assert.assertEquals("name" + i, actual.get(i).getName()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setPageIndex(2); pager.setSortColumn(PersonList.PROPERTY_NAME); @@ -111,7 +111,7 @@ Assert.assertEquals("name" + (5 + i), actual.get(i).getName()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(PersonList.PROPERTY_NAME); pager.setSortAscendant(false); @@ -122,7 +122,7 @@ Assert.assertEquals("name" + (8 - i), actual.get(i).getName()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(PersonList.PROPERTY_NAME); pager.setSortAscendant(false); Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -29,7 +29,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.DateUtil; import java.util.Date; @@ -68,9 +68,9 @@ tx.commitTransaction(); List<Poll> actual; - TopiaFilterPagerUtil.FilterPagerBean pager; + TopiaPagerBean pager; - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(true); @@ -81,7 +81,7 @@ Assert.assertEquals("title" + i, actual.get(i).getTitle()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setPageIndex(2); pager.setSortColumn(Poll.PROPERTY_TITLE); @@ -93,7 +93,7 @@ Assert.assertEquals("title" + (5 + i), actual.get(i).getTitle()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(false); @@ -104,7 +104,7 @@ Assert.assertEquals("title" + (8 - i), actual.get(i).getTitle()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setPageIndex(3); pager.setSortColumn(Poll.PROPERTY_TITLE); @@ -136,9 +136,9 @@ tx.commitTransaction(); List<Poll> actual; - TopiaFilterPagerUtil.FilterPagerBean pager; + TopiaPagerBean pager; - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(true); @@ -149,7 +149,7 @@ Assert.assertEquals("title" + i, actual.get(i).getTitle()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setPageIndex(2); pager.setSortColumn(Poll.PROPERTY_TITLE); @@ -161,7 +161,7 @@ Assert.assertEquals("title" + (5 + i), actual.get(i).getTitle()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(false); @@ -172,7 +172,7 @@ Assert.assertEquals("title" + (8 - i), actual.get(i).getTitle()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(false); @@ -208,10 +208,10 @@ tx.commitTransaction(); - TopiaFilterPagerUtil.FilterPagerBean pager; + TopiaPagerBean pager; List<Pair<Poll, PollAccount>> actual; - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); actual = dao.findParticipatedPolls(pager, userAccount1); Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -92,10 +92,10 @@ tx.commitTransaction(); - TopiaFilterPagerUtil.FilterPagerBean pager; + TopiaPagerBean pager; List<UserAccount> actual; - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(UserAccount.PROPERTY_LOGIN); pager.setSortAscendant(true); @@ -106,7 +106,7 @@ Assert.assertEquals("login" + i, actual.get(i).getLogin()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setPageIndex(2); pager.setSortColumn(UserAccount.PROPERTY_LOGIN); @@ -118,7 +118,7 @@ Assert.assertEquals("login" + (5 + i), actual.get(i).getLogin()); } - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(5); pager.setSortColumn(UserAccount.PROPERTY_LOGIN); pager.setSortAscendant(false); Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.DateUtil; import java.util.List; @@ -107,8 +107,7 @@ tx.commitTransaction(); List<Vote> actual; - TopiaFilterPagerUtil.FilterPagerBean pager = - TopiaFilterPagerUtil.newFilterPagerBean(); + TopiaPagerBean pager = new TopiaPagerBean(); pager.setPageSize(10); actual = voteDAO.findAllVotesByPoll(poll1, pager); @@ -118,7 +117,7 @@ Assert.assertEquals(vote1, actual.get(1)); Assert.assertFalse(actual.contains(vote3)); - pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager = new TopiaPagerBean(); pager.setPageSize(10); actual = voteDAO.findAllVotesByPoll(poll2, pager); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -45,7 +45,7 @@ import org.chorem.pollen.services.exceptions.ParticipantNotFoundInListException; import org.chorem.pollen.services.exceptions.UserNotFoundException; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.StringUtil; import javax.naming.NamingEnumeration; @@ -72,7 +72,7 @@ private static final Log log = LogFactory.getLog(FavoriteService.class); public List<PersonList> getFavoriteLists(UserAccount user, - TopiaFilterPagerUtil.FilterPagerBean pager) { + TopiaPagerBean pager) { Preconditions.checkNotNull(user); Preconditions.checkNotNull(pager); @@ -128,7 +128,7 @@ } public List<PollAccount> getFavoriteListUsers(PersonList favoriteList, - TopiaFilterPagerUtil.FilterPagerBean pager) { + TopiaPagerBean pager) { Preconditions.checkNotNull(favoriteList); Preconditions.checkNotNull(pager); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -33,7 +33,7 @@ import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.PollCommentNotFound; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -145,8 +145,7 @@ return result; } - public List<Comment> getComments(TopiaFilterPagerUtil.FilterPagerBean pager, - String pollId) { + public List<Comment> getComments(TopiaPagerBean pager, String pollId) { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(pollId); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -58,7 +58,7 @@ import org.chorem.pollen.services.exceptions.PollChoiceNotFoundException; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.beans.Binder; import javax.imageio.ImageIO; @@ -421,7 +421,7 @@ return pollToUpdate; } - public List<Poll> getPolls(TopiaFilterPagerUtil.FilterPagerBean pager) { + public List<Poll> getPolls(TopiaPagerBean pager) { Preconditions.checkNotNull(pager); try { @@ -433,8 +433,7 @@ } } - public List<Poll> getCreatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, - UserAccount user) { + public List<Poll> getCreatedPolls(TopiaPagerBean pager, UserAccount user) { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(user); @@ -448,7 +447,7 @@ } public List<Pair<Poll, PollAccount>> getInvitedPolls( - TopiaFilterPagerUtil.FilterPagerBean pager, + TopiaPagerBean pager, UserAccount user) { Preconditions.checkNotNull(pager); @@ -469,9 +468,8 @@ } } - public List<Pair<Poll, PollAccount>> getParticipatedPolls( - TopiaFilterPagerUtil.FilterPagerBean pager, - UserAccount user) { + public List<Pair<Poll, PollAccount>> getParticipatedPolls(TopiaPagerBean pager, + UserAccount user) { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(user); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -39,7 +39,7 @@ import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserNotFoundException; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.StringUtil; import org.nuiton.util.beans.Binder; @@ -263,7 +263,7 @@ } } - public List<UserAccount> getUsers(TopiaFilterPagerUtil.FilterPagerBean pager) { + public List<UserAccount> getUsers(TopiaPagerBean pager) { Preconditions.checkNotNull(pager); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -45,7 +45,7 @@ import org.chorem.pollen.services.exceptions.PollAccountNotFound; import org.chorem.pollen.services.exceptions.VoteNotFoundException; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; @@ -352,8 +352,7 @@ } } - public List<Vote> getVotesByPoll(Poll poll, - TopiaFilterPagerUtil.FilterPagerBean pager) { + public List<Vote> getVotesByPoll(Poll poll, TopiaPagerBean pager) { try { VoteDAO dao = getDAO(Vote.class); List<Vote> results = dao.findAllVotesByPoll(poll, pager); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -26,7 +26,7 @@ import org.apache.struts2.json.JSONException; import org.apache.struts2.json.JSONUtil; import org.chorem.pollen.ui.actions.PollenActionSupport; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; /** * Abstract JSON action with pagination support. @@ -38,16 +38,23 @@ private static final long serialVersionUID = 1L; - public abstract Integer getRows(); + public final Integer getRows() { + return pager.getPageSize(); + } - public abstract Integer getPage(); + public final Integer getPage() { + return pager.getPageIndex(); + } - public abstract Integer getTotal(); + public final Long getTotal() { + return pager.getPagesNumber(); + } - public abstract Integer getRecords(); + public final Long getRecords() { + return pager.getRecords(); + } - protected TopiaFilterPagerUtil.FilterPagerBean pager = - TopiaFilterPagerUtil.newFilterPagerBean(); + protected TopiaPagerBean pager = new TopiaPagerBean(); protected String filters; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -51,26 +51,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { PollService pollService = getPollService(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -58,26 +58,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { FavoriteService service = getFavoriteService(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -45,26 +45,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { List<PersonList> allFavoriteLists = getFavoriteService().getFavoriteLists( Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -54,26 +54,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { PollService pollService = getPollService(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -54,26 +54,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { PollService pollService = getPollService(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -57,26 +57,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { Preconditions.checkNotNull(pollId); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -48,26 +48,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { PollService pollService = getPollService(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-09-14 16:33:06 UTC (rev 3691) @@ -48,26 +48,6 @@ } @Override - public Integer getRows() { - return pager.getPageSize(); - } - - @Override - public Integer getPage() { - return pager.getPageIndex(); - } - - @Override - public Integer getTotal() { - return pager.getPagesNumber(); - } - - @Override - public Integer getRecords() { - return pager.getRecords(); - } - - @Override public String execute() throws Exception { List<UserAccount> allUsers = getUserService().getUsers(pager); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 21:04:41 UTC (rev 3690) +++ trunk/pom.xml 2012-09-14 16:33:06 UTC (rev 3691) @@ -153,13 +153,13 @@ <projectId>pollen</projectId> <!-- customized versions --> - <topiaVersion>2.6.14-SNAPSHOT</topiaVersion> + <topiaVersion>2.7</topiaVersion> <eugenePluginVersion>2.5</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.6.1</nuitonUtilsVersion> - <h2Version>1.3.167</h2Version> + <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> + <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version> <jqueryPluginVersion>3.3.1</jqueryPluginVersion>