Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-16 16:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-18414 remove duplicated call to callAttributeBindersInSecondPass()

Browse Source 
alternative to proposed fix by @quaff

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-07-26 04:23:48 -06:00
parent f828b2a914
commit b5a5869b9b
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
View File

@ -128,5 +128,6 @@ private static void bindAny(
prop.setOptional( optional && value.isNullable() ); prop.setOptional( optional && value.isNullable() );
//composite FK columns are in the same table, so it's OK //composite FK columns are in the same table, so it's OK
propertyHolder.addProperty( prop, columns, inferredData.getDeclaringClass() ); propertyHolder.addProperty( prop, columns, inferredData.getDeclaringClass() );
binder.callAttributeBindersInSecondPass( prop );
} }
} }

1
hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
View File

@ -1321,6 +1321,7 @@ private void bindProperty() {
throw new AssertionFailure( "DeclaringClass is not set in CollectionBinder while binding" ); throw new AssertionFailure( "DeclaringClass is not set in CollectionBinder while binding" );
} }
propertyHolder.addProperty( prop, declaringClass ); propertyHolder.addProperty( prop, declaringClass );
binder.callAttributeBindersInSecondPass( prop );
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

1
hibernate-core/src/main/java/org/hibernate/boot/model/internal/OneToOneSecondPass.java
View File

@ -127,6 +127,7 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses) throws
else { else {
bindUnowned( persistentClasses, value, result ); bindUnowned( persistentClasses, value, result );
} }
binder.callAttributeBindersInSecondPass( result );
value.sortProperties(); value.sortProperties();
} }

3
hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
View File

@ -325,7 +325,7 @@ private Property bind(Property property) {
return property; return property;
} }
private void callAttributeBindersInSecondPass(Property property) { void callAttributeBindersInSecondPass(Property property) {
final InFlightMetadataCollector metadataCollector = buildingContext.getMetadataCollector(); final InFlightMetadataCollector metadataCollector = buildingContext.getMetadataCollector();
if ( metadataCollector.isInSecondPass() ) { if ( metadataCollector.isInSecondPass() ) {
callAttributeBinders( property, metadataCollector.getEntityBindingMap() ); callAttributeBinders( property, metadataCollector.getEntityBindingMap() );
@ -426,7 +426,6 @@ public Property makeProperty() {
handleOptional( property ); handleOptional( property );
inferOptimisticLocking( property ); inferOptimisticLocking( property );
LOG.tracev( "Cascading {0} with {1}", name, cascade ); LOG.tracev( "Cascading {0} with {1}", name, cascade );
callAttributeBindersInSecondPass( property );
return property; return property;
} }