Hibernate SVN: r10560 - tags/v32cr5
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-10-04 22:35:20 -0400 (Wed, 04 Oct 2006)
New Revision: 10560
Added:
tags/v32cr5/Hibernate3/
Log:
tagging 3.2.0.cr5
Copied: tags/v32cr5/Hibernate3 (from rev 10559, branches/Branch_3_2/Hibernate3)
17 years, 8 months
Hibernate SVN: r10559 - branches/Branch_3_2/Hibernate3/doc/reference/en
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-10-04 22:33:52 -0400 (Wed, 04 Oct 2006)
New Revision: 10559
Modified:
branches/Branch_3_2/Hibernate3/doc/reference/en/master.xml
Log:
prepare 3.2.0.cr5
Modified: branches/Branch_3_2/Hibernate3/doc/reference/en/master.xml
===================================================================
--- branches/Branch_3_2/Hibernate3/doc/reference/en/master.xml 2006-10-05 02:33:16 UTC (rev 10558)
+++ branches/Branch_3_2/Hibernate3/doc/reference/en/master.xml 2006-10-05 02:33:52 UTC (rev 10559)
@@ -33,7 +33,7 @@
<bookinfo>
<title>HIBERNATE - Relational Persistence for Idiomatic Java</title>
<subtitle>Hibernate Reference Documentation</subtitle>
- <releaseinfo>3.2 cr4</releaseinfo>
+ <releaseinfo>3.2 cr5</releaseinfo>
</bookinfo>
<toc/>
17 years, 8 months
Hibernate SVN: r10558 - branches/Branch_3_2/Hibernate3
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-10-04 22:33:16 -0400 (Wed, 04 Oct 2006)
New Revision: 10558
Modified:
branches/Branch_3_2/Hibernate3/readme.txt
Log:
prepare 3.2.0.cr5
Modified: branches/Branch_3_2/Hibernate3/readme.txt
===================================================================
--- branches/Branch_3_2/Hibernate3/readme.txt 2006-10-05 02:32:29 UTC (rev 10557)
+++ branches/Branch_3_2/Hibernate3/readme.txt 2006-10-05 02:33:16 UTC (rev 10558)
@@ -1,6 +1,6 @@
Hibernate - Relational Persistence for Idiomatic Java
=====================================================
-version 3.2 cr4, August 24, 2006
+version 3.2 cr5, October 4, 2006
Instructions
------------
17 years, 8 months
Hibernate SVN: r10557 - branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-10-04 22:32:29 -0400 (Wed, 04 Oct 2006)
New Revision: 10557
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java
Log:
prepare 3.2.0.cr5
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java 2006-10-05 02:31:29 UTC (rev 10556)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java 2006-10-05 02:32:29 UTC (rev 10557)
@@ -153,7 +153,7 @@
*/
public final class Environment {
- public static final String VERSION = "3.2 cr4";
+ public static final String VERSION = "3.2.0.cr5";
/**
* <tt>ConnectionProvider</tt> implementor to use when obtaining connections
17 years, 8 months
Hibernate SVN: r10556 - branches/Branch_3_2/Hibernate3
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-10-04 22:31:29 -0400 (Wed, 04 Oct 2006)
New Revision: 10556
Modified:
branches/Branch_3_2/Hibernate3/build.xml
Log:
prepare 3.2.0.cr5
Modified: branches/Branch_3_2/Hibernate3/build.xml
===================================================================
--- branches/Branch_3_2/Hibernate3/build.xml 2006-10-05 02:31:06 UTC (rev 10555)
+++ branches/Branch_3_2/Hibernate3/build.xml 2006-10-05 02:31:29 UTC (rev 10556)
@@ -23,7 +23,7 @@
<property name="version.major" value="3"/>
<property name="version.minor" value="2"/>
<property name="version.micro" value="0"/>
- <property name="version.qualifier" value="cr4"/>
+ <property name="version.qualifier" value="cr5"/>
<property name="version.full" value="${version.major}.${version.minor}.${version.micro}.${version.qualifier}"/>
<property name="version.major_minor" value="${version.major}.${version.minor}"/>
<property name="fullname" value="${name}-${version.full}"/>
17 years, 8 months
Hibernate SVN: r10555 - branches/Branch_3_2/Hibernate3
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-10-04 22:31:06 -0400 (Wed, 04 Oct 2006)
New Revision: 10555
Modified:
branches/Branch_3_2/Hibernate3/changelog.txt
Log:
prepare 3.2.0.cr5
Modified: branches/Branch_3_2/Hibernate3/changelog.txt
===================================================================
--- branches/Branch_3_2/Hibernate3/changelog.txt 2006-10-05 02:17:32 UTC (rev 10554)
+++ branches/Branch_3_2/Hibernate3/changelog.txt 2006-10-05 02:31:06 UTC (rev 10555)
@@ -6,6 +6,22 @@
more about each case.
+Chages in version 3.2.0.cr5 (2006.10.04)
+-------------------------------------------
+
+** Bug
+ * [HHH-1668] - PersistentSet write methods mark collection as dirty even if entry is not written
+ * [HHH-1714] - Session.get() behavior
+ * [HHH-1891] - Since rc3 deprecation Warning: The syntax 'TYPE=storage_engine' is deprecated and will be removed in MySQL 5.2.
+
+** Improvement
+ * [HHH-2093] - PERSIST_ON_FLUSH ineffective for recursive object graphs
+ * [HHH-2103] - Rolling back 'SELECT is mandatory' on JPA strict compliance
+
+** Task
+ * [HHH-1931] - verify that the instrument tasks actually work
+
+
Chages in version 3.2.0.cr4 (2006.08.24)
-------------------------------------------
17 years, 8 months
Hibernate SVN: r10554 - tags
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-10-04 22:17:32 -0400 (Wed, 04 Oct 2006)
New Revision: 10554
Added:
tags/v32cr5/
Log:
created tag folder for 3.2.0.cr5
17 years, 8 months
Hibernate SVN: r10553 - branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect
by hibernate-commits＠lists.jboss.org
Author: scottmarlownovell
Date: 2006-10-04 14:23:31 -0400 (Wed, 04 Oct 2006)
New Revision: 10553
Added:
branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/MySQL5InnoDBDialect.java
Log:
Fix for HHH-1891. We already have MySQL dialect, MySQL5 dialect and
MySQLInnodb dialect. This addition handles the changes in the MySQL5 Innodb
storage engine.
Added: branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/MySQL5InnoDBDialect.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/MySQL5InnoDBDialect.java 2006-10-04 02:45:35 UTC (rev 10552)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/MySQL5InnoDBDialect.java 2006-10-04 18:23:31 UTC (rev 10553)
@@ -0,0 +1,21 @@
+//$Id: $
+package org.hibernate.dialect;
+
+/**
+ * @author Gavin King, Scott Marlow
+ */
+public class MySQL5InnoDBDialect extends MySQL5Dialect {
+
+ public boolean supportsCascadeDelete() {
+ return true;
+ }
+
+ public String getTableTypeString() {
+ return " ENGINE=InnoDB";
+ }
+
+ public boolean hasSelfReferentialForeignKeyBug() {
+ return true;
+ }
+
+}
Property changes on: branches/Branch_3_2/Hibernate3/src/org/hibernate/dialect/MySQL5InnoDBDialect.java
___________________________________________________________________
Name: svn:executable
+ *
17 years, 8 months
Hibernate SVN: r10552 - in trunk/HibernateExt/ejb/src: java/org/hibernate/ejb java/org/hibernate/ejb/connection java/org/hibernate/ejb/event java/org/hibernate/ejb/instrument java/org/hibernate/ejb/packaging test/org/hibernate/ejb/test/association
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2006-10-03 22:45:35 -0400 (Tue, 03 Oct 2006)
New Revision: 10552
Added:
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Kitchen.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Oven.java
Modified:
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/ListenerCallback.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/XmlHelper.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/AssociationTest.java
Log:
Code cleaning, potential bug fixes and more tests
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -114,9 +114,11 @@
private AnnotationConfiguration cfg;
private SettingsFactory settingsFactory;
+ //made transient and not restored in deserialization on purpose, should no longer be called after restoration
private transient EventListenerConfigurator listenerConfigurator;
private PersistenceUnitTransactionType transactionType;
private boolean discardOnClose;
+ //made transient and not restored in deserialization on purpose, should no longer be called after restoration
private transient ClassLoader overridenClassLoader;
@@ -191,7 +193,7 @@
try {
log.debug( "Look up for persistence unit: " + persistenceUnitName );
integration = integration == null ?
- integration = CollectionHelper.EMPTY_MAP :
+ CollectionHelper.EMPTY_MAP :
Collections.unmodifiableMap( integration );
Enumeration<URL> xmls = Thread.currentThread()
.getContextClassLoader()
@@ -344,6 +346,7 @@
new Properties();
ConfigurationHelper.overrideProperties( properties, integration );
+ //FIXME entities is used to enhance classes and to collect annotated entities this should not be mixed
//fill up entities with the on found in xml files
addXMLEntities( xmlFiles, info, entities );
@@ -449,7 +452,7 @@
}
}
else if ( rootElement != null && "hibernate-mappings".equals( rootElement.getName() ) ) {
- //TODO
+ //FIXME include hbm xml entities to enhance them but entities is also used to collect annotated entities
}
}
catch (DocumentException e) {
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static String VERSION = "3.2.0.CR2";
+ public static final String VERSION = "3.2.0.CR2";
private static Log log = LogFactory.getLog( Version.class );
static {
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -2,6 +2,8 @@
package org.hibernate.ejb.connection;
import java.util.Properties;
+import java.sql.Connection;
+import java.sql.SQLException;
import javax.sql.DataSource;
import org.apache.commons.logging.Log;
@@ -18,6 +20,7 @@
* @see org.hibernate.connection.ConnectionProvider
*/
public class InjectedDataSourceConnectionProvider extends DatasourceConnectionProvider {
+ //TODO make datasource connection provider properties protected in 3.3
private String user;
private String pass;
@@ -35,4 +38,13 @@
log.info( "Using provided datasource" );
}
+ @Override
+ public Connection getConnection() throws SQLException {
+ if (user != null || pass != null) {
+ return getDataSource().getConnection(user, pass);
+ }
+ else {
+ return getDataSource().getConnection();
+ }
+ }
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -25,7 +25,7 @@
catch (InvocationTargetException e) {
//keep runtime exceptions as is
if ( e.getTargetException() instanceof RuntimeException ) {
- throw (RuntimeException) e.getCause();
+ throw (RuntimeException) e.getTargetException();
}
else {
throw new RuntimeException( e.getTargetException() );
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -14,16 +14,14 @@
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
+import javax.persistence.ExcludeDefaultListeners;
import javax.persistence.ExcludeSuperclassListeners;
import javax.persistence.MappedSuperclass;
import javax.persistence.PersistenceException;
-import javax.persistence.ExcludeDefaultListeners;
+import org.hibernate.reflection.ReflectionManager;
import org.hibernate.reflection.XClass;
import org.hibernate.reflection.XMethod;
-import org.hibernate.reflection.ReflectionManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* @author <a href="mailto:kabir.khan@jboss.org">Kabir Khan</a>
@@ -32,7 +30,7 @@
public final class CallbackResolver {
private static boolean useAnnotationAnnotatedByListener;
- {
+ static {
//check whether reading annotations of annotations is useful or not
useAnnotationAnnotatedByListener = false;
Target target = (Target) EntityListeners.class.getAnnotation( Target.class );
@@ -42,7 +40,6 @@
}
}
}
- private static Log log = LogFactory.getLog( CallbackResolver.class );
private CallbackResolver() {
}
@@ -107,13 +104,13 @@
while ( currentClazz != null );
//handle default listeners
- if (! stopDefaultListeners) {
+ if ( ! stopDefaultListeners ) {
List<Class> defaultListeners = (List<Class>) reflectionManager.getDefaults().get( EntityListeners.class );
- if (defaultListeners != null) {
+ if ( defaultListeners != null ) {
int defaultListenerSize = defaultListeners.size();
- for (int i = defaultListenerSize - 1 ; i >= 0 ; i--) {
- orderedListeners.add( defaultListeners.get(i) );
+ for ( int i = defaultListenerSize - 1; i >= 0 ; i-- ) {
+ orderedListeners.add( defaultListeners.get( i ) );
}
}
}
@@ -127,13 +124,13 @@
List<XMethod> methods = xListener.getDeclaredMethods();
final int size = methods.size();
for ( int i = 0; i < size ; i++ ) {
- final XMethod xMethod = methods.get(i);
+ final XMethod xMethod = methods.get( i );
if ( xMethod.isAnnotationPresent( annotation ) ) {
final Method method = reflectionManager.toMethod( xMethod );
final String methodName = method.getName();
if ( ! callbacksMethodNames.contains( methodName ) ) {
//overriden method, remove the superclass overriden method
- if ( callback == null ) {
+ if ( callback == null ) {
try {
callback = new ListenerCallback( method, listener.newInstance() );
}
@@ -174,7 +171,7 @@
}
xListener = null; //xListener.getSuperclass();
}
- while (xListener != null);
+ while ( xListener != null );
}
}
return callbacks.toArray( new Callback[ callbacks.size() ] );
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/ListenerCallback.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/ListenerCallback.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/ListenerCallback.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -33,7 +33,7 @@
catch (InvocationTargetException e) {
//keep runtime exceptions as is
if ( e.getTargetException() instanceof RuntimeException ) {
- throw (RuntimeException) e.getCause();
+ throw (RuntimeException) e.getTargetException();
}
else {
throw new RuntimeException( e.getTargetException() );
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -3,14 +3,12 @@
import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hibernate.cfg.Environment;
import org.hibernate.bytecode.util.ClassFilter;
import org.hibernate.bytecode.util.FieldFilter;
+import org.hibernate.cfg.Environment;
/**
* Enhance the classes allowing them to implements InterceptFieldEnabled
@@ -19,7 +17,6 @@
* @author Emmanuel Bernard
*/
public class InterceptFieldClassFileTransformer implements javax.persistence.spi.ClassTransformer {
- Log log = LogFactory.getLog( InterceptFieldClassFileTransformer.class.getName() );
private org.hibernate.bytecode.ClassTransformer classTransformer;
public InterceptFieldClassFileTransformer(List<String> entities) {
@@ -29,11 +26,13 @@
final List<String> copyEntities = new ArrayList<String>( entities.size() );
copyEntities.addAll( entities );
classTransformer = Environment.getBytecodeProvider().getTransformer(
+ //TODO change it to a static class to make it faster?
new ClassFilter() {
public boolean shouldInstrumentClass(String className) {
return copyEntities.contains( className );
}
},
+ //TODO change it to a static class to make it faster?
new FieldFilter() {
public boolean shouldInstrumentField(String className, String fieldName) {
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/XmlHelper.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/XmlHelper.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/XmlHelper.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -144,17 +144,17 @@
}
NodeList children = element.getChildNodes();
- String result = "";
+ StringBuilder result = new StringBuilder("");
for ( int i = 0; i < children.getLength() ; i++ ) {
if ( children.item( i ).getNodeType() == Node.TEXT_NODE ||
children.item( i ).getNodeType() == Node.CDATA_SECTION_NODE ) {
- result += children.item( i ).getNodeValue();
+ result.append( children.item( i ).getNodeValue() );
}
- else if ( children.item( i ).getNodeType() == Node.COMMENT_NODE ) {
- // Ignore comment nodes
- }
+// else if ( children.item( i ).getNodeType() == Node.COMMENT_NODE ) {
+// // Ignore comment nodes
+// }
}
- return result.trim();
+ return result.toString().trim();
}
/**
Modified: trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/AssociationTest.java
===================================================================
--- trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/AssociationTest.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/AssociationTest.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -29,10 +29,31 @@
em.close();
}
+ public void testMergeAndBidirOneToOne() throws Exception {
+ EntityManager em = factory.createEntityManager();
+ em.getTransaction().begin();
+ Oven oven = new Oven();
+ Kitchen kitchen = new Kitchen();
+ em.persist( oven );
+ em.persist( kitchen );
+ kitchen.setOven( oven );
+ oven.setKitchen( kitchen );
+ em.flush();
+ em.clear();
+ //oven = em.find(Oven.class, oven.getId() );
+ oven = em.merge( oven );
+ em.flush();
+
+ em.getTransaction().rollback();
+ em.close();
+ }
+
public Class[] getAnnotatedClasses() {
return new Class[]{
Incident.class,
- IncidentStatus.class
+ IncidentStatus.class,
+ Kitchen.class,
+ Oven.class
};
}
}
Added: trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Kitchen.java
===================================================================
--- trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Kitchen.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Kitchen.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -0,0 +1,35 @@
+//$Id: $
+package org.hibernate.ejb.test.association;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+public class Kitchen {
+ @Id @GeneratedValue
+ private Long id;
+
+ @OneToOne(mappedBy = "kitchen")
+ private Oven oven;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Oven getOven() {
+ return oven;
+ }
+
+ public void setOven(Oven oven) {
+ this.oven = oven;
+ }
+}
Added: trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Oven.java
===================================================================
--- trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Oven.java 2006-10-04 02:42:01 UTC (rev 10551)
+++ trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Oven.java 2006-10-04 02:45:35 UTC (rev 10552)
@@ -0,0 +1,38 @@
+//$Id: $
+package org.hibernate.ejb.test.association;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+import javax.persistence.JoinColumn;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.FetchType;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+public class Oven {
+ @Id @GeneratedValue
+ private Long id;
+
+ @OneToOne(fetch= FetchType.LAZY)
+ @JoinColumn
+ private Kitchen kitchen;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Kitchen getKitchen() {
+ return kitchen;
+ }
+
+ public void setKitchen(Kitchen kitchen) {
+ this.kitchen = kitchen;
+ }
+}
17 years, 8 months
Hibernate SVN: r10551 - in trunk/HibernateExt/metadata/src/java/org/hibernate: cfg cfg/annotations reflection/java validator validator/interpolator
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2006-10-03 22:42:01 -0400 (Tue, 03 Oct 2006)
New Revision: 10551
Modified:
trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java
trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXArrayType.java
trunk/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java
trunk/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolatorAggerator.java
Log:
Code cleaning and potential bug fixes
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java 2006-10-04 00:11:49 UTC (rev 10550)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java 2006-10-04 02:42:01 UTC (rev 10551)
@@ -806,7 +806,6 @@
elements.clear();
for ( int index = 0; index < deep ; index++ ) {
XClass clazz = classesToProcess.get( index );
- InheritanceState state = inheritanceStatePerClass.get( clazz );
boolean currentHasIdentifier = addElementsOfAClass(
elements, propertyHolder, isPropertyAnnotated,
accessType, clazz, mappings
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java 2006-10-04 00:11:49 UTC (rev 10550)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java 2006-10-04 02:42:01 UTC (rev 10551)
@@ -743,7 +743,7 @@
List<String> properties = new ArrayList<String>();
List<String> ordering = new ArrayList<String>();
StringBuilder orderByBuffer = new StringBuilder();
- if ( "".equals( hqlOrderBy ) ) {
+ if ( hqlOrderBy.length() == 0 ) {
//order by id
Iterator it = associatedClass.getIdentifier().getColumnIterator();
while ( it.hasNext() ) {
@@ -822,7 +822,7 @@
List<String> properties = new ArrayList<String>();
List<String> ordering = new ArrayList<String>();
StringBuilder orderByBuffer = new StringBuilder();
- if ( hqlOrderBy != null && hqlOrderBy.length() == 0 ) {
+ if ( hqlOrderBy.length() == 0 ) {
//TODO : Check that. Maybe order by key for maps
}
else {
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java 2006-10-04 00:11:49 UTC (rev 10550)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java 2006-10-04 02:42:01 UTC (rev 10551)
@@ -737,7 +737,7 @@
//we have nothing, so Java annotations might occurs
Annotation annotation = super.getAnnotation( Version.class );
if ( annotation != null ) {
- if ( annotation != null ) annotationList.add( annotation );
+ annotationList.add( annotation );
annotation = super.getAnnotation( Column.class );
if ( annotation != null ) annotationList.add( annotation );
annotation = super.getAnnotation( Columns.class );
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXArrayType.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXArrayType.java 2006-10-04 00:11:49 UTC (rev 10550)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXArrayType.java 2006-10-04 02:42:01 UTC (rev 10551)
@@ -32,6 +32,7 @@
}
private Type getElementType() {
+ //TODO make it a static class for faster performance?
return new TypeSwitch<Type>() {
@Override
public Type caseClass(Class classType) {
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java 2006-10-04 00:11:49 UTC (rev 10550)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java 2006-10-04 02:42:01 UTC (rev 10551)
@@ -80,7 +80,16 @@
private transient List<XMember> childGetters;
private transient DefaultMessageInterpolatorAggerator defaultInterpolator;
private transient MessageInterpolator userInterpolator;
+ private static final Filter GET_ALL_FILTER = new Filter() {
+ public boolean returnStatic() {
+ return true;
+ }
+ public boolean returnTransient() {
+ return true;
+ }
+ };
+
/**
* create the validator engine for this bean type
*/
@@ -201,15 +210,7 @@
}
List<XProperty> fields = currClass.getDeclaredProperties(
- "field", new Filter() {
- public boolean returnStatic() {
- return true;
- }
-
- public boolean returnTransient() {
- return true;
- }
- }
+ "field", GET_ALL_FILTER
);
for ( XProperty field : fields ) {
createMemberValidator( field );
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolatorAggerator.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolatorAggerator.java 2006-10-04 00:11:49 UTC (rev 10550)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolatorAggerator.java 2006-10-04 02:42:01 UTC (rev 10551)
@@ -16,7 +16,9 @@
*/
public class DefaultMessageInterpolatorAggerator implements MessageInterpolator, Serializable {
private Map<Validator, DefaultMessageInterpolator> interpolators = new HashMap<Validator, DefaultMessageInterpolator>();
+ //transient but repopulated by the object owing a reference to the interpolator
private transient ResourceBundle messageBundle;
+ //transient but repopulated by the object owing a reference to the interpolator
private transient ResourceBundle defaultMessageBundle;
//not an interface method
17 years, 8 months