November 2013 - Topia-commits - mailman.cloud.codelutin.com

r2880 - in trunk: . topia-persistence topia-service-migration topia-service-replication
by maven-release＠users.nuiton.org Nov. 22, 2013

Nov. 22, 2013

Author: maven-release Date: 2013-11-22 17:37:57 +0100 (Fri, 22 Nov 2013) New Revision: 2880 Url: http://nuiton.org/projects/topia/repository/revisions/2880 Log: [maven-release-plugin] prepare release topia-3.0-alpha-5 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-22 16:35:48 UTC (rev 2879) +++ trunk/pom.xml 2013-11-22 16:37:57 UTC (rev 2880) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -207,12 +207,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-5</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/trunk + scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-5 </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/trunk + http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-5 </url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-11-22 16:35:48 UTC (rev 2879) +++ trunk/topia-persistence/pom.xml 2013-11-22 16:37:57 UTC (rev 2880) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-11-22 16:35:48 UTC (rev 2879) +++ trunk/topia-service-migration/pom.xml 2013-11-22 16:37:57 UTC (rev 2880) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-11-22 16:35:48 UTC (rev 2879) +++ trunk/topia-service-replication/pom.xml 2013-11-22 16:37:57 UTC (rev 2880) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2879 - trunk
by maven-release＠users.nuiton.org Nov. 22, 2013

Nov. 22, 2013

Author: maven-release Date: 2013-11-22 17:35:48 +0100 (Fri, 22 Nov 2013) New Revision: 2879 Url: http://nuiton.org/projects/topia/repository/revisions/2879 Log: Update to mavenpom 4.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-22 16:17:05 UTC (rev 2878) +++ trunk/pom.xml 2013-11-22 16:35:48 UTC (rev 2879) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.1</version> + <version>4.3</version> </parent> <artifactId>topia</artifactId>

1 0

r2878 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by athimel＠users.nuiton.org Nov. 22, 2013

Nov. 22, 2013

Author: athimel Date: 2013-11-22 17:17:05 +0100 (Fri, 22 Nov 2013) New Revision: 2878 Url: http://nuiton.org/projects/topia/repository/revisions/2878 Log: SVN properties and file headers Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java 2013-11-22 16:13:38 UTC (rev 2877) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java 2013-11-22 16:17:05 UTC (rev 2878) @@ -1,5 +1,29 @@ package org.nuiton.topia; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Map; /** Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java 2013-11-22 16:13:38 UTC (rev 2877) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java 2013-11-22 16:17:05 UTC (rev 2878) @@ -1,5 +1,29 @@ package org.nuiton.topia; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Map; /** Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java 2013-11-22 16:13:38 UTC (rev 2877) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java 2013-11-22 16:17:05 UTC (rev 2878) @@ -1,5 +1,29 @@ package org.nuiton.topia; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Map; /** Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java 2013-11-22 16:13:38 UTC (rev 2877) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java 2013-11-22 16:17:05 UTC (rev 2878) @@ -1,5 +1,29 @@ package org.nuiton.topia; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Map; /** Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2877 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org Nov. 22, 2013

Nov. 22, 2013

Author: bleny Date: 2013-11-22 17:13:38 +0100 (Fri, 22 Nov 2013) New Revision: 2877 Url: http://nuiton.org/projects/topia/repository/revisions/2877 Log: fixes TODO by adding throws TopiaNoResultException to findByTopiaId Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-22 14:24:00 UTC (rev 2876) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-22 16:13:38 UTC (rev 2877) @@ -627,9 +627,9 @@ } @Override - public E findByTopiaId(String id) { + public E findByTopiaId(String topiaId) throws TopiaNoResultException { // AThimel 30/10/13 Not using findUnique to avoid querying several elements (cf. findUnique implementation) - E result = forTopiaIdEquals(id).findAny(); + E result = forTopiaIdEquals(topiaId).findAny(); return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2013-11-22 14:24:00 UTC (rev 2876) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2013-11-22 16:13:38 UTC (rev 2877) @@ -24,13 +24,13 @@ * #L% */ -import java.util.List; -import java.util.Map; - +import com.google.common.base.Optional; +import org.nuiton.topia.TopiaNoResultException; import org.nuiton.topia.event.TopiaEntityListener; import org.nuiton.topia.event.TopiaEntityVetoable; -import com.google.common.base.Optional; +import java.util.List; +import java.util.Map; /** * This contract represents the common operation any DAO should @@ -209,12 +209,15 @@ * * @param topiaId the identifier of the entity to look for * @return The entity found - * @throws SomeException when not result is found // TODO AThimel 30/10/13 Find the right exception + * @throws TopiaNoResultException if result is found, if you + * do not want an exception to be raised, use + * {@link #tryFindByTopiaId(String)} */ - E findByTopiaId(String topiaId); + E findByTopiaId(String topiaId) throws TopiaNoResultException; /** - * Tries to find the entity with the given topiaId. If not found, the result.isPresent() will be <code>false</code>. + * Tries to find the entity with the given topiaId. + * If not found, the result.isPresent() will be <code>false</code>. * * @param topiaId the identifier of the entity to look for * @return The entity found wrapped by an Optional

1 0

r2876 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . persistence
by bleny＠users.nuiton.org Nov. 22, 2013

Nov. 22, 2013

Author: bleny Date: 2013-11-22 15:24:00 +0100 (Fri, 22 Nov 2013) New Revision: 2876 Url: http://nuiton.org/projects/topia/repository/revisions/2876 Log: fixes #2915 introduce QueryMissingOrderException, in TopiaQueryBuilderRunQueryStep add throws clauses in signature Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/QueryMissingOrderException.java 2013-11-22 14:24:00 UTC (rev 2876) @@ -0,0 +1,24 @@ +package org.nuiton.topia; + +import java.util.Map; + +/** + * If you get this exception, it means that you asked topia + * to make an operation that need a deterministic way to sort the + * result but you didn't defined such query. + * + * To fix you issue, you may use another API call (maybe user findAny instead + * of findFirst) or change your query by adding an order by clause. A quick and + * easy fix would be to just use "order by topiaId". + * + * @since 3.0 + */ +public class QueryMissingOrderException extends TopiaQueryException { + + protected static final String MESSAGE = "given query needs an order by clause since the API call you use need the results sorting to be deterministic"; + + public QueryMissingOrderException(String hql, Map<String, Object> hqlParameters) { + super(MESSAGE, hql, hqlParameters); + } + +} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-18 14:44:43 UTC (rev 2875) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-22 14:24:00 UTC (rev 2876) @@ -47,6 +47,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.metadata.ClassMetadata; +import org.nuiton.topia.QueryMissingOrderException; import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaHibernateSupport; @@ -413,12 +414,12 @@ return result; } - protected E findUnique(String hql, Map<String, Object> hqlParameters) { + protected E findUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { E result = findUnique(hql, hqlParameters, getEntityClass()); return result; } - protected E findUniqueOrNull(String hql, Map<String, Object> hqlParameters) { + protected E findUniqueOrNull(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { E result = findUniqueOrNull(hql, hqlParameters, getEntityClass()); return result; } @@ -428,22 +429,22 @@ return result; } - protected E findFirst(String hql, Map<String, Object> hqlParameters) { + protected E findFirst(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { E result = findFirst(hql, hqlParameters, getEntityClass()); return result; } - protected E findFirstOrNull(String hql, Map<String, Object> hqlParameters) { + protected E findFirstOrNull(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { E result = findFirstOrNull(hql, hqlParameters, getEntityClass()); return result; } - protected Optional<E> tryFindFirst(String hql, Map<String, Object> hqlParameters) { + protected Optional<E> tryFindFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { Optional<E> result = tryFindFirst(hql, hqlParameters, getEntityClass()); return result; } - protected E findAny(String hql, Map<String, Object> hqlParameters) { + protected E findAny(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { E result = findAny(hql, hqlParameters, getEntityClass()); return result; } @@ -458,7 +459,7 @@ return result; } - protected <R> R findUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <R> R findUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNoResultException, TopiaNonUniqueResultException { R result = findUniqueOrNull(hql, hqlParameters, type); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); @@ -466,13 +467,13 @@ return result; } - protected <R> Optional<R> tryFindUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <R> Optional<R> tryFindUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNonUniqueResultException { R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); Optional<R> result = Optional.fromNullable(uniqueOrNull); return result; } - protected <R> R findUniqueOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <R> R findUniqueOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNonUniqueResultException { List<R> results = findAll(hql, hqlParameters, type, 0, 1); // If there is more than 1 result, throw an exception if (results.size() > 1) { @@ -483,7 +484,7 @@ return result; } - protected <R> R findFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <R> R findFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) throws QueryMissingOrderException { R result = findFirstOrNull(hql, hqlParameters, type); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); @@ -491,19 +492,21 @@ return result; } - protected <R> Optional<R> tryFindFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <R> Optional<R> tryFindFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) throws QueryMissingOrderException { R firstOrNull = findFirstOrNull(hql, hqlParameters, type); Optional<R> result = Optional.fromNullable(firstOrNull); return result; } - protected <R> R findFirstOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { - Preconditions.checkArgument(hql.toLowerCase().contains("order by")); + protected <R> R findFirstOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) throws QueryMissingOrderException { + if ( ! hql.toLowerCase().contains("order by")) { + throw new QueryMissingOrderException(hql, hqlParameters); + } R result = findAnyOrNull(hql, hqlParameters, type); return result; } - protected <R> R findAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <R> R findAny(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNoResultException { R result = findAnyOrNull(hql, hqlParameters, type); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); @@ -712,9 +715,7 @@ String hql2 = hql.toLowerCase(); int i = hql2.indexOf("order by"); if (i == -1) { - throw new IllegalStateException( - "must have a *order by* in hql, " + - "but did not find it in " + hql); + throw new QueryMissingOrderException(hql, params); } // get the count (removing the order-by) @@ -969,37 +970,37 @@ } @Override - public E findUnique() { + public E findUnique() throws TopiaNoResultException, TopiaNonUniqueResultException { return topiaDAO.findUnique(hql, hqlParameters); } @Override - public E findUniqueOrNull() { + public E findUniqueOrNull() throws TopiaNonUniqueResultException { return topiaDAO.findUniqueOrNull(hql, hqlParameters); } @Override - public Optional<E> tryFindUnique() { + public Optional<E> tryFindUnique() throws TopiaNonUniqueResultException { return topiaDAO.tryFindUnique(hql, hqlParameters); } @Override - public E findFirst() { + public E findFirst() throws QueryMissingOrderException, TopiaNoResultException { return topiaDAO.findFirst(hql, hqlParameters); } @Override - public E findFirstOrNull() { + public E findFirstOrNull() throws QueryMissingOrderException { return topiaDAO.findFirstOrNull(hql, hqlParameters); } @Override - public Optional<E> tryFindFirst() { + public Optional<E> tryFindFirst() throws QueryMissingOrderException { return topiaDAO.tryFindFirst(hql, hqlParameters); } @Override - public E findAny() { + public E findAny() throws TopiaNoResultException { return topiaDAO.findAny(hql, hqlParameters); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2013-11-18 14:44:43 UTC (rev 2875) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2013-11-22 14:24:00 UTC (rev 2876) @@ -25,45 +25,90 @@ */ import com.google.common.base.Optional; +import org.nuiton.topia.QueryMissingOrderException; +import org.nuiton.topia.TopiaNoResultException; +import org.nuiton.topia.TopiaNonUniqueResultException; import java.util.List; /** - * @author bleny + * This interface represents different common operations that + * a user may do after a query is defined (using the + * {@link org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaStep}) + * + * There are different methods according to the supposed existence or uniqueness + * of the result. Also some methods may be used only if order is defined in query. + * + * Some methods return an {@link Optional}, but since it's not yet available in JDK, + * we use Guava's. If you don't want your project to require Guava dependency, we + * provide equivalent method named XXXOrNull() for the same purpose. + * + * @since 3.0 */ public interface TopiaQueryBuilderRunQueryStep<E extends TopiaEntity> { + /** + * @return true if the query returns at least one element + */ boolean exists(); + /** + * This method is equivalent as calling {@link java.util.Collection#size()} + * after doing a {@link #findAll()} but it may be faster. + * + * @return the number of that the query would have returned, if executed + */ long count(); - E findUnique(); + E findUnique() throws TopiaNoResultException, TopiaNonUniqueResultException; - E findUniqueOrNull(); + E findUniqueOrNull() throws TopiaNonUniqueResultException; - Optional<E> tryFindUnique(); + Optional<E> tryFindUnique() throws TopiaNonUniqueResultException; /** - * Find first entity for query. - * - * Warning: Query must be ordered for this to run. - * - * @return first entity + * Get the first element of the non-empty result set. + * + * @return the first value from the set of result, + * according to given order. Returned value + * can't be null + * @throws QueryMissingOrderException if you the query + * misses an order clause */ - E findFirst(); + E findFirst() throws QueryMissingOrderException, TopiaNoResultException; /** - * Find first entity for query (or null if no entity is found). - * - * Warning: Query must be ordered for this to run. - * - * @return first entity (or null if no entity is found) + * Get the first element of the result set or null if + * query result was empty. + * + * This method duplicates {@link #tryFindFirst()} + * but allows you to prevent using Guava in you project. + * + * @return the first value from the set of result, + * according to given order, or null of result + * set for given query was empty + * @throws QueryMissingOrderException if you the query + * misses an order clause */ - E findFirstOrNull(); + E findFirstOrNull() throws QueryMissingOrderException; - Optional<E> tryFindFirst(); + /** + * Get the first element of the result set. + * + * This method duplicates {@link #tryFindFirst()} + * but allows you to prevent using Guava in you project. + * + * If the call must return a result, prefer {@link #findFirst()} + * + * @return the first value from the set of result, + * according to given order. It's an optional + * because the query may return no result. + * @throws QueryMissingOrderException if you the query + * misses an order clause + */ + Optional<E> tryFindFirst() throws QueryMissingOrderException; - E findAny(); + E findAny() throws TopiaNoResultException; E findAnyOrNull();

1 0

r2875 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org Nov. 18, 2013

Nov. 18, 2013

Author: echatellier Date: 2013-11-18 15:44:43 +0100 (Mon, 18 Nov 2013) New Revision: 2875 Url: http://nuiton.org/projects/topia/repository/revisions/2875 Log: Add doc about findFirst Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2013-11-15 09:57:02 UTC (rev 2874) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2013-11-18 14:44:43 UTC (rev 2875) @@ -43,8 +43,22 @@ Optional<E> tryFindUnique(); + /** + * Find first entity for query. + * + * Warning: Query must be ordered for this to run. + * + * @return first entity + */ E findFirst(); + /** + * Find first entity for query (or null if no entity is found). + * + * Warning: Query must be ordered for this to run. + * + * @return first entity (or null if no entity is found) + */ E findFirstOrNull(); Optional<E> tryFindFirst();

1 0

r2874 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . persistence
by bleny＠users.nuiton.org Nov. 15, 2013

Nov. 15, 2013

Author: bleny Date: 2013-11-15 10:57:02 +0100 (Fri, 15 Nov 2013) New Revision: 2874 Url: http://nuiton.org/projects/topia/repository/revisions/2874 Log: fixes #2896 introduce TopiaNoResultException and TopiaNonUniqueResultException Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNoResultException.java 2013-11-15 09:57:02 UTC (rev 2874) @@ -0,0 +1,16 @@ +package org.nuiton.topia; + +import java.util.Map; + +/** + * Exception raised when a query returned no result while at least one + * result was expected. + * + * @since 3.0 + */ +public class TopiaNoResultException extends TopiaQueryException { + + public TopiaNoResultException(String hql, Map<String, Object> hqlParameters) { + super("given query doesn't returns any result (at least one expected)", hql, hqlParameters); + } +} Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNonUniqueResultException.java 2013-11-15 09:57:02 UTC (rev 2874) @@ -0,0 +1,17 @@ +package org.nuiton.topia; + +import java.util.Map; + +/** + * Exception raised when a query returns more than one result while it was + * expected to return only one (or no result). + * + * @since 3.0 + */ +public class TopiaNonUniqueResultException extends TopiaQueryException { + + public TopiaNonUniqueResultException(String hql, Map<String, Object> hqlParameters) { + super("given query returns more than one result", hql, hqlParameters); + } + +} Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaQueryException.java 2013-11-15 09:57:02 UTC (rev 2874) @@ -0,0 +1,54 @@ +package org.nuiton.topia; + +import java.util.Map; + +/** + * Exception raised when an error occur in the context of a + * particular query. Catching this exception class allow you + * to get the buggy request and its parameters. + * + * When cathing such an exception you may ease development by + * logging all the provided information given by {@link #getHql()} + * and {@link #getHqlParameters()} but it's considered dangerous + * since parameters can contain sensible data (such as passwords) + * that should not be printed anywhere. + * + * @since 3.0 + */ +public class TopiaQueryException extends TopiaException { + + protected String hql; + + protected Map<String, Object> hqlParameters; + + public TopiaQueryException(String hql, Map<String, Object> hqlParameters) { + this.hql = hql; + this.hqlParameters = hqlParameters; + } + + public TopiaQueryException(String message, String hql, Map<String, Object> hqlParameters) { + super(message); + this.hql = hql; + this.hqlParameters = hqlParameters; + } + + public TopiaQueryException(String message, Throwable cause, String hql, Map<String, Object> hqlParameters) { + super(message, cause); + this.hql = hql; + this.hqlParameters = hqlParameters; + } + + public TopiaQueryException(Throwable cause, String hql, Map<String, Object> hqlParameters) { + super(cause); + this.hql = hql; + this.hqlParameters = hqlParameters; + } + + public String getHql() { + return hql; + } + + public Map<String, Object> getHqlParameters() { + return hqlParameters; + } +} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-15 09:54:20 UTC (rev 2873) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-15 09:57:02 UTC (rev 2874) @@ -52,6 +52,8 @@ import org.nuiton.topia.TopiaHibernateSupport; import org.nuiton.topia.TopiaJpaSupport; import org.nuiton.topia.TopiaListenableSupport; +import org.nuiton.topia.TopiaNoResultException; +import org.nuiton.topia.TopiaNonUniqueResultException; import org.nuiton.topia.TopiaSqlSupport; import org.nuiton.topia.event.TopiaEntityListener; import org.nuiton.topia.event.TopiaEntityVetoable; @@ -459,8 +461,7 @@ protected <R> R findUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { R result = findUniqueOrNull(hql, hqlParameters, type); if (result == null) { - // TODO brendan 30/09/13 throw another exception if no result - throw new TopiaException("query " + hql + " returns no elements"); + throw new TopiaNoResultException(hql, hqlParameters); } return result; } @@ -475,10 +476,7 @@ List<R> results = findAll(hql, hqlParameters, type, 0, 1); // If there is more than 1 result, throw an exception if (results.size() > 1) { - String message = String.format( - "The query '%s' returns more than 1 unique result", hql); - // TODO AThimel 02/08/13 Throw another exception if more than 1 result is found - throw new TopiaException(message); + throw new TopiaNonUniqueResultException(hql, hqlParameters); } // otherwise return the first one, or null R result = Iterables.getOnlyElement(results, null); @@ -488,8 +486,7 @@ protected <R> R findFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { R result = findFirstOrNull(hql, hqlParameters, type); if (result == null) { - // TODO brendan 30/09/13 throw another exception if no result - throw new TopiaException("query " + hql + " returns no elements"); + throw new TopiaNoResultException(hql, hqlParameters); } return result; } @@ -509,8 +506,7 @@ protected <R> R findAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { R result = findAnyOrNull(hql, hqlParameters, type); if (result == null) { - // TODO brendan 30/09/13 throw another exception if no result - throw new TopiaException(String.format("Query '%s' returns no elements", hql)); + throw new TopiaNoResultException(hql, hqlParameters); } return result; } @@ -803,18 +799,36 @@ } @Override + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotEquals(String property, Object value) { + hqlAndParametersBuilder.addNotEquals(property, value); + return this; + } + + @Override public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Iterable<Object> values) { hqlAndParametersBuilder.addIn(property, values); return this; } @Override + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotIn(String property, Iterable<Object> values) { + hqlAndParametersBuilder.addNotIn(property, values); + return this; + } + + @Override public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addContains(String property, Object value) { hqlAndParametersBuilder.addContains(property, value); return this; } @Override + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotContains(String property, Object value) { + hqlAndParametersBuilder.addNotContains(property, value); + return this; + } + + @Override public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNull(String property) { hqlAndParametersBuilder.addNull(property); return this;

1 0

r2873 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by bleny＠users.nuiton.org Nov. 15, 2013

Nov. 15, 2013

Author: bleny Date: 2013-11-15 10:54:20 +0100 (Fri, 15 Nov 2013) New Revision: 2873 Url: http://nuiton.org/projects/topia/repository/revisions/2873 Log: remove generated context field in ApplicationContext Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java 2013-11-15 09:51:40 UTC (rev 2872) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java 2013-11-15 09:54:20 UTC (rev 2873) @@ -35,7 +35,6 @@ import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.topia.AbstractTopiaApplicationContext; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.topia.persistence.util.EntityOperatorStore; @@ -131,9 +130,7 @@ } -// addImport(output, TopiaDAO.class); addImport(output, TopiaEntity.class); -// addImport(output, TopiaContext.class); addImport(output, Array.class); addImport(output, Array.class); @@ -142,10 +139,6 @@ addImport(output, EntityOperatorStore.class); } - // add context field - addAttribute(output, "context", TopiaContext.class, null, - ObjectModelJavaModifier.PROTECTED); - // add public constructor ObjectModelOperation constructor = addConstructor( output,

1 0

r2872 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org Nov. 15, 2013

Nov. 15, 2013

Author: bleny Date: 2013-11-15 10:51:40 +0100 (Fri, 15 Nov 2013) New Revision: 2872 Url: http://nuiton.org/projects/topia/repository/revisions/2872 Log: fixes #2910 add addNotEquals addNotIn addNotContains in API and HQL builder Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-11-08 12:22:43 UTC (rev 2871) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-11-15 09:51:40 UTC (rev 2872) @@ -107,16 +107,46 @@ } } + public void addNotEquals(String property, Object value) { + Preconditions.checkNotNull(property); + // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive types + // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type + if (value == null) { + addNotNull(property); + } else { + String hqlParameterName = putHqlParameterWithAvailableName(property, value); + whereClauses.add(alias + "." + property + " != :" + hqlParameterName); + } + } + public void addIn(String property, Iterable<Object> values) { + addInOrNotIn(property, values, true); + } + + public void addNotIn(String property, Iterable<Object> values) { + addInOrNotIn(property, values, false); + } + + /** + * @param in true if property value must be in given collection, false if value + * must not be in given collection + */ + protected void addInOrNotIn(String property, Iterable<Object> values, boolean in) { Preconditions.checkNotNull(property); Preconditions.checkNotNull(values); // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive - Preconditions.checkArgument(!Iterables.isEmpty(values)); + String aliasedProperty = alias + "." + property; if (Iterables.size(values) == 1) { - addEquals(property, Iterables.getOnlyElement(values)); + // if there is only one possible value, replace "in" clause by a "=" clause + Object onlyElement = Iterables.getOnlyElement(values); + if (in) { + addEquals(property, onlyElement); + } else { + addNotEquals(property, onlyElement); + } } else { - boolean propertyMayBeNull = false; + boolean propertyMayBeNull = false; // true if values contains null Set<String> hqlParameterNames = Sets.newLinkedHashSet(); for (Object value : values) { if (value == null) { @@ -126,21 +156,33 @@ hqlParameterNames.add(hqlParameterName); } } - String inClause = alias + "." + property + " in (:" + StringUtils.join(hqlParameterNames, ", :")+ ")"; - String whereClause = inClause; - if (propertyMayBeNull) { - whereClause = alias + "." + property + " is null or " + inClause; + String whereClause; + if (in) { + String inClause = aliasedProperty + " in (:" + StringUtils.join(hqlParameterNames, ", :")+ ")"; + if (propertyMayBeNull) { + whereClause = aliasedProperty + " is null or " + inClause; + } else { + whereClause = inClause; + } + } else { + String inClause = aliasedProperty + " not in (:" + StringUtils.join(hqlParameterNames, ", :") + ")"; + if (propertyMayBeNull) { + whereClause = aliasedProperty + " is not null and " + inClause; + } else { + whereClause = inClause; + } } whereClauses.add(whereClause); } } public void addTopiaIdEquals(String property, String topiaId) { - addEquals(alias + "." + property + "." + TopiaEntity.PROPERTY_TOPIA_ID, topiaId); + Preconditions.checkNotNull(topiaId); + addEquals(property + "." + TopiaEntity.PROPERTY_TOPIA_ID, topiaId); } public void addTopiaIdIn(String property, Iterable<String> topiaIds) { - addIn(alias + "." + property + "." + TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds); + addIn(property + "." + TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds); } public void addContains(String property, Object value) { @@ -148,6 +190,11 @@ whereClauses.add(":" + hqlParameterName + " in elements(" + alias + "." + property + ")"); } + public void addNotContains(String property, Object value) { + String hqlParameterName = putHqlParameterWithAvailableName(property, value); + whereClauses.add(":" + hqlParameterName + " not in elements(" + alias + "." + property + ")"); + } + public void addWhereClause(String whereClause) { whereClauses.add(whereClause); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2013-11-08 12:22:43 UTC (rev 2871) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2013-11-15 09:51:40 UTC (rev 2872) @@ -46,20 +46,41 @@ /** * @param property the name of a field of the queried entity, must be + * a one-to-one or a many-to-one property. + * @param value the value the field of the entity must not be equals to argument + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotEquals(String property, Object value); + + /** + * @param property the name of a field of the queried entity, must be * a one-to-one or a many-to-one property - * @param values the value the field of the entity must be equals to argument + * @param values the value the field of the entity must be equals to one of the given values */ TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Iterable<Object> values); /** * @param property the name of a field of the queried entity, must be + * a one-to-one or a many-to-one property + * @param values the value the field of the entity must not be equals to any of the given values + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotIn(String property, Iterable<Object> values); + + /** + * @param property the name of a field of the queried entity, must be * a one-to-many or a many-to-many property - * @param value the value the field of the entity must be equals to argument + * @param value the property of the entity must be a collection that contains value */ TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addContains(String property, Object value); /** * @param property the name of a field of the queried entity, must be + * a one-to-many or a many-to-many property + * @param value the property of the entity must be a collection that doesn't contain value + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotContains(String property, Object value); + + /** + * @param property the name of a field of the queried entity, must be * a one-to-one or a many-to-one property */ TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNull(String property); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2013-11-08 12:22:43 UTC (rev 2871) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2013-11-15 09:51:40 UTC (rev 2872) @@ -24,24 +24,93 @@ * #L% */ +import com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; +import java.util.Collection; + public class HqlAndParametersBuilderTest { + protected HqlAndParametersBuilder hqlAndParametersBuilder = + new HqlAndParametersBuilder(TopiaEntity.class); + + protected static final Collection<String> SOME_VALUES = + Lists.newArrayList("value1", "value2", "value3"); + + protected static final Collection<String> SOME_VALUES_WITH_NULL = + Lists.newArrayList("value1", "value2", null, "value3"); + @Test public void testFindAvailableHqlParameterName() { - HqlAndParametersBuilder hqlAndParametersBuilderTest = - new HqlAndParametersBuilder(TopiaEntity.class); + String availableHqlParameterName1 = hqlAndParametersBuilder.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); + String availableHqlParameterName2 = hqlAndParametersBuilder.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); - String availableHqlParameterName1 = hqlAndParametersBuilderTest.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); - String availableHqlParameterName2 = hqlAndParametersBuilderTest.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); - Assert.assertNotEquals(availableHqlParameterName1, availableHqlParameterName2); Assert.assertFalse(availableHqlParameterName1.contains(".")); Assert.assertFalse(availableHqlParameterName2.contains(".")); } + @Test + public void testEqualsNull() { + + hqlAndParametersBuilder.addEquals("myProp", null); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertFalse(actualHql.contains("myProp = null")); + Assert.assertTrue(actualHql.contains("myProp is null")); + + } + + @Test + public void testAddInWithNull() { + + hqlAndParametersBuilder.addIn("myProp", SOME_VALUES_WITH_NULL); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp is null or topiaEntity_.myProp in (")); + Assert.assertEquals( + SOME_VALUES_WITH_NULL.size() - 1, // there should be as many argument as in collection minus 1 because null is removed + hqlAndParametersBuilder.getHqlParameters().size()); + + } + + @Test + public void testAddNotEqualsToValue() { + + hqlAndParametersBuilder.addNotEquals("myProp", "value"); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp != ")); + Assert.assertFalse(actualHql.contains("myProp = ")); + + } + + @Test + public void testAddNotEqualsToNull() { + + hqlAndParametersBuilder.addNotEquals("myProp", null); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp is not null")); + + } + + @Test + public void testAddNotInWithNull() { + + hqlAndParametersBuilder.addNotIn("myProp", SOME_VALUES_WITH_NULL); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp is not null and ")); + + } + }

1 0

r2871 - trunk/src/site/rst
by bleny＠users.nuiton.org Nov. 8, 2013

Nov. 8, 2013

Author: bleny Date: 2013-11-08 13:22:43 +0100 (Fri, 08 Nov 2013) New Revision: 2871 Url: http://nuiton.org/projects/topia/repository/revisions/2871 Log: add instructions to rename DAOs in topia 3.0 migration doc Modified: trunk/src/site/rst/migrate_to_3.0.rst Modified: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst 2013-11-08 12:16:32 UTC (rev 2870) +++ trunk/src/site/rst/migrate_to_3.0.rst 2013-11-08 12:22:43 UTC (rev 2871) @@ -66,12 +66,17 @@ TopiaId ------- -|RECOMMENDED| +|MANDATORY| La classe sera supprimée. Pour manipuler les topiaId, il faut utiliser le **TopiaIdFactory**. +La forme des topiaIds générés à changé. Si vous souhaitez conserver l'ancienne forme parce que vous +souhaitez conserver l'uniformité avec une base de données existante ou si vous utilisez +topia-service-security, vous devez explicitement le spécifier à Topia 3.0 via la configuration : + ``topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.LegacyTopiaIdFactory`` + TopiaContextImplementor est déprécié ------------------------------------ @@ -136,7 +141,7 @@ |RECOMMENDED| -Si vous utilisiez explicitment le Transformer de DAO dans la configuration de votre plugin Eugene, il faut maintenant +Si vous utilisiez explicitement le Transformer de DAO dans la configuration de votre plugin Eugene, il faut maintenant changer le nouveau Transformer : org.nuiton.topia.generator.EntityDaoTransformer Exemple de configuration : @@ -166,10 +171,10 @@ -|RECOMMENDED| +|MANDATORY| -Si vous aviez surchargé certains des Dao générés, vous devrez probablement les renommer et changer leur signature. -Surveillez les logs de génération des Dao à la recherche des messages tels que : +Si vous aviez surchargé certains des DAO générés, vous devrez probablement les renommer et changer leur signature. +Surveillez les logs de génération des DAO à la recherche des messages tels que : :: @@ -177,20 +182,24 @@ - You should consider renaming 'org.project.entities.ZoneDAOImpl' to 'org.project.entities.AbstractZoneTopiaDao' - Expected class declaration is : public class AbstractZoneTopiaDao<E extends Zone> extends GeneratedZoneTopiaDao<E> { +Pour l'entité Zone, vous devez supprimer votre ZoneDAO et votre ZoneDAOImpl et déplacer les méthodes +* dans ZoneTopiaDao si la méthode ne peut être utilisée seulement pour l'entité Zone (et pas les sous-classes de Zone) +* dans AbstractZoneTopiaDao si la méthode peut être utilisée pour Zone ET les entités qui héritent de Zone + Méthodes findAll, find et findUnique sur TopiaContext ----------------------------------------------------- |MANDATORY| -Si vous utilisiez ces méthodes, il est désormais recommandé de les utiliser méthodes sur le Dao associé à votre éntité +Si vous utilisiez ces méthodes, il est désormais recommandé d'utiliser les méthodes sur le DAO associé à votre éntité ou par l'intermédiare du **TopiaJpaSupport**. -Depuis un Dao surchargé +Depuis un DAO surchargé ~~~~~~~~~~~~~~~~~~~~~~~ Pour faciliter la migration, ces méthodes ont été portées sur l'interface deprecated **TopiaDAO**. Donc si dans votre -Dao vous faisiez : +DAO vous faisiez : :: @@ -206,7 +215,8 @@ ~~~~~~~~~~~~~~~~~ Dans tous les cas, ces méthodes étant dépréciées, vous devriez consulter leur Javadoc pour savoir par quels appels de -méthodes les remplacer. +méthodes les remplacer. S'il n'y pas de documentation, il faut remplacer le code appellant par le corps de la méthode dépréciée +(fonctionnalité « inline » dans l'IDE).

1 0

r2870 - trunk/topia-service-migration
by athimel＠users.nuiton.org Nov. 8, 2013

Nov. 8, 2013

Author: athimel Date: 2013-11-08 13:16:32 +0100 (Fri, 08 Nov 2013) New Revision: 2870 Url: http://nuiton.org/projects/topia/repository/revisions/2870 Log: refs #2785 Declare module topia-service-migration as the latest in the build Modified: trunk/topia-service-migration/pom.xml Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-11-08 11:54:04 UTC (rev 2869) +++ trunk/topia-service-migration/pom.xml 2013-11-08 12:16:32 UTC (rev 2870) @@ -38,6 +38,11 @@ <name>ToPIA :: Service Migration</name> <description>Hibernate based migration service</description> + <properties> +  + <skipPostRelease>false</skipPostRelease> + </properties> + <dependencies>

1 0

[ANN] - ToPIA 3.0-alpha-4 released
by nuiton.org Release Notification Nov. 8, 2013

Nov. 8, 2013

The ToPIA team is pleased to announce the topia-3.0-alpha-4 release! Tools for Portable and Independent Architecture : Framework de persistance et de distribution d'application. Documentation of the project can be found here: http://maven-site.nuiton.org/topia Changes ------- Changes in this version include: New features: o Make DAOHelper instantiable and not static anymore Issue: 1468. Thanks to Florian DESBOIS. Resolved by tchemit. Changes: o Update to EUGene 2.7.3 Issue: 2903. Thanks to Arnaud Thimel. Resolved by athimel. o See if a new query API can be used Issue: 2087. Thanks to Arnaud Thimel. Resolved by bleny. o Remove module topia-service-security Issue: 2785. Thanks to Arnaud Thimel. Resolved by athimel. o Review DAOs naming Issue: 2086. Thanks to Arnaud Thimel. Resolved by bleny. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|${announceParameters.releaseProjec… Have fun! -ToPIA team

1 0

r2869 - in trunk: . topia-persistence topia-service-migration topia-service-replication
by maven-release＠users.nuiton.org Nov. 8, 2013

Nov. 8, 2013

Author: maven-release Date: 2013-11-08 12:54:04 +0100 (Fri, 08 Nov 2013) New Revision: 2869 Url: http://nuiton.org/projects/topia/repository/revisions/2869 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-08 11:54:01 UTC (rev 2868) +++ trunk/pom.xml 2013-11-08 11:54:04 UTC (rev 2869) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-alpha-4</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -207,12 +207,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-4</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-4 + scm:svn:http://svn.nuiton.org/svn/topia/trunk </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-4 + http://nuiton.org/projects/topia/repository/show/trunk </url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-11-08 11:54:01 UTC (rev 2868) +++ trunk/topia-persistence/pom.xml 2013-11-08 11:54:04 UTC (rev 2869) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-11-08 11:54:01 UTC (rev 2868) +++ trunk/topia-service-migration/pom.xml 2013-11-08 11:54:04 UTC (rev 2869) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-11-08 11:54:01 UTC (rev 2868) +++ trunk/topia-service-replication/pom.xml 2013-11-08 11:54:04 UTC (rev 2869) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2868 - in tags: . topia-3.0-alpha-4
by maven-release＠users.nuiton.org Nov. 8, 2013

Nov. 8, 2013

Author: maven-release Date: 2013-11-08 12:54:01 +0100 (Fri, 08 Nov 2013) New Revision: 2868 Url: http://nuiton.org/projects/topia/repository/revisions/2868 Log: [maven-release-plugin] copy for tag topia-3.0-alpha-4 Added: tags/topia-3.0-alpha-4/ Property changes on: tags/topia-3.0-alpha-4 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2867 - in trunk: . topia-persistence topia-service-migration topia-service-replication
by maven-release＠users.nuiton.org Nov. 8, 2013

Nov. 8, 2013

Author: maven-release Date: 2013-11-08 12:53:57 +0100 (Fri, 08 Nov 2013) New Revision: 2867 Url: http://nuiton.org/projects/topia/repository/revisions/2867 Log: [maven-release-plugin] prepare release topia-3.0-alpha-4 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-08 11:51:51 UTC (rev 2866) +++ trunk/pom.xml 2013-11-08 11:53:57 UTC (rev 2867) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-4</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -207,12 +207,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-4</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/trunk + scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-4 </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/trunk + http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-4 </url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-11-08 11:51:51 UTC (rev 2866) +++ trunk/topia-persistence/pom.xml 2013-11-08 11:53:57 UTC (rev 2867) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-11-08 11:51:51 UTC (rev 2866) +++ trunk/topia-service-migration/pom.xml 2013-11-08 11:53:57 UTC (rev 2867) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-11-08 11:51:51 UTC (rev 2866) +++ trunk/topia-service-replication/pom.xml 2013-11-08 11:53:57 UTC (rev 2867) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-4</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2866 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org Nov. 8, 2013

Nov. 8, 2013

Author: athimel Date: 2013-11-08 12:51:51 +0100 (Fri, 08 Nov 2013) New Revision: 2866 Url: http://nuiton.org/projects/topia/repository/revisions/2866 Log: SVN properties and file headers Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java 2013-11-08 09:38:02 UTC (rev 2865) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java 2013-11-08 11:51:51 UTC (rev 2866) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContext; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2013-11-08 09:38:02 UTC (rev 2865) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2013-11-08 11:51:51 UTC (rev 2866) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.List; import java.util.Map; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java 2013-11-08 09:38:02 UTC (rev 2865) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java 2013-11-08 11:51:51 UTC (rev 2866) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + public interface TopiaQueryBuilderAddCriteriaOrRunQueryStep<E extends TopiaEntity> extends TopiaQueryBuilderAddCriteriaStep<E>, TopiaQueryBuilderRunQueryStep<E> { } Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2013-11-08 09:38:02 UTC (rev 2865) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2013-11-08 11:51:51 UTC (rev 2866) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Set; /** Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2013-11-08 09:38:02 UTC (rev 2865) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2013-11-08 11:51:51 UTC (rev 2866) @@ -1,5 +1,29 @@ package org.nuiton.topia.persistence; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.base.Optional; import java.util.List; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2865 - trunk
by athimel＠users.nuiton.org Nov. 8, 2013

Nov. 8, 2013

Author: athimel Date: 2013-11-08 10:38:02 +0100 (Fri, 08 Nov 2013) New Revision: 2865 Url: http://nuiton.org/projects/topia/repository/revisions/2865 Log: fixes #2903 Update to EUGene 2.7.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-04 15:36:32 UTC (rev 2864) +++ trunk/pom.xml 2013-11-08 09:38:02 UTC (rev 2865) @@ -230,7 +230,7 @@ <relativizeDecorationLinks>false</relativizeDecorationLinks>  - <eugeneVersion>2.7.3-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.7.3</eugeneVersion> <nuitonUtilsVersion>2.7</nuitonUtilsVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-1</nuitonDecoratorVersion>

1 0

r2864 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org Nov. 4, 2013

Nov. 4, 2013

Author: bleny Date: 2013-11-04 16:36:32 +0100 (Mon, 04 Nov 2013) New Revision: 2864 Url: http://nuiton.org/projects/topia/repository/revisions/2864 Log: add addNotNull(property) method in AddCriteriaStep refs #2087 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-10-31 22:53:01 UTC (rev 2863) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-04 15:36:32 UTC (rev 2864) @@ -821,6 +821,12 @@ } @Override + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotNull(String property) { + hqlAndParametersBuilder.addNotNull(property); + return this; + } + + @Override public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdEquals(String property, String topiaId) { hqlAndParametersBuilder.addTopiaIdEquals(property, topiaId); return this; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-10-31 22:53:01 UTC (rev 2863) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-11-04 15:36:32 UTC (rev 2864) @@ -77,6 +77,10 @@ whereClauses.add(alias + "." + property + " is null"); } + public void addNotNull(String property) { + whereClauses.add(alias + "." + property + " is not null"); + } + public void setParameters(Map<String, Object> parameters) { this.parameters = parameters; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2013-10-31 22:53:01 UTC (rev 2863) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2013-11-04 15:36:32 UTC (rev 2864) @@ -41,6 +41,12 @@ TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNull(String property); /** + * @param property the name of a field of the queried entity, must be + * a one-to-one or a many-to-one property + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotNull(String property); + + /** * This method has the same behavior as {@link #addEquals(String, Object)} but * you don't need to have the entity but only the topiaId. *

1 0