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

HHH-17460 - Ongoing JPA 32 work

This commit is contained in:
Steve Ebersole 2024-03-13 12:20:07 -05:00
parent 29c1eeb468
commit 9bdc098b0f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java
View File

@ -172,6 +172,9 @@ public class PropertyContainer {
return results; return results;
} }
/**
* Collects members "backing" an attribute based on any local `@Access` annotation
*/
private static void collectPersistentAttributesUsingLocalAccessType( private static void collectPersistentAttributesUsingLocalAccessType(
ClassDetails classDetails, ClassDetails classDetails,
Map<String, MemberDetails> persistentAttributeMap, Map<String, MemberDetails> persistentAttributeMap,
@ -233,6 +236,9 @@ public class PropertyContainer {
} }
} }
/**
* Collects members "backing" an attribute based on the Class's "default" access-type
*/
private static void collectPersistentAttributesUsingClassLevelAccessType( private static void collectPersistentAttributesUsingClassLevelAccessType(
ClassDetails classDetails, ClassDetails classDetails,
AccessType classLevelAccessType, AccessType classLevelAccessType,
@ -256,11 +262,11 @@ public class PropertyContainer {
else { else {
for ( int i = 0; i < getters.size(); i++ ) { for ( int i = 0; i < getters.size(); i++ ) {
final MethodDetails getterDetails = getters.get( i ); final MethodDetails getterDetails = getters.get( i );
final String name = getterDetails.getName(); final String name = getterDetails.resolveAttributeName();
// HHH-10242 detect registration of the same property getter twice - eg boolean isId() + UUID getId() // HHH-10242 detect registration of the same property getter twice - eg boolean isId() + UUID getId()
final MethodDetails previous = persistentAttributesFromGetters.get( name ); final MethodDetails previous = persistentAttributesFromGetters.get( name );
if ( previous != null ) { if ( previous != null && getterDetails != previous ) {
throw new org.hibernate.boot.MappingException( throw new org.hibernate.boot.MappingException(
LOG.ambiguousPropertyMethods( LOG.ambiguousPropertyMethods(
classDetails.getName(), classDetails.getName(),
@ -275,7 +281,7 @@ public class PropertyContainer {
continue; continue;
} }
persistentAttributeMap.put( getterDetails.getName(), getterDetails ); persistentAttributeMap.put( name, getterDetails );
persistentAttributesFromGetters.put( name, getterDetails ); persistentAttributesFromGetters.put( name, getterDetails );
} }
@ -291,7 +297,6 @@ public class PropertyContainer {
persistentAttributeMap.put( name, componentDetails ); persistentAttributeMap.put( name, componentDetails );
persistentAttributesFromComponents.put( name, componentDetails ); persistentAttributesFromComponents.put( name, componentDetails );
} }
} }
} }