Author: tchemit Date: 2012-08-12 16:07:52 +0200 (Sun, 12 Aug 2012) New Revision: 3599 Url: http://chorem.org/repositories/revision/pollen/3599 Log: fixes #642: Review persistence module - no more TopiaQuery (at last...) - improve dao code (using the PollenPersistenceUtil) - renam efor dao method (getXXX becomes findXXX) - review tests Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 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/AbstractDAOTest.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/PollAccountDAOImplTest.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/SecurityService.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 Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -22,17 +22,10 @@ */ package org.chorem.pollen; -import com.google.common.base.Preconditions; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaFilterPagerUtil; -import org.nuiton.util.PagerUtil; import java.io.File; -import java.util.List; /** * Some utils IO methods. @@ -48,7 +41,9 @@ protected PollenIOUtil() { } - public static File getTestSpecificDirectory(Class<?> klass, String methodName, long timestamp) { + public static File getTestSpecificDirectory(Class<?> klass, + String methodName, + long timestamp) { // Trying to look for the temporary folder to store data for the test String tempDirPath = System.getProperty("java.io.tmpdir"); if (tempDirPath == null) { @@ -70,31 +65,4 @@ return databaseFile; } - public static <E> List<E> findByPager(TopiaContext tx, - String hql, - TopiaFilterPagerUtil.FilterPagerBean pager, - Object... params) throws TopiaException { - Preconditions.checkNotNull(pager); - - if (StringUtils.isNotBlank(pager.getSortColumn())) { - hql += " ORDER BY " + pager.getSortColumn(); - if (!pager.isSortAscendant()) { - hql += " DESC"; - } - } - List<E> result = tx.find(hql, - pager.getRecordStartIndex(), - pager.getRecordEndIndex() - 1, params); - return result; - } - - public static void computeAndAddRecordsToPager( - TopiaContext tx, - String countHql, - TopiaFilterPagerUtil.FilterPagerBean pager, - Object... params) throws TopiaException { - long records = (Long) tx.findUnique(countHql, params); - pager.setRecords((int) records); - PagerUtil.computeRecordIndexesAndPagesNumber(pager); - } } Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java (rev 0) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -0,0 +1,149 @@ +package org.chorem.pollen; +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.util.PagerUtil; + +import java.util.List; + +/** + * Useful method around persistence. + * <p/> + * <strong>Note:</strong> Some of these methods should be pushed back to + * ToPIA dao. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.4.5 + */ +public class PollenPersistenceUtil { + + public static boolean exists(TopiaDAO dao, + String hql, + Object... params) throws TopiaException { + long count = count(dao, hql, params); + return count > 0; + } + + public static long count(TopiaDAO<?> dao, + String hql, + Object... params) throws TopiaException { + + Preconditions.checkNotNull(hql); + Preconditions.checkArgument(hql.startsWith("SELECT COUNT(")); + + return findUnique(dao, Long.class, hql, params); + } + + public static <R extends TopiaEntity> R findUnique(TopiaDAO<R> dao, + String hql, + Object... params) throws TopiaException { + return findUnique(dao, dao.getEntityClass(), hql, params); + } + + public static <R, V extends TopiaEntity> R findUnique(TopiaDAO<V> dao, + Class<R> type, + String hql, + Object... params) throws TopiaException { + + Preconditions.checkNotNull(dao); + Preconditions.checkNotNull(type); + Preconditions.checkNotNull(hql); + + Object unique = dao.getContext().findUnique(hql, params); + Preconditions.checkState(unique == null || + type.isAssignableFrom(unique.getClass())); + return (R) unique; + } + + public static <R extends TopiaEntity> List<R> findAll(TopiaDAO<R> dao, + String hql, + Object... params) throws TopiaException { + + Preconditions.checkNotNull(dao); + return findAll(dao, dao.getEntityClass(), hql, params); + } + + public static <R, V extends TopiaEntity> List<R> findAll(TopiaDAO<V> dao, + Class<R> type, + String hql, + Object... params) throws TopiaException { + + Preconditions.checkNotNull(dao); + Preconditions.checkNotNull(type); + Preconditions.checkNotNull(hql); + + List<R> result = dao.getContext().findAll(hql, params); + return result; + } + + public static <R extends TopiaEntity> List<R> findAllWithBound(TopiaDAO<R> dao, + String hql, + int startIndex, + int endIndex, + Object... params) throws TopiaException { + + Preconditions.checkNotNull(dao); + Preconditions.checkNotNull(hql); + + List<R> result = dao.getContext().find(hql, startIndex, endIndex, params); + return result; + } + + public static <R extends TopiaEntity> List<R> findByPager(TopiaDAO<R> dao, + String hql, + TopiaFilterPagerUtil.FilterPagerBean pager, + Object... params) throws TopiaException { + Preconditions.checkNotNull(pager); + Preconditions.checkNotNull(hql); + + if (StringUtils.isNotBlank(pager.getSortColumn())) { + hql += " ORDER BY " + pager.getSortColumn(); + if (!pager.isSortAscendant()) { + hql += " DESC"; + } + } + List<R> result = findAllWithBound(dao, + hql, + pager.getRecordStartIndex(), + pager.getRecordEndIndex() - 1, + params); + return result; + } + + public static void computeAndAddRecordsToPager(TopiaDAO<?> dao, + String hql, + TopiaFilterPagerUtil.FilterPagerBean pager, + Object... params) throws TopiaException { + + long records = count(dao, hql, params); + + pager.setRecords((int) records); + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + } +} Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -23,7 +23,7 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; -import org.chorem.pollen.PollenIOUtil; +import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -31,31 +31,35 @@ public class CommentDAOImpl<E extends Comment> extends CommentDAOAbstract<E> { - public List<E> getComments(TopiaFilterPagerUtil.FilterPagerBean pager, - String pollId) throws TopiaException { + public List<E> findComments(TopiaFilterPagerUtil.FilterPagerBean pager, + String pollId) throws TopiaException { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(pollId); - String countHql = "SELECT COUNT(e) FROM CommentImpl e, PollImpl p WHERE p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; - PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager, - "pollId", pollId); + String countHql = "SELECT COUNT(e) FROM CommentImpl e, PollImpl p WHERE" + + " p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; - String hql = "SELECT e FROM CommentImpl e, PollImpl p WHERE p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; - List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, - "pollId", pollId); + PollenPersistenceUtil.computeAndAddRecordsToPager( + this, countHql, pager, "pollId", pollId); + + String hql = "SELECT e FROM CommentImpl e, PollImpl p WHERE " + + "p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; + + List<E> result = PollenPersistenceUtil.findByPager( + this, hql, pager, "pollId", pollId); return result; - } - public List<E> getAllComments(String pollId) throws TopiaException { + public List<E> findAllComments(String pollId) throws TopiaException { Preconditions.checkNotNull(pollId); - String hql = "SELECT e FROM CommentImpl e, PollImpl p WHERE p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; - List<E> result = getContext().findAll(hql, "pollId", pollId); + String hql = "SELECT e FROM CommentImpl e, PollImpl p WHERE " + + "p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; + + List<E> result = PollenPersistenceUtil.findAll( + this, hql, "pollId", pollId); return result; - } - } 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.PollenIOUtil; +import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -32,27 +32,33 @@ public class PersonListDAOImpl<E extends PersonList> extends PersonListDAOAbstract<E> { - public List<E> getFavoriteLists(UserAccount user, - TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + public List<E> findFavoriteLists(UserAccount user, + TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { Preconditions.checkNotNull(user); Preconditions.checkNotNull(pager); - String countHql = "SELECT COUNT(*) FROM PersonListImpl WHERE owner = :owner"; - PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager, - "owner", user); + String countHql = "SELECT COUNT(*) FROM PersonListImpl WHERE " + + "owner = :owner"; + PollenPersistenceUtil.computeAndAddRecordsToPager( + this, countHql, pager, "owner", user); + String hql = "FROM PersonListImpl e WHERE e.owner = :owner"; - List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, - "owner", user); + + List<E> result = PollenPersistenceUtil.findByPager( + this, hql, pager, "owner", user); return result; } - public List<E> getFavoriteLists(UserAccount user) throws TopiaException { + public List<E> findAllFavoriteLists(UserAccount user) throws TopiaException { Preconditions.checkNotNull(user); + String hql = "FROM PersonListImpl WHERE owner = :owner"; - List<E> result = getContext().findAll(hql, "owner", user); + + List<E> result = PollenPersistenceUtil.findAll( + this, hql, "owner", user); return result; } @@ -61,15 +67,14 @@ Preconditions.checkNotNull(user); Preconditions.checkNotNull(name); - - // can't accept favorite list without name Preconditions.checkArgument(StringUtils.isNotEmpty(name)); - // check list does not already exists + String hql = "SELECT COUNT(*) FROM PersonListImpl WHERE " + + "owner = :owner AND name = :name"; - String hql = "SELECT COUNT(*) FROM PersonListImpl WHERE owner = :owner AND name = :name"; - long count = (Long) getContext().findUnique(hql, "owner", user, "name", name); - return count > 0; + boolean result = PollenPersistenceUtil.exists( + this, hql, "owner", user, "name", name); + 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -23,8 +23,8 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; +import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.List; @@ -41,19 +41,27 @@ * @return the found pollAccount, or {@code null} if not foud * @throws TopiaException if any db pb */ - public E getRestrictedPollAccountByAccountId(String pollId, - String accountId) throws TopiaException { + public E findRestrictedPollAccountByAccountId(String pollId, + String accountId) throws TopiaException { Preconditions.checkNotNull(pollId); Preconditions.checkNotNull(accountId); - TopiaQuery query = new TopiaQuery(PersonToList.class, "p"). - addFrom(Poll.class, "poll"). - setSelect("p." + PersonToList.PROPERTY_POLL_ACCOUNT). - addWhere("poll." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). - addWhere("p." + PersonToList.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_ACCOUNT_ID, TopiaQuery.Op.EQ, accountId). - addInElements("p", "poll." + Poll.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST); - E result = findByQuery(query); +// TopiaQuery query = new TopiaQuery(PersonToList.class, "p"). +// addFrom(Poll.class, "poll"). +// setSelect("p." + PersonToList.PROPERTY_POLL_ACCOUNT). +// addWhere("poll." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). +// addWhere("p." + PersonToList.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_ACCOUNT_ID, TopiaQuery.Op.EQ, accountId). +// addInElements("p", "poll." + Poll.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST); +// E result = findByQuery(query); + + String hql = "SELECT p.pollAccount FROM PersonToListImpl p, PollImpl poll WHERE " + + "poll.pollId = :pollId AND " + + "p.pollAccount.accountId = :accountId AND " + + "p in elements (poll.votingList.pollAccountPersonToList)"; + + E result = PollenPersistenceUtil.findUnique( + this, hql, "pollId", pollId, "accountId", accountId); return result; } @@ -67,19 +75,27 @@ * @return the found pollAccount, or {@code null} if not found * @throws TopiaException if any db pb */ - public E getRestrictedPollAccountByEmail(String pollId, - String email) throws TopiaException { + public E findRestrictedPollAccountByEmail(String pollId, + String email) throws TopiaException { Preconditions.checkNotNull(pollId); Preconditions.checkNotNull(email); - TopiaQuery query = new TopiaQuery(PersonToList.class, "p"). - addFrom(Poll.class, "poll"). - setSelect("p." + PersonToList.PROPERTY_POLL_ACCOUNT). - addWhere("poll." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). - addWhere("p." + PersonToList.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_EMAIL, TopiaQuery.Op.EQ, email). - addInElements("p", "poll." + Poll.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST); - E result = findByQuery(query); +// TopiaQuery query = new TopiaQuery(PersonToList.class, "p"). +// addFrom(Poll.class, "poll"). +// setSelect("p." + PersonToList.PROPERTY_POLL_ACCOUNT). +// addWhere("poll." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). +// addWhere("p." + PersonToList.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_EMAIL, TopiaQuery.Op.EQ, email). +// addInElements("p", "poll." + Poll.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST); +// E result = findByQuery(query); + + String hql = "SELECT p.pollAccount FROM PersonToListImpl p, PollImpl poll WHERE " + + "poll.pollId = :pollId AND " + + "p.pollAccount.email = :email AND " + + "p in elements (poll.votingList.pollAccountPersonToList)"; + + E result = PollenPersistenceUtil.findUnique( + this, hql, "pollId", pollId, "email", email); return result; } @@ -92,20 +108,29 @@ * @return the found pollAccount, or {@code null} if not found * @throws TopiaException if any db pb */ - public PollAccount getVoterPollAccountByAccountId(String pollId, - String accountId) throws TopiaException { + public E findVoterPollAccountByAccountId(String pollId, + String accountId) throws TopiaException { Preconditions.checkNotNull(pollId); Preconditions.checkNotNull(accountId); - TopiaQuery query = createQuery("e") - .addFrom(Poll.class, "p") - .addFrom(Vote.class, "v") - .addEquals("p." + Poll.PROPERTY_POLL_ID, pollId) - .addInElements("v", "p." + Poll.PROPERTY_VOTE) - .addWhere("e = v." + Vote.PROPERTY_POLL_ACCOUNT) - .addEquals("e." + PollAccount.PROPERTY_ACCOUNT_ID, accountId); - PollAccount result = findByQuery(query); +// TopiaQuery query = createQuery("e") +// .addFrom(Poll.class, "p") +// .addFrom(Vote.class, "v") +// .addEquals("p." + Poll.PROPERTY_POLL_ID, pollId) +// .addInElements("v", "p." + Poll.PROPERTY_VOTE) +// .addWhere("e = v." + Vote.PROPERTY_POLL_ACCOUNT) +// .addEquals("e." + PollAccount.PROPERTY_ACCOUNT_ID, accountId); +// PollAccount result = findByQuery(query); + + String hql = "SELECT e FROM PollAccountImpl e, PollImpl p, VoteImpl v WHERE " + + "p.pollId = :pollId AND " + + "v in elements (p.vote) AND " + + "e = v.pollAccount AND " + + "e.accountId = :accountId"; + + E result = PollenPersistenceUtil.findUnique( + this, hql, "pollId", pollId, "accountId", accountId); return result; } @@ -118,25 +143,34 @@ * @return the found pollAccount, or {@code null} if not found * @throws TopiaException if any db pb */ - public PollAccount getVoterPollAccountByUserAccount(String pollId, - UserAccount user) throws TopiaException { + public E findVoterPollAccountByUserAccount(String pollId, + UserAccount user) throws TopiaException { Preconditions.checkNotNull(pollId); Preconditions.checkNotNull(user); - TopiaQuery query = createQuery("e") - .addFrom(Poll.class, "p") - .addFrom(Vote.class, "v") - .addEquals("p." + Poll.PROPERTY_POLL_ID, pollId) - .addInElements("v", "p." + Poll.PROPERTY_VOTE) - .addWhere("e = v." + Vote.PROPERTY_POLL_ACCOUNT) - .addEquals("e." + PollAccount.PROPERTY_USER_ACCOUNT, user); - PollAccount result = findByQuery(query); +// TopiaQuery query = createQuery("e") +// .addFrom(Poll.class, "p") +// .addFrom(Vote.class, "v") +// .addEquals("p." + Poll.PROPERTY_POLL_ID, pollId) +// .addInElements("v", "p." + Poll.PROPERTY_VOTE) +// .addWhere("e = v." + Vote.PROPERTY_POLL_ACCOUNT) +// .addEquals("e." + PollAccount.PROPERTY_USER_ACCOUNT, user); +// PollAccount result = findByQuery(query); + + String hql = "SELECT e FROM PollAccountImpl e, PollImpl p, VoteImpl v WHERE " + + "p.pollId = :pollId AND " + + "v in elements (p.vote) AND " + + "e = v.pollAccount AND " + + "e.userAccount = :user"; + + E result = PollenPersistenceUtil.findUnique( + this, hql, "pollId", pollId, "user", user); return result; } - public List<E> getFavoriteListUsers(PersonList favoriteList, - TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + public List<E> findFavoriteListUsers(PersonList favoriteList, + TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { Preconditions.checkNotNull(favoriteList); Preconditions.checkNotNull(pager); @@ -144,11 +178,16 @@ int records = favoriteList.sizePollAccount(); pager.setRecords(records); - TopiaQuery query = createQuery("e"); - TopiaFilterPagerUtil.addPagerToQuery(query, pager); - query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, favoriteList); +// TopiaQuery query = createQuery("e"); +// TopiaFilterPagerUtil.addPagerToQuery(query, pager); +// query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, favoriteList); +// +// List<E> result = findAllByQuery(query); - List<E> result = findAllByQuery(query); + String hql = "FROM PollAccountImpl e WHERE e.personList = :owner"; + + List<E> result = PollenPersistenceUtil.findByPager( + this, hql, pager, "owner", favoriteList); return result; } @@ -158,20 +197,43 @@ Preconditions.checkNotNull(personListToUpdate); Preconditions.checkNotNull(pollAccount); - // check there is other poll account in this list with same id - TopiaQuery query = createQuery("e"); - query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate); - query.addWhere("e." + PollAccount.PROPERTY_EMAIL, TopiaQuery.Op.EQ, pollAccount.getEmail()); +// // check there is other poll account in this list with same id +// TopiaQuery query = createQuery("e"); +// query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate); +// query.addWhere("e." + PollAccount.PROPERTY_EMAIL, TopiaQuery.Op.EQ, pollAccount.getEmail()); +// +// String pollAccountId = pollAccount.getTopiaId(); +// if (pollAccountId == null) { +// // no check necessary, it's a new pollAccount +// +// } else { +// query.addWhere("e." + PollAccount.TOPIA_ID, TopiaQuery.Op.NEQ, pollAccountId); +// } +// +// boolean result = existByQuery(query); + String hql = "FROM PollAccountImpl e WHERE " + + "e.personList = :person AND " + + "e.email = :email"; + boolean result; String pollAccountId = pollAccount.getTopiaId(); if (pollAccountId == null) { + // no check necessary, it's a new pollAccount + result = PollenPersistenceUtil.exists( + this, hql, + "person", personListToUpdate, + "email", pollAccount.getEmail()); } else { - query.addWhere("e." + PollAccount.TOPIA_ID, TopiaQuery.Op.NEQ, pollAccountId); + hql += " AND e.topiaId = :topiaId"; + + result = PollenPersistenceUtil.exists( + this, hql, + "person", personListToUpdate, + "email", pollAccount.getEmail(), + "topiaId", pollAccountId); } - - boolean result = existByQuery(query); return result; } 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -27,7 +27,7 @@ import com.google.common.collect.Maps; import org.apache.commons.lang3.tuple.Pair; import org.chorem.pollen.PollenFunctions; -import org.chorem.pollen.PollenIOUtil; +import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -37,37 +37,42 @@ public class PollDAOImpl<E extends Poll> extends PollDAOAbstract<E> { - public List<E> getPolls( - TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + public List<E> getPolls(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { Preconditions.checkNotNull(pager); String countHql = "SELECT COUNT(*) FROM PollImpl"; - PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager); + + PollenPersistenceUtil.computeAndAddRecordsToPager( + this, countHql, pager); + String hql = "FROM PollImpl"; - List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager); + + List<E> result = PollenPersistenceUtil.findByPager(this, hql, pager); return result; } - public List<E> getCreatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, - UserAccount user) throws TopiaException { + public List<E> findCreatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, + UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(user); String countHql = "SELECT COUNT(*) FROM PollImpl " + "WHERE creator.userAccount = :user"; - PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager, - "user", user); + + PollenPersistenceUtil.computeAndAddRecordsToPager( + this, countHql, pager, "user", user); + String hql = "FROM PollImpl WHERE creator.userAccount = :user"; - List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, - "user", user); + + List<E> result = PollenPersistenceUtil.findByPager( + this, hql, pager, "user", user); return result; } - public List<Pair<Poll, PollAccount>> getInvitedPolls( - TopiaFilterPagerUtil.FilterPagerBean pager, - UserAccount user) throws TopiaException { + public List<Pair<Poll, PollAccount>> findInvitedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, + UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(user); @@ -81,9 +86,8 @@ return result; } - public List<Pair<Poll, PollAccount>> getParticipatedPolls( - TopiaFilterPagerUtil.FilterPagerBean pager, - UserAccount user) throws TopiaException { + public List<Pair<Poll, PollAccount>> findParticipatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, + UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(user); @@ -91,24 +95,30 @@ String hql = "SELECT p, v.pollAccount FROM VoteImpl v, PollImpl p " + "WHERE v IN ELEMENTS(p.vote) " + "AND v.pollAccount.userAccount = :user"; + List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( hql, pager, "user", user); return result; } - public List<E> getRunningPolls(Date currentTime) throws TopiaException { + public List<E> findRunningPolls(Date currentTime) throws TopiaException { - String hql = "FROM PollImpl WHERE (endDate IS NULL OR endDate > :currentTime) AND (beginDate IS NULL OR beginDate < :currentTime)"; - List<E> results = getContext().findAll(hql, "currentTime", currentTime); + String hql = "FROM PollImpl WHERE " + + "(endDate IS NULL OR endDate > :currentTime) AND " + + "(beginDate IS NULL OR beginDate < :currentTime)"; + + List<E> results = PollenPersistenceUtil.findAll( + this, hql, "currentTime", currentTime); return results; } - protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts( - String hql, - TopiaFilterPagerUtil.FilterPagerBean pager, Object... params) + protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts(String hql, + TopiaFilterPagerUtil.FilterPagerBean pager, Object... params) throws TopiaException { - List<Object[]> queryResults = getContext().findAll(hql, params); + List<Object[]> queryResults = PollenPersistenceUtil.findAll( + this, Object[].class, hql, params); + Map<Poll, PollAccount> mapResult = Maps.newLinkedHashMap(); for (Object[] row : queryResults) { Poll poll = (Poll) row[0]; 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.PollenIOUtil; +import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -39,23 +39,27 @@ // In case of email change, check if an other user has not already // the new email // FIXME-fdesbois-20100510 : replace by using id directly - String hql = "SELECT COUNT(*) FROM UserAccountImpl WHERE login = :login AND email = :email"; - long count = (Long) getContext().findUnique( - hql, + String hql = "SELECT COUNT(*) FROM UserAccountImpl WHERE " + + "login = :login AND email = :email"; + + boolean result = PollenPersistenceUtil.exists( + this, hql, "login", user.getLogin(), "email", StringUtils.lowerCase(user.getEmail())); - return count > 0; + return result; } - public List<E> getUsers(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + public List<E> findUsers(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { Preconditions.checkNotNull(pager); String countHql = "SELECT COUNT(*) FROM UserAccountImpl"; - PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager); + PollenPersistenceUtil.computeAndAddRecordsToPager(this, countHql, pager); + String hql = "FROM UserAccountImpl"; - List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager); + + List<E> result = PollenPersistenceUtil.findByPager(this, 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.chorem.pollen.PollenIOUtil; +import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -32,7 +32,7 @@ public class VoteDAOImpl<E extends Vote> extends VoteDAOAbstract<E> { - public List<E> getAllVotes(Poll poll) throws TopiaException { + public List<E> findAllVotes(Poll poll) throws TopiaException { Preconditions.checkNotNull(poll); List<E> results; @@ -43,14 +43,18 @@ results = Lists.newArrayList(); } else { - String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE p = :p AND e IN ELEMENTS(p.vote) ORDER BY e.topiaCreateDate DESC"; - results = getContext().findAll(hql, "p", poll); + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + + "p = :p AND " + + "e IN ELEMENTS(p.vote) " + + "ORDER BY e.topiaCreateDate DESC"; + + results = PollenPersistenceUtil.findAll(this, hql, "p", poll); } return results; } - public List<E> getVotesByPoll(Poll poll, - TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { + public List<E> findAllVotesByPoll(Poll poll, + TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { Preconditions.checkNotNull(poll); Preconditions.checkNotNull(pager); @@ -63,33 +67,41 @@ results = Lists.newArrayList(); } else { - String countHql = "SELECT COUNT(e) FROM VoteImpl e, PollImpl p WHERE p = :p AND e IN ELEMENTS(p.vote)"; + String countHql = "SELECT COUNT(e) FROM " + + "VoteImpl e, PollImpl p WHERE " + + "p = :p AND e IN ELEMENTS(p.vote)"; - PollenIOUtil.computeAndAddRecordsToPager(getContext(), - countHql, pager, - "p", poll); + PollenPersistenceUtil.computeAndAddRecordsToPager( + this, countHql, pager, "p", poll); - String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE p = :p AND e IN ELEMENTS(p.vote) ORDER BY e.topiaCreateDate DESC"; + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + + "p = :p AND " + + "e IN ELEMENTS(p.vote) " + + "ORDER BY e.topiaCreateDate DESC"; - - results = PollenIOUtil.findByPager(getContext(), hql, pager, - "p", poll); + results = PollenPersistenceUtil.findByPager( + this, hql, pager, "p", poll); } return results; } public boolean hasAlreadyVoted(Poll poll, String votingId) throws TopiaException { - // Test using a count(*) on votes - String hql = "SELECT COUNT(*) FROM VoteImpl e, PollImpl p WHERE p = :p AND e in elements(p.vote) AND e.pollAccount.votingId = :v"; - Long nb = (Long) getContext().findUnique(hql, "p", poll, "v", votingId); - return nb == 1; + String hql = "SELECT COUNT(*) FROM VoteImpl e, PollImpl p WHERE " + + "p = :p AND " + + "e in elements(p.vote) AND " + + "e.pollAccount.votingId = :v"; + + boolean result = PollenPersistenceUtil.exists( + this, hql, "p", poll, "v", votingId); + return result; } - public Vote findByAccountId(String accountId) throws TopiaException { + public E findByAccountId(String accountId) throws TopiaException { String hql = "FROM VoteImpl e WHERE e.pollAccount.accountId = :a"; - Vote result = (Vote) getContext().findUnique(hql, "a", accountId); + + E result = PollenPersistenceUtil.findUnique(this, hql, "a", accountId); return result; } } Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -87,8 +87,8 @@ testBasedir, "/" + CONFIGURATION_PATH ); - if (log.isInfoEnabled()) { - log.info("Starts db " + + if (log.isDebugEnabled()) { + log.debug("Starts db " + ((TopiaContextImplementor) rootCtxt).getConfig().get(TopiaContextFactory.CONFIG_URL)); } } 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -39,7 +39,7 @@ public class CommentDAOImplTest extends AbstractDAOTest { @Test - public void getComments() throws Exception { + public void findComments() throws Exception { TopiaContext tx = beginTransaction(); CommentDAO dao = PollenDAOHelper.getCommentDAO(tx); @@ -58,7 +58,7 @@ pager.setPageSize(5); pager.setSortColumn(Comment.PROPERTY_TEXT); pager.setSortAscendant(true); - actual = dao.getComments(pager, pollId1); + actual = dao.findComments(pager, pollId1); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { @@ -70,7 +70,7 @@ pager.setPageIndex(2); pager.setSortColumn(Comment.PROPERTY_TEXT); pager.setSortAscendant(true); - actual = dao.getComments(pager, pollId1); + actual = dao.findComments(pager, pollId1); Assert.assertNotNull(actual); Assert.assertEquals(4, actual.size()); for (int i = 0; i < 4; i++) { @@ -81,7 +81,7 @@ pager.setPageSize(5); pager.setSortColumn(Comment.PROPERTY_TEXT); pager.setSortAscendant(false); - actual = dao.getComments(pager, pollId1); + actual = dao.findComments(pager, pollId1); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { @@ -92,15 +92,14 @@ pager.setPageSize(5); pager.setSortColumn(Comment.PROPERTY_TEXT); pager.setSortAscendant(false); - actual = dao.getComments(pager, pollId1 + "-"); + actual = dao.findComments(pager, pollId1 + "-"); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); } @Test - public void getAllComments() throws Exception { + public void findAllComments() throws Exception { - TopiaContext tx = beginTransaction(); CommentDAO dao = PollenDAOHelper.getCommentDAO(tx); PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); @@ -115,11 +114,11 @@ tx.commitTransaction(); List<Comment> actual; - actual = dao.getAllComments(pollId1); + actual = dao.findAllComments(pollId1); Assert.assertNotNull(actual); Assert.assertEquals(9, actual.size()); - actual = dao.getAllComments(pollId1 + "-"); + actual = dao.findAllComments(pollId1 + "-"); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); } 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -39,7 +39,7 @@ public class PersonListDAOImplTest extends AbstractDAOTest { @Test - public void getAllFavoriteLists() throws Exception { + public void findAllFavoriteLists() throws Exception { TopiaContext tx = beginTransaction(); PersonListDAO dao = PollenDAOHelper.getPersonListDAO(tx); @@ -57,17 +57,17 @@ tx.commitTransaction(); List<PersonList> actual; - actual = dao.getFavoriteLists(userAccount1); + actual = dao.findAllFavoriteLists(userAccount1); Assert.assertNotNull(actual); Assert.assertEquals(9, actual.size()); - actual = dao.getFavoriteLists(userAccount2); + actual = dao.findAllFavoriteLists(userAccount2); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); } @Test - public void getFavoriteLists() throws Exception { + public void findFavoriteLists() throws Exception { TopiaContext tx = beginTransaction(); PersonListDAO dao = PollenDAOHelper.getPersonListDAO(tx); @@ -92,7 +92,7 @@ pager.setSortColumn(PersonList.PROPERTY_NAME); pager.setSortAscendant(true); - actual = dao.getFavoriteLists(userAccount1, pager); + actual = dao.findFavoriteLists(userAccount1, pager); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { @@ -104,7 +104,7 @@ pager.setPageIndex(2); pager.setSortColumn(PersonList.PROPERTY_NAME); pager.setSortAscendant(true); - actual = dao.getFavoriteLists(userAccount1, pager); + actual = dao.findFavoriteLists(userAccount1, pager); Assert.assertNotNull(actual); Assert.assertEquals(4, actual.size()); for (int i = 0; i < 4; i++) { @@ -115,7 +115,7 @@ pager.setPageSize(5); pager.setSortColumn(PersonList.PROPERTY_NAME); pager.setSortAscendant(false); - actual = dao.getFavoriteLists(userAccount1, pager); + actual = dao.findFavoriteLists(userAccount1, pager); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { @@ -127,7 +127,7 @@ pager.setSortColumn(PersonList.PROPERTY_NAME); pager.setSortAscendant(false); - actual = dao.getFavoriteLists(userAccount2, pager); + actual = dao.findFavoriteLists(userAccount2, pager); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); } Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java 2012-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -42,8 +42,51 @@ private static final Log log = LogFactory.getLog(PollAccountDAOImplTest.class); + String pollId = "pollId"; + + String accountId = "accountId"; + + String accountId2 = "accountId2"; + + String accountId3 = "accountId3"; + + String accountEmail = "email"; + + String accountEmail2 = "email2"; + + String accountEmail3 = "email3"; + @Test - public void getRestrictedPollAccount() throws Exception { + public void findVoterPollAccountByAccountId() throws Exception { + if (log.isWarnEnabled()) { + log.warn("Missing PollAccountDAOImpl#findVoterPollAccountByAccountId request test!"); + } + } + + @Test + public void findVoterPollAccountByUserAccount() throws Exception { + if (log.isWarnEnabled()) { + log.warn("Missing PollAccountDAOImpl#findVoterPollAccountByUserAccount request test!"); + } + } + + @Test + public void findFavoriteListUsers() throws TopiaException { + if (log.isWarnEnabled()) { + log.warn("Missing PollAccountDAOImpl#findFavoriteListUsers request test!"); + } + } + + @Test + public void isPollAccountExists() throws TopiaException { + if (log.isWarnEnabled()) { + log.warn("Missing PollAccountDAOImpl#isPollAccountExists request test!"); + } + } + + @Test + public void findRestrictedPollAccountByAccountId() throws Exception { + TopiaContext tx = beginTransaction(); PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); @@ -51,18 +94,16 @@ VotingListDAO votingListDAO = PollenDAOHelper.getVotingListDAO(tx); PersonToListDAO personToListDAO = PollenDAOHelper.getPersonToListDAO(tx); - String pollId = "pollId"; - String accountId = "accountId"; - String accountId2 = "accountId2"; - String accountId3 = "accountId3"; - PollAccount pollAccount = pollAccountDAO.create( - PollAccount.PROPERTY_ACCOUNT_ID, accountId); + PollAccount.PROPERTY_ACCOUNT_ID, accountId, + PollAccount.PROPERTY_EMAIL, accountEmail); PollAccount pollAccount2 = pollAccountDAO.create( - PollAccount.PROPERTY_ACCOUNT_ID, accountId2); + PollAccount.PROPERTY_ACCOUNT_ID, accountId2, + PollAccount.PROPERTY_EMAIL, accountEmail2); PollAccount pollAccount3 = pollAccountDAO.create( - PollAccount.PROPERTY_ACCOUNT_ID, accountId3); + PollAccount.PROPERTY_ACCOUNT_ID, accountId3, + PollAccount.PROPERTY_EMAIL, accountEmail3); Poll poll = pollDAO.create(Poll.PROPERTY_POLL_ID, pollId); @@ -90,7 +131,7 @@ pollAccount3.addVotingListPersonToList(personToList3); PollAccount restrictedPollAccount = - pollAccountDAO.getRestrictedPollAccountByAccountId(pollId, accountId); + pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, accountId); Assert.assertNotNull(restrictedPollAccount); Assert.assertEquals(accountId, restrictedPollAccount.getAccountId()); @@ -98,7 +139,7 @@ Assert.assertTrue(restrictedPollAccount.getVotingListPersonToList().contains(personToList)); PollAccount restrictedPollAccount2 = - pollAccountDAO.getRestrictedPollAccountByAccountId(pollId, accountId2); + pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, accountId2); Assert.assertNotNull(restrictedPollAccount2); Assert.assertEquals(accountId2, restrictedPollAccount2.getAccountId()); @@ -107,7 +148,7 @@ Assert.assertTrue(restrictedPollAccount2.getVotingListPersonToList().contains(personToList2)); PollAccount restrictedPollAccount3 = - pollAccountDAO.getRestrictedPollAccountByAccountId(pollId, accountId3); + pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, accountId3); Assert.assertNotNull(restrictedPollAccount3); Assert.assertEquals(accountId3, restrictedPollAccount3.getAccountId()); @@ -116,36 +157,86 @@ Assert.assertTrue(restrictedPollAccount3.getVotingListPersonToList().contains(personToList3)); PollAccount restrictedPollAccount4 = - pollAccountDAO.getRestrictedPollAccountByAccountId(pollId, System.nanoTime() + "--"); + pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, System.nanoTime() + "--"); Assert.assertNull(restrictedPollAccount4); } @Test - public void getFavoriteListUsers() throws TopiaException { - if (log.isInfoEnabled()) { - log.info("TODO"); - } - } + public void findRestrictedPollAccountByEmail() throws Exception { + TopiaContext tx = beginTransaction(); - @Test - public void isPollAccountExists() throws TopiaException { - if (log.isInfoEnabled()) { - log.info("TODO"); - } - } + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); + VotingListDAO votingListDAO = PollenDAOHelper.getVotingListDAO(tx); + PersonToListDAO personToListDAO = PollenDAOHelper.getPersonToListDAO(tx); - @Test - public void findByPollVoteUser() throws TopiaException { - if (log.isInfoEnabled()) { - log.info("TODO"); - } + PollAccount pollAccount = pollAccountDAO.create( + PollAccount.PROPERTY_ACCOUNT_ID, accountId, + PollAccount.PROPERTY_EMAIL, accountEmail); + + PollAccount pollAccount2 = pollAccountDAO.create( + PollAccount.PROPERTY_ACCOUNT_ID, accountId2, + PollAccount.PROPERTY_EMAIL, accountEmail2); + PollAccount pollAccount3 = pollAccountDAO.create( + PollAccount.PROPERTY_ACCOUNT_ID, accountId3, + PollAccount.PROPERTY_EMAIL, accountEmail3); + + Poll poll = pollDAO.create(Poll.PROPERTY_POLL_ID, pollId); + + VotingList votingList = votingListDAO.create(); + poll.addVotingList(votingList); + VotingList votingList2 = votingListDAO.create(); + poll.addVotingList(votingList2); + + PersonToList personToList = personToListDAO.create( + PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount, + PersonToList.PROPERTY_VOTING_LIST, votingList + ); + + PersonToList personToList2 = personToListDAO.create( + PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount2, + PersonToList.PROPERTY_VOTING_LIST, votingList + ); + PersonToList personToList3 = personToListDAO.create( + PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount3, + PersonToList.PROPERTY_VOTING_LIST, votingList2 + ); + + pollAccount.addVotingListPersonToList(personToList); + pollAccount2.addVotingListPersonToList(personToList2); + pollAccount3.addVotingListPersonToList(personToList3); + + PollAccount restrictedPollAccount = + pollAccountDAO.findRestrictedPollAccountByEmail(pollId, accountEmail); + + Assert.assertNotNull(restrictedPollAccount); + Assert.assertEquals(accountId, restrictedPollAccount.getAccountId()); + Assert.assertNotNull(restrictedPollAccount.getVotingListPersonToList()); + Assert.assertTrue(restrictedPollAccount.getVotingListPersonToList().contains(personToList)); + + PollAccount restrictedPollAccount2 = + pollAccountDAO.findRestrictedPollAccountByEmail(pollId, accountEmail2); + + Assert.assertNotNull(restrictedPollAccount2); + Assert.assertEquals(accountId2, restrictedPollAccount2.getAccountId()); + Assert.assertNotNull(restrictedPollAccount2.getVotingListPersonToList()); + Assert.assertFalse(restrictedPollAccount2.getVotingListPersonToList().contains(personToList)); + Assert.assertTrue(restrictedPollAccount2.getVotingListPersonToList().contains(personToList2)); + + PollAccount restrictedPollAccount3 = + pollAccountDAO.findRestrictedPollAccountByEmail(pollId, accountEmail3); + + Assert.assertNotNull(restrictedPollAccount3); + Assert.assertEquals(accountId3, restrictedPollAccount3.getAccountId()); + Assert.assertNotNull(restrictedPollAccount3.getVotingListPersonToList()); + Assert.assertFalse(restrictedPollAccount3.getVotingListPersonToList().contains(personToList)); + Assert.assertTrue(restrictedPollAccount3.getVotingListPersonToList().contains(personToList3)); + + PollAccount restrictedPollAccount4 = + pollAccountDAO.findRestrictedPollAccountByEmail(pollId, System.nanoTime() + "--"); + + Assert.assertNull(restrictedPollAccount4); } - @Test - public void existsByPollVoteAccountId() throws TopiaException { - if (log.isInfoEnabled()) { - log.info("TODO"); - } - } } 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -47,8 +47,16 @@ private static final Log log = LogFactory.getLog(PollDAOImplTest.class); @Test - public void getPolls() throws Exception { + public void findInvitedPolls() throws Exception { + if (log.isWarnEnabled()) { + log.warn("Missing PollDAOImpl#findInvitedPolls request test!"); + } + } + + @Test + public void findPolls() throws Exception { + TopiaContext tx = beginTransaction(); PollDAO dao = PollenDAOHelper.getPollDAO(tx); @@ -108,7 +116,7 @@ } @Test - public void getCreatedPolls() throws Exception { + public void findCreatedPolls() throws Exception { TopiaContext tx = beginTransaction(); PollDAO dao = PollenDAOHelper.getPollDAO(tx); @@ -134,7 +142,7 @@ pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(true); - actual = dao.getCreatedPolls(pager, userAccount1); + actual = dao.findCreatedPolls(pager, userAccount1); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { @@ -146,7 +154,7 @@ pager.setPageIndex(2); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(true); - actual = dao.getCreatedPolls(pager, userAccount1); + actual = dao.findCreatedPolls(pager, userAccount1); Assert.assertNotNull(actual); Assert.assertEquals(4, actual.size()); for (int i = 0; i < 4; i++) { @@ -157,7 +165,7 @@ pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(false); - actual = dao.getCreatedPolls(pager, userAccount1); + actual = dao.findCreatedPolls(pager, userAccount1); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { @@ -168,27 +176,17 @@ pager.setPageSize(5); pager.setSortColumn(Poll.PROPERTY_TITLE); pager.setSortAscendant(false); - actual = dao.getCreatedPolls(pager, userAccount2); + actual = dao.findCreatedPolls(pager, userAccount2); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); } @Test - public void getInvitedPolls() throws Exception { + public void findParticipatedPolls() throws Exception { TopiaContext tx = beginTransaction(); PollDAO dao = PollenDAOHelper.getPollDAO(tx); - if (log.isInfoEnabled()) { - log.info("TODO"); - } - } - - @Test - public void getParticipatedPolls() throws Exception { - - TopiaContext tx = beginTransaction(); - PollDAO dao = PollenDAOHelper.getPollDAO(tx); VoteDAO voteDao = PollenDAOHelper.getVoteDAO(tx); PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); UserAccountDAO userAccountDAO = PollenDAOHelper.getUserAccountDAO(tx); @@ -216,7 +214,7 @@ pager = TopiaFilterPagerUtil.newFilterPagerBean(); pager.setPageSize(5); - actual = dao.getParticipatedPolls(pager, userAccount1); + actual = dao.findParticipatedPolls(pager, userAccount1); Assert.assertNotNull(actual); Assert.assertEquals(2, actual.size()); Assert.assertEquals(poll0, actual.get(0).getLeft()); @@ -224,13 +222,13 @@ Assert.assertEquals(poll1, actual.get(1).getLeft()); Assert.assertEquals(pollAccount1, actual.get(1).getRight()); - actual = dao.getParticipatedPolls(pager, userAccount2); + actual = dao.findParticipatedPolls(pager, userAccount2); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); } @Test - public void getRunningPolls() throws Exception { + public void findRunningPolls() throws Exception { TopiaContext tx = beginTransaction(); PollDAO dao = PollenDAOHelper.getPollDAO(tx); @@ -259,7 +257,7 @@ List<Poll> actual; - actual = dao.getRunningPolls(now); + actual = dao.findRunningPolls(now); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); Assert.assertEquals(poll0, actual.get(0)); @@ -269,13 +267,13 @@ Assert.assertEquals(poll5, actual.get(4)); - actual = dao.getRunningPolls(lastYearNow); + actual = dao.findRunningPolls(lastYearNow); Assert.assertNotNull(actual); Assert.assertEquals(2, actual.size()); Assert.assertEquals(poll0, actual.get(0)); Assert.assertEquals(poll5, actual.get(1)); - actual = dao.getRunningPolls(nextMonthNow); + actual = dao.findRunningPolls(nextMonthNow); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); Assert.assertEquals(poll0, actual.get(0)); @@ -284,7 +282,7 @@ Assert.assertEquals(poll3, actual.get(3)); Assert.assertEquals(poll5, actual.get(4)); - actual = dao.getRunningPolls(nextYearNow); + actual = dao.findRunningPolls(nextYearNow); Assert.assertNotNull(actual); Assert.assertEquals(3, actual.size()); Assert.assertEquals(poll0, actual.get(0)); 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -45,7 +45,8 @@ UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(tx); for (int i = 0; i < 20; i++) { - dao.create(UserAccount.PROPERTY_LOGIN, "login" + i, UserAccount.PROPERTY_EMAIL, "email" + i); + dao.create(UserAccount.PROPERTY_LOGIN, "login" + i, + UserAccount.PROPERTY_EMAIL, "email" + i); } tx.commitTransaction(); @@ -78,14 +79,15 @@ } @Test - public void getUsers() throws Exception { + public void findUsers() throws Exception { TopiaContext tx = beginTransaction(); UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(tx); for (int i = 0; i < 9; i++) { - dao.create(UserAccount.PROPERTY_LOGIN, "login" + i, UserAccount.PROPERTY_EMAIL, "email" + i); + dao.create(UserAccount.PROPERTY_LOGIN, "login" + i, + UserAccount.PROPERTY_EMAIL, "email" + i); } tx.commitTransaction(); @@ -97,7 +99,7 @@ pager.setPageSize(5); pager.setSortColumn(UserAccount.PROPERTY_LOGIN); pager.setSortAscendant(true); - actual = dao.getUsers(pager); + actual = dao.findUsers(pager); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { @@ -109,7 +111,7 @@ pager.setPageIndex(2); pager.setSortColumn(UserAccount.PROPERTY_LOGIN); pager.setSortAscendant(true); - actual = dao.getUsers(pager); + actual = dao.findUsers(pager); Assert.assertNotNull(actual); Assert.assertEquals(4, actual.size()); for (int i = 0; i < 4; i++) { @@ -120,13 +122,11 @@ pager.setPageSize(5); pager.setSortColumn(UserAccount.PROPERTY_LOGIN); pager.setSortAscendant(false); - actual = dao.getUsers(pager); + actual = dao.findUsers(pager); Assert.assertNotNull(actual); Assert.assertEquals(5, actual.size()); for (int i = 0; i < 5; i++) { Assert.assertEquals("login" + (8 - i), actual.get(i).getLogin()); } - - } } 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -40,7 +40,7 @@ public class VoteDAOImplTest extends AbstractDAOTest { @Test - public void getAllVotes() throws Exception { + public void findAllVotes() throws Exception { TopiaContext tx = beginTransaction(); @@ -65,7 +65,7 @@ List<Vote> actual; - actual = voteDAO.getAllVotes(poll1); + actual = voteDAO.findAllVotes(poll1); Assert.assertNotNull(actual); Assert.assertEquals(2, actual.size()); @@ -73,16 +73,15 @@ Assert.assertEquals(vote1, actual.get(1)); Assert.assertFalse(actual.contains(vote3)); - actual = voteDAO.getAllVotes(poll2); + actual = voteDAO.findAllVotes(poll2); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); } @Test - public void getVotesByPoll() throws Exception { + public void findAllVotesByPoll() throws Exception { - TopiaContext tx = beginTransaction(); VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(tx); @@ -108,7 +107,7 @@ TopiaFilterPagerUtil.FilterPagerBean pager = TopiaFilterPagerUtil.newFilterPagerBean(); pager.setPageSize(10); - actual = voteDAO.getVotesByPoll(poll1, pager); + actual = voteDAO.findAllVotesByPoll(poll1, pager); Assert.assertNotNull(actual); Assert.assertEquals(2, actual.size()); @@ -118,7 +117,7 @@ pager = TopiaFilterPagerUtil.newFilterPagerBean(); pager.setPageSize(10); - actual = voteDAO.getVotesByPoll(poll2, pager); + actual = voteDAO.findAllVotesByPoll(poll2, pager); Assert.assertNotNull(actual); Assert.assertTrue(actual.isEmpty()); @@ -127,7 +126,6 @@ @Test public void hasAlreadyVoted() throws Exception { - TopiaContext tx = beginTransaction(); VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(tx); @@ -207,7 +205,5 @@ actual = voteDAO.findByAccountId(accountId2); Assert.assertNotNull(actual); Assert.assertEquals(vote2, actual); - - } } 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -79,7 +79,7 @@ try { PersonListDAO dao = getDAO(PersonList.class); - List<PersonList> result = dao.getFavoriteLists(user, pager); + List<PersonList> result = dao.findFavoriteLists(user, pager); return result; } catch (TopiaException e) { throw new PollenTechnicalException(e); @@ -92,7 +92,7 @@ try { PersonListDAO dao = getDAO(PersonList.class); - List<PersonList> result = dao.getFavoriteLists(user); + List<PersonList> result = dao.findAllFavoriteLists(user); return result; } catch (TopiaException e) { throw new PollenTechnicalException(e); @@ -136,7 +136,7 @@ try { PollAccountDAO dao = getDAO(PollAccount.class); - List<PollAccount> result = dao.getFavoriteListUsers(favoriteList, pager); + List<PollAccount> result = dao.findFavoriteListUsers(favoriteList, pager); return result; } catch (TopiaException e) { 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -153,7 +153,7 @@ try { CommentDAO dao = getDAO(Comment.class); - List<Comment> result = dao.getComments(pager, pollId); + List<Comment> result = dao.findComments(pager, pollId); return result; } catch (TopiaException e) { throw new PollenTechnicalException("Could not obtain comments", e); @@ -166,7 +166,7 @@ try { CommentDAO dao = getDAO(Comment.class); - List<Comment> result = dao.getAllComments(pollId); + List<Comment> result = dao.findAllComments(pollId); return result; } catch (TopiaException e) { throw new PollenTechnicalException("Could not obtain comments", e); 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -336,7 +336,7 @@ Preconditions.checkNotNull(user); try { PollDAO dao = getDAO(Poll.class); - List<Poll> result = dao.getCreatedPolls(pager, user); + List<Poll> result = dao.findCreatedPolls(pager, user); return result; } catch (TopiaException e) { throw new PollenTechnicalException("Could not obtain created polls", e); @@ -358,7 +358,7 @@ try { PollDAO pollDao = getDAO(Poll.class); List<Pair<Poll, PollAccount>> result = - pollDao.getInvitedPolls(pager, userToUse); + pollDao.findInvitedPolls(pager, userToUse); return result; } catch (TopiaException e) { throw new PollenTechnicalException("Could not obtain invited polls", e); @@ -381,7 +381,7 @@ try { PollDAO pollDao = getDAO(Poll.class); List<Pair<Poll, PollAccount>> result = - pollDao.getParticipatedPolls(pager, userToUse); + pollDao.findParticipatedPolls(pager, userToUse); return result; } catch (TopiaException e) { throw new PollenTechnicalException( @@ -393,7 +393,7 @@ try { PollDAO dao = getDAO(Poll.class); - List<Poll> results = dao.getRunningPolls(currentTime); + List<Poll> results = dao.findRunningPolls(currentTime); return results; } catch (TopiaException e) { throw new PollenTechnicalException( @@ -460,7 +460,7 @@ try { pollAccountLoaded = - dao.getVoterPollAccountByAccountId(poll.getPollId(), accountId); + dao.findVoterPollAccountByAccountId(poll.getPollId(), accountId); } catch (TopiaException e) { throw new PollenTechnicalException(e); } @@ -476,7 +476,7 @@ // try to find pollAccount from the list of voters try { pollAccountLoaded = - dao.getVoterPollAccountByUserAccount( + dao.findVoterPollAccountByUserAccount( poll.getPollId(), userAccount); } catch (TopiaException e) { throw new PollenTechnicalException(e); @@ -487,7 +487,7 @@ try { pollAccountLoaded = - dao.getRestrictedPollAccountByEmail( + dao.findRestrictedPollAccountByEmail( poll.getPollId(), userAccount.getEmail()); } catch (TopiaException e) { throw new PollenTechnicalException(e); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -423,7 +423,7 @@ private boolean isVoterAccountId(PollAccountDAO dao, PollUri uri) { try { - PollAccount pollAccount = dao.getVoterPollAccountByAccountId( + PollAccount pollAccount = dao.findVoterPollAccountByAccountId( uri.getPollId(), uri.getAccountId()); return pollAccount != null; @@ -438,7 +438,7 @@ UserAccount userAccount) { try { - PollAccount pollAccount = dao.getVoterPollAccountByUserAccount( + PollAccount pollAccount = dao.findVoterPollAccountByUserAccount( pollId, userAccount); return pollAccount != null; @@ -453,8 +453,8 @@ try { PollAccount result = - dao.getRestrictedPollAccountByAccountId(uri.getPollId(), - uri.getAccountId()); + dao.findRestrictedPollAccountByAccountId(uri.getPollId(), + uri.getAccountId()); return result != null; @@ -471,7 +471,7 @@ try { PollAccount result = - dao.getRestrictedPollAccountByEmail(pollId, userAccount.getEmail()); + dao.findRestrictedPollAccountByEmail(pollId, userAccount.getEmail()); return result != null; 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -266,7 +266,7 @@ try { UserAccountDAO dao = getDAO(UserAccount.class); - List<UserAccount> result = dao.getUsers(pager); + List<UserAccount> result = dao.findUsers(pager); return result; } catch (TopiaException e) { throw new PollenTechnicalException(e); 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-08-12 14:06:32 UTC (rev 3598) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-08-12 14:07:52 UTC (rev 3599) @@ -356,7 +356,7 @@ public List<Vote> getAllVotes(Poll poll) { try { VoteDAO dao = getDAO(Vote.class); - List<Vote> results = dao.getAllVotes(poll); + List<Vote> results = dao.findAllVotes(poll); return results; } catch (TopiaException e) { @@ -368,7 +368,7 @@ TopiaFilterPagerUtil.FilterPagerBean pager) { try { VoteDAO dao = getDAO(Vote.class); - List<Vote> results = dao.getVotesByPoll(poll, pager); + List<Vote> results = dao.findAllVotesByPoll(poll, pager); return results; } catch (TopiaException e) {