Skip to content

Commit de3d142

Browse files
gavinkinggavinking
committed
introduce DetachedObjectException
and remove obsolete code relating to reassociation from lock() and refresh() also remove code for reattaching proxies during flush
1 parent 734d974 commit de3d142

25 files changed

+238
-304
lines changed

‎hibernate-core/src/main/java/org/hibernate/DetachedObjectException.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
* Copyright Red Hat Inc. and Hibernate Authors
4+
*/
5+
package org.hibernate;
6+
7+
/**
8+
* Thrown if a detached instance of an entity class is passed to
9+
* a {@link Session} method that expects a managed instance.
10+
*
11+
* @author Gavin King
12+
*
13+
* @since 7.0
14+
*/
15+
@Incubating
16+
public class DetachedObjectException extends HibernateException {
17+
public DetachedObjectException(String message) {
18+
super( message );
19+
}
20+
}

‎hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.io.Serializable;
88
import java.util.ArrayList;
99
import java.util.Collection;
10-
import java.util.Collections;
1110
import java.util.HashSet;
1211
import java.util.Iterator;
1312
import java.util.List;
@@ -22,8 +21,6 @@
2221
import org.hibernate.HibernateException;
2322
import org.hibernate.LazyInitializationException;
2423
import org.hibernate.engine.spi.CollectionEntry;
25-
import org.hibernate.engine.spi.EntityEntry;
26-
import org.hibernate.engine.spi.PersistenceContext;
2724
import org.hibernate.engine.spi.SharedSessionContractImplementor;
2825
import org.hibernate.engine.spi.Status;
2926
import org.hibernate.engine.spi.TypedValue;
@@ -37,6 +34,7 @@
3734

3835
import org.checkerframework.checker.nullness.qual.Nullable;
3936

37+
import static java.util.Collections.emptyIterator;
4038
import static java.util.Collections.emptyList;
4139
import static org.hibernate.collection.internal.CollectionLogger.COLLECTION_LOGGER;
4240
import static org.hibernate.engine.internal.ForeignKeys.getEntityIdentifier;
@@ -686,15 +684,17 @@ public final boolean unsetSession(SharedSessionContractImplementor currentSessio
686684
if ( allowLoadOutsideTransaction
687685
&& !initialized
688686
&& session.getLoadQueryInfluencers().hasEnabledFilters() ) {
689-
COLLECTION_LOGGER.enabledFiltersWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) );
687+
COLLECTION_LOGGER.enabledFiltersWhenDetachFromSession(
688+
collectionInfoString( getRole(), getKey() ) );
690689
}
691690
session = null;
692691
}
693692
return true;
694693
}
695694
else {
696695
if ( session != null ) {
697-
COLLECTION_LOGGER.logCannotUnsetUnexpectedSessionInCollection( unexpectedSessionStateMessage( currentSession ) );
696+
COLLECTION_LOGGER.logCannotUnsetUnexpectedSessionInCollection(
697+
unexpectedSessionStateMessage( currentSession ) );
698698
}
699699
return false;
700700
}
@@ -704,20 +704,23 @@ private void logDiscardedQueuedOperations() {
704704
try {
705705
if ( wasTransactionRolledBack() ) {
706706
// It was due to a rollback.
707-
if ( COLLECTION_LOGGER.isDebugEnabled()) {
708-
COLLECTION_LOGGER.queuedOperationWhenDetachFromSessionOnRollback( collectionInfoString( getRole(), getKey() ) );
707+
if ( COLLECTION_LOGGER.isDebugEnabled() ) {
708+
COLLECTION_LOGGER.queuedOperationWhenDetachFromSessionOnRollback(
709+
collectionInfoString( getRole(), getKey() ) );
709710
}
710711
}
711712
else {
712713
// We don't know why the collection is being detached.
713714
// Just log the info.
714-
COLLECTION_LOGGER.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) );
715+
COLLECTION_LOGGER.queuedOperationWhenDetachFromSession(
716+
collectionInfoString( getRole(), getKey() ) );
715717
}
716718
}
717719
catch (Exception e) {
718720
// We don't know why the collection is being detached.
719721
// Just log the info.
720-
COLLECTION_LOGGER.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) );
722+
COLLECTION_LOGGER.queuedOperationWhenDetachFromSession(
723+
collectionInfoString( getRole(), getKey() ) );
721724
}
722725
}
723726

@@ -756,7 +759,8 @@ else if ( this.session != null ) {
756759
}
757760
}
758761
if ( hasQueuedOperations() ) {
759-
COLLECTION_LOGGER.queuedOperationWhenAttachToSession( collectionInfoString( getRole(), getKey() ) );
762+
COLLECTION_LOGGER.queuedOperationWhenAttachToSession(
763+
collectionInfoString( getRole(), getKey() ) );
760764
}
761765
this.session = session;
762766
return true;
@@ -872,7 +876,7 @@ public void remove() {
872876
};
873877
}
874878
else {
875-
return Collections.emptyIterator();
879+
return emptyIterator();
876880
}
877881
}
878882

@@ -1070,8 +1074,8 @@ public <A> A[] toArray(A[] array) {
10701074
public final boolean equals(Object object) {
10711075
return object == this
10721076
|| object instanceof Set<?> that
1073-
&& that.size() == this.size()
1074-
&& containsAll( that );
1077+
&& that.size() == this.size()
1078+
&& containsAll( that );
10751079
}
10761080

10771081
@Override
@@ -1306,11 +1310,11 @@ protected static <E> Collection<E> getOrphans(
13061310
// collect EntityIdentifier(s) of the *current* elements - add them into a HashSet for fast access
13071311
final java.util.Set<Object> currentIds = new HashSet<>();
13081312
final java.util.Set<Object> currentSaving = new IdentitySet<>();
1309-
final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
1313+
final var persistenceContext = session.getPersistenceContextInternal();
13101314
for ( Object current : currentElements ) {
13111315
if ( current != null && isNotTransient( entityName, current, null, session ) ) {
1312-
final EntityEntry ee = persistenceContext.getEntry( current );
1313-
if ( ee != null && ee.getStatus() == Status.SAVING ) {
1316+
final var entityEntry = persistenceContext.getEntry( current );
1317+
if ( entityEntry != null && entityEntry.getStatus() == Status.SAVING ) {
13141318
currentSaving.add( current );
13151319
}
13161320
else {
@@ -1335,7 +1339,7 @@ protected static <E> Collection<E> getOrphans(
13351339

13361340
private static boolean mayUseIdDirect(Type idType) {
13371341
if ( idType instanceof BasicType<?> basicType ) {
1338-
final Class<?> javaType = basicType.getJavaType();
1342+
final var javaType = basicType.getJavaType();
13391343
return javaType == String.class
13401344
|| javaType == Integer.class
13411345
|| javaType == Long.class

‎hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,9 @@ private static <T> void cascadeLogicalOneToOneOrphanRemoval(
322322
if ( child == null || loadedValue != null && child != loadedValue ) {
323323
EntityEntry valueEntry = persistenceContext.getEntry( loadedValue );
324324
if ( valueEntry == null && isHibernateProxy( loadedValue ) ) {
325-
// un-proxy and re-associate for cascade operation
325+
// unproxy and reassociate for cascade operation
326326
// useful for @OneToOne defined as FetchType.LAZY
327+
//TODO: what should really happen here???
327328
loadedValue = persistenceContext.unproxyAndReassociate( loadedValue );
328329
valueEntry = persistenceContext.getEntry( loadedValue );
329330
// HHH-11965

‎hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java‎

Lines changed: 82 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.function.Supplier;
2424

2525
import org.hibernate.AssertionFailure;
26+
import org.hibernate.DetachedObjectException;
2627
import org.hibernate.Hibernate;
2728
import org.hibernate.HibernateException;
2829
import org.hibernate.LockMode;
@@ -677,26 +678,62 @@ public boolean containsProxy(Object entity) {
677678

678679
@Override
679680
public boolean reassociateIfUninitializedProxy(Object value) throws MappingException {
680-
if ( !Hibernate.isInitialized( value ) ) {
681-
// could be a proxy
682-
final var lazyInitializer = extractLazyInitializer( value );
683-
if ( lazyInitializer != null ) {
681+
if ( Hibernate.isInitialized( value ) ) {
682+
return false;
683+
}
684+
// could be a proxy
685+
final var lazyInitializer = extractLazyInitializer( value );
686+
if ( lazyInitializer != null ) {
687+
final boolean uninitialized = lazyInitializer.isUninitialized();
688+
if ( uninitialized ) {
684689
reassociateProxy( lazyInitializer, asHibernateProxy( value ) );
685-
return true;
686690
}
687-
// or an uninitialized enhanced entity ("bytecode proxy")
688-
if ( isPersistentAttributeInterceptable( value ) ) {
689-
final var bytecodeProxy = asPersistentAttributeInterceptable( value );
690-
final var interceptor =
691-
(BytecodeLazyAttributeInterceptor)
692-
bytecodeProxy.$$_hibernate_getInterceptor();
693-
if ( interceptor != null ) {
694-
interceptor.setSession( getSession() );
695-
}
696-
return true;
691+
return uninitialized;
692+
}
693+
// or an uninitialized enhanced entity ("bytecode proxy")
694+
else if ( isPersistentAttributeInterceptable( value ) ) {
695+
final var interceptor =
696+
(BytecodeLazyAttributeInterceptor)
697+
asPersistentAttributeInterceptable( value )
698+
.$$_hibernate_getInterceptor();
699+
final boolean uninitialized =
700+
interceptor instanceof EnhancementAsProxyLazinessInterceptor enhancementInterceptor
701+
&& !enhancementInterceptor.isInitialized();
702+
if ( uninitialized ) {
703+
interceptor.setSession( getSession() );
697704
}
705+
return uninitialized;
706+
}
707+
else {
708+
return false;
709+
}
710+
}
711+
712+
@Override
713+
public boolean isUninitializedProxy(Object value) throws MappingException {
714+
// could be a proxy
715+
final var lazyInitializer = extractLazyInitializer( value );
716+
if ( lazyInitializer != null ) {
717+
if ( lazyInitializer.getSession() != session ) {
718+
throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
719+
}
720+
return lazyInitializer.isUninitialized();
721+
}
722+
// or an uninitialized enhanced entity ("bytecode proxy")
723+
else if ( isPersistentAttributeInterceptable( value ) ) {
724+
final var interceptor =
725+
(BytecodeLazyAttributeInterceptor)
726+
asPersistentAttributeInterceptable( value )
727+
.$$_hibernate_getInterceptor();
728+
if ( interceptor != null && interceptor.getLinkedSession() != session ) {
729+
throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
730+
}
731+
return interceptor instanceof EnhancementAsProxyLazinessInterceptor enhancementInterceptor
732+
&& !enhancementInterceptor.isInitialized();
733+
}
734+
else {
735+
return false;
698736
}
699-
return false;
700737
}
701738

702739
@Override
@@ -741,7 +778,7 @@ public Object unproxy(Object maybeProxy) throws HibernateException {
741778
final var lazyInitializer = extractLazyInitializer( maybeProxy );
742779
if ( lazyInitializer != null ) {
743780
if ( lazyInitializer.isUninitialized() ) {
744-
throw new PersistentObjectException( "object was an uninitialized proxy for "
781+
throw new PersistentObjectException( "Object was an uninitialized proxy for "
745782
+ lazyInitializer.getEntityName() );
746783
}
747784
//unwrap the object and return
@@ -752,6 +789,34 @@ public Object unproxy(Object maybeProxy) throws HibernateException {
752789
}
753790
}
754791

792+
@Override
793+
public Object unproxyLoadingIfNecessary(final Object maybeProxy) throws HibernateException {
794+
final var lazyInitializer = extractLazyInitializer( maybeProxy );
795+
if ( lazyInitializer != null ) {
796+
if ( lazyInitializer.getSession() != session ) {
797+
throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
798+
}
799+
//initialize + unwrap the object and return it
800+
return lazyInitializer.getImplementation();
801+
}
802+
else if ( isPersistentAttributeInterceptable( maybeProxy ) ) {
803+
final var interceptor =
804+
asPersistentAttributeInterceptable( maybeProxy )
805+
.$$_hibernate_getInterceptor();
806+
if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor lazinessInterceptor ) {
807+
if ( lazinessInterceptor.getLinkedSession() != session ) {
808+
throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
809+
}
810+
lazinessInterceptor.forceInitialize( maybeProxy, null );
811+
}
812+
return maybeProxy;
813+
}
814+
else {
815+
return maybeProxy;
816+
}
817+
}
818+
819+
755820
@Override
756821
public Object unproxyAndReassociate(final Object maybeProxy) throws HibernateException {
757822
final var lazyInitializer = extractLazyInitializer( maybeProxy );

‎hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,12 @@ EntityEntry addReferenceEntry(
296296
*/
297297
Object unproxy(Object maybeProxy);
298298

299+
@Incubating
300+
Object unproxyLoadingIfNecessary(final Object maybeProxy);
301+
302+
@Incubating
303+
boolean isUninitializedProxy(Object value);
304+
299305
/**
300306
* Possibly unproxy the given reference and reassociate it with the current session.
301307
*

‎hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org.hibernate.event.internal;
66

77
import org.hibernate.CacheMode;
8+
import org.hibernate.DetachedObjectException;
89
import org.hibernate.HibernateException;
910
import org.hibernate.LockMode;
1011
import org.hibernate.StaleObjectStateException;
@@ -166,7 +167,7 @@ private void deleteUnmanagedInstance(DeleteEvent event, DeleteContext transientE
166167
private void deleteDetachedEntity(
167168
DeleteEvent event, DeleteContext transientEntities, Object entity, EntityPersister persister, EventSource source) {
168169
if ( source.getFactory().getSessionFactoryOptions().isJpaBootstrap() ) {
169-
throw new IllegalArgumentException( "Given entity is not associated with the persistence context" );
170+
throw new DetachedObjectException( "Given entity is not associated with the persistence context" );
170171
}
171172
final Object id = persister.getIdentifier( entity, source );
172173
if ( id == null ) {
@@ -182,18 +183,19 @@ private void deleteDetachedEntity(
182183

183184
new OnUpdateVisitor( source, id, entity ).process( entity, persister );
184185

185-
final var persistenceContext = source.getPersistenceContextInternal();
186-
final var entityEntry = persistenceContext.addEntity(
187-
entity,
188-
persister.isMutable() ? Status.MANAGED : Status.READ_ONLY,
189-
persister.getValues( entity ),
190-
key,
191-
version,
192-
LockMode.NONE,
193-
true,
194-
persister,
195-
false
196-
);
186+
final var entityEntry =
187+
source.getPersistenceContextInternal()
188+
.addEntity(
189+
entity,
190+
persister.isMutable() ? Status.MANAGED : Status.READ_ONLY,
191+
persister.getValues( entity ),
192+
key,
193+
version,
194+
LockMode.NONE,
195+
true,
196+
persister,
197+
false
198+
);
197199
persister.afterReassociate( entity, source );
198200

199201
delete( event, transientEntities, source, entity, persister, id, version, entityEntry );
@@ -524,7 +526,7 @@ protected void cascadeAfterDelete(
524526
final var persistenceContext = session.getPersistenceContextInternal();
525527
persistenceContext.incrementCascadeLevel();
526528
try {
527-
// cascade-delete to many-to-one AFTER the parent was deleted
529+
// cascade delete to many-to-one AFTER the parent was deleted
528530
Cascade.cascade(
529531
CascadingActions.REMOVE,
530532
CascadePoint.BEFORE_INSERT_AFTER_DELETE,

‎hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.hibernate.event.spi.EvictEvent;
1414
import org.hibernate.event.spi.EvictEventListener;
1515
import org.hibernate.persister.entity.EntityPersister;
16-
import org.hibernate.proxy.LazyInitializer;
1716

1817
import static org.hibernate.event.internal.EventListenerLogging.EVENT_LISTENER_LOGGER;
1918
import static org.hibernate.pretty.MessageHelper.infoString;
@@ -43,7 +42,7 @@ public void onEvict(EvictEvent event) throws HibernateException {
4342
if ( object == null ) {
4443
throw new NullPointerException( "null passed to Session.evict()" );
4544
}
46-
final LazyInitializer lazyInitializer = extractLazyInitializer( object );
45+
final var lazyInitializer = extractLazyInitializer( object );
4746
if ( lazyInitializer != null ) {
4847
final Object id = lazyInitializer.getInternalIdentifier();
4948
if ( id == null ) {

0 commit comments

Comments
 (0)