Author: tchemit Date: 2012-08-18 14:14:55 +0200 (Sat, 18 Aug 2012) New Revision: 3615 Url: http://chorem.org/repositories/revision/pollen/3615 Log: refs #781: Updates to topia 2.6 (use new TopiaDAO methods) fixes #782: Updates to eugene 2.5 Removed: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java Modified: trunk/pollen-persistence/pom.xml 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/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-08-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/pom.xml 2012-08-18 12:14:55 UTC (rev 3615) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -87,7 +89,7 @@ <!-- Plug in Topia --> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> @@ -101,7 +103,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Deleted: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java 2012-08-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenPersistenceUtil.java 2012-08-18 12:14:55 UTC (rev 3615) @@ -1,149 +0,0 @@ -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); - } -} 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-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-08-18 12:14:55 UTC (rev 3615) @@ -23,7 +23,6 @@ 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.persistence.TopiaFilterPagerUtil; @@ -40,14 +39,12 @@ String countHql = "SELECT COUNT(e) FROM CommentImpl e, PollImpl p WHERE" + " p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; - PollenPersistenceUtil.computeAndAddRecordsToPager( - this, countHql, pager, "pollId", pollId); + computeAndAddRecordsToPager(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); + List<E> result = findByQueryAndPager(hql, pager, "pollId", pollId); return result; } @@ -58,8 +55,7 @@ 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); + List<E> result = findAllByQuery(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-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-08-18 12:14:55 UTC (rev 3615) @@ -24,7 +24,6 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -41,13 +40,11 @@ String countHql = "SELECT COUNT(*) FROM PersonListImpl WHERE " + "owner = :owner"; - PollenPersistenceUtil.computeAndAddRecordsToPager( - this, countHql, pager, "owner", user); + computeAndAddRecordsToPager(countHql, pager, "owner", user); String hql = "FROM PersonListImpl e WHERE e.owner = :owner"; - List<E> result = PollenPersistenceUtil.findByPager( - this, hql, pager, "owner", user); + List<E> result = findByQueryAndPager(hql, pager, "owner", user); return result; } @@ -57,8 +54,7 @@ String hql = "FROM PersonListImpl WHERE owner = :owner"; - List<E> result = PollenPersistenceUtil.findAll( - this, hql, "owner", user); + List<E> result = findAllByQuery(hql, "owner", user); return result; } @@ -72,8 +68,7 @@ String hql = "SELECT COUNT(*) FROM PersonListImpl WHERE " + "owner = :owner AND name = :name"; - boolean result = PollenPersistenceUtil.exists( - this, hql, "owner", user, "name", name); + boolean result = existsByQuery(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-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-08-18 12:14:55 UTC (rev 3615) @@ -25,7 +25,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -87,7 +86,7 @@ hql += "p.pollAccount.email = :email"; } - E result = PollenPersistenceUtil.findUnique(this, hql, params.toArray()); + E result = findUniqueByQuery(hql, params.toArray()); return result; } @@ -144,7 +143,7 @@ hql += "e.userAccount = :user"; } - E result = PollenPersistenceUtil.findUnique(this, hql, params.toArray()); + E result = findUniqueByQuery(hql, params.toArray()); return result; } @@ -165,8 +164,7 @@ String hql = "FROM PollAccountImpl e WHERE e.personList = :owner"; - List<E> result = PollenPersistenceUtil.findByPager( - this, hql, pager, "owner", favoriteList); + List<E> result = findByQueryAndPager(hql, pager, "owner", favoriteList); return result; } @@ -194,7 +192,6 @@ String hql = "FROM PollAccountImpl e WHERE " + "e.personList = :person AND " + "e.email = :email"; - boolean result; String pollAccountId = pollAccount.getTopiaId(); List<Object> params = Lists.<Object>newArrayList( @@ -212,7 +209,7 @@ } - result = PollenPersistenceUtil.exists(this, hql, params.toArray()); + boolean result = existsByQuery(hql, params.toArray()); 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-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-08-18 12:14:55 UTC (rev 3615) @@ -27,7 +27,6 @@ import com.google.common.collect.Maps; import org.apache.commons.lang3.tuple.Pair; import org.chorem.pollen.PollenFunctions; -import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -43,12 +42,11 @@ String countHql = "SELECT COUNT(*) FROM PollImpl"; - PollenPersistenceUtil.computeAndAddRecordsToPager( - this, countHql, pager); + computeAndAddRecordsToPager(countHql, pager); String hql = "FROM PollImpl"; - List<E> result = PollenPersistenceUtil.findByPager(this, hql, pager); + List<E> result = findByQueryAndPager(hql, pager); return result; } @@ -61,13 +59,11 @@ String countHql = "SELECT COUNT(*) FROM PollImpl " + "WHERE creator.userAccount = :user"; - PollenPersistenceUtil.computeAndAddRecordsToPager( - this, countHql, pager, "user", user); + computeAndAddRecordsToPager(countHql, pager, "user", user); String hql = "FROM PollImpl WHERE creator.userAccount = :user"; - List<E> result = PollenPersistenceUtil.findByPager( - this, hql, pager, "user", user); + List<E> result = findByQueryAndPager(hql, pager, "user", user); return result; } @@ -107,8 +103,7 @@ "(endDate IS NULL OR endDate > :currentTime) AND " + "(beginDate IS NULL OR beginDate < :currentTime)"; - List<E> results = PollenPersistenceUtil.findAll( - this, hql, "currentTime", currentTime); + List<E> results = findAllByQuery(hql, "currentTime", currentTime); return results; } @@ -116,8 +111,7 @@ TopiaFilterPagerUtil.FilterPagerBean pager, Object... params) throws TopiaException { - List<Object[]> queryResults = PollenPersistenceUtil.findAll( - this, Object[].class, hql, params); + List<Object[]> queryResults = findAllByQuery(Object[].class, hql, params); Map<Poll, PollAccount> mapResult = Maps.newLinkedHashMap(); for (Object[] row : queryResults) { 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-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-08-18 12:14:55 UTC (rev 3615) @@ -24,7 +24,6 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -42,8 +41,8 @@ String hql = "SELECT COUNT(*) FROM UserAccountImpl WHERE " + "login = :login AND email = :email"; - boolean result = PollenPersistenceUtil.exists( - this, hql, + boolean result = existsByQuery( + hql, "login", user.getLogin(), "email", StringUtils.lowerCase(user.getEmail())); return result; @@ -55,11 +54,11 @@ String countHql = "SELECT COUNT(*) FROM UserAccountImpl"; - PollenPersistenceUtil.computeAndAddRecordsToPager(this, countHql, pager); + computeAndAddRecordsToPager(countHql, pager); String hql = "FROM UserAccountImpl"; - List<E> result = PollenPersistenceUtil.findByPager(this, hql, pager); + List<E> result = findByQueryAndPager(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-14 19:21:59 UTC (rev 3614) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-18 12:14:55 UTC (rev 3615) @@ -24,7 +24,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -48,7 +47,7 @@ "e IN ELEMENTS(p.vote) " + "ORDER BY e.topiaCreateDate DESC"; - results = PollenPersistenceUtil.findAll(this, hql, "p", poll); + results = findAllByQuery(hql, "p", poll); } return results; } @@ -71,16 +70,14 @@ "VoteImpl e, PollImpl p WHERE " + "p = :p AND e IN ELEMENTS(p.vote)"; - PollenPersistenceUtil.computeAndAddRecordsToPager( - this, countHql, pager, "p", poll); + computeAndAddRecordsToPager(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"; - results = PollenPersistenceUtil.findByPager( - this, hql, pager, "p", poll); + results = findByQueryAndPager(hql, pager, "p", poll); } return results; } @@ -92,8 +89,7 @@ "e in elements(p.vote) AND " + "e.pollAccount.votingId = :v"; - boolean result = PollenPersistenceUtil.exists( - this, hql, "p", poll, "v", votingId); + boolean result = existsByQuery(hql, "p", poll, "v", votingId); return result; } @@ -101,7 +97,7 @@ String hql = "FROM VoteImpl e WHERE e.pollAccount.accountId = :a"; - E result = PollenPersistenceUtil.findUnique(this, hql, "a", accountId); + E result = findUniqueByQuery(hql, "a", accountId); return result; } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 19:21:59 UTC (rev 3614) +++ trunk/pom.xml 2012-08-18 12:14:55 UTC (rev 3615) @@ -153,12 +153,12 @@ <projectId>pollen</projectId> <!-- customized versions --> - <topiaVersion>2.6.11</topiaVersion> - <eugenePluginVersion>2.4.2</eugenePluginVersion> + <topiaVersion>2.6.12-SNAPSHOT</topiaVersion> + <eugenePluginVersion>2.5</eugenePluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6-SNAPSHOT</nuitonUtilsVersion> <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version> @@ -167,7 +167,7 @@ <slf4jVersion>1.6.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <seleniumVersion>2.21.0</seleniumVersion> + <seleniumVersion>2.25.0</seleniumVersion> <mockitoVersion>1.9.0</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> @@ -491,7 +491,7 @@ <!-- EUGene plugin for entities generation --> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> <configuration> <inputs>zargo</inputs>