Call LazyInitialized#getInternalIdentifier() instead of getIdentifier()

dreab8 · dreab8 · commit cfb1d76220ed · 2025-05-28T14:04:00.000+02:00
to avoid unnecessary proxy initializan when JPA proxy compliance is enabled
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
@@ -226,7 +226,7 @@ private boolean isNullifiable(final String entityName, Object object)
 					// an unloaded proxy might be scheduled for deletion
 					return persistenceContext.containsDeletedUnloadedEntityKey(
 							session.generateEntityKey(
-									lazyInitializer.getIdentifier(),
+									lazyInitializer.getInternalIdentifier(),
 									session.getFactory().getMappingMetamodel()
 											.getEntityDescriptor( lazyInitializer.getEntityName() )
 							)
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java
@@ -109,7 +109,7 @@ private boolean optimizeUnloadedDelete(DeleteEvent event) {
 				final EventSource source = event.getSession();
 				final EntityPersister persister = event.getFactory().getMappingMetamodel()
 						.findEntityDescriptor( lazyInitializer.getEntityName() );
-				final Object id = lazyInitializer.getIdentifier();
+				final Object id = lazyInitializer.getInternalIdentifier();
 				final EntityKey key = source.generateEntityKey( id, persister );
 				final PersistenceContext persistenceContext = source.getPersistenceContextInternal();
 				if ( !persistenceContext.containsEntity( key )
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -1788,7 +1788,7 @@ public <T> T getReference(T object) {
 		checkOpen();
 		final LazyInitializer lazyInitializer = extractLazyInitializer( object );
 		if ( lazyInitializer != null ) {
-			return (T) getReference( lazyInitializer.getPersistentClass(), lazyInitializer.getIdentifier() );
+			return (T) getReference( lazyInitializer.getPersistentClass(), lazyInitializer.getInternalIdentifier() );
 		}
 		else {
 			EntityPersister persister = getEntityPersister( null, object );
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
@@ -703,7 +703,7 @@ public void fetch(Object association) {
 		if ( initializer != null ) {
 			if ( initializer.isUninitialized() ) {
 				final String entityName = initializer.getEntityName();
-				final Object id = initializer.getIdentifier();
+				final Object id = initializer.getInternalIdentifier();
 				initializer.setSession( this );
 				persistenceContext.beforeLoad();
 				try {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
@@ -153,7 +153,7 @@ public IdentifierValue getUnsavedStrategy() {
 	public Object getIdentifier(Object entity) {
 		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
 		if ( lazyInitializer != null ) {
-			return lazyInitializer.getIdentifier();
+			return lazyInitializer.getInternalIdentifier();
 		}
 		return propertyAccess.getGetter().get( entity );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
@@ -87,7 +87,7 @@ public void applySqlSelections(
 	public Object getIdentifier(Object entity) {
 		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
 		if ( lazyInitializer != null ) {
-			return lazyInitializer.getIdentifier();
+			return lazyInitializer.getInternalIdentifier();
 		}
 		return propertyAccess.getGetter().get( entity );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java
@@ -246,7 +246,7 @@ public Object getIdentifier(Object entity, MergeContext mergeContext) {
 		if ( hasContainingClass() ) {
 			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
 			if ( lazyInitializer != null ) {
-				return lazyInitializer.getIdentifier();
+				return lazyInitializer.getInternalIdentifier();
 			}
 			final EmbeddableMappingType embeddableTypeDescriptor = getEmbeddableTypeDescriptor();
 			final Object[] propertyValues = new Object[embeddableTypeDescriptor.getNumberOfAttributeMappings()];
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
@@ -500,7 +500,7 @@ public Object getAssociationKeyFromSide(
 		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( targetObject );
 		if ( lazyInitializer != null ) {
 			if ( refersToPrimaryKey ) {
-				return lazyInitializer.getIdentifier();
+				return lazyInitializer.getInternalIdentifier();
 			}
 			else {
 				targetObject = lazyInitializer.getImplementation();
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
@@ -123,7 +123,7 @@ public Class<?> getImplementationClass() {
 		}
 		final SharedSessionContractImplementor session = getSession();
 		if ( session == null ) {
-			throw new LazyInitializationException( "could not retrieve real entity class [" + getEntityName() + "#" + getIdentifier() + "] - no Session" );
+			throw new LazyInitializationException( "could not retrieve real entity class [" + getEntityName() + "#" + getInternalIdentifier() + "] - no Session" );
 		}
 		final SessionFactoryImplementor factory = session.getFactory();
 		final EntityPersister entityDescriptor = factory.getMappingMetamodel().getEntityDescriptor( getEntityName() );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractBatchEntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractBatchEntitySelectFetchInitializer.java
@@ -170,13 +170,13 @@ && isPersistentAttributeInterceptable( instance )
 		}
 		else if ( lazyInitializer.isUninitialized() ) {
 			data.setState( State.RESOLVED );
-			data.entityIdentifier = lazyInitializer.getIdentifier();
+			data.entityIdentifier = lazyInitializer.getInternalIdentifier();
 		}
 		else {
 			// Entity is initialized
 			data.setState( State.INITIALIZED );
 			if ( keyIsEager ) {
-				data.entityIdentifier = lazyInitializer.getIdentifier();
+				data.entityIdentifier = lazyInitializer.getInternalIdentifier();
 			}
 			data.setInstance( lazyInitializer.getImplementation() );
 		}
@@ -240,7 +240,7 @@ public void initializeInstanceFromParent(Object parentInstance, Data data) {
 		else {
 			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( instance );
 			if ( lazyInitializer != null && lazyInitializer.isUninitialized() ) {
-				data.entityKey = new EntityKey( lazyInitializer.getIdentifier(), concreteDescriptor );
+				data.entityKey = new EntityKey( lazyInitializer.getInternalIdentifier(), concreteDescriptor );
 				registerToBatchFetchQueue( data );
 			}
 			data.setState( State.INITIALIZED );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityInitializer.java
@@ -226,14 +226,14 @@ else if ( lazyInitializer.isUninitialized() ) {
 					// Read the discriminator from the result set if necessary
 					final Object discriminatorValue = discriminatorValueAssembler.assemble( rowProcessingState );
 					data.concreteDescriptor = fetchedPart.resolveDiscriminatorValue( discriminatorValue ).getEntityPersister();
-					data.entityIdentifier = lazyInitializer.getIdentifier();
+					data.entityIdentifier = lazyInitializer.getInternalIdentifier();
 				}
 			}
 			else {
 				data.setState( State.INITIALIZED );
 				if ( keyIsEager ) {
 					data.concreteDescriptor = rowProcessingState.getSession().getEntityPersister( null, lazyInitializer.getImplementation() );
-					data.entityIdentifier = lazyInitializer.getIdentifier();
+					data.entityIdentifier = lazyInitializer.getInternalIdentifier();
 				}
 			}
 			data.setInstance( instance );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java
@@ -172,13 +172,13 @@ public void resolveInstance(Object instance, Data data) {
 			else if ( lazyInitializer.isUninitialized() ) {
 				data.setState( State.RESOLVED );
 				if ( keyIsEager ) {
-					data.entityIdentifier = lazyInitializer.getIdentifier();
+					data.entityIdentifier = lazyInitializer.getInternalIdentifier();
 				}
 			}
 			else {
 				data.setState( State.INITIALIZED );
 				if ( keyIsEager ) {
-					data.entityIdentifier = lazyInitializer.getIdentifier();
+					data.entityIdentifier = lazyInitializer.getInternalIdentifier();
 				}
 			}
 			data.setInstance( instance );

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ private boolean isNullifiable(final String entityName, Object object)`
`226`	`226`	`// an unloaded proxy might be scheduled for deletion`
`227`	`227`	`return persistenceContext.containsDeletedUnloadedEntityKey(`
`228`	`228`	`session.generateEntityKey(`
`229`		`- lazyInitializer.getIdentifier(),`
	`229`	`+ lazyInitializer.getInternalIdentifier(),`
`230`	`230`	`session.getFactory().getMappingMetamodel()`
`231`	`231`	`.getEntityDescriptor( lazyInitializer.getEntityName() )`
`232`	`232`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1788,7 +1788,7 @@ public <T> T getReference(T object) {`
`1788`	`1788`	`checkOpen();`
`1789`	`1789`	`final LazyInitializer lazyInitializer = extractLazyInitializer( object );`
`1790`	`1790`	`if ( lazyInitializer != null ) {`
`1791`		`- return (T) getReference( lazyInitializer.getPersistentClass(), lazyInitializer.getIdentifier() );`
	`1791`	`+ return (T) getReference( lazyInitializer.getPersistentClass(), lazyInitializer.getInternalIdentifier() );`
`1792`	`1792`	`}`
`1793`	`1793`	`else {`
`1794`	`1794`	`EntityPersister persister = getEntityPersister( null, object );`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public IdentifierValue getUnsavedStrategy() {`
`153`	`153`	`public Object getIdentifier(Object entity) {`
`154`	`154`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );`
`155`	`155`	`if ( lazyInitializer != null ) {`
`156`		`- return lazyInitializer.getIdentifier();`
	`156`	`+ return lazyInitializer.getInternalIdentifier();`
`157`	`157`	`}`
`158`	`158`	`return propertyAccess.getGetter().get( entity );`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public void applySqlSelections(`
`87`	`87`	`public Object getIdentifier(Object entity) {`
`88`	`88`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );`
`89`	`89`	`if ( lazyInitializer != null ) {`
`90`		`- return lazyInitializer.getIdentifier();`
	`90`	`+ return lazyInitializer.getInternalIdentifier();`
`91`	`91`	`}`
`92`	`92`	`return propertyAccess.getGetter().get( entity );`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public Object getIdentifier(Object entity, MergeContext mergeContext) {`
`246`	`246`	`if ( hasContainingClass() ) {`
`247`	`247`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );`
`248`	`248`	`if ( lazyInitializer != null ) {`
`249`		`- return lazyInitializer.getIdentifier();`
	`249`	`+ return lazyInitializer.getInternalIdentifier();`
`250`	`250`	`}`
`251`	`251`	`final EmbeddableMappingType embeddableTypeDescriptor = getEmbeddableTypeDescriptor();`
`252`	`252`	`final Object[] propertyValues = new Object[embeddableTypeDescriptor.getNumberOfAttributeMappings()];`
Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ public Object getAssociationKeyFromSide(`
`500`	`500`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( targetObject );`
`501`	`501`	`if ( lazyInitializer != null ) {`
`502`	`502`	`if ( refersToPrimaryKey ) {`
`503`		`- return lazyInitializer.getIdentifier();`
	`503`	`+ return lazyInitializer.getInternalIdentifier();`
`504`	`504`	`}`
`505`	`505`	`else {`
`506`	`506`	`targetObject = lazyInitializer.getImplementation();`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public Class<?> getImplementationClass() {`
`123`	`123`	`}`
`124`	`124`	`final SharedSessionContractImplementor session = getSession();`
`125`	`125`	`if ( session == null ) {`
`126`		`- throw new LazyInitializationException( "could not retrieve real entity class [" + getEntityName() + "#" + getIdentifier() + "] - no Session" );`
	`126`	`+ throw new LazyInitializationException( "could not retrieve real entity class [" + getEntityName() + "#" + getInternalIdentifier() + "] - no Session" );`
`127`	`127`	`}`
`128`	`128`	`final SessionFactoryImplementor factory = session.getFactory();`
`129`	`129`	`final EntityPersister entityDescriptor = factory.getMappingMetamodel().getEntityDescriptor( getEntityName() );`
Original file line number	Diff line number	Diff line change
`@@ -170,13 +170,13 @@ && isPersistentAttributeInterceptable( instance )`
`170`	`170`	`}`
`171`	`171`	`else if ( lazyInitializer.isUninitialized() ) {`
`172`	`172`	`data.setState( State.RESOLVED );`
`173`		`- data.entityIdentifier = lazyInitializer.getIdentifier();`
	`173`	`+ data.entityIdentifier = lazyInitializer.getInternalIdentifier();`
`174`	`174`	`}`
`175`	`175`	`else {`
`176`	`176`	`// Entity is initialized`
`177`	`177`	`data.setState( State.INITIALIZED );`
`178`	`178`	`if ( keyIsEager ) {`
`179`		`- data.entityIdentifier = lazyInitializer.getIdentifier();`
	`179`	`+ data.entityIdentifier = lazyInitializer.getInternalIdentifier();`
`180`	`180`	`}`
`181`	`181`	`data.setInstance( lazyInitializer.getImplementation() );`
`182`	`182`	`}`
`@@ -240,7 +240,7 @@ public void initializeInstanceFromParent(Object parentInstance, Data data) {`
`240`	`240`	`else {`
`241`	`241`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( instance );`
`242`	`242`	`if ( lazyInitializer != null && lazyInitializer.isUninitialized() ) {`
`243`		`- data.entityKey = new EntityKey( lazyInitializer.getIdentifier(), concreteDescriptor );`
	`243`	`+ data.entityKey = new EntityKey( lazyInitializer.getInternalIdentifier(), concreteDescriptor );`
`244`	`244`	`registerToBatchFetchQueue( data );`
`245`	`245`	`}`
`246`	`246`	`data.setState( State.INITIALIZED );`
Original file line number	Diff line number	Diff line change
`@@ -226,14 +226,14 @@ else if ( lazyInitializer.isUninitialized() ) {`
`226`	`226`	`// Read the discriminator from the result set if necessary`
`227`	`227`	`final Object discriminatorValue = discriminatorValueAssembler.assemble( rowProcessingState );`
`228`	`228`	`data.concreteDescriptor = fetchedPart.resolveDiscriminatorValue( discriminatorValue ).getEntityPersister();`
`229`		`- data.entityIdentifier = lazyInitializer.getIdentifier();`
	`229`	`+ data.entityIdentifier = lazyInitializer.getInternalIdentifier();`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`else {`
`233`	`233`	`data.setState( State.INITIALIZED );`
`234`	`234`	`if ( keyIsEager ) {`
`235`	`235`	`data.concreteDescriptor = rowProcessingState.getSession().getEntityPersister( null, lazyInitializer.getImplementation() );`
`236`		`- data.entityIdentifier = lazyInitializer.getIdentifier();`
	`236`	`+ data.entityIdentifier = lazyInitializer.getInternalIdentifier();`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`data.setInstance( instance );`
Original file line number	Diff line number	Diff line change
`@@ -172,13 +172,13 @@ public void resolveInstance(Object instance, Data data) {`
`172`	`172`	`else if ( lazyInitializer.isUninitialized() ) {`
`173`	`173`	`data.setState( State.RESOLVED );`
`174`	`174`	`if ( keyIsEager ) {`
`175`		`- data.entityIdentifier = lazyInitializer.getIdentifier();`
	`175`	`+ data.entityIdentifier = lazyInitializer.getInternalIdentifier();`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`else {`
`179`	`179`	`data.setState( State.INITIALIZED );`
`180`	`180`	`if ( keyIsEager ) {`
`181`		`- data.entityIdentifier = lazyInitializer.getIdentifier();`
	`181`	`+ data.entityIdentifier = lazyInitializer.getInternalIdentifier();`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`	`data.setInstance( instance );`