Author: fdesbois Date: 2010-06-24 18:34:31 +0200 (Thu, 24 Jun 2010) New Revision: 3033 Url: http://chorem.org/repositories/revision/pollen/3033 Log: Use last Topia and EUGene snapshot + QueryHelperTransformer Removed: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenQueryAlias.java Modified: trunk/ trunk/pollen-business/ trunk/pollen-business/pom.xml trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java trunk/pollen-business/src/main/xmi/pollen.zargo trunk/pollen-ui/ trunk/pollen-votecounting/ trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .pollen + *.ipr *.iws .classpath .project target .pollen .settings nbactions.xml Property changes on: trunk/pollen-business ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings *.ipr *.iws *.iml + *.ipr *.iws .classpath .project target .settings Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/pom.xml 2010-06-24 16:34:31 UTC (rev 3033) @@ -117,7 +117,8 @@ org.nuiton.topia.generator.ServiceTransformer, org.nuiton.eugene.java.JavaInterfaceTransformer, org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.BinderHelperTransformer + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer </templates> <excludeTemplates> <excludeTemplate>org.nuiton.topia.generator.EntityAbstractTransformer</excludeTemplate> Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -315,16 +315,7 @@ } } } - throw new PollenException(eee, message, args); - // PollenBusinessException must be managed (catch and throw) when needed -// if (! (eee instanceof PollenBusinessException)) { -// throw new PollenException(eee, message, args); -// } else { -// if (log.isDebugEnabled()) { -// log.debug("Business error : " + _(message, args)); -// } -// throw eee; -// } + throw new PollenException(message, eee, args); } /** Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -12,7 +12,7 @@ * @param args */ - public PollenException(Throwable eee, String message, Object... args) { + public PollenException(String message, Throwable eee, Object... args) { super(message, eee); this.args = args; } Deleted: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenQueryAlias.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenQueryAlias.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenQueryAlias.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -1,23 +0,0 @@ -package org.chorem.pollen; - -/** - * Created: 3 juin 2010 - * - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ - */ -public class PollenQueryAlias { - - public static final String POLL = "P"; - - public static final String POLL_PARTICIPANT = "A"; - - public static final String POLL_LIST = "PL"; - - public static final String FAVORITE_PARTICIPANT = "FP"; - - public static final String FAVORITE_LIST = "FL"; - - public static final String COMMENT = "C"; - -} Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -1,6 +1,6 @@ package org.chorem.pollen.entity; -import org.chorem.pollen.PollenQueryAlias; +import org.chorem.pollen.PollenQueryHelper; import org.nuiton.topia.framework.EntityFilter; import org.nuiton.topia.framework.TopiaQuery; @@ -21,8 +21,8 @@ // ------------------------- PROPERTIES ----------------------------- // - String participantAlias = PollenQueryAlias.POLL_PARTICIPANT; - String listAlias = PollenQueryAlias.POLL_LIST; + String participantAlias = PollenQueryHelper.ALIAS_FAVORITE_PARTICIPANT; + String listAlias = PollenQueryHelper.ALIAS_FAVORITE_LIST; String listParticipantProperty = TopiaQuery.getProperty(listAlias, FavoriteList.PROPERTY_FAVORITE_PARTICIPANT); Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -1,6 +1,7 @@ package org.chorem.pollen.entity; -import org.chorem.pollen.PollenQueryAlias; +import org.chorem.pollen.PollenContext; +import org.chorem.pollen.PollenQueryHelper; import org.nuiton.topia.framework.EntityFilter; import org.nuiton.topia.framework.TopiaQuery; @@ -19,11 +20,11 @@ // ------------------------- PROPERTIES ----------------------------- // - String pollAlias = PollenQueryAlias.POLL; + String pollAlias = PollenQueryHelper.ALIAS_POLL; String pollAccountProperty = TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_POLL_ACCOUNT); - String participantAlias = PollenQueryAlias.POLL_PARTICIPANT; + String participantAlias = PollenQueryHelper.ALIAS_POLL_ACCOUNT; String participantVoteDateProperty = TopiaQuery.getProperty(participantAlias, PollAccount.PROPERTY_VOTE_DATE); @@ -45,15 +46,15 @@ @Override public TopiaQuery createQueryFindAllParticipantsByPoll(Poll poll) { - String pollAlias = PollenQueryAlias.POLL; + String pollAlias = PollenQueryHelper.ALIAS_POLL; String pollAccountProperty = TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_POLL_ACCOUNT); - String listAlias = PollenQueryAlias.POLL_LIST; + String listAlias = PollenQueryHelper.ALIAS_POLL_ACCOUNT; String listChildProperty = TopiaQuery.getProperty(listAlias, PollAccount.PROPERTY_CHILD); - String participantAlias = PollenQueryAlias.POLL_PARTICIPANT; + String participantAlias = PollenQueryHelper.ALIAS_POLL_ACCOUNT_CHILD; TopiaQuery query = context.createQuery(Poll.class, pollAlias). setSelect(participantAlias). Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -1,6 +1,7 @@ package org.chorem.pollen.entity; -import org.chorem.pollen.PollenQueryAlias; +import org.chorem.pollen.PollenContext; +import org.chorem.pollen.PollenQueryHelper; import org.nuiton.topia.framework.EntityFilter; import org.nuiton.topia.framework.TopiaQuery; @@ -19,45 +20,68 @@ // Filter reference is not always necessary but only used on UserAccount filter.checkReference(UserAccount.class, false); - // ------------------------- PROPERTIES ----------------------------- // +// // ------------------------- PROPERTIES ----------------------------- // +// +// String pollAlias = PollenQueryAlias.POLL; +// String pollCreatorProperty = +// TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_CREATOR); +// String pollAccountProperty = +// TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_POLL_ACCOUNT); +// +// // Property names for participant +// String participantAlias = PollenQueryAlias.POLL_PARTICIPANT; +// String participantUserProperty = +// TopiaQuery.getProperty(participantAlias, +// PollAccount.PROPERTY_USER_ACCOUNT); +// +// // Property names for participant list +// String listAlias = PollenQueryAlias.POLL_LIST; +// String listChildProperty = +// TopiaQuery.getProperty(listAlias, PollAccount.PROPERTY_CHILD); +// +// // participantUser is the reference to filter on if necessary +// filter.setReferenceProperty(participantUserProperty); +// +// // ----------------------- QUERY ------------------------------------ // +// +// StringBuilder orBuilder = new StringBuilder(participantAlias). +// // IN poll.pollAccount (NORMAL) +// append(" IN (").append(listAlias).append(')'). +// append(" OR ").append(participantAlias). +// // IN poll.pollAccount.child (GROUP) +// append(" IN elements(").append(listChildProperty).append(')'). +// append(" OR ").append(participantAlias). +// // = poll.creator (CREATOR) +// append(" = ").append(pollCreatorProperty); +// +// TopiaQuery query = createQuery(pollAlias). +// addDistinct(). +// addLeftJoin(pollAccountProperty, listAlias, false). +// addFrom(PollAccount.class, participantAlias). +// addWhere(orBuilder.toString()). +// addFilter(filter); - String pollAlias = PollenQueryAlias.POLL; - String pollCreatorProperty = - TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_CREATOR); - String pollAccountProperty = - TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_POLL_ACCOUNT); + PollenQueryHelper.PollProperty pollProperty = + PollenQueryHelper.newPollProperty(); + PollenQueryHelper.PollAccountProperty listProperty = + PollenQueryHelper.newPollAccountProperty(); + PollenQueryHelper.PollAccountProperty participantProperty = + PollenQueryHelper.newPollAccountChildProperty(); - // Property names for participant - String participantAlias = PollenQueryAlias.POLL_PARTICIPANT; - String participantUserProperty = - TopiaQuery.getProperty(participantAlias, - PollAccount.PROPERTY_USER_ACCOUNT); - - // Property names for participant list - String listAlias = PollenQueryAlias.POLL_LIST; - String listChildProperty = - TopiaQuery.getProperty(listAlias, PollAccount.PROPERTY_CHILD); - // participantUser is the reference to filter on if necessary - filter.setReferenceProperty(participantUserProperty); + filter.setReferenceProperty(participantProperty.userAccount()); - // ----------------------- QUERY ------------------------------------ // - - StringBuilder orBuilder = new StringBuilder(participantAlias). - // IN poll.pollAccount (NORMAL) - append(" IN (").append(listAlias).append(')'). - append(" OR ").append(participantAlias). - // IN poll.pollAccount.child (GROUP) - append(" IN elements(").append(listChildProperty).append(')'). - append(" OR ").append(participantAlias). - // = poll.creator (CREATOR) - append(" = ").append(pollCreatorProperty); - - TopiaQuery query = createQuery(pollAlias). + TopiaQuery query = PollenQueryHelper.createQuery(pollProperty). addDistinct(). - addLeftJoin(pollAccountProperty, listAlias, false). - addFrom(PollAccount.class, participantAlias). - addWhere(orBuilder.toString()). + addLeftJoin(pollProperty.pollAccount(), listProperty.$alias(), false). + addFrom(PollAccount.class, participantProperty.$alias()). + addWhere(PollenQueryHelper.format( + "$1 IN ($2) OR $1 IN elements($3) OR $1 = $4", + participantProperty.$alias(), + listProperty.$alias(), + listProperty.child(), + pollProperty.creator()) + ). addFilter(filter); return query; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -8,7 +8,7 @@ import org.chorem.pollen.PollenContext; import org.chorem.pollen.PollenDAOHelper; import org.chorem.pollen.PollenException; -import org.chorem.pollen.PollenQueryAlias; +import org.chorem.pollen.PollenQueryHelper; import org.chorem.pollen.bean.UserPoll; import org.chorem.pollen.bean.UserPollImpl; import org.chorem.pollen.common.ChoiceType; @@ -360,7 +360,7 @@ // Filter can be apply on userAccount as reference TopiaQuery query = dao.createQueryFindAllByUser(filter); - query.addSelect(PollenQueryAlias.POLL_PARTICIPANT); + query.addSelect(PollenQueryHelper.ALIAS_POLL_ACCOUNT_CHILD); log.debug("Query : " + query); @@ -394,7 +394,7 @@ return result; } - protected List<UserPoll> retrieveUserPolls(TopiaContext transaction, + protected List<UserPoll> retrieveUserPolls(TopiaContext transaction, TopiaQuery query) throws TopiaException { @@ -436,10 +436,10 @@ CommentDAO dao = PollenDAOHelper.getCommentDAO(transaction); - String pollAlias = PollenQueryAlias.POLL; + String pollAlias = PollenQueryHelper.ALIAS_POLL; String pollCommentProperty = TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_COMMENT); - String commentAlias = PollenQueryAlias.COMMENT; + String commentAlias = PollenQueryHelper.ALIAS_COMMENT; filter.checkReference(Poll.class, true); filter.setReferenceProperty(pollAlias); Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java 2010-06-24 16:34:31 UTC (rev 3033) @@ -8,7 +8,7 @@ import org.chorem.pollen.PollenContext; import org.chorem.pollen.PollenDAOHelper; import org.chorem.pollen.PollenException; -import org.chorem.pollen.PollenQueryAlias; +import org.chorem.pollen.PollenQueryHelper; import org.chorem.pollen.entity.Choice; import org.chorem.pollen.entity.Poll; import org.chorem.pollen.entity.PollAccount; @@ -121,10 +121,10 @@ TopiaQuery query = dao.createQueryFindAllParticipantsByPoll(poll); - String participantAlias = PollenQueryAlias.POLL_PARTICIPANT; + String participantAlias = PollenQueryHelper.ALIAS_POLL_ACCOUNT_CHILD; String pollCreatorProperty = - TopiaQuery.getProperty(PollenQueryAlias.POLL, + TopiaQuery.getProperty(PollenQueryHelper.ALIAS_POLL, Poll.PROPERTY_CREATOR); query.addEquals(participantAlias, participant). @@ -169,7 +169,7 @@ PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(transaction); String participantChoiceProperty = - TopiaQuery.getProperty(PollenQueryAlias.POLL_PARTICIPANT, + TopiaQuery.getProperty(PollenQueryHelper.ALIAS_POLL_ACCOUNT, PollAccount.PROPERTY_CHOICE_VOTE, Vote.PROPERTY_CHOICE); @@ -316,7 +316,7 @@ TopiaQuery query = dao.createQueryFindAllParticipantsByPoll(poll); - String participantAlias = PollenQueryAlias.POLL_PARTICIPANT; + String participantAlias = PollenQueryHelper.ALIAS_POLL_ACCOUNT_CHILD; String participantNameProperty = TopiaQuery.getProperty(participantAlias, Modified: trunk/pollen-business/src/main/xmi/pollen.zargo =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws .classpath *.iml .project target profiles.xml .pollen nbactions.xml .settings + *.ipr .classpath *.iws .project target profiles.xml .pollen .settings nbactions.xml Property changes on: trunk/pollen-votecounting ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings *.ipr *.iws *.iml + *.ipr *.iws .classpath .project target .settings Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 18:58:32 UTC (rev 3032) +++ trunk/pom.xml 2010-06-24 16:34:31 UTC (rev 3033) @@ -319,12 +319,12 @@ <!-- customized versions --> <!--javadoc.version>2.4</javadoc.version--> - <topia.version>2.4-SNAPSHOT</topia.version> - <eugene.version>2.0.2-SNAPSHOT</eugene.version> + <topia.version>2.3.5-SNAPSHOT</topia.version> + <eugene.version>2.0.3-SNAPSHOT</eugene.version> <i18n.version>1.2.2</i18n.version> <tapestry.version>5.1.0.5</tapestry.version> - <nuiton-web.version>0.1-SNAPSHOT</nuiton-web.version> - <nuiton-utils.version>1.3.1-SNAPSHOT</nuiton-utils.version> + <nuiton-web.version>0.1</nuiton-web.version> + <nuiton-utils.version>1.3.1</nuiton-utils.version> <processor.version>1.0.2</processor.version> <!--Multilanguage maven-site -->