[Pollen-commits] r3596 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence

Author: tchemit Date: 2012-08-12 13:57:21 +0200 (Sun, 12 Aug 2012) New Revision: 3596 Url: http://chorem.org/repositories/revision/pollen/3596 Log: refs #642: Review persistence module (remove commented code + others...) 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/PersonToListDAOImpl.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/UserAccountImpl.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-12 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -45,17 +45,6 @@ List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, "pollId", pollId); return result; -// TopiaQuery countQuery = createQuery("e"). -// addFrom(Poll.class, "p"). -// addWhere("p." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). -// addWhere("e in elements(p." + Poll.PROPERTY_COMMENT + ")"); -// long records = countByQuery(countQuery); -// pager.setRecords((int) records); -// -// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, -// pager); -// List<E> result = findAllByQuery(query); -// return result; } @@ -66,14 +55,7 @@ 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); return result; -// TopiaQuery query = createQuery("e"). -// addFrom(Poll.class, "p"). -// addWhere("p." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). -// addWhere("e in elements(p." + Poll.PROPERTY_COMMENT + ")"); -// query.addOrderDesc(Comment.PROPERTY_POST_DATE); -// List<E> result = findAllByQuery(query); -// return result; } -} //CommentDAOImpl<E extends Comment> +} 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 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -46,16 +46,6 @@ List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, "owner", user); return result; -// TopiaQuery countQuery = createQuery("e"); -// countQuery.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); -// long records = countByQuery(countQuery); -// -// pager.setRecords((int) records); -// -// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); -// -// List<E> result = findAllByQuery(query); -// return result; } public List<E> getFavoriteLists(UserAccount user) throws TopiaException { @@ -64,10 +54,6 @@ String hql = "FROM PersonListImpl WHERE owner = :owner"; List<E> result = getContext().findAll(hql, "owner", user); return result; -// TopiaQuery query = createQuery("e"); -// query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); -// List<E> result = findAllByQuery(query); -// return result; } public boolean isPersonListExist(UserAccount user, @@ -84,13 +70,6 @@ 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; -// TopiaQuery query = createQuery("e"); -// -// query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); -// query.addWhere("e." + PersonList.PROPERTY_NAME, TopiaQuery.Op.EQ, name); -// -// boolean exist = existByQuery(query); -// return exist; } -} //PersonListDAOImpl<E extends PersonList> +} Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-08-12 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -22,6 +22,8 @@ */ package org.chorem.pollen.business.persistence; +import com.google.common.base.Preconditions; + /** * Created: 28/03/12 * @@ -33,6 +35,9 @@ public PersonToList findByPollAndAccount(Poll poll, PollAccount account) { + Preconditions.checkNotNull(poll); + Preconditions.checkNotNull(account); + PersonToList result = null; if (!poll.isVotingListEmpty()) { for (VotingList votingList : poll.getVotingList()) { 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 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -175,38 +175,4 @@ return result; } -// public PollAccount findByPollVoteUser(Poll poll, -// UserAccount user) throws TopiaException { -// -// Preconditions.checkNotNull(poll); -// Preconditions.checkNotNull(user); -// -// TopiaQuery query = createQuery("e") -// .addFrom(Poll.class, "p") -// .addFrom(Vote.class, "v") -// .addEquals("p", poll) -// .addInElements("v", "p." + Poll.PROPERTY_VOTE) -// .addWhere("e = v." + Vote.PROPERTY_POLL_ACCOUNT) -// .addEquals("e." + PollAccount.PROPERTY_USER_ACCOUNT, user); -// PollAccount result = findByQuery(query); -// return result; -// } - - public boolean existsByPollVoteAccountId(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); - boolean result = existByQuery(query); - return result; - } - -} //PollAccountDAOImpl<E extends PollAccount> +} 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 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -47,14 +47,6 @@ String hql = "FROM PollImpl"; List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager); return result; -// long records = count(); -// pager.setRecords((int) records); -// -// TopiaQuery query = createQuery("e"); -// TopiaFilterPagerUtil.addPagerToQuery(query, pager); -// -// List<E> result = findAllByQuery(query); -// return result; } public List<E> getCreatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, @@ -71,18 +63,6 @@ List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, "user", user); return result; - -// TopiaQuery countQuery = createQuery("e"); -// countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + -// PollAccount.PROPERTY_USER_ACCOUNT, -// TopiaQuery.Op.EQ, user); -// long records = countByQuery(countQuery); -// pager.setRecords((int) records); -// -// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); -// -// List<E> result = findAllByQuery(query); -// return result; } public List<Pair<Poll, PollAccount>> getInvitedPolls( @@ -99,19 +79,6 @@ List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( hql, pager, "email", user.getEmail()); return result; - -// String email = user.getEmail(); -// -// TopiaQuery query = createQuery("p"). -// setSelect("p", "l." + PersonToList.PROPERTY_POLL_ACCOUNT). -// addLeftJoin("p." + Poll.PROPERTY_VOTING_LIST, "v", false). -// addLeftJoin("v." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST, "l", false). -// addEquals("l." + PersonToList.PROPERTY_POLL_ACCOUNT -// + "." + PollAccount.PROPERTY_EMAIL, email); -// -// List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( -// query, pager); -// return result; } public List<Pair<Poll, PollAccount>> getParticipatedPolls( @@ -127,20 +94,13 @@ List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( hql, pager, "user", user); return result; + } -// VoteDAO voteDao = PollenDAOHelper.getVoteDAO(context); -// -// TopiaQuery query = voteDao.createQuery("e"). -// addFrom(Poll.class, "p"). -// addWhere("e in elements(p." + Poll.PROPERTY_VOTE + ")"). -// setSelect("p", "e." + Vote.PROPERTY_POLL_ACCOUNT). -// addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + -// PollAccount.PROPERTY_USER_ACCOUNT, -// TopiaQuery.Op.EQ, user); -// -// List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( -// query, pager); -// return result; + public List<E> getRunningPolls(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); + return results; } protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts( @@ -166,55 +126,4 @@ return result; } -// protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts( -// TopiaQuery query, -// TopiaFilterPagerUtil.FilterPagerBean pager) -// throws TopiaException { -// -// List<Object[]> queryResults = getContext().findByQuery(query); -// Map<Poll, PollAccount> mapResult = Maps.newLinkedHashMap(); -// for (Object[] row : queryResults) { -// Poll poll = (Poll) row[0]; -// PollAccount pollAccount = (PollAccount) row[1]; -// mapResult.put(poll, pollAccount); -// } -// -// long records = mapResult.size(); -// pager.setRecords((int) records); -// TopiaFilterPagerUtil.computeRecordIndexesAndPagesNumber(pager); -// List<Map.Entry<Poll, PollAccount>> entries = -// Lists.newLinkedList(mapResult.entrySet()); -// List<Pair<Poll, PollAccount>> result = -// Lists.transform(TopiaFilterPagerUtil.getPageFromList(entries, pager), -// PollenFunctions.MAP_ENTRY_TO_PAIR_FUNCTION); -// return result; -// } - - public List<E> getRunningPolls(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); - return results; -// List<E> results; -// TopiaQuery query; -// -// if (withEndDate) { -// -// query = createQuery("poll"). -// addWhere("poll.endDate is not null and poll.endDate > current_timestamp()"). -// addWhere("poll.beginDate is null or poll.beginDate < current_timestamp()"); -// } else { -// query = createQuery("poll"). -// addWhere("poll.endDate is null or poll.endDate > current_timestamp()"). -// addWhere("poll.beginDate is null or poll.beginDate < current_timestamp()"); -// } -// -// results = findAllByQuery(query); -// -// if (log.isDebugEnabled()) { -// log.debug("Entities found: " -// + ((results == null) ? "null" : results.size())); -// } -// return results; - } -} //PollDAOImpl<E extends Poll> +} 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 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -45,15 +45,6 @@ "login", user.getLogin(), "email", StringUtils.lowerCase(user.getEmail())); return count > 0; -// TopiaQuery query = createQuery(). -// addWhere(UserAccount.PROPERTY_LOGIN, -// TopiaQuery.Op.NEQ, user.getLogin()). -// addEquals(UserAccount.PROPERTY_EMAIL, -// StringUtils.lowerCase(user.getEmail())); -// -// // existing user found -// boolean result = existByQuery(query); -// return result; } public List<E> getUsers(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { @@ -66,13 +57,5 @@ String hql = "FROM UserAccountImpl"; List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager); return result; -// long records = count(); -// pager.setRecords((int) records); -// -// TopiaQuery query = createQuery("e"); -// TopiaFilterPagerUtil.addPagerToQuery(query, pager); -// -// List<E> result = findAllByQuery(query); -// return result; } -} //UserAccountDAOImpl<E extends UserAccount> +} Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-08-12 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -46,4 +46,4 @@ return result; } -} //UserAccountImpl +} 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 11:45:39 UTC (rev 3595) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-12 11:57:21 UTC (rev 3596) @@ -45,13 +45,6 @@ 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); - -// TopiaQuery query = createQuery("e"). -// addFrom(Poll.class, "p"). -// addWhere("p", TopiaQuery.Op.EQ, poll). -// addInElements("e", "p." + Poll.PROPERTY_VOTE). -// addOrder("e.topiaCreateDate DESC"); -// results = findAllByQuery(query); } return results; } @@ -81,18 +74,6 @@ results = PollenIOUtil.findByPager(getContext(), hql, pager, "p", poll); - -// TopiaQuery countQuery = createQuery("e"). -// addFrom(Poll.class, "p"). -// addWhere("p", TopiaQuery.Op.EQ, poll). -// addInElements("e", "p." + Poll.PROPERTY_VOTE). -// addOrder("e.topiaCreateDate"); -// long records = countByQuery(countQuery); -// pager.setRecords((int) records); -// -// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery( -// countQuery, pager); -// results = findAllByQuery(query); } return results; } @@ -103,13 +84,6 @@ 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; -// TopiaQuery query = createQuery("e"). -// addFrom(Poll.class, "p"). -// addWhere("p", TopiaQuery.Op.EQ, poll). -// addInElements("e", "p." + Poll.PROPERTY_VOTE). -// addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, votingId); -// boolean result = existByQuery(query); -// return result; } public Vote findByAccountId(String accountId) throws TopiaException { @@ -117,12 +91,5 @@ String hql = "FROM VoteImpl e WHERE e.pollAccount.accountId = :a"; Vote result = (Vote) getContext().findUnique(hql, "a", accountId); return result; -// String accountIdProperty = -// TopiaQuery.getProperty("e", Vote.PROPERTY_POLL_ACCOUNT, PollAccount.PROPERTY_ACCOUNT_ID); -// TopiaQuery query = createQuery("e").addEquals(accountIdProperty, accountId); -// Vote result = findByQuery(query); -// return result; } - - -} //VoteDAOImpl<E extends Vote> +}