Call LazyInitialized#getInternalIdentifier() instead of getIdentifier()

dreab8 · dreab8 · commit 0a288cebe29c · 2025-05-28T13:54:01.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
@@ -224,7 +224,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
@@ -97,7 +97,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();
 				final EntityHolder entityHolder = persistenceContext.getEntityHolder( 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
@@ -1829,7 +1829,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 {
 			final 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
@@ -1090,7 +1090,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
@@ -150,7 +150,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
@@ -85,7 +85,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
@@ -244,7 +244,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
@@ -497,7 +497,7 @@ public Object getAssociationKeyFromSide(
 		final LazyInitializer lazyInitializer = 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
@@ -121,7 +121,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 @@ && getAttributeInterceptor( 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
@@ -223,14 +223,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
@@ -170,13 +170,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
`@@ -224,7 +224,7 @@ private boolean isNullifiable(final String entityName, Object object)`
`224`	`224`	`// an unloaded proxy might be scheduled for deletion`
`225`	`225`	`return persistenceContext.containsDeletedUnloadedEntityKey(`
`226`	`226`	`session.generateEntityKey(`
`227`		`- lazyInitializer.getIdentifier(),`
	`227`	`+ lazyInitializer.getInternalIdentifier(),`
`228`	`228`	`session.getFactory().getMappingMetamodel()`
`229`	`229`	`.getEntityDescriptor( lazyInitializer.getEntityName() )`
`230`	`230`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1829,7 +1829,7 @@ public <T> T getReference(T object) {`
`1829`	`1829`	`checkOpen();`
`1830`	`1830`	`final LazyInitializer lazyInitializer = extractLazyInitializer( object );`
`1831`	`1831`	`if ( lazyInitializer != null ) {`
`1832`		`- return (T) getReference( lazyInitializer.getPersistentClass(), lazyInitializer.getIdentifier() );`
	`1832`	`+ return (T) getReference( lazyInitializer.getPersistentClass(), lazyInitializer.getInternalIdentifier() );`
`1833`	`1833`	`}`
`1834`	`1834`	`else {`
`1835`	`1835`	`final EntityPersister persister = getEntityPersister( null, object );`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public IdentifierValue getUnsavedStrategy() {`
`150`	`150`	`public Object getIdentifier(Object entity) {`
`151`	`151`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );`
`152`	`152`	`if ( lazyInitializer != null ) {`
`153`		`- return lazyInitializer.getIdentifier();`
	`153`	`+ return lazyInitializer.getInternalIdentifier();`
`154`	`154`	`}`
`155`	`155`	`return propertyAccess.getGetter().get( entity );`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public void applySqlSelections(`
`85`	`85`	`public Object getIdentifier(Object entity) {`
`86`	`86`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );`
`87`	`87`	`if ( lazyInitializer != null ) {`
`88`		`- return lazyInitializer.getIdentifier();`
	`88`	`+ return lazyInitializer.getInternalIdentifier();`
`89`	`89`	`}`
`90`	`90`	`return propertyAccess.getGetter().get( entity );`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ public Object getIdentifier(Object entity, MergeContext mergeContext) {`
`244`	`244`	`if ( hasContainingClass() ) {`
`245`	`245`	`final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );`
`246`	`246`	`if ( lazyInitializer != null ) {`
`247`		`- return lazyInitializer.getIdentifier();`
	`247`	`+ return lazyInitializer.getInternalIdentifier();`
`248`	`248`	`}`
`249`	`249`	`final EmbeddableMappingType embeddableTypeDescriptor = getEmbeddableTypeDescriptor();`
`250`	`250`	`final Object[] propertyValues = new Object[embeddableTypeDescriptor.getNumberOfAttributeMappings()];`
Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ public Object getAssociationKeyFromSide(`
`497`	`497`	`final LazyInitializer lazyInitializer = extractLazyInitializer( targetObject );`
`498`	`498`	`if ( lazyInitializer != null ) {`
`499`	`499`	`if ( refersToPrimaryKey ) {`
`500`		`- return lazyInitializer.getIdentifier();`
	`500`	`+ return lazyInitializer.getInternalIdentifier();`
`501`	`501`	`}`
`502`	`502`	`else {`
`503`	`503`	`targetObject = lazyInitializer.getImplementation();`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public Class<?> getImplementationClass() {`
`121`	`121`	`}`
`122`	`122`	`final SharedSessionContractImplementor session = getSession();`
`123`	`123`	`if ( session == null ) {`
`124`		`- throw new LazyInitializationException( "could not retrieve real entity class [" + getEntityName() + "#" + getIdentifier() + "] - no Session" );`
	`124`	`+ throw new LazyInitializationException( "could not retrieve real entity class [" + getEntityName() + "#" + getInternalIdentifier() + "] - no Session" );`
`125`	`125`	`}`
`126`	`126`	`final SessionFactoryImplementor factory = session.getFactory();`
`127`	`127`	`final EntityPersister entityDescriptor = factory.getMappingMetamodel().getEntityDescriptor( getEntityName() );`
Original file line number	Diff line number	Diff line change
`@@ -170,13 +170,13 @@ && getAttributeInterceptor( 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 );`