HHH-7803 Refactored the attribute type discovery and moved into ReflectHelper

gbadner · gbadner · commit d779125ea510 · 2012-11-20T11:56:53.000-08:00
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
@@ -57,7 +57,6 @@
 import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 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;
@@ -323,7 +322,7 @@ private boolean isPersistentMember(Set<String> transientNames, Set<String> expli
 			return false;
 		}
 
-		if ( explicitlyConfiguredMemberNames.contains( ReflectionHelper.getPropertyName( member ) ) ) {
+		if ( explicitlyConfiguredMemberNames.contains( ReflectHelper.getPropertyName( member ) ) ) {
 			return false;
 		}
 
@@ -396,7 +395,7 @@ private Set<String> createExplicitlyConfiguredAccessProperties(ResolvedTypeWithM
 			}
 			if ( ReflectHelper.isProperty( member ) ) {
 				createMappedAttribute( member, resolvedMembers, accessType );
-				explicitAccessPropertyNames.add( ReflectionHelper.getPropertyName( member ) );
+				explicitAccessPropertyNames.add( ReflectHelper.getPropertyName( member ) );
 			}
 		}
 		return explicitAccessPropertyNames;
@@ -437,7 +436,7 @@ private void checkExplicitJpaAttributeAccessAnnotationPlacedCorrectly(Annotation
 	}
 
 	private void createMappedAttribute(Member member, ResolvedTypeWithMembers resolvedType, AccessType accessType) {
-		final String attributeName = ReflectionHelper.getPropertyName( member );
+		final String attributeName = ReflectHelper.getPropertyName( member );
 		final ResolvedMember[] resolvedMembers = Field.class.isInstance( member ) ? resolvedType.getMemberFields() : resolvedType
 				.getMemberMethods();
 		ResolvedMember resolvedMember = findResolvedMember( member.getName(), resolvedMembers );
@@ -581,7 +580,7 @@ private EmbeddableClass resolveEmbeddable(String attributeName, Class<?> type, M
 	 * Given the annotations defined on a persistent attribute this methods determines the attribute type.
 	 *
 	 * @param annotations the annotations defined on the persistent attribute
-	 * @param type the attribute's type
+	 * @param attributeType the attribute's type
 	 * @param referencedCollectionType the type of the collection element in case the attribute is collection valued
 	 *
 	 * @return an instance of the {@code AttributeType} enum

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@`
`57`	`57`	`import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;`
`58`	`58`	`import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;`
`59`	`59`	`import org.hibernate.metamodel.spi.source.MappingException;`
`60`		`-import org.hibernate.validator.util.ReflectionHelper;`
`61`	`60`	`import org.jboss.jandex.AnnotationInstance;`
`62`	`61`	`import org.jboss.jandex.AnnotationTarget;`
`63`	`62`	`import org.jboss.jandex.ClassInfo;`
`@@ -323,7 +322,7 @@ private boolean isPersistentMember(Set<String> transientNames, Set<String> expli`
`323`	`322`	`return false;`
`324`	`323`	`}`
`325`	`324`
`326`		`- if ( explicitlyConfiguredMemberNames.contains( ReflectionHelper.getPropertyName( member ) ) ) {`
	`325`	`+ if ( explicitlyConfiguredMemberNames.contains( ReflectHelper.getPropertyName( member ) ) ) {`
`327`	`326`	`return false;`
`328`	`327`	`}`
`329`	`328`
`@@ -396,7 +395,7 @@ private Set<String> createExplicitlyConfiguredAccessProperties(ResolvedTypeWithM`
`396`	`395`	`}`
`397`	`396`	`if ( ReflectHelper.isProperty( member ) ) {`
`398`	`397`	`createMappedAttribute( member, resolvedMembers, accessType );`
`399`		`- explicitAccessPropertyNames.add( ReflectionHelper.getPropertyName( member ) );`
	`398`	`+ explicitAccessPropertyNames.add( ReflectHelper.getPropertyName( member ) );`
`400`	`399`	`}`
`401`	`400`	`}`
`402`	`401`	`return explicitAccessPropertyNames;`
`@@ -437,7 +436,7 @@ private void checkExplicitJpaAttributeAccessAnnotationPlacedCorrectly(Annotation`
`437`	`436`	`}`
`438`	`437`
`439`	`438`	`private void createMappedAttribute(Member member, ResolvedTypeWithMembers resolvedType, AccessType accessType) {`
`440`		`- final String attributeName = ReflectionHelper.getPropertyName( member );`
	`439`	`+ final String attributeName = ReflectHelper.getPropertyName( member );`
`441`	`440`	`final ResolvedMember[] resolvedMembers = Field.class.isInstance( member ) ? resolvedType.getMemberFields() : resolvedType`
`442`	`441`	`.getMemberMethods();`
`443`	`442`	`ResolvedMember resolvedMember = findResolvedMember( member.getName(), resolvedMembers );`
`@@ -581,7 +580,7 @@ private EmbeddableClass resolveEmbeddable(String attributeName, Class<?> type, M`
`581`	`580`	`* Given the annotations defined on a persistent attribute this methods determines the attribute type.`
`582`	`581`	`*`
`583`	`582`	`* @param annotations the annotations defined on the persistent attribute`
`584`		`- * @param type the attribute's type`
	`583`	`+ * @param attributeType the attribute's type`
`585`	`584`	`* @param referencedCollectionType the type of the collection element in case the attribute is collection valued`
`586`	`585`	`*`
`587`	`586`	`* @return an instance of the {@code AttributeType} enum`