4:02 a.m.
Author: d.plentz
Date: 2007-07-08 05:02:58 -0400 (Sun, 08 Jul 2007)
New Revision: 12746
Modified:
core/trunk/code/core/src/main/java/org/hibernate/criterion/Expression.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java
core/trunk/code/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java
Log:
[HHH-2551] Deprecate org.hibernate.criterion.Expression
Modified: core/trunk/code/core/src/main/java/org/hibernate/criterion/Expression.java
===================================================================
--- core/trunk/code/core/src/main/java/org/hibernate/criterion/Expression.java 2007-07-08
08:47:10 UTC (rev 12745)
+++ core/trunk/code/core/src/main/java/org/hibernate/criterion/Expression.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -4,10 +4,8 @@
import org.hibernate.type.Type;
import org.hibernate.util.ArrayHelper;
-
/**
- * This class is semi-deprecated. Use <tt>Restrictions</tt>.
- *
+ * @deprecated Use <tt>Restrictions</tt>.
* @see Restrictions
* @author Gavin King
*/
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -16,7 +16,6 @@
import org.hibernate.cfg.Environment;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Example;
-import org.hibernate.criterion.Expression;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projection;
@@ -397,8 +396,8 @@
.add( Projections.property("studentNumber"), "stNumber" )
.add( Projections.property("courseCode"), "cCode" ) )
)
- .add( Expression.gt( "studentNumber", new Long(665) ) )
- .add( Expression.lt( "studentNumber", new Long(668) ) )
+ .add( Restrictions.gt( "studentNumber", new Long(665) ) )
+ .add( Restrictions.lt( "studentNumber", new Long(668) ) )
.addOrder( Order.asc("stNumber") )
.setResultTransformer(Criteria.ALIAS_TO_ENTITY_MAP)
.list();
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -18,15 +18,15 @@
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.cache.CacheKey;
import org.hibernate.cache.entry.CollectionCacheEntry;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.engine.SessionImplementor;
import org.hibernate.impl.SessionFactoryImpl;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.transform.DistinctRootEntityResultTransformer;
@@ -195,7 +195,7 @@
log.info( "Criteria query against Product..." );
List products = session.createCriteria( Product.class )
- .add( Expression.eq( "stockNumber", new Integer( 124 ) ) )
+ .add( Restrictions.eq( "stockNumber", new Integer( 124 ) ) )
.list();
assertEquals( "Incorrect product count", 1, products.size() );
@@ -273,7 +273,7 @@
Product prod = ( Product ) session.createCriteria( Product.class )
.setResultTransformer( new DistinctRootEntityResultTransformer() )
- .add( Expression.eq( "id", testData.prod1Id ) )
+ .add( Restrictions.eq( "id", testData.prod1Id ) )
.uniqueResult();
assertNotNull( prod );
@@ -413,7 +413,7 @@
Session session = openSession();
List result = session.createCriteria( Product.class )
- .add( Expression.eq( "id", testData.prod1Id ) )
+ .add( Restrictions.eq( "id", testData.prod1Id ) )
.list();
Product prod = ( Product ) result.get( 0 );
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -11,8 +11,8 @@
import org.hibernate.LockMode;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.criterion.Expression;
import org.hibernate.criterion.Property;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -96,7 +96,7 @@
if ( supportsRowValueConstructorSyntaxInInList() ) {
s.createCriteria(Person.class).add(
- Expression.in("address", new Address[] { mark.getAddress(),
joe.getAddress() } )
+ Restrictions.in("address", new Address[] { mark.getAddress(),
joe.getAddress() } )
).list();
}
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -40,15 +40,17 @@
import org.hibernate.connection.ConnectionProvider;
import org.hibernate.connection.DriverManagerConnectionProvider;
import org.hibernate.criterion.Example;
-import org.hibernate.criterion.Expression;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.InterbaseDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.PointbaseDialect;
@@ -56,8 +58,6 @@
import org.hibernate.dialect.SAPDBDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.mapping.RootClass;
@@ -1801,10 +1801,10 @@
s.flush();
List list = s.createCriteria(Foo.class)
- .add( Expression.eq( "integer", f.getInteger() ) )
- .add( Expression.eqProperty("integer", "integer") )
- .add( Expression.like( "string", f.getString().toUpperCase() ).ignoreCase()
)
- .add( Expression.in( "boolean", new Boolean[] { f.getBoolean(),
f.getBoolean() } ) )
+ .add( Restrictions.eq( "integer", f.getInteger() ) )
+ .add( Restrictions.eqProperty("integer", "integer") )
+ .add( Restrictions.like( "string", f.getString().toUpperCase()
).ignoreCase() )
+ .add( Restrictions.in( "boolean", new Boolean[] { f.getBoolean(),
f.getBoolean() } ) )
.setFetchMode("foo", FetchMode.JOIN)
.setFetchMode("baz", FetchMode.SELECT)
.setFetchMode("abstracts", FetchMode.JOIN)
@@ -1812,12 +1812,12 @@
assertTrue( list.size()==1 && list.get(0)==f );
list = s.createCriteria(Foo.class).add(
- Expression.disjunction()
- .add( Expression.eq( "integer", f.getInteger() ) )
- .add( Expression.like( "string", f.getString() ) )
- .add( Expression.eq( "boolean", f.getBoolean() ) )
+ Restrictions.disjunction()
+ .add( Restrictions.eq( "integer", f.getInteger() ) )
+ .add( Restrictions.like( "string", f.getString() ) )
+ .add( Restrictions.eq( "boolean", f.getBoolean() ) )
)
- .add( Expression.isNotNull("boolean") )
+ .add( Restrictions.isNotNull("boolean") )
.list();
assertTrue( list.size()==1 && list.get(0)==f );
@@ -1847,12 +1847,12 @@
assertTrue( "Example API without like did not work correctly, size was " +
list.size(), list.size()==1 && list.get(0)==f );
list = s.createCriteria(Foo.class)
- .add( Expression.or(
- Expression.and(
- Expression.eq( "integer", f.getInteger() ),
- Expression.like( "string", f.getString() )
+ .add( Restrictions.or(
+ Restrictions.and(
+ Restrictions.eq( "integer", f.getInteger() ),
+ Restrictions.like( "string", f.getString() )
),
- Expression.eq( "boolean", f.getBoolean() )
+ Restrictions.eq( "boolean", f.getBoolean() )
) )
.list();
assertTrue( list.size()==1 && list.get(0)==f );
@@ -1890,10 +1890,10 @@
s = openSession();
txn = s.beginTransaction();
list = s.createCriteria(Foo.class)
- .add( Expression.eq( "integer", f.getInteger() ) )
- .add( Expression.like( "string", f.getString() ) )
- .add( Expression.in( "boolean", new Boolean[] { f.getBoolean(),
f.getBoolean() } ) )
- .add( Expression.isNotNull("foo") )
+ .add( Restrictions.eq( "integer", f.getInteger() ) )
+ .add( Restrictions.like( "string", f.getString() ) )
+ .add( Restrictions.in( "boolean", new Boolean[] { f.getBoolean(),
f.getBoolean() } ) )
+ .add( Restrictions.isNotNull("foo") )
.setFetchMode("foo", FetchMode.EAGER)
.setFetchMode("baz", FetchMode.LAZY)
.setFetchMode("component.glarch", FetchMode.LAZY)
@@ -4447,7 +4447,7 @@
assertTrue( l.getCountryCode().equals("AU") );
assertTrue( l.getCity().equals("Melbourne") );
assertTrue( l.getLocale().equals( Locale.getDefault() ) );
- assertTrue( s.createCriteria(Location.class).add( Expression.eq(
"streetNumber", new Integer(300) ) ).list().size()==1 );
+ assertTrue( s.createCriteria(Location.class).add( Restrictions.eq(
"streetNumber", new Integer(300) ) ).list().size()==1 );
s.connection().commit();
s.close();
Modified: core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -31,14 +31,14 @@
import org.hibernate.Query;
import org.hibernate.Transaction;
import org.hibernate.classic.Session;
-import org.hibernate.criterion.Expression;
import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.PointbaseDialect;
import org.hibernate.dialect.TimesTenDialect;
-import org.hibernate.dialect.Dialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.transform.Transformers;
import org.hibernate.type.DateType;
@@ -107,10 +107,9 @@
s.close();
s = openSession();
Fum b = (Fum) s.createCriteria(Fum.class).add(
- Expression.in("fum", new String[] { "a value", "no
value" } )
+ Restrictions.in("fum", new String[] { "a value", "no
value" } )
)
.uniqueResult();
- //assertTrue( Hibernate.isInitialized( b.getMapComponent().getFummap() ) );
assertTrue( Hibernate.isInitialized( b.getMapComponent().getStringmap() ) );
assertTrue( b.getMapComponent().getFummap().size()==1 );
assertTrue( b.getMapComponent().getStringmap().size()==2 );
@@ -140,21 +139,21 @@
s.save(fum);
Criteria base = s.createCriteria(Fum.class)
- .add( Expression.like("fum", "f", MatchMode.START) );
+ .add( Restrictions.like("fum", "f", MatchMode.START) );
base.createCriteria("fo")
- .add( Expression.isNotNull("fum") );
+ .add( Restrictions.isNotNull("fum") );
base.createCriteria("friends")
- .add( Expression.like("fum", "g%") );
+ .add( Restrictions.like("fum", "g%") );
List list = base.list();
assertTrue( list.size()==1 && list.get(0)==fum );
base = s.createCriteria(Fum.class)
- .add( Expression.like("fum", "f%") )
+ .add( Restrictions.like("fum", "f%") )
.setResultTransformer(Criteria.ALIAS_TO_ENTITY_MAP);
base.createCriteria("fo", "fo")
- .add( Expression.isNotNull("fum") );
+ .add( Restrictions.isNotNull("fum") );
base.createCriteria("friends", "fum")
- .add( Expression.like("fum", "g", MatchMode.START) );
+ .add( Restrictions.like("fum", "g", MatchMode.START) );
Map map = (Map) base.uniqueResult();
assertTrue(
@@ -165,11 +164,11 @@
);
base = s.createCriteria(Fum.class)
- .add( Expression.like("fum", "f%") )
+ .add( Restrictions.like("fum", "f%") )
.setResultTransformer(Criteria.ALIAS_TO_ENTITY_MAP)
.setFetchMode("friends", FetchMode.EAGER);
base.createCriteria("fo", "fo")
- .add( Expression.eq( "fum", fum.getFo().getFum() ) );
+ .add( Restrictions.eq( "fum", fum.getFo().getFum() ) );
map = (Map) base.list().get(0);
assertTrue(
@@ -181,11 +180,11 @@
list = s.createCriteria(Fum.class)
.createAlias("friends", "fr")
.createAlias("fo", "fo")
- .add( Expression.like("fum", "f%") )
- .add( Expression.isNotNull("fo") )
- .add( Expression.isNotNull("fo.fum") )
- .add( Expression.like("fr.fum", "g%") )
- .add( Expression.eqProperty("fr.id.short", "id.short") )
+ .add( Restrictions.like("fum", "f%") )
+ .add( Restrictions.isNotNull("fo") )
+ .add( Restrictions.isNotNull("fo.fum") )
+ .add( Restrictions.like("fr.fum", "g%") )
+ .add( Restrictions.eqProperty("fr.id.short", "id.short") )
.list();
assertTrue( list.size()==1 && list.get(0)==fum );
txn.commit();
@@ -194,11 +193,11 @@
s = openSession();
txn = s.beginTransaction();
base = s.createCriteria(Fum.class)
- .add( Expression.like("fum", "f%") );
+ .add( Restrictions.like("fum", "f%") );
base.createCriteria("fo")
- .add( Expression.isNotNull("fum") );
+ .add( Restrictions.isNotNull("fum") );
base.createCriteria("friends")
- .add( Expression.like("fum", "g%") );
+ .add( Restrictions.like("fum", "g%") );
fum = (Fum) base.list().get(0);
assertTrue( fum.getFriends().size()==2 );
s.delete(fum);
@@ -254,11 +253,11 @@
assertNotNull(fc.get("xam"));
Criteria base = s.createCriteria(Fum.class, "fum")
- .add( Expression.like("fum", "f%") )
+ .add( Restrictions.like("fum", "f%") )
.setResultTransformer(Transformers.aliasToBean(ABean.class))
.setFetchMode("friends", FetchMode.JOIN);
base.createCriteria("fo", "fo")
- .add( Expression.eq( "fum", fum.getFo().getFum() ) );
+ .add( Restrictions.eq( "fum", fum.getFo().getFum() ) );
ABean map = (ABean) base.list().get(0);
assertTrue(
Modified: core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -13,7 +13,7 @@
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.criterion.Example;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -88,9 +88,9 @@
assertTrue( bag.size()==1 );
size = s.createCriteria("TestMap")
- .add( Expression.eq("address", "bar") )
+ .add( Restrictions.eq("address", "bar") )
.createCriteria("parent")
- .add( Expression.eq("name", "foobar") )
+ .add( Restrictions.eq("name", "foobar") )
.list()
.size();
assertTrue(size==1);
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -18,7 +18,7 @@
import org.hibernate.Transaction;
import org.hibernate.classic.Session;
import org.hibernate.criterion.Example;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
@@ -224,7 +224,7 @@
.uniqueResult();
assertTrue( m1.getOtherMaster()==m1 );
m1 = (Master) s.createCriteria(Master.class)
- .add( Expression.eq("name", "foobar") )
+ .add( Restrictions.eq("name", "foobar") )
.uniqueResult();
assertTrue( m1==null );
m1 = (Master) s.createCriteria(Master.class)
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -16,7 +16,7 @@
import org.hibernate.LockMode;
import org.hibernate.Transaction;
import org.hibernate.classic.Session;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -45,9 +45,9 @@
s.flush();
Criteria c = s.createCriteria(Lower.class);
c.createCriteria("yetanother")
- .add( Expression.isNotNull("id") )
+ .add( Restrictions.isNotNull("id") )
.createCriteria("another");
- c.createCriteria("another").add( Expression.isNotNull("id") );
+ c.createCriteria("another").add( Restrictions.isNotNull("id") );
c.list();
t.commit();
s.close();
@@ -308,13 +308,13 @@
assertTrue( s.createCriteria(SubMulti.class).list().size()==1 );
assertTrue(
s.createCriteria(SubMulti.class)
- .add( Expression.lt("amount", new Float(0)) )
+ .add( Restrictions.lt("amount", new Float(0)) )
.list()
.size()==0
);
assertTrue(
s.createCriteria(SubMulti.class)
- .add( Expression.ge("amount", new Float(0)) )
+ .add( Restrictions.ge("amount", new Float(0)) )
.list()
.size()==1
);
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -23,7 +23,7 @@
import org.hibernate.ReplicationMode;
import org.hibernate.Transaction;
import org.hibernate.classic.Session;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MySQLDialect;
@@ -232,17 +232,17 @@
Criteria crit = s.createCriteria(Baz.class);
crit.createCriteria("topGlarchez")
- .add( Expression.isNotNull("name") )
+ .add( Restrictions.isNotNull("name") )
.createCriteria("proxyArray")
- .add( Expression.eqProperty("name", "name") )
- .add( Expression.eq("name", "g2") )
- .add( Expression.gt("x", new Integer(-666) ) );
+ .add( Restrictions.eqProperty("name", "name") )
+ .add( Restrictions.eq("name", "g2") )
+ .add( Restrictions.gt("x", new Integer(-666) ) );
crit.createCriteria("fooSet")
- .add( Expression.isNull("null") )
- .add( Expression.eq("string", "a string") )
- .add( Expression.lt("integer", new Integer(-665) ) );
+ .add( Restrictions.isNull("null") )
+ .add( Restrictions.eq("string", "a string") )
+ .add( Restrictions.lt("integer", new Integer(-665) ) );
crit.createCriteria("fooArray")
- .add( Expression.eq("string", "a string") )
+ .add( Restrictions.eq("string", "a string") )
.setLockMode(lockMode);
List list = crit.list();
@@ -258,13 +258,13 @@
s = openSession();
t = s.beginTransaction();
- list = s.createCriteria(Baz.class).add( Expression.isEmpty("fooSet")
).list();
+ list = s.createCriteria(Baz.class).add( Restrictions.isEmpty("fooSet")
).list();
assertEquals( list.size(), 0 );
- list = s.createCriteria(Baz.class).add( Expression.isNotEmpty("fooSet")
).list();
+ list = s.createCriteria(Baz.class).add( Restrictions.isNotEmpty("fooSet")
).list();
assertEquals( new HashSet(list).size(), 1 );
- list = s.createCriteria(Baz.class).add( Expression.sizeEq("fooSet", 2)
).list();
+ list = s.createCriteria(Baz.class).add( Restrictions.sizeEq("fooSet", 2)
).list();
assertEquals( new HashSet(list).size(), 1 );
t.commit();
@@ -276,9 +276,9 @@
crit = s.createCriteria(Baz.class)
.setLockMode(lockMode);
crit.createCriteria("topGlarchez")
- .add( Expression.gt( "x", new Integer(-666) ) );
+ .add( Restrictions.gt( "x", new Integer(-666) ) );
crit.createCriteria("fooSet")
- .add( Expression.isNull("null") );
+ .add( Restrictions.isNull("null") );
list = crit.list();
assertTrue( list.size()==4 );
@@ -286,17 +286,11 @@
assertTrue( Hibernate.isInitialized(baz.getTopGlarchez()) ); //cos it is nonlazy
assertTrue( !Hibernate.isInitialized(baz.getFooSet()) );
- /*list = s.createCriteria(Baz.class)
- .createCriteria("fooSet.foo.component.glarch")
- .add( Expression.eq("name", "xxx") )
- .add( Expression.eq("fooSet.foo.component.glarch.name", "xxx") )
- .list();
- assertTrue( list.size()==0 );*/
list = s.createCriteria(Baz.class)
.createCriteria("fooSet")
.createCriteria("foo")
.createCriteria("component.glarch")
- .add( Expression.eq("name", "xxx") )
+ .add( Restrictions.eq("name", "xxx") )
.list();
assertTrue( list.size()==0 );
@@ -304,9 +298,9 @@
.createAlias("fooSet", "foo")
.createAlias("foo.foo", "foo2")
.setLockMode("foo2", lockMode)
- .add( Expression.isNull("foo2.component.glarch") )
+ .add( Restrictions.isNull("foo2.component.glarch") )
.createCriteria("foo2.component.glarch")
- .add( Expression.eq("name", "xxx") )
+ .add( Restrictions.eq("name", "xxx") )
.list();
assertTrue( list.size()==0 );
@@ -318,9 +312,9 @@
crit = s.createCriteria(Baz.class);
crit.createCriteria("topGlarchez")
- .add( Expression.isNotNull("name") );
+ .add( Restrictions.isNotNull("name") );
crit.createCriteria("fooSet")
- .add( Expression.isNull("null") );
+ .add( Restrictions.isNull("null") );
list = crit.list();
assertTrue( list.size()==2 );
@@ -328,7 +322,6 @@
assertTrue( Hibernate.isInitialized(baz.getTopGlarchez()) ); //cos it is nonlazy
assertTrue( !Hibernate.isInitialized(baz.getFooSet()) );
-
list = s.createCriteria(Child.class).setFetchMode("parent",
FetchMode.JOIN).list();
s.delete("from Glarch g");
@@ -357,7 +350,7 @@
s = openSession();
t = s.beginTransaction();
assertTrue( s.createCriteria(Part.class).list().size()==1 ); //there is a where
condition on Part mapping
- assertTrue( s.createCriteria(Part.class).add( Expression.eq( "id", p1.getId()
) ).list().size()==1 );
+ assertTrue( s.createCriteria(Part.class).add( Restrictions.eq( "id",
p1.getId() ) ).list().size()==1 );
assertTrue( s.createQuery("from Part").list().size()==1 );
assertTrue( s.createQuery("from Baz baz join baz.parts").list().size()==2 );
baz = (Baz) s.createCriteria(Baz.class).uniqueResult();
@@ -388,7 +381,7 @@
s = openSession();
t = s.beginTransaction();
assertTrue( s.createCriteria(Part.class).list().size()==1 ); //there is a where
condition on Part mapping
- assertTrue( s.createCriteria(Part.class).add( Expression.eq( "id", p1.getId()
) ).list().size()==1 );
+ assertTrue( s.createCriteria(Part.class).add( Restrictions.eq( "id",
p1.getId() ) ).list().size()==1 );
assertTrue( s.createQuery("from Part").list().size()==1 );
assertTrue( s.createQuery("from Baz baz join baz.moreParts").list().size()==2
);
baz = (Baz) s.createCriteria(Baz.class).uniqueResult();
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -9,7 +9,7 @@
import org.hibernate.Transaction;
import org.hibernate.classic.Session;
import org.hibernate.criterion.Example;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
@@ -59,7 +59,7 @@
Criteria crit = s.createCriteria(Componentizable.class);
Example ex = Example.create(master).enableLike();
- crit.add(Expression.or(Expression.not(ex), ex));
+ crit.add(Restrictions.or(Restrictions.not(ex), ex));
List result = crit.list();
assertNotNull(result);
Modified:
core/trunk/code/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java
===================================================================
---
core/trunk/code/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java 2007-07-08
08:47:10 UTC (rev 12745)
+++
core/trunk/code/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java 2007-07-08
09:02:58 UTC (rev 12746)
@@ -10,8 +10,8 @@
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.criterion.Expression;
import org.hibernate.criterion.Property;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -96,7 +96,7 @@
if ( supportsRowValueConstructorSyntaxInInList() ) {
s.createCriteria(Person.class).add(
- Expression.in("address", new Address[] { mark.getAddress(),
joe.getAddress() } )
+ Restrictions.in("address", new Address[] { mark.getAddress(),
joe.getAddress() } )
).list();
}