Hibernate SVN: r11198 - trunk/Hibernate3/src/org/hibernate/engine.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-13 16:04:10 -0500 (Tue, 13 Feb 2007)
New Revision: 11198
Modified:
trunk/Hibernate3/src/org/hibernate/engine/NamedSQLQueryDefinition.java
Log:
mark method as deprecated, annotations does not use it
Modified: trunk/Hibernate3/src/org/hibernate/engine/NamedSQLQueryDefinition.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/engine/NamedSQLQueryDefinition.java 2007-02-13 18:42:44 UTC (rev 11197)
+++ trunk/Hibernate3/src/org/hibernate/engine/NamedSQLQueryDefinition.java 2007-02-13 21:04:10 UTC (rev 11198)
@@ -124,6 +124,10 @@
* This form used from annotations (?). Essentially the same as the above using a
* resultset-mapping reference, but without cacheMode, readOnly, and comment.
*
+ * FIXME: annotations do not use it, so it can be remove from my POV
+ * @deprecated
+ *
+ *
* @param query The sql query string
* @param resultSetRef The result-set-mapping name
* @param querySpaces Any specified query spaces (used for auto-flushing)
17 years, 2 months
Hibernate SVN: r11197 - in branches/Branch_3_2/HibernateExt/validator/src: test/org/hibernate/validator/test and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-13 13:42:44 -0500 (Tue, 13 Feb 2007)
New Revision: 11197
Added:
branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/Patterns.java
branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/Engine.java
Modified:
branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/ClassValidator.java
branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/ValidatorTest.java
Log:
ANN-513 support for validations like @MyValidators({@MyValidator(...)})
Modified: branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/ClassValidator.java
===================================================================
--- branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/ClassValidator.java 2007-02-13 05:33:27 UTC (rev 11196)
+++ branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/ClassValidator.java 2007-02-13 18:42:44 UTC (rev 11197)
@@ -205,6 +205,7 @@
Annotation classAnnotation = classAnnotations[i];
Validator beanValidator = createValidator( classAnnotation );
if ( beanValidator != null ) beanValidators.add( beanValidator );
+ handleAggregateAnnotations(classAnnotation, null);
}
}
@@ -236,6 +237,47 @@
}
}
+ private boolean handleAggregateAnnotations(Annotation annotation, XMember member) {
+ Object[] values;
+ try {
+ Method valueMethod = annotation.getClass().getMethod( "value" );
+ if ( valueMethod.getReturnType().isArray() ) {
+ values = (Object[]) valueMethod.invoke( annotation );
+ }
+ else {
+ return false;
+ }
+ }
+ catch (NoSuchMethodException e) {
+ return false;
+ }
+ catch (Exception e) {
+ throw new IllegalStateException( e );
+ }
+
+ boolean validatorPresent = false;
+ for ( Object value : values ) {
+ if ( value instanceof Annotation ) {
+ annotation = (Annotation) value;
+ Validator validator = createValidator( annotation );
+ if ( validator != null ) {
+ if ( member != null ) {
+ //member
+ memberValidators.add( validator );
+ setAccessible( member );
+ memberGetters.add( member );
+ }
+ else {
+ //bean
+ beanValidators.add( validator );
+ }
+ validatorPresent = true;
+ }
+ }
+ }
+ return validatorPresent;
+ }
+
@SuppressWarnings("unchecked")
private void createChildValidator( XMember member) {
if ( member.isAnnotationPresent( Valid.class ) ) {
@@ -249,6 +291,7 @@
clazz = member.getType();
}
if ( !childClassValidators.containsKey( clazz ) ) {
+ //ClassValidator added by side effect (added to childClassValidators during CV construction)
new ClassValidator( clazz, messageBundle, userInterpolator, childClassValidators, reflectionManager );
}
}
@@ -257,8 +300,7 @@
private void createMemberValidator(XMember member) {
boolean validatorPresent = false;
Annotation[] memberAnnotations = member.getAnnotations();
- for ( int j = 0; j < memberAnnotations.length ; j++ ) {
- Annotation methodAnnotation = memberAnnotations[j];
+ for ( Annotation methodAnnotation : memberAnnotations ) {
Validator propertyValidator = createValidator( methodAnnotation );
if ( propertyValidator != null ) {
memberValidators.add( propertyValidator );
@@ -266,6 +308,8 @@
memberGetters.add( member );
validatorPresent = true;
}
+ boolean agrValidPresent = handleAggregateAnnotations( methodAnnotation, member );
+ validatorPresent = validatorPresent || agrValidPresent;
}
if ( validatorPresent && !member.isTypeResolved() ) {
log.warn( "Original type of property " + member + " is unbound and has been approximated." );
Added: branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/Patterns.java
===================================================================
--- branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/Patterns.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/Patterns.java 2007-02-13 18:42:44 UTC (rev 11197)
@@ -0,0 +1,21 @@
+//$Id: $
+package org.hibernate.validator;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+
+/**
+ * The annotated element must follow the list of regexp patterns
+ *
+ * @author Gavin King
+ */
+@Documented
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface Patterns {
+ Pattern[] value();
+}
Added: branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/Engine.java
===================================================================
--- branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/Engine.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/Engine.java 2007-02-13 18:42:44 UTC (rev 11197)
@@ -0,0 +1,34 @@
+//$Id: $
+package org.hibernate.validator.test;
+
+import org.hibernate.validator.Patterns;
+import org.hibernate.validator.Pattern;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class Engine {
+ @Patterns( {
+ @Pattern(regex = "^[A-Z0-9-]+$", message = "must contain alphabetical characters only"),
+ @Pattern(regex = "^....-....-....$", message="must match ....-....-....")
+ } )
+ private String serialNumber;
+ private long horsePower;
+
+
+ public String getSerialNumber() {
+ return serialNumber;
+ }
+
+ public void setSerialNumber(String serialNumber) {
+ this.serialNumber = serialNumber;
+ }
+
+ public long getHorsePower() {
+ return horsePower;
+ }
+
+ public void setHorsePower(long horsePower) {
+ this.horsePower = horsePower;
+ }
+}
Modified: branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/ValidatorTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/ValidatorTest.java 2007-02-13 05:33:27 UTC (rev 11196)
+++ branches/Branch_3_2/HibernateExt/validator/src/test/org/hibernate/validator/test/ValidatorTest.java 2007-02-13 18:42:44 UTC (rev 11197)
@@ -101,6 +101,19 @@
assertEquals( 1, invalidValues.length );
}
+ public void testAggregationAnnotations() throws Exception {
+ Engine eng = new Engine();
+ eng.setHorsePower( 23 );
+ eng.setSerialNumber( "23-43###4" );
+ ClassValidator<Engine> classValidator = new ClassValidator<Engine>( Engine.class );
+ InvalidValue[] invalidValues = classValidator.getInvalidValues( eng );
+ assertEquals( 2, invalidValues.length );
+
+ eng.setSerialNumber( "1234-5678-9012");
+ invalidValues = classValidator.getInvalidValues( eng );
+ assertEquals( 0, invalidValues.length );
+ }
+
public void testDefaultResourceBundle() throws Exception {
Tv tv = new Tv();
tv.serial = "FS";
17 years, 2 months
Hibernate SVN: r11196 - in branches/Branch_3_2/HibernateExt/jpa-api: doc and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-13 00:33:27 -0500 (Tue, 13 Feb 2007)
New Revision: 11196
Added:
branches/Branch_3_2/HibernateExt/jpa-api/doc/
branches/Branch_3_2/HibernateExt/jpa-api/doc/api/
branches/Branch_3_2/HibernateExt/jpa-api/doc/api/package.html
Modified:
branches/Branch_3_2/HibernateExt/jpa-api/build.xml
Log:
ANN-521 missing package-info
Modified: branches/Branch_3_2/HibernateExt/jpa-api/build.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/jpa-api/build.xml 2007-02-13 05:22:09 UTC (rev 11195)
+++ branches/Branch_3_2/HibernateExt/jpa-api/build.xml 2007-02-13 05:33:27 UTC (rev 11196)
@@ -93,7 +93,8 @@
use="true"
protected="true"
version="true"
- windowtitle="EJB 3.0 Persistence API Documentation"
+ overview="${basedir}/doc/api/package.html"
+ windowtitle="EJB 3.0 Persistence API Documentation"
doctitle="EJB 3.0 Persistence API Documentation"
stylesheetfile="./etc/jdstyle.css"
link="http://java.sun.com/j2se/1.5/docs/api">
Added: branches/Branch_3_2/HibernateExt/jpa-api/doc/api/package.html
===================================================================
--- branches/Branch_3_2/HibernateExt/jpa-api/doc/api/package.html (rev 0)
+++ branches/Branch_3_2/HibernateExt/jpa-api/doc/api/package.html 2007-02-13 05:33:27 UTC (rev 11196)
@@ -0,0 +1 @@
+<body></body>
\ No newline at end of file
17 years, 2 months
Hibernate SVN: r11195 - in branches/Branch_3_2/HibernateExt/annotations/src: java/org/hibernate/cfg and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-13 00:22:09 -0500 (Tue, 13 Feb 2007)
New Revision: 11195
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/ForeignKey.java
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/OneToOneSecondPass.java
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java
Log:
ANN-525 @ForeignKey for secondary table and joined subclasses
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/ForeignKey.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/ForeignKey.java 2007-02-13 05:09:17 UTC (rev 11194)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/ForeignKey.java 2007-02-13 05:22:09 UTC (rev 11195)
@@ -3,11 +3,12 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-@Target({FIELD, METHOD})
+@Target({FIELD, METHOD, TYPE})
@Retention(RUNTIME)
/**
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java 2007-02-13 05:09:17 UTC (rev 11194)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java 2007-02-13 05:22:09 UTC (rev 11195)
@@ -29,4 +29,10 @@
*/
String comment() default "";
+ /**
+ * Defines the Foreign Key name of a secondary table
+ * back to the propary table
+ */
+ ForeignKey foreignKey() default @ForeignKey( name="" );
+
}
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-02-13 05:09:17 UTC (rev 11194)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-02-13 05:22:09 UTC (rev 11195)
@@ -586,6 +586,10 @@
}
SimpleValue key = new DependantValue( jsc.getTable(), jsc.getIdentifier() );
jsc.setKey( key );
+ ForeignKey fk = annotatedClass.getAnnotation( ForeignKey.class );
+ if (fk != null && ! BinderHelper.isDefault( fk.name() ) ) {
+ key.setForeignKeyName( fk.name() );
+ }
if ( onDeleteAnn != null ) {
key.setCascadeDeleteEnabled( OnDeleteAction.CASCADE.equals( onDeleteAnn.action() ) );
}
@@ -750,7 +754,7 @@
if ( !inheritanceState.hasParents ) {
final RootClass rootClass = (RootClass) persistentClass;
- //no need to handle inSecondPass this is an Etntiy related work
+ //no need to handle inSecondPass this is an Entity related work
mappings.addSecondPass( new CreateKeySecondPass( rootClass ) );
}
else {
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/OneToOneSecondPass.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/OneToOneSecondPass.java 2007-02-13 05:09:17 UTC (rev 11194)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/OneToOneSecondPass.java 2007-02-13 05:22:09 UTC (rev 11195)
@@ -217,6 +217,7 @@
join.setTable( originalJoin.getTable() );
join.setInverse( true );
SimpleValue key = new DependantValue( join.getTable(), persistentClass.getIdentifier() );
+ //TODO support @ForeignKey
join.setKey( key );
join.setSequentialSelect( false );
join.setOptional( true ); //perhaps not quite per-spec, but a Good Thing anyway
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-13 05:09:17 UTC (rev 11194)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-13 05:22:09 UTC (rev 11195)
@@ -491,14 +491,15 @@
for ( Ejb3JoinColumn joinColumn : ejb3JoinColumns ) {
joinColumn.forceNotNull();
}
- bindJoinToPersistentClass( join, ejb3JoinColumns, persistentClass, mappings );
+ bindJoinToPersistentClass( join, ejb3JoinColumns );
}
- public static void bindJoinToPersistentClass(
- Join join, Ejb3JoinColumn[] ejb3JoinColumns, PersistentClass persistentClass, ExtendedMappings mappings
+ private void bindJoinToPersistentClass(
+ Join join, Ejb3JoinColumn[] ejb3JoinColumns
) {
SimpleValue key = new DependantValue( join.getTable(), persistentClass.getIdentifier() );
join.setKey( key );
+ setFKNameIfDefined(join);
join.setSequentialSelect( false );
join.setInverse( false );
join.setOptional( true ); //perhaps not quite per-spec, but a Good Thing anyway
@@ -509,6 +510,29 @@
persistentClass.addJoin( join );
}
+ private void setFKNameIfDefined(Join join) {
+ String tableName = join.getTable().getQuotedName();
+ org.hibernate.annotations.Table table = annotatedClass.getAnnotation( org.hibernate.annotations.Table.class );
+ org.hibernate.annotations.Table matchingTable = null;
+ if ( table != null && tableName.equals( table.appliesTo() ) ) {
+ matchingTable = table;
+ }
+ else {
+ org.hibernate.annotations.Tables tables = annotatedClass.getAnnotation( org.hibernate.annotations.Tables.class );
+ if ( tables != null) {
+ for (org.hibernate.annotations.Table current : tables.value() ) {
+ if ( tableName.equals( current.appliesTo() ) ) {
+ matchingTable = current;
+ break;
+ }
+ }
+ }
+ }
+ if (matchingTable != null && ! BinderHelper.isDefault( matchingTable.foreignKey().name() ) ) {
+ ( (SimpleValue) join.getKey() ).setForeignKeyName( matchingTable.foreignKey().name() );
+ }
+ }
+
public void firstLevelSecondaryTablesBinding(
SecondaryTable secTable, SecondaryTables secTables
) {
@@ -666,19 +690,19 @@
public void processComplementaryTableDefinitions(org.hibernate.annotations.Table table) {
if ( table == null ) return;
- String tableName = table.appliesTo();
+ String appliedTable = table.appliesTo();
Iterator tables = persistentClass.getTableClosureIterator();
Table hibTable = null;
while ( tables.hasNext() ) {
hibTable = (Table) tables.next();
- if ( hibTable.getName().equals( tableName ) ) {
+ if ( hibTable.getQuotedName().equals( appliedTable ) ) {
//we are in the correct table to find columns
break;
}
}
if ( hibTable == null ) {
throw new AnnotationException(
- "@org.hibernate.annotations.Table references an unknown table: " + tableName
+ "@org.hibernate.annotations.Table references an unknown table: " + appliedTable
);
}
if ( ! BinderHelper.isDefault( table.comment() ) ) hibTable.setComment( table.comment() );
@@ -687,7 +711,7 @@
public void processComplementaryTableDefinitions(Tables tables) {
if ( tables == null ) return;
- for ( org.hibernate.annotations.Table table : tables.values() ) {
+ for ( org.hibernate.annotations.Table table : tables.value() ) {
processComplementaryTableDefinitions( table );
}
}
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2007-02-13 05:09:17 UTC (rev 11194)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2007-02-13 05:22:09 UTC (rev 11195)
@@ -4,10 +4,13 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import org.hibernate.annotations.ForeignKey;
+
/**
* @author Emmanuel Bernard
*/
@Entity
+@ForeignKey(name = "FK_DOCU_FILE")
public class Document extends File {
@Column(nullable = false)
private int size;
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java 2007-02-13 05:09:17 UTC (rev 11194)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java 2007-02-13 05:22:09 UTC (rev 11195)
@@ -12,6 +12,8 @@
import org.hibernate.annotations.Index;
import org.hibernate.annotations.Table;
+import org.hibernate.annotations.ForeignKey;
+import org.hibernate.annotations.Tables;
/**
* @author Emmanuel Bernard
@@ -21,7 +23,11 @@
@SecondaryTable(name = "`Cat nbr1`"),
@SecondaryTable(name = "Cat2", uniqueConstraints = {@UniqueConstraint(columnNames = {"storyPart2"})})
})
-@Table(appliesTo = "Cat", indexes = @Index(name = "secondname", columnNames = "secondName"), comment = "My cat table")
+@Tables( {
+ @Table(appliesTo = "Cat", indexes = @Index(name = "secondname",
+ columnNames = "secondName"), comment = "My cat table" ),
+ @Table(appliesTo = "Cat2", foreignKey = @ForeignKey(name="FK_CAT2_CAT") )
+ } )
public class Cat implements Serializable {
private Integer id;
17 years, 2 months
Hibernate SVN: r11194 - branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-13 00:09:17 -0500 (Tue, 13 Feb 2007)
New Revision: 11194
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Tables.java
Log:
ANN-555
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Tables.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Tables.java 2007-02-10 17:35:56 UTC (rev 11193)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Tables.java 2007-02-13 05:09:17 UTC (rev 11194)
@@ -14,5 +14,5 @@
@Target({TYPE})
@Retention(RUNTIME)
public @interface Tables {
- Table[] values();
+ Table[] value();
}
17 years, 2 months
Hibernate SVN: r11193 - in branches/Branch_3_2/HibernateExt/annotations/src: java/org/hibernate/cfg and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-10 12:35:56 -0500 (Sat, 10 Feb 2007)
New Revision: 11193
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
Log:
ANN-537 Support comments on table
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java 2007-02-10 17:05:28 UTC (rev 11192)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Table.java 2007-02-10 17:35:56 UTC (rev 11193)
@@ -24,4 +24,9 @@
*/
Index[] indexes() default {};
+ /**
+ * define a table comment
+ */
+ String comment() default "";
+
}
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-02-10 17:05:28 UTC (rev 11192)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-02-10 17:35:56 UTC (rev 11193)
@@ -760,9 +760,9 @@
mappings.addClass( persistentClass );
entityBinder.finalSecondaryTableBinding( propertyHolder );
- //add indexes
- entityBinder.addIndexes( annotatedClass.getAnnotation( org.hibernate.annotations.Table.class ) );
- entityBinder.addIndexes( annotatedClass.getAnnotation( org.hibernate.annotations.Tables.class ) );
+ //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: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-10 17:05:28 UTC (rev 11192)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-10 17:35:56 UTC (rev 11193)
@@ -664,7 +664,7 @@
this.ignoreIdAnnotations = ignoreIdAnnotations;
}
- public void addIndexes(org.hibernate.annotations.Table table) {
+ public void processComplementaryTableDefinitions(org.hibernate.annotations.Table table) {
if ( table == null ) return;
String tableName = table.appliesTo();
Iterator tables = persistentClass.getTableClosureIterator();
@@ -681,13 +681,14 @@
"@org.hibernate.annotations.Table references an unknown table: " + tableName
);
}
+ if ( ! BinderHelper.isDefault( table.comment() ) ) hibTable.setComment( table.comment() );
TableBinder.addIndexes( hibTable, table.indexes(), mappings );
}
- public void addIndexes(Tables tables) {
+ public void processComplementaryTableDefinitions(Tables tables) {
if ( tables == null ) return;
for ( org.hibernate.annotations.Table table : tables.values() ) {
- addIndexes( table );
+ processComplementaryTableDefinitions( table );
}
}
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java 2007-02-10 17:05:28 UTC (rev 11192)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/join/Cat.java 2007-02-10 17:35:56 UTC (rev 11193)
@@ -21,7 +21,7 @@
@SecondaryTable(name = "`Cat nbr1`"),
@SecondaryTable(name = "Cat2", uniqueConstraints = {@UniqueConstraint(columnNames = {"storyPart2"})})
})
-@Table(appliesTo = "Cat", indexes = @Index(name = "secondname", columnNames = "secondName"))
+@Table(appliesTo = "Cat", indexes = @Index(name = "secondname", columnNames = "secondName"), comment = "My cat table")
public class Cat implements Serializable {
private Integer id;
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2007-02-10 17:05:28 UTC (rev 11192)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2007-02-10 17:35:56 UTC (rev 11193)
@@ -87,8 +87,6 @@
return new Class[]{
PrimeMinister.class,
Sky.class,
- //AImpl.class,
- //BImpl.class,
ZImpl.class
};
17 years, 2 months
Hibernate SVN: r11192 - branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-10 12:05:28 -0500 (Sat, 10 Feb 2007)
New Revision: 11192
Added:
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
Log:
More tests regarding hbm/ann mix when interfaces are used ANN-541
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
+<hibernate-mapping>
+ <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A"
+ proxy="org.hibernate.test.annotations.xml.hbm.A">
+ <id name="AId" column="aID" type="java.lang.Integer">
+ <generator class="identity"/>
+ </id>
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/A.java 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,11 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface A extends java.io.Serializable {
+ public Integer getAId();
+
+ public void setAId(Integer aId);
+}
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/AImpl.java 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,34 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+
+@Entity
+@Inheritance( strategy = InheritanceType.JOINED )
+(a)org.hibernate.annotations.Proxy( proxyClass = A.class )
+@Table( name = "A" )
+public class AImpl implements A {
+ private static final long serialVersionUID = 1L;
+
+ private Integer aId = 0;
+
+ public AImpl() {
+ }
+
+ @Id
+ @GeneratedValue
+ @Column( name = "aID" )
+ public Integer getAId() {
+ return this.aId;
+ }
+
+ public void setAId(Integer aId) {
+ this.aId = aId;
+ }
+}
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
+<hibernate-mapping>
+ <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B"
+ proxy="org.hibernate.test.annotations.xml.hbm.B"
+ extends="org.hibernate.test.annotations.xml.hbm.AImpl">
+ <key column="aID"/>
+ <property name="BId" column="bID" type="java.lang.Integer"
+ not-null="true"/>
+ </joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/B.java 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,11 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface B extends A {
+ public Integer getBId();
+
+ public void setBId(Integer bId);
+}
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/BImpl.java 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,26 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+(a)org.hibernate.annotations.Proxy( proxyClass = B.class )
+@Table( name = "B" )
+public class BImpl extends AImpl implements B {
+ private static final long serialVersionUID = 1L;
+
+ private Integer bId = 0;
+
+ public BImpl() {
+ super();
+ }
+
+ public Integer getBId() {
+ return bId;
+ }
+
+ public void setBId(Integer bId) {
+ this.bId = bId;
+ }
+}
\ No newline at end of file
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2007-02-10 09:23:53 UTC (rev 11191)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2007-02-10 17:05:28 UTC (rev 11192)
@@ -63,6 +63,20 @@
s.close();
}
+ public void testManyToOneAndInterface() throws Exception {
+ Session s = openSession();
+ s.getTransaction().begin();
+ B b = new BImpl();
+ b.setBId( 1 );
+ s.persist( b );
+ Z z = new ZImpl();
+ z.setB( b );
+ s.persist( z );
+ s.flush();
+ s.getTransaction().rollback();
+ s.close();
+ }
+
@Override
protected void configure(Configuration cfg) {
super.configure( cfg );
@@ -72,7 +86,11 @@
protected Class[] getMappings() {
return new Class[]{
PrimeMinister.class,
- Sky.class
+ Sky.class,
+ //AImpl.class,
+ //BImpl.class,
+ ZImpl.class
+
};
}
@@ -80,7 +98,9 @@
protected String[] getXmlFiles() {
return new String[]{
"org/hibernate/test/annotations/xml/hbm/Government.hbm.xml",
- "org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml"
+ "org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml",
+ "org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
+ "org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
};
}
}
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/Z.java 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,15 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public interface Z extends java.io.Serializable {
+ public Integer getZId();
+
+ public void setZId(Integer zId);
+
+ public B getB();
+
+ public void setB(B b);
+}
Added: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/xml/hbm/ZImpl.java 2007-02-10 17:05:28 UTC (rev 11192)
@@ -0,0 +1,45 @@
+//$Id: $
+package org.hibernate.test.annotations.xml.hbm;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+
+@Entity
+@Inheritance( strategy = InheritanceType.JOINED )
+(a)org.hibernate.annotations.Proxy( proxyClass = Z.class )
+@Table( name = "Z" )
+public class ZImpl implements Z {
+ private static final long serialVersionUID = 1L;
+
+ private Integer zId = null;
+ private B b = null;
+
+ @Id
+ @GeneratedValue
+ @Column( name = "zID" )
+ public Integer getZId() {
+ return zId;
+ }
+
+ public void setZId(Integer zId) {
+ this.zId = zId;
+ }
+
+ @ManyToOne( optional = false, targetEntity = BImpl.class, fetch = FetchType.LAZY )
+ @JoinColumn( name = "bID", referencedColumnName = "bID")
+ public B getB() {
+ return b;
+ }
+
+ public void setB(B b) {
+ this.b = b;
+ }
+}
17 years, 2 months
Hibernate SVN: r11191 - in branches/Branch_3_2/HibernateExt/annotations/src: java/org/hibernate/cfg/annotations and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-10 04:23:53 -0500 (Sat, 10 Feb 2007)
New Revision: 11191
Added:
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Immutable.java
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/City.java
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java
Log:
ANN-542 immutable implementation
Added: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Immutable.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Immutable.java (rev 0)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/annotations/Immutable.java 2007-02-10 09:23:53 UTC (rev 11191)
@@ -0,0 +1,15 @@
+//$Id: $
+package org.hibernate.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Mark an Entity or a Collection as immutable
+ * No annotation means the element is mutable
+ *
+ * @author Emmanuel Bernard
+ */
+(a)java.lang.annotation.Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention( RetentionPolicy.RUNTIME )
+public @interface Immutable {
+}
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/CollectionBinder.java 2007-02-10 09:20:51 UTC (rev 11190)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/CollectionBinder.java 2007-02-10 09:23:53 UTC (rev 11191)
@@ -45,6 +45,7 @@
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.SQLDeleteAll;
import org.hibernate.annotations.Loader;
+import org.hibernate.annotations.Immutable;
import org.hibernate.cfg.AnnotatedClassType;
import org.hibernate.cfg.AnnotationBinder;
import org.hibernate.cfg.BinderHelper;
@@ -305,6 +306,8 @@
);
}
+ collection.setMutable( ! property.isAnnotationPresent( Immutable.class ) );
+
// set ordering
if ( orderBy != null ) collection.setOrderBy( orderBy );
if ( isSorted ) {
Modified: branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-10 09:20:51 UTC (rev 11190)
+++ branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-10 09:23:53 UTC (rev 11191)
@@ -37,6 +37,7 @@
import org.hibernate.annotations.SQLDeleteAll;
import org.hibernate.annotations.Tuplizers;
import org.hibernate.annotations.Tuplizer;
+import org.hibernate.annotations.Immutable;
import org.hibernate.cache.CacheFactory;
import org.hibernate.cfg.AnnotationBinder;
import org.hibernate.cfg.BinderHelper;
@@ -75,7 +76,6 @@
private boolean dynamicInsert;
private boolean dynamicUpdate;
private boolean explicitHibernateEntityAnnotation;
- private boolean mutable;
private OptimisticLockType optimisticLockType;
private String persister;
private PolymorphismType polymorphismType;
@@ -120,7 +120,6 @@
if ( hibAnn != null ) {
dynamicInsert = hibAnn.dynamicInsert();
dynamicUpdate = hibAnn.dynamicUpdate();
- mutable = hibAnn.mutable();
optimisticLockType = hibAnn.optimisticLock();
persister = hibAnn.persister();
selectBeforeUpdate = hibAnn.selectBeforeUpdate();
@@ -131,7 +130,6 @@
//default values when the annotation is not there
dynamicInsert = false;
dynamicUpdate = false;
- mutable = true;
optimisticLockType = OptimisticLockType.VERSION;
persister = "";
polymorphismType = PolymorphismType.IMPLICIT;
@@ -170,6 +168,18 @@
if ( persistentClass instanceof RootClass ) {
RootClass rootClass = (RootClass) persistentClass;
+ boolean mutable = true;
+ //priority on @Immutable, then @Entity.mutable()
+ if ( annotatedClass.isAnnotationPresent( Immutable.class ) ) {
+ mutable = false;
+ }
+ else {
+ org.hibernate.annotations.Entity entityAnn =
+ annotatedClass.getAnnotation( org.hibernate.annotations.Entity.class );
+ if ( entityAnn != null ) {
+ mutable = entityAnn.mutable();
+ }
+ }
rootClass.setMutable( mutable );
rootClass.setExplicitPolymorphism( isExplicitPolymorphism( polymorphismType ) );
if ( StringHelper.isNotEmpty( where ) ) rootClass.setWhere( where );
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/City.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/City.java 2007-02-10 09:20:51 UTC (rev 11190)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/City.java 2007-02-10 09:23:53 UTC (rev 11191)
@@ -11,6 +11,7 @@
import javax.persistence.OrderBy;
import org.hibernate.annotations.ForeignKey;
+import org.hibernate.annotations.Immutable;
/**
* @author Emmanuel Bernard
@@ -54,6 +55,7 @@
@JoinColumn(name = "mainstreetcity_id")
@ForeignKey(name = "CITYSTR_FK")
@OrderBy
+ @Immutable
public List<Street> getMainStreets() {
return mainStreets;
}
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2007-02-10 09:20:51 UTC (rev 11190)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2007-02-10 09:23:53 UTC (rev 11191)
@@ -72,9 +72,10 @@
s.persist( grandeArmee );
paris.addMainStreet( chmpsElysees );
paris.addMainStreet( grandeArmee );
- tx.commit();
+
+ s.flush();
s.clear();
- tx = s.beginTransaction();
+
//testing @OrderBy with explicit values including Formula
paris = (City) s.get( City.class, paris.getId() );
assertEquals( 3, paris.getStreets().size() );
@@ -86,7 +87,7 @@
assertTrue( previousId < street.getId() );
previousId = street.getId();
}
- tx.commit();
+ tx.rollback();
s.close();
}
17 years, 2 months
Hibernate SVN: r11190 - branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/manytoone.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-10 04:20:51 -0500 (Sat, 10 Feb 2007)
New Revision: 11190
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
Log:
adjust test
Modified: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
===================================================================
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2007-02-10 08:09:18 UTC (rev 11189)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2007-02-10 09:20:51 UTC (rev 11190)
@@ -33,7 +33,9 @@
// s.persist( lot );
// s.persist( car );
//
+// s.flush();
// s.clear();
+// s.clear();
//
// car = (Carz) s.createQuery( "from Carz car left join fetch car.lot").uniqueResult();
// assertNotNull( car.getLot() );
17 years, 2 months
Hibernate SVN: r11189 - branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2007-02-10 03:09:18 -0500 (Sat, 10 Feb 2007)
New Revision: 11189
Modified:
branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/FutureValidator.java
branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/PastValidator.java
Log:
HV-2
Modified: branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/FutureValidator.java
===================================================================
--- branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/FutureValidator.java 2007-02-10 07:38:41 UTC (rev 11188)
+++ branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/FutureValidator.java 2007-02-10 08:09:18 UTC (rev 11189)
@@ -20,16 +20,7 @@
public boolean isValid(Object value) {
if ( value == null ) return true;
- if ( value instanceof String ) {
- try {
- Date date = DateFormat.getTimeInstance().parse( (String) value );
- return date.after( new Date() );
- }
- catch (ParseException nfe) {
- return false;
- }
- }
- else if ( value instanceof Date ) {
+ if ( value instanceof Date ) {
Date date = (Date) value;
return date.after( new Date() );
}
Modified: branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/PastValidator.java
===================================================================
--- branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/PastValidator.java 2007-02-10 07:38:41 UTC (rev 11188)
+++ branches/Branch_3_2/HibernateExt/validator/src/java/org/hibernate/validator/PastValidator.java 2007-02-10 08:09:18 UTC (rev 11189)
@@ -23,16 +23,7 @@
public boolean isValid(Object value) {
if ( value == null ) return true;
- if ( value instanceof String ) {
- try {
- Date date = DateFormat.getTimeInstance().parse( (String) value );
- return date.before( new Date() );
- }
- catch (ParseException nfe) {
- return false;
- }
- }
- else if ( value instanceof Date ) {
+ if ( value instanceof Date ) {
Date date = (Date) value;
return date.before( new Date() );
}
17 years, 2 months