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. *