[hibernate-commits] Hibernate SVN: r10551 - in trunk/HibernateExt/metadata/src/java/org/hibernate: cfg cfg/annotations reflection/java validator validator/interpolator

[hibernate-commits at 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