Hibernate SVN: r12754 - in trunk/HibernateExt/annotations/src: test/org/hibernate/test/annotations/cid and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-07-11 18:20:24 -0400 (Wed, 11 Jul 2007)
New Revision: 12754
Added:
trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/SecondaryTableSecondPass.java
trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgram.java
trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgramIdClass.java
Modified:
trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationConfiguration.java
trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java
Log:
ANN-602 process SecondaryTable PK binding in a second pass to handle @ManyToOne PKs
Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-11 18:21:44 UTC (rev 12753)
+++ trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-11 22:20:24 UTC (rev 12754)
@@ -761,7 +761,6 @@
if ( !inheritanceState.hasParents ) {
final RootClass rootClass = (RootClass) persistentClass;
- //no need to handle inSecondPass this is an Entity related work
mappings.addSecondPass( new CreateKeySecondPass( rootClass ) );
}
else {
@@ -769,8 +768,10 @@
}
mappings.addClass( persistentClass );
- entityBinder.finalSecondaryTableBinding( propertyHolder );
+ mappings.addSecondPass( new SecondaryTableSecondPass(entityBinder, propertyHolder) );
+ //entityBinder.finalSecondaryTableBinding( propertyHolder );
+
//add process complementary Table definition (index & all)
entityBinder.processComplementaryTableDefinitions( annotatedClass.getAnnotation( org.hibernate.annotations.Table.class ) );
entityBinder.processComplementaryTableDefinitions( annotatedClass.getAnnotation( org.hibernate.annotations.Tables.class ) );
Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationConfiguration.java 2007-07-11 18:21:44 UTC (rev 12753)
+++ trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationConfiguration.java 2007-07-11 22:20:24 UTC (rev 12754)
@@ -302,6 +302,16 @@
iter.remove();
}
}
+
+ iter = secondPasses.iterator();
+ while ( iter.hasNext() ) {
+ SecondPass sp = (SecondPass) iter.next();
+ //do the SecondaryTable second pass before any association becasue associations can be built on joins
+ if ( sp instanceof SecondaryTableSecondPass ) {
+ sp.doSecondPass( classes );
+ iter.remove();
+ }
+ }
super.secondPassCompile();
inSecondPass = false;
Iterator tables = (Iterator<Map.Entry<Table, List<String[]>>>) tableUniqueConstraints.entrySet().iterator();
Added: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/SecondaryTableSecondPass.java
===================================================================
--- trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/SecondaryTableSecondPass.java (rev 0)
+++ trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/SecondaryTableSecondPass.java 2007-07-11 22:20:24 UTC (rev 12754)
@@ -0,0 +1,24 @@
+//$Id$
+package org.hibernate.cfg;
+
+import java.util.Map;
+
+import org.hibernate.MappingException;
+import org.hibernate.cfg.annotations.EntityBinder;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class SecondaryTableSecondPass implements SecondPass {
+ private EntityBinder entityBinder;
+ private PropertyHolder propertyHolder;
+
+ public SecondaryTableSecondPass(EntityBinder entityBinder, PropertyHolder propertyHolder) {
+ this.entityBinder = entityBinder;
+ this.propertyHolder = propertyHolder;
+ }
+
+ public void doSecondPass(Map persistentClasses) throws MappingException {
+ entityBinder.finalSecondaryTableBinding( propertyHolder );
+ }
+}
Modified: trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java
===================================================================
--- trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java 2007-07-11 18:21:44 UTC (rev 12753)
+++ trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java 2007-07-11 22:20:24 UTC (rev 12754)
@@ -164,12 +164,83 @@
s.close();
}
+ public void testSecondaryTableWithCompositeId() throws Exception {
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ Channel channel = new Channel();
+ s.persist( channel );
+ Presenter pres = new Presenter();
+ pres.name = "Tim Russet";
+ s.persist( pres );
+ TvMagazinPk pk = new TvMagazinPk();
+ TvProgram program = new TvProgram();
+ program.time = new Date();
+ program.id = pk;
+ program.text = "Award Winning Programming";
+ //pk.name = "Trax";
+ pk.channel = channel;
+ pk.presenter = pres;
+ s.persist( program );
+ tx.commit();
+ s.clear();
+ tx = s.beginTransaction();
+ program = (TvProgram) s.createQuery( "from TvProgram pr" ) // where mag.id.name = :name")
+ //.setParameter( "name", "Trax" )
+ .uniqueResult();
+ assertNotNull( program.id );
+ assertNotNull( program.id.channel );
+ assertEquals( channel.id, program.id.channel.id );
+ assertNotNull( program.id.presenter );
+ assertNotNull( program.text );
+ assertEquals( pres.name, program.id.presenter.name );
+ s.delete( program );
+ s.delete( program.id.channel );
+ s.delete( program.id.presenter );
+ tx.commit();
+ s.close();
+ }
+
+ public void testSecondaryTableWithIdClass() throws Exception {
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ Channel channel = new Channel();
+ s.persist( channel );
+ Presenter pres = new Presenter();
+ pres.name = "Bob";
+ s.persist( pres );
+ TvProgramIdClass program = new TvProgramIdClass();
+ program.time = new Date();
+ program.channel = channel;
+ program.presenter = pres;
+ program.text = "Jump the shark programming";
+ //pk.name = "Trax";
+ s.persist( program );
+ tx.commit();
+ s.clear();
+ tx = s.beginTransaction();
+ program = (TvProgramIdClass) s.createQuery( "from TvProgramIdClass pr" ) // where mag.id.name = :name")
+ //.setParameter( "name", "Trax" )
+ .uniqueResult();
+ assertNotNull( program.channel );
+ assertEquals( channel.id, program.channel.id );
+ assertNotNull( program.presenter );
+ assertNotNull( program.text );
+ assertEquals( pres.name, program.presenter.name );
+ s.delete( program );
+ s.delete( program.channel );
+ s.delete( program.presenter );
+ tx.commit();
+ s.close();
+ }
+
protected Class[] getMappings() {
return new Class[] {
Parent.class,
Child.class,
Channel.class,
TvMagazin.class,
+ TvProgramIdClass.class,
+ TvProgram.class,
Presenter.class,
Order.class,
Product.class,
Added: trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgram.java
===================================================================
--- trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgram.java (rev 0)
+++ trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgram.java 2007-07-11 22:20:24 UTC (rev 12754)
@@ -0,0 +1,31 @@
+//$Id$
+package org.hibernate.test.annotations.cid;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.SecondaryTable;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * @author Chandra Patni
+ */
+@Entity
+@SecondaryTable( name = "TV_PROGRAM_EXT", pkJoinColumns = {
+@PrimaryKeyJoinColumn( name = "CHANNEL_ID" ),
+@PrimaryKeyJoinColumn( name = "PRESENTER_NAME" )
+ } )
+public class TvProgram {
+ @EmbeddedId
+ public TvMagazinPk id;
+
+ @Temporal( TemporalType.TIME )
+ Date time;
+
+ @Column( name = "TXT", table = "TV_PROGRAM_EXT" )
+ public String text;
+
+}
\ No newline at end of file
Added: trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgramIdClass.java
===================================================================
--- trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgramIdClass.java (rev 0)
+++ trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/cid/TvProgramIdClass.java 2007-07-11 22:20:24 UTC (rev 12754)
@@ -0,0 +1,34 @@
+//$Id$
+package org.hibernate.test.annotations.cid;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.SecondaryTable;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SecondaryTable( name = "TV_PROGRAM_IDCLASS", pkJoinColumns =
+ {
+ @PrimaryKeyJoinColumn( name = "CHANNEL_ID" ),
+ @PrimaryKeyJoinColumn( name = "PRESENTER_NAME" )
+ } )
+@IdClass( TvMagazinPk.class )
+public class TvProgramIdClass {
+ @Id
+ public Channel channel;
+ @Id
+ public Presenter presenter;
+
+ @Temporal( TemporalType.TIME )
+ Date time;
+
+ @Column( name = "TXT", table = "TV_PROGRAM_IDCLASS" )
+ public String text;
+}
+
+
18 years, 2 months
- 1
- 0
Hibernate SVN: r12753 - trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-07-11 14:21:44 -0400 (Wed, 11 Jul 2007)
New Revision: 12753
Modified:
trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java
Log:
minor test update
Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java
===================================================================
--- trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java 2007-07-11 16:02:55 UTC (rev 12752)
+++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/fieldAccess/Document.java 2007-07-11 18:21:44 UTC (rev 12753)
@@ -11,6 +11,8 @@
import org.hibernate.search.annotations.Keyword;
import org.hibernate.search.annotations.Boost;
import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
/**
* @author Richard Hallier
@@ -23,7 +25,7 @@
@Keyword(id = true)
private Long id;
- @Text
+ @Field(index = Index.TOKENIZED)
@Boost(2)
private String title;
18 years, 2 months
- 1
- 0
Hibernate SVN: r12752 - in shards/trunk/src: test/org/hibernate/shards/integration/model and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: buurzgoth
Date: 2007-07-11 12:02:55 -0400 (Wed, 11 Jul 2007)
New Revision: 12752
Modified:
shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java
Log:
Fix bug in replicate(). Implement merge().
Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-07-11 06:43:23 UTC (rev 12751)
+++ shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-07-11 16:02:55 UTC (rev 12752)
@@ -20,66 +20,33 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.CacheMode;
-import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
-import org.hibernate.Filter;
-import org.hibernate.FlushMode;
-import org.hibernate.HibernateException;
-import org.hibernate.Interceptor;
-import org.hibernate.LockMode;
-import org.hibernate.Query;
-import org.hibernate.ReplicationMode;
-import org.hibernate.SQLQuery;
-import org.hibernate.SessionException;
-import org.hibernate.Transaction;
-import org.hibernate.TransientObjectException;
-import org.hibernate.UnresolvableObjectException;
+import org.hibernate.*;
import org.hibernate.classic.Session;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.shards.CrossShardAssociationException;
-import org.hibernate.shards.Shard;
-import org.hibernate.shards.ShardId;
-import org.hibernate.shards.ShardImpl;
-import org.hibernate.shards.ShardOperation;
-import org.hibernate.shards.ShardedTransaction;
+import org.hibernate.shards.*;
import org.hibernate.shards.criteria.CriteriaFactoryImpl;
import org.hibernate.shards.criteria.CriteriaId;
import org.hibernate.shards.criteria.ShardedCriteriaImpl;
import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
import org.hibernate.shards.engine.ShardedSessionImplementor;
import org.hibernate.shards.id.ShardEncodingIdentifierGenerator;
-import org.hibernate.shards.query.AdHocQueryFactoryImpl;
-import org.hibernate.shards.query.ExitOperationsQueryCollector;
-import org.hibernate.shards.query.NamedQueryFactoryImpl;
-import org.hibernate.shards.query.QueryId;
-import org.hibernate.shards.query.ShardedQueryImpl;
+import org.hibernate.shards.query.*;
import org.hibernate.shards.stat.ShardedSessionStatistics;
import org.hibernate.shards.strategy.ShardStrategy;
import org.hibernate.shards.strategy.exit.FirstNonNullResultExitStrategy;
import org.hibernate.shards.strategy.selection.ShardResolutionStrategyData;
import org.hibernate.shards.strategy.selection.ShardResolutionStrategyDataImpl;
import org.hibernate.shards.transaction.ShardedTransactionImpl;
-import org.hibernate.shards.util.Iterables;
-import org.hibernate.shards.util.Lists;
-import org.hibernate.shards.util.Maps;
-import org.hibernate.shards.util.Pair;
-import org.hibernate.shards.util.Preconditions;
-import org.hibernate.shards.util.Sets;
+import org.hibernate.shards.util.*;
import org.hibernate.stat.SessionStatistics;
import org.hibernate.type.Type;
import java.io.Serializable;
import java.sql.Connection;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
* Concrete implementation of a ShardedSession, and also the central component of
@@ -612,6 +579,7 @@
List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new
ShardResolutionStrategyDataImpl(object.getClass(), id));
if (shardIds.size() == 1) {
+ setCurrentSubgraphShardId(shardIds.get(0));
shardIdsToShards.get(shardIds.get(0)).establishSession().replicate(entityName, object, replicationMode);
} else {
Object result = null;
@@ -901,19 +869,30 @@
return shardIdListToShardList(shardIds);
}
- /**
- * Unsupported. This is a scope decision, not a technical decision.
- */
public Object merge(Object object) throws HibernateException {
- throw new UnsupportedOperationException();
+ return merge(null, object);
}
- /**
- * Unsupported. This is a scope decision, not a technical decision.
- */
public Object merge(String entityName, Object object)
throws HibernateException {
- throw new UnsupportedOperationException();
+ Serializable id = extractId(object);
+ List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new
+ ShardResolutionStrategyDataImpl(object.getClass(), id));
+ if (shardIds.size() == 1) {
+ setCurrentSubgraphShardId(shardIds.get(0));
+ return shardIdsToShards.get(shardIds.get(0)).establishSession().merge(entityName, object);
+ } else {
+ Object result = null;
+ if (id != null) result = get(object.getClass(), id);
+ if (result == null) { // non-persisted object
+ ShardId shardId = selectShardIdForNewObject(object);
+ setCurrentSubgraphShardId(shardId);
+ return shardIdsToShards.get(shardId).establishSession().merge(entityName, object);
+ } else {
+ Shard objectShard = getShardForObject(result, shardIdListToShardList(shardIds));
+ return objectShard.establishSession().merge(entityName, object);
+ }
+ }
}
public void persist(Object object) throws HibernateException {
@@ -1501,7 +1480,8 @@
List<ShardId> selectShardIdsFromShardResolutionStrategyData(ShardResolutionStrategyData srsd) {
IdentifierGenerator idGenerator = shardedSessionFactory.getIdentifierGenerator(srsd.getEntityName());
- if (idGenerator instanceof ShardEncodingIdentifierGenerator) {
+ if ((idGenerator instanceof ShardEncodingIdentifierGenerator) &&
+ (srsd.getId() != null)) {
return Collections.singletonList(((ShardEncodingIdentifierGenerator)idGenerator).extractShardId(srsd.getId()));
}
return shardStrategy.getShardResolutionStrategy().selectShardIdsFromShardResolutionStrategyData(srsd);
Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java 2007-07-11 06:43:23 UTC (rev 12751)
+++ shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java 2007-07-11 16:02:55 UTC (rev 12752)
@@ -900,6 +900,35 @@
}
}
+ public void testMergeUnpersisted() {
+ session.beginTransaction();
+ Building b = building("b1");
+ Building returnedB = (Building)session.merge(b);
+ commitAndResetSession();
+ Building mergedB = (Building)session.get(Building.class,
+ returnedB.getBuildingId());
+ assertNotNull(mergedB);
+ assertEquals("b1", mergedB.getName());
+ }
+
+ public void testMergePersisted() {
+ session.beginTransaction();
+ Building b = building("b1");
+ session.save(b);
+ commitAndResetSession();
+ session.evict(b);
+
+ session.beginTransaction();
+ b.setName("b2");
+ session.merge(b);
+ assertFalse(session.contains(b));
+ commitAndResetSession();
+
+ Building mergedB = (Building)session.get(Building.class, b.getBuildingId());
+ assertNotNull(mergedB);
+ assertEquals("b2", mergedB.getName());
+ }
+
public void testReplicate() {
session.beginTransaction();
Building idB = building("just need to get id");
18 years, 2 months
- 1
- 0
Hibernate SVN: r12751 - in shards/trunk/src: java/org/hibernate/shards/cfg and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-07-11 02:43:23 -0400 (Wed, 11 Jul 2007)
New Revision: 12751
Modified:
shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java
shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java
shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java
shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java
Log:
HSHARDS-38
Allow cache region prefix to vary across shards.
Modified: shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java 2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java 2007-07-11 06:43:23 UTC (rev 12751)
@@ -229,6 +229,7 @@
safeSet(prototypeConfiguration, Environment.PASS, config.getShardPassword());
safeSet(prototypeConfiguration, Environment.URL, config.getShardUrl());
safeSet(prototypeConfiguration, Environment.DATASOURCE, config.getShardDatasource());
+ safeSet(prototypeConfiguration, Environment.CACHE_REGION_PREFIX, config.getShardCacheRegionPrefix());
safeSet(prototypeConfiguration, Environment.SESSION_FACTORY_NAME, config.getShardSessionFactoryName());
safeSet(prototypeConfiguration, ShardedEnvironment.SHARD_ID_PROPERTY, config.getShardId().toString());
}
Modified: shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java 2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java 2007-07-11 06:43:23 UTC (rev 12751)
@@ -56,4 +56,8 @@
public String getShardDatasource() {
return config.getProperty(Environment.DATASOURCE);
}
+
+ public String getShardCacheRegionPrefix() {
+ return config.getProperty(Environment.CACHE_REGION_PREFIX);
+ }
}
Modified: shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java 2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java 2007-07-11 06:43:23 UTC (rev 12751)
@@ -59,4 +59,10 @@
* @return the datasource for the shard
*/
String getShardDatasource();
+
+ /**
+ * @see org.hibernate.cfg.Environment#CACHE_REGION_PREFIX
+ * @return the cache region prefix for the shard
+ */
+ String getShardCacheRegionPrefix();
}
Modified: shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java 2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java 2007-07-11 06:43:23 UTC (rev 12751)
@@ -54,7 +54,7 @@
shardStrategyFactory = new MyShardStrategyFactory();
Configuration protoConfig = new Configuration();
protoConfig.setProperty(Environment.DIALECT, HSQLDialect.class.getName());
- shardConfig = new MyShardConfig("user", "url", "pwd", "sfname", 33);
+ shardConfig = new MyShardConfig("user", "url", "pwd", "sfname", "prefix", 33);
shardedConfiguration =
new ShardedConfiguration(
@@ -90,7 +90,8 @@
}
public void testShardIdRequired() {
- ShardConfiguration config = new MyShardConfig("user", "url", "pwd", "sfname", null);
+ ShardConfiguration config =
+ new MyShardConfig("user", "url", "pwd", "sfname", null, null);
try {
shardedConfiguration.populatePrototypeWithVariableProperties(config);
fail("expected npe");
@@ -132,14 +133,16 @@
private final String url;
private final String password;
private final String sessionFactoryName;
+ private final String cacheRegionPrefix;
private final Integer shardId;
public MyShardConfig(String user, String url, String password,
- String sessionFactoryName, Integer shardId) {
+ String sessionFactoryName, String cacheRegionPrefix, Integer shardId) {
this.user = user;
this.url = url;
this.password = password;
this.sessionFactoryName = sessionFactoryName;
+ this.cacheRegionPrefix = cacheRegionPrefix;
this.shardId = shardId;
}
@@ -166,5 +169,9 @@
public String getShardDatasource() {
return null;
}
+
+ public String getShardCacheRegionPrefix() {
+ return cacheRegionPrefix;
+ }
}
}
Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java 2007-07-09 12:51:32 UTC (rev 12750)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java 2007-07-11 06:43:23 UTC (rev 12751)
@@ -47,5 +47,9 @@
public String getShardDatasource() {
throw new UnsupportedOperationException();
}
+
+ public String getShardCacheRegionPrefix() {
+ throw new UnsupportedOperationException();
+ }
}
18 years, 2 months
- 1
- 0
Hibernate SVN: r12750 - trunk/HibernateExt/annotations/src/java/org/hibernate/cfg.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-07-09 08:51:32 -0400 (Mon, 09 Jul 2007)
New Revision: 12750
Modified:
trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
Log:
ANN-434 better error message when @Id in @Embeddable objects are used
Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-08 10:46:37 UTC (rev 12749)
+++ trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-09 12:51:32 UTC (rev 12750)
@@ -1787,6 +1787,9 @@
);
Component componentId = (Component) id;
componentId.setKey( true );
+ if ( rootClass.getIdentifier() != null ) {
+ throw new AnnotationException( componentId.getComponentClassName() + " must not have @Id properties when used as an @EmbeddedId" );
+ }
if ( componentId.getPropertySpan() == 0 ) {
throw new AnnotationException( componentId.getComponentClassName() + " has no persistent id property" );
}
18 years, 2 months
- 1
- 0
Hibernate SVN: r12749 - in core/trunk/code: testsuite/src/test/java/org/hibernate/test/legacy and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-08 06:46:37 -0400 (Sun, 08 Jul 2007)
New Revision: 12749
Modified:
core/trunk/code/core/src/main/java/org/hibernate/Transaction.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/proxy/ProxyTest.java
Log:
[HHH-2566] Remove FlushMode.NEVER
Modified: core/trunk/code/core/src/main/java/org/hibernate/Transaction.java
===================================================================
--- core/trunk/code/core/src/main/java/org/hibernate/Transaction.java 2007-07-08 09:24:38 UTC (rev 12748)
+++ core/trunk/code/core/src/main/java/org/hibernate/Transaction.java 2007-07-08 10:46:37 UTC (rev 12749)
@@ -32,7 +32,7 @@
/**
* Flush the associated <tt>Session</tt> and end the unit of work (unless
- * we are in {@link FlushMode#NEVER}.
+ * we are in {@link FlushMode#MANUAL}.
* </p>
* This method will commit the underlying transaction if and only
* if the underlying transaction was initiated by this object.
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 09:24:38 UTC (rev 12748)
+++ core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2007-07-08 10:46:37 UTC (rev 12749)
@@ -4442,7 +4442,7 @@
s.connection().commit();
s.close();
s = openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
l = (Location) s.find("from Location l where l.countryCode = 'AU' and l.description='foo bar'").get(0);
assertTrue( l.getCountryCode().equals("AU") );
assertTrue( l.getCity().equals("Melbourne") );
@@ -4746,7 +4746,7 @@
s.close();
s = openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
t = s.beginTransaction();
Foo foo = (Foo) s.get(Foo.class, id);
t.commit();
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 09:24:38 UTC (rev 12748)
+++ core/trunk/code/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java 2007-07-08 10:46:37 UTC (rev 12749)
@@ -719,7 +719,7 @@
///////////////////////////////////////////////////////////////////////////
// Test insertions across serializations
Session s = getSessions().openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
Simple simple = new Simple();
simple.setAddress("123 Main St. Anytown USA");
@@ -751,7 +751,7 @@
///////////////////////////////////////////////////////////////////////////
// Test updates across serializations
s = getSessions().openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
simple = (Simple) s.get( Simple.class, new Long(10) );
assertTrue("Not same parent instances", check.getName().equals( simple.getName() ) );
@@ -773,7 +773,7 @@
///////////////////////////////////////////////////////////////////////////
// Test deletions across serializations
s = getSessions().openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
simple = (Simple) s.get( Simple.class, new Long(10) );
assertTrue("Not same parent instances", check.getName().equals( simple.getName() ) );
@@ -795,7 +795,7 @@
///////////////////////////////////////////////////////////////////////////
// Test collection actions across serializations
s = getSessions().openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
Fum fum = new Fum( fumKey("uss-fum") );
fum.setFo( new Fum( fumKey("uss-fo") ) );
@@ -824,7 +824,7 @@
s.close();
s = getSessions().openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
fum = (Fum) s.load( Fum.class, fum.getId() );
assertTrue("the Fum.friends did not get saved", fum.getFriends().size() == 2);
@@ -842,7 +842,7 @@
s.close();
s = getSessions().openSession();
- s.setFlushMode(FlushMode.NEVER);
+ s.setFlushMode(FlushMode.MANUAL);
fum = (Fum) s.load( Fum.class, fum.getId() );
assertTrue("the Fum.friends is not empty", fum.getFriends() == null || fum.getFriends().size() == 0);
s.connection().commit();
Modified: core/trunk/code/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java
===================================================================
--- core/trunk/code/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java 2007-07-08 09:24:38 UTC (rev 12748)
+++ core/trunk/code/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java 2007-07-08 10:46:37 UTC (rev 12749)
@@ -325,7 +325,7 @@
s.close();
s = openSession();
- s.setFlushMode( FlushMode.NEVER );
+ s.setFlushMode( FlushMode.MANUAL );
t = s.beginTransaction();
// load the last container as a proxy
Container proxy = ( Container ) s.load( Container.class, lastContainerId );
18 years, 2 months
- 1
- 0
Hibernate SVN: r12748 - in core/trunk/documentation/manual: es-ES/src/main/docbook/modules and 5 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-08 05:24:38 -0400 (Sun, 08 Jul 2007)
New Revision: 12748
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/performance.xml
core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_hql.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/performance.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_hql.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/performance.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_hql.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/performance.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_hql.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/performance.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_hql.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/performance.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_hql.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/performance.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_hql.xml
Log:
[HHH-2201] session.iterate() does not exist
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/performance.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/performance.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/performance.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -351,7 +351,7 @@
</para>
<programlisting><![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);
-Iterator iter = session.iterate("from CatImpl as cat where cat.name='fritz'");
+Iterator iter = session.createQuery("from CatImpl as cat where cat.name='fritz'").iterate();
Cat fritz = (Cat) iter.next();]]></programlisting>
<para>
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_hql.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_hql.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -1085,7 +1085,7 @@
You can count the number of query results without actually returning them:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue()]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue()]]></programlisting>
<para>
To order a result by the size of a collection, use the following query:
@@ -1153,7 +1153,7 @@
You can find the size of a collection without initializing it:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue();]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/performance.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/performance.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/performance.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -315,7 +315,7 @@
</para>
<programlisting><![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);
-Iterator iter = session.iterate("from CatImpl as cat where cat.name='fritz'");
+Iterator iter = session.createQuery("from CatImpl as cat where cat.name='fritz'").iterate();
Cat fritz = (Cat) iter.next();]]></programlisting>
<para>
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_hql.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_hql.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -1031,7 +1031,7 @@
Puedes contar el número de resultados de una consulta sin devolverlos realmente:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue()]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue()]]></programlisting>
<para>
Para ordenar un resultado por el tamaño de una colección, usa la siguiente consulta:
@@ -1099,7 +1099,7 @@
Puedes hallar el tamaño de una colección sin inicializarla:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue();]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/performance.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/performance.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/performance.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -369,7 +369,7 @@
</para>
<programlisting><![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);
-Iterator iter = session.iterate("from CatImpl as cat where cat.name='fritz'");
+Iterator iter = session.createQuery("from CatImpl as cat where cat.name='fritz'").iterate();
Cat fritz = (Cat) iter.next();]]></programlisting>
<para>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_hql.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_hql.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -1074,7 +1074,7 @@
Vous pouvez compter le nombre de r�sultats d'une requ�te sans les retourner :
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue()]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue()]]></programlisting>
<para>
Pour trier les r�sultats par la taille d'une collection, utilisez la requ�te suivante :
@@ -1142,7 +1142,7 @@
Vous pouvez r�cup�rer la taille d'une collection sans l'initialiser :
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue();]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/performance.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/performance.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/performance.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -347,7 +347,7 @@
</para>
<programlisting><![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);
-Iterator iter = session.iterate("from CatImpl as cat where cat.name='fritz'");
+Iterator iter = session.createQuery("from CatImpl as cat where cat.name='fritz'").iterate();
Cat fritz = (Cat) iter.next();]]></programlisting>
<para>
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_hql.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_hql.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -1056,7 +1056,7 @@
���ۂɌ��ʂ�Ԃ��Ȃ��Ă�N�G���̌��ʐ��𐔂��邱�Ƃ��ł��܂��B:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue()]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue()]]></programlisting>
<para>
�R���N�V�����̃T�C�Y�ɂ�茋�ʂ���בւ��邽�߂ɂ͈ȉ��̃N�G����g�p���܂��B:
@@ -1123,7 +1123,7 @@
�R���N�V���������������ɃR���N�V�����̃T�C�Y�邱�Ƃ��ł��܂��B:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue();]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/performance.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/performance.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/performance.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -315,7 +315,7 @@
</para>
<programlisting><![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);
-Iterator iter = session.iterate("from CatImpl as cat where cat.name='fritz'");
+Iterator iter = session.createQuery("from CatImpl as cat where cat.name='fritz'").iterate();
Cat fritz = (Cat) iter.next();]]></programlisting>
<para>
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_hql.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_hql.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -1032,7 +1032,7 @@
당신은 실제로 질의 결과들을 반환하지 않고서 그것들(질의 결과들)의 개수를 카운트할 수 있다:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue()]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue()]]></programlisting>
<para>
콜렉션의 크기에 따라 결과를 순서(ordering)지우려면, 다음 질의를 사용하라:
@@ -1099,7 +1099,7 @@
당신은 콜렉션을 초기화 하지 않고서 그것(콜렉션)의 크기를 찾을 수 있다:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue();]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/performance.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/performance.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/performance.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -346,7 +346,7 @@
</para>
<programlisting><![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);
-Iterator iter = session.iterate("from CatImpl as cat where cat.name='fritz'");
+Iterator iter = session.createQuery("from CatImpl as cat where cat.name='fritz'").iterate();
Cat fritz = (Cat) iter.next();]]></programlisting>
<para>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_hql.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_hql.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -1085,7 +1085,7 @@
Pode-se contar o número de resultados da query, sem realmente retorna-los.
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue()]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue()]]></programlisting>
<para>
Para ordenar um resultado pelo tamanho de uma Collection, use a query a seguir.
@@ -1154,7 +1154,7 @@
Pode-se achar o tamanho de uma Collection sem inicializa-la:
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue();]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/performance.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/performance.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/performance.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -310,7 +310,7 @@
</para>
<programlisting><![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);
-Iterator iter = session.iterate("from CatImpl as cat where cat.name='fritz'");
+Iterator iter = session.createQuery("from CatImpl as cat where cat.name='fritz'").iterate();
Cat fritz = (Cat) iter.next();]]></programlisting>
<para>
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_hql.xml 2007-07-08 09:16:48 UTC (rev 12747)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_hql.xml 2007-07-08 09:24:38 UTC (rev 12748)
@@ -1014,7 +1014,7 @@
你可以统计查询结果的数目而不必实际的返回他们：
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue()]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue()]]></programlisting>
<para>
若想根据一个集合的大小来进行排序，可以使用如下的语句：
@@ -1081,7 +1081,7 @@
不用通过初始化，你就可以知道一个集合（Collection）的大小：
</para>
- <programlisting><![CDATA[( (Integer) session.iterate("select count(*) from ....").next() ).intValue();]]></programlisting>
+ <programlisting><![CDATA[( (Integer) session.createQuery("select count(*) from ....").iterate().next() ).intValue();]]></programlisting>
</sect1>
18 years, 2 months
- 1
- 0
Hibernate SVN: r12747 - in core/trunk/documentation/manual: es-ES/src/main/docbook/modules and 5 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-08 05:16:48 -0400 (Sun, 08 Jul 2007)
New Revision: 12747
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/configuration.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/configuration.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/configuration.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/configuration.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/configuration.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/configuration.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/configuration.xml
Log:
[HHH-2649] Batcher configuration parameter incorrectly documented
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/configuration.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/configuration.xml 2007-07-08 09:02:58 UTC (rev 12746)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/configuration.xml 2007-07-08 09:16:48 UTC (rev 12747)
@@ -594,7 +594,7 @@
will not need this configuration property.
<para>
<emphasis role="strong">eg.</emphasis>
- <literal>classname.of.Batcher</literal>
+ <literal>classname.of.BatcherFactory</literal>
</para>
</entry>
</row>
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/configuration.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/configuration.xml 2007-07-08 09:02:58 UTC (rev 12746)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/configuration.xml 2007-07-08 09:16:48 UTC (rev 12747)
@@ -601,7 +601,7 @@
esta propiedad de configuración.
<para>
<emphasis role="strong">ej.</emphasis>
- <literal>classname.of.Batcher</literal>
+ <literal>classname.of.BatcherFactory</literal>
</para>
</entry>
</row>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/configuration.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/configuration.xml 2007-07-08 09:02:58 UTC (rev 12746)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/configuration.xml 2007-07-08 09:16:48 UTC (rev 12747)
@@ -602,7 +602,7 @@
de configuration
<para>
<emphasis role="strong">ex.</emphasis>
- <literal>classname.of.Batcher</literal>
+ <literal>classname.of.BatcherFactory</literal>
</para>
</entry>
</row>
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/configuration.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/configuration.xml 2007-07-08 09:02:58 UTC (rev 12746)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/configuration.xml 2007-07-08 09:16:48 UTC (rev 12747)
@@ -586,7 +586,7 @@
�قƂ�ǂ̃A�v���P�[�V�����ɁA���̐ݒ�͕K�v����܂���B
<para>
<emphasis role="strong">��F</emphasis>
- <literal>classname.of.Batcher</literal>
+ <literal>classname.of.BatcherFactory</literal>
</para>
</entry>
</row>
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/configuration.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/configuration.xml 2007-07-08 09:02:58 UTC (rev 12746)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/configuration.xml 2007-07-08 09:16:48 UTC (rev 12747)
@@ -556,7 +556,7 @@
않을 것이다.
<para>
<emphasis role="strong">예.</emphasis>
- <literal>classname.of.Batcher</literal>
+ <literal>classname.of.BatcherFactory</literal>
</para>
</entry>
</row>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/configuration.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/configuration.xml 2007-07-08 09:02:58 UTC (rev 12746)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/configuration.xml 2007-07-08 09:16:48 UTC (rev 12747)
@@ -600,7 +600,7 @@
aplicações não irão necessitar desta propriedade de configuração
<para>
<emphasis role="strong">Ex.</emphasis>
- <literal>classname.of.Batcher</literal>
+ <literal>classname.of.BatcherFactory</literal>
</para>
</entry>
</row>
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/configuration.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/configuration.xml 2007-07-08 09:02:58 UTC (rev 12746)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/configuration.xml 2007-07-08 09:16:48 UTC (rev 12747)
@@ -591,7 +591,7 @@
选择一个自定义的<literal>Batcher</literal>. 多数应用程序不需要这个配置属性.
<para>
<emphasis role="strong">eg.</emphasis>
- <literal>classname.of.Batcher</literal>
+ <literal>classname.of.BatcherFactory</literal>
</para>
</entry>
</row>
18 years, 2 months
- 1
- 0
Hibernate SVN: r12746 - in core/trunk/code: testsuite/src/test/java/org/hibernate/test/criteria and 4 other directories.
by hibernate-commits＠lists.jboss.org
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();
}
18 years, 2 months
- 1
- 0
Hibernate SVN: r12745 - core/trunk/code/core/src/main/java/org/hibernate/criterion.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-08 04:47:10 -0400 (Sun, 08 Jul 2007)
New Revision: 12745
Modified:
core/trunk/code/core/src/main/java/org/hibernate/criterion/Expression.java
Log:
[HHH-2552] Update javadoc to refer Restriction methods
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:29:28 UTC (rev 12744)
+++ core/trunk/code/core/src/main/java/org/hibernate/criterion/Expression.java 2007-07-08 08:47:10 UTC (rev 12745)
@@ -22,6 +22,7 @@
* parameters. Any occurrences of <tt>{alias}</tt> will be
* replaced by the table alias.
*
+ * @deprecated use {@link org.hibernate.criterion.Restrictions#sqlRestriction(String, Object[], Type[])}
* @param sql
* @param values
* @param types
@@ -35,6 +36,7 @@
* parameter. Any occurrences of <tt>{alias}</tt> will be replaced
* by the table alias.
*
+ * @deprecated use {@link org.hibernate.criterion.Restrictions#sqlRestriction(String, Object, Type)}
* @param sql
* @param value
* @param type
@@ -47,6 +49,7 @@
* Apply a constraint expressed in SQL. Any occurrences of <tt>{alias}</tt>
* will be replaced by the table alias.
*
+ * @deprecated use {@link org.hibernate.criterion.Restrictions#sqlRestriction(String)}
* @param sql
* @return Criterion
*/
18 years, 2 months
- 1
- 0