Author: tchemit Date: 2012-08-19 13:18:22 +0200 (Sun, 19 Aug 2012) New Revision: 3616 Url: http://chorem.org/repositories/revision/pollen/3616 Log: use new topia query api 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 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-18 12:14:55 UTC (rev 3615) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-08-19 11:18:22 UTC (rev 3616) @@ -44,7 +44,7 @@ String hql = "SELECT e FROM CommentImpl e, PollImpl p WHERE " + "p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; - List<E> result = findByQueryAndPager(hql, pager, "pollId", pollId); + List<E> result = findAllByQueryAndPager(hql, pager, "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-18 12:14:55 UTC (rev 3615) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-08-19 11:18:22 UTC (rev 3616) @@ -44,7 +44,7 @@ String hql = "FROM PersonListImpl e WHERE e.owner = :owner"; - List<E> result = findByQueryAndPager(hql, pager, "owner", user); + List<E> result = findAllByQueryAndPager(hql, pager, "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-08-18 12:14:55 UTC (rev 3615) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-08-19 11:18:22 UTC (rev 3616) @@ -86,7 +86,7 @@ hql += "p.pollAccount.email = :email"; } - E result = findUniqueByQuery(hql, params.toArray()); + E result = findByQuery(hql, params.toArray()); return result; } @@ -143,7 +143,7 @@ hql += "e.userAccount = :user"; } - E result = findUniqueByQuery(hql, params.toArray()); + E result = findByQuery(hql, params.toArray()); return result; } @@ -164,7 +164,7 @@ String hql = "FROM PollAccountImpl e WHERE e.personList = :owner"; - List<E> result = findByQueryAndPager(hql, pager, "owner", favoriteList); + List<E> result = findAllByQueryAndPager(hql, pager, "owner", favoriteList); 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-18 12:14:55 UTC (rev 3615) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-08-19 11:18:22 UTC (rev 3616) @@ -46,7 +46,7 @@ String hql = "FROM PollImpl"; - List<E> result = findByQueryAndPager(hql, pager); + List<E> result = findAllByQueryAndPager(hql, pager); return result; } @@ -63,7 +63,7 @@ String hql = "FROM PollImpl WHERE creator.userAccount = :user"; - List<E> result = findByQueryAndPager(hql, pager, "user", user); + List<E> result = findAllByQueryAndPager(hql, pager, "user", user); 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-08-18 12:14:55 UTC (rev 3615) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-08-19 11:18:22 UTC (rev 3616) @@ -58,7 +58,7 @@ String hql = "FROM UserAccountImpl"; - List<E> result = findByQueryAndPager(hql, pager); + 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-08-18 12:14:55 UTC (rev 3615) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-19 11:18:22 UTC (rev 3616) @@ -77,7 +77,7 @@ "e IN ELEMENTS(p.vote) " + "ORDER BY e.topiaCreateDate DESC"; - results = findByQueryAndPager(hql, pager, "p", poll); + results = findAllByQueryAndPager(hql, pager, "p", poll); } return results; } @@ -97,7 +97,7 @@ String hql = "FROM VoteImpl e WHERE e.pollAccount.accountId = :a"; - E result = findUniqueByQuery(hql, "a", accountId); + E result = findByQuery(hql, "a", accountId); return result; } }