HHH-7803 Refactored the attribute type discovery and moved into

brmeyer · brmeyer · commit 1c992b1faf57 · 2012-11-19T18:00:47.000-05:00
ReflectHelper
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
@@ -24,10 +24,16 @@
  */
 package org.hibernate.internal.util;
 
+import java.beans.Introspector;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.TypeVariable;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
@@ -381,4 +387,87 @@ public static Method getMethod(Class clazz, Method method) {
 		}
 	}
 
+	/**
+	 * Process bean properties getter by applying the JavaBean naming conventions.
+	 *
+	 * @param member the member for which to get the property name.
+	 *
+	 * @return The bean method name with the "is" or "get" prefix stripped off, {@code null}
+	 *         the method name id not according to the JavaBeans standard.
+	 */
+	public static String getPropertyName(Member member) {
+		String name = null;
+
+		if ( member instanceof Field ) {
+			name = member.getName();
+		}
+
+		if ( member instanceof Method ) {
+			String methodName = member.getName();
+			if ( methodName.startsWith( "is" ) ) {
+				name = Introspector.decapitalize( methodName.substring( 2 ) );
+			}
+			else if ( methodName.startsWith( "has" ) ) {
+				name = Introspector.decapitalize( methodName.substring( 3 ) );
+			}
+			else if ( methodName.startsWith( "get" ) ) {
+				name = Introspector.decapitalize( methodName.substring( 3 ) );
+			}
+		}
+		return name;
+	}
+
+	public static boolean isProperty(Member m) {
+		if ( m instanceof Method ) {
+			Method method = (Method) m;
+			return !method.isSynthetic()
+					&& !method.isBridge()
+					&& !Modifier.isStatic( method.getModifiers() )
+					&& method.getParameterTypes().length == 0
+					&& ( method.getName().startsWith( "get" ) || method.getName().startsWith( "is" ) );
+		}
+		else {
+			return !Modifier.isTransient( m.getModifiers() ) && !m.isSynthetic();
+		}
+	}
+	
+	/**
+	 * Returns a Set of field types in the given class.  However, for Collection
+	 * and Map fields, the value and key types are returned instead of the
+	 * Iterable class itself.
+	 * 
+	 * @param clazz
+	 * @return Set<Class<?>>
+	 */
+	public static Set<Class<?>> getFieldTypes( Class<?> clazz ) {
+		Set<Class<?>> fieldTypes = new HashSet<Class<?>>();
+
+		for ( Field declaredField : clazz.getDeclaredFields() ) {
+			Class<?> fieldClass = declaredField.getType();
+			if ( fieldClass.isArray() ) {
+				fieldTypes.add( fieldClass.getComponentType() );
+			}
+			else if ( declaredField.getGenericType() instanceof ParameterizedType ) {
+				final java.lang.reflect.Type[] types
+						= ( (ParameterizedType) declaredField.getGenericType() )
+								.getActualTypeArguments();
+				if ( types != null ) {
+					// assumes we want to check values *and* map keys
+					for ( java.lang.reflect.Type type : types ) {
+						if ( type instanceof TypeVariable ) {
+							fieldTypes.add( (Class<?>) ( (TypeVariable) type )
+									.getGenericDeclaration() );
+						}
+						else {
+							fieldTypes.add( (Class<?>) type );
+						}
+					}
+				}
+			}
+			else {
+				fieldTypes.add( fieldClass );
+			}
+		}
+		return fieldTypes;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
@@ -46,6 +46,7 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.spi.CacheRegionDefinition;
+import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.jaxb.internal.JaxbMappingProcessor;
 import org.hibernate.jaxb.spi.JaxbRoot;
 import org.hibernate.jaxb.spi.Origin;
@@ -522,27 +523,15 @@ private void indexClass(Class clazz, Indexer indexer, Set<Class<?>> processedCla
 		// For backward compatibility, don't require @Embeddable
 		// classes to be explicitly identified.
 		// Automatically find them by checking the fields' types.
-		// TODO: There has to be a better way to do this.
-		for ( Field declaredField : clazz.getDeclaredFields() ) {
-			Class<?> fieldClass = declaredField.getType();
-			if ( fieldClass.isArray() ) {
-				fieldClass = fieldClass.getComponentType();
-			}
-			else if ( Collection.class.isAssignableFrom( fieldClass )
-					&& declaredField.getGenericType() instanceof ParameterizedType ) {
-				ParameterizedType listType = (ParameterizedType) declaredField.getGenericType();
-				fieldClass = (Class<?>) listType.getActualTypeArguments()[0];
-		    }
-			// TODO: Map
-			
-			if ( !fieldClass.isPrimitive() && fieldClass != Object.class ) {
+		for ( Class<?> fieldType : ReflectHelper.getFieldTypes( clazz ) ) {		
+			if ( !fieldType.isPrimitive() && fieldType != Object.class ) {
 				try {
 					Index fieldIndex = JandexHelper.indexForClass(
 							serviceRegistry.getService( ClassLoaderService.class ),
-							fieldClass );
+							fieldType );
 					if ( !fieldIndex.getAnnotations(
 							JPADotNames.EMBEDDABLE ).isEmpty() ) {
-						indexClass( fieldClass, indexer, processedClasses );
+						indexClass( fieldType, indexer, processedClasses );
 					}
 				} catch ( Exception e ) {
 					// do nothing
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/ConfiguredClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/ConfiguredClass.java
@@ -44,6 +44,7 @@
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.internal.CoreMessageLogger;
+import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
 import org.hibernate.metamodel.internal.source.annotations.attribute.AssociationAttribute;
@@ -54,9 +55,9 @@
 import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
 import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
-import org.hibernate.metamodel.internal.source.annotations.util.ReflectionHelper;
 import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
 import org.hibernate.metamodel.spi.source.MappingException;
+import org.hibernate.validator.util.ReflectionHelper;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
@@ -304,7 +305,7 @@ private void collectAttributes() {
 	}
 
 	private boolean isPersistentMember(Set<String> transientNames, Set<String> explicitlyConfiguredMemberNames, Member member) {
-		if ( !ReflectionHelper.isProperty( member ) ) {
+		if ( !ReflectHelper.isProperty( member ) ) {
 			return false;
 		}
 
@@ -393,7 +394,7 @@ private Set<String> createExplicitlyConfiguredAccessProperties(ResolvedTypeWithM
 					);
 				}
 			}
-			if ( ReflectionHelper.isProperty( member ) ) {
+			if ( ReflectHelper.isProperty( member ) ) {
 				createMappedAttribute( member, resolvedMembers, accessType );
 				explicitAccessPropertyNames.add( ReflectionHelper.getPropertyName( member ) );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/ReflectionHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/ReflectionHelper.java
