[Openutils-svn] SF.net SVN: openutils:[2821] trunk/openutils-mgnlcriteria/src

[<die...@us...>]

Revision: 2821
          http://openutils.svn.sourceforge.net/openutils/?rev=2821&view=rev
Author:   diego_schivo
Date:     2010-07-16 07:41:22 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
CRIT-15 Restrictions.betweenDates(String, Calendar, Calendar)

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java	2010-07-16 07:33:39 UTC (rev 2820)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java	2010-07-16 07:41:22 UTC (rev 2821)
@@ -43,14 +43,14 @@
  *     .setBasePath("/pets")
  *     .add(Restrictions.contains("@title", "Lucky"))
  *     .add(Restrictions.eq("@petType", "dog"))
- *     .add(Restrictions.between("@birthDate", begin, end))
+ *     .add(Restrictions.betweenDates("@birthDate", begin, end))
  *     .addOrder(Order.desc("@title"));
  * </pre>
  * 
  * will be translated into the following xpath statement
  * 
  * <pre>
- *  //pets//*[((jcr:contains(@title, 'Lucky')) and (@petType='dog') and (@birthDate &gt;=xs:dateTime('1999-01-01T00:00:00.000+00:00') and @birthDate &lt;=xs:dateTime('2001-12-31T23:59:59.000+00:00')))] order by @title descending
+ *  //pets//*[((jcr:contains(@title, 'Lucky')) and (@petType='dog') and (@birthDate &gt;=xs:dateTime('1999-01-01T00:00:00.000+00:00') and @birthDate &lt;=xs:dateTime('2001-12-31T23:59:59.999+00:00')))] order by @title descending
  * </pre>
  * 
  * Furthermore, you may want to have only a subset of the whole result set returned, much like in a MySQL limit clause.
@@ -62,7 +62,7 @@
  *     .createCriteria()
  *     .setWorkspace(ContentRepository.WEBSITE)
  *     .setBasePath("/pets")
- *     .add(Restrictions.between("@birthDate", begin, end))
+ *     .add(Restrictions.betweenDates("@birthDate", begin, end))
  *     .addOrder(Order.asc("@birthDate"))
  *     .setFirstResult(5)
  *     .setMaxResults(5);
@@ -77,7 +77,7 @@
  * <pre>
  * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE)
  *     .setBasePath("/pets")
- *     .add(Restrictions.between("@birthDate", begin, end))
+ *     .add(Restrictions.betweenDates("@birthDate", begin, end))
  *     .addOrder(Order.asc("@birthDate"))
  *     .setPaging(5, 2);
  *</pre>

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2010-07-16 07:33:39 UTC (rev 2820)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2010-07-16 07:41:22 UTC (rev 2821)
@@ -147,7 +147,7 @@
             .createCriteria()
             .setWorkspace(ContentRepository.WEBSITE)
             .setBasePath("/pets")
-            .add(Restrictions.between("@birthDate", begin, end))
+            .add(Restrictions.betweenDates("@birthDate", begin, end))
             .addOrder(Order.asc("@birthDate"))
             .setFirstResult(5)
             .setMaxResults(5);
@@ -185,7 +185,7 @@
         end.set(2001, Calendar.DECEMBER, 31);
 
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE).setBasePath(
-            "/pets").add(Restrictions.between("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")).setPaging(
+            "/pets").add(Restrictions.betweenDates("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")).setPaging(
             5,
             2);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.