implemented tests for what is documented in criteria.adoc

Author: borinquenkid

docs/src/docs/asciidoc/querying/criteria.adoc

@@ -58,12 +58,15 @@ And you can also negate using logical NOT:
 [source,java]
 ----
 not {
-    between("balance", 500, 1000)
-    eq("branch", "London")
+    and{
+        between("balance", 500, 1000)
+        eq("branch", "London")
+    }
+
 }
 ----
 
-All top level conditions are implied to be AND'd together.
+In previous release all top level conditions weere implied to be AND'd together, but this is not supported anymore
 
 
 ==== Querying Associations
@@ -183,135 +186,15 @@ def accountsOverview = c.get {
 Each alias must have a corresponding property or explicit setter on the bean otherwise an exception will be thrown.
 
 
-==== SQL Projections
+==== SQL Projections are not supported in Hibernate 6
 
 
-The criteria DSL provides access to Hibernate's SQL projection API.
 
-[source,java]
-----
-// Box is a domain class...
-class Box {
-    int width
-    int height
-}
-----
+==== sqlRestriction have been removed from Hibernate 6
 
-[source,java]
-----
-// Use SQL projections to retrieve the perimeter and area of all of the Box instances...
-def c = Box.createCriteria()
 
-def results = c.list {
-    projections {
-      sqlProjection '(2 * (width + height)) as perimeter, (width * height) as area', ['perimeter', 'area'], [INTEGER, INTEGER]
-    }
-}
-----
-
-The first argument to the `sqlProjection` method is the SQL which defines the projections.  The second argument is a list of
-Strings which represent column aliases corresponding to the projected values expressed in the SQL.  The third argument
-is a list of `org.hibernate.type.Type` instances which correspond to the projected values expressed in the SQL.  The API
-supports all `org.hibernate.type.Type` objects but constants like INTEGER, LONG, FLOAT etc. are provided by the DSL which
-correspond to all of the types defined in `org.hibernate.type.StandardBasicTypes`.
 
-Consider that the following table represents the data in the
-`BOX` table.
-[format="csv", options="header"]
-|===
 
-width,height
-2,7
-2,8
-2,9
-4,9
-|===
-
-The query above would return results like this:
-
-[source,groovy]
-----
-[[18, 14], [20, 16], [22, 18], [26, 36]]
-----
-
-Each of the inner lists contains the 2 projected values for each `Box`, perimeter and area.
-
-NOTE: Note that if there are other references in scope wherever your criteria query is expressed that have names that conflict
-with any of the type constants described above, the code in your criteria will refer to those references, not the type
-constants provided by the DSL.  In the unlikely event of that happening you can disambiguate the conflict by referring
-to the fully qualified Hibernate type.  For example `StandardBasicTypes.INTEGER` instead of `INTEGER`.
-
-If only 1 value is being projected, the alias and the type do not need to be included in a list.
-
-[source,java]
-----
-def results = c.list {
-    projections {
-      sqlProjection 'sum(width * height) as totalArea', 'totalArea', INTEGER
-    }
-}
-----
-
-That query would return a single result with the value of 84 as the total area of all of the `Box` instances.
-
-The DSL supports grouped projections with the `sqlGroupProjection` method.
-
-[source,java]
-----
-def results = c.list {
-    projections {
-        sqlGroupProjection 'width, sum(height) as combinedHeightsForThisWidth', 'width', ['width', 'combinedHeightsForThisWidth'], [INTEGER, INTEGER]
-    }
-}
-----
-
-The first argument to the `sqlGroupProjection` method is the SQL which defines the projections.  The second argument represents the
-group by clause that should be part of the query.  That string may be single column name or a comma separated list of column
-names.  The third argument is a list of
-Strings which represent column aliases corresponding to the projected values expressed in the SQL.  The fourth argument
-is a list of `org.hibernate.type.Type` instances which correspond to the projected values expressed in the SQL.
-
-The query above is projecting the combined heights of boxes grouped by width and would return results that look like this:
-
-[source,groovy]
-----
-[[2, 24], [4, 9]]
-----
-
-Each of the inner lists contains 2 values.  The first value is a box width and the second value is the sum of the heights
-of all of the boxes which have that width.
-
-
-==== Using SQL Restrictions
-
-
-You can access Hibernate's SQL Restrictions capabilities.
-
-[source,java]
-----
-def c = Person.createCriteria()
-
-def peopleWithShortFirstNames = c.list {
-    sqlRestriction "char_length(first_name) <= 4"
-}
-----
-
-SQL Restrictions may be parameterized to deal with SQL injection vulnerabilities related to dynamic restrictions.
-
-
-[source,java]
-----
-def c = Person.createCriteria()
-
-def peopleWithShortFirstNames = c.list {
-    sqlRestriction "char_length(first_name) < ? AND char_length(first_name) > ?", [maxValue, minValue]
-}
-----
-
-
-NOTE: Note that the parameter there is SQL. The `first_name` attribute referenced in the example refers to the persistence model, not the object model like in HQL queries. The `Person` property named `firstName` is mapped to the `first_name` column in the database and you must refer to that in the `sqlRestriction` string.
-
-Also note that the SQL used here is not necessarily portable across databases.
 
 
 ==== Using Scrollable Results
@@ -324,13 +207,17 @@ You can use Hibernate's https://docs.jboss.org/hibernate/orm/5.6/javadocs/org/hi
 def results = crit.scroll {
     maxResults(10)
 }
-def f = results.first()
-def l = results.last()
-def n = results.next()
-def p = results.previous()
+results.last()
+m =results.get()
+results.previous()
+j = results.get()
+results.first()
+f = results.get()
+results.next()
+b = results.get()
 
 def future = results.scroll(10)
-def accountNumber = results.getLong('number')
+def g = results.get()
 ----
 
 To quote the documentation of Hibernate ScrollableResults:
@@ -342,21 +229,10 @@ ____
 Contrary to JDBC, columns of results are numbered from zero.
 
 
-==== Setting properties in the Criteria instance
+==== The Criteria API is not part of Hibernate 6
 
 
-If a node within the builder tree doesn't match a particular criterion it will attempt to set a property on the Criteria object itself. This allows full access to all the properties in this class. This example calls `setMaxResults` and `setFirstResult` on the https://docs.jboss.org/hibernate/orm/5.6/javadocs/org/hibernate/Criteria.html[Criteria] instance:
 
-[source,java]
-----
-import org.hibernate.FetchMode as FM
-...
-def results = c.list {
-    maxResults(10)
-    firstResult(50)
-    fetchMode("aRelationship", FM.JOIN)
-}
-----
 
 
 ==== Querying with Eager Fetching