Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Gail Badner 2012-11-20 11:56:53 -08:00
parent 037f081793
commit d779125ea5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/ConfiguredClass.java
View File

@ -57,7 +57,6 @@ 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.JandexHelper;
import org.hibernate.metamodel.spi.binding.SingularAttributeBinding; import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
import org.hibernate.metamodel.spi.source.MappingException; import org.hibernate.metamodel.spi.source.MappingException;
import org.hibernate.validator.util.ReflectionHelper;
import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.ClassInfo; import org.jboss.jandex.ClassInfo;
@ -323,7 +322,7 @@ public class ConfiguredClass {
return false; return false;
} }
if ( explicitlyConfiguredMemberNames.contains( ReflectionHelper.getPropertyName( member ) ) ) { if ( explicitlyConfiguredMemberNames.contains( ReflectHelper.getPropertyName( member ) ) ) {
return false; return false;
} }
@ -396,7 +395,7 @@ public class ConfiguredClass {
} }
if ( ReflectHelper.isProperty( member ) ) { if ( ReflectHelper.isProperty( member ) ) {
createMappedAttribute( member, resolvedMembers, accessType ); createMappedAttribute( member, resolvedMembers, accessType );
explicitAccessPropertyNames.add( ReflectionHelper.getPropertyName( member ) ); explicitAccessPropertyNames.add( ReflectHelper.getPropertyName( member ) );
} }
} }
return explicitAccessPropertyNames; return explicitAccessPropertyNames;
@ -437,7 +436,7 @@ public class ConfiguredClass {
} }
private void createMappedAttribute(Member member, ResolvedTypeWithMembers resolvedType, AccessType accessType) { 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 final ResolvedMember[] resolvedMembers = Field.class.isInstance( member ) ? resolvedType.getMemberFields() : resolvedType
.getMemberMethods(); .getMemberMethods();
ResolvedMember resolvedMember = findResolvedMember( member.getName(), resolvedMembers ); ResolvedMember resolvedMember = findResolvedMember( member.getName(), resolvedMembers );
@ -581,7 +580,7 @@ public class ConfiguredClass {
* Given the annotations defined on a persistent attribute this methods determines the attribute type. * Given the annotations defined on a persistent attribute this methods determines the attribute type.
* *
* @param annotations the annotations defined on the persistent attribute * @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 * @param referencedCollectionType the type of the collection element in case the attribute is collection valued
* *
* @return an instance of the {@code AttributeType} enum * @return an instance of the {@code AttributeType} enum