HHH-19345 Relax JPA bootstrap entity state checks for remove

Author: beikov

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

@@ -103,6 +103,9 @@ private boolean optimizeUnloadedDelete(DeleteEvent event) {
 				final PersistenceContext persistenceContext = source.getPersistenceContextInternal();
 				if ( !persistenceContext.containsEntity( key )
 						&& canBeDeletedWithoutLoading( source, persister ) ) {
+					if ( event.getFactory().getSessionFactoryOptions().isJpaBootstrap() ) {
+						throw new IllegalArgumentException( "Given entity is not associated with the persistence context" );
+					}
 					// optimization for deleting certain entities without loading them
 					persistenceContext.reassociateProxy( object, id );
 					if ( !persistenceContext.containsDeletedUnloadedEntityKey( key ) ) {
@@ -166,6 +169,9 @@ private void deleteUnmanagedInstance(DeleteEvent event, DeleteContext transientE
 
 	private void deleteDetachedEntity(
 			DeleteEvent event, DeleteContext transientEntities, Object entity, EntityPersister persister, EventSource source) {
+		if ( source.getFactory().getSessionFactoryOptions().isJpaBootstrap() ) {
+			throw new IllegalArgumentException( "Given entity is not associated with the persistence context" );
+		}
 		final Object id = persister.getIdentifier( entity, source );
 		if ( id == null ) {
 			throw new TransientObjectException( "Cannot delete instance of entity '"

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -927,7 +927,6 @@ private void logRemoveOrphanBeforeUpdates(String timing, String entityName, Obje
 	}
 
 	private void fireDelete(final DeleteEvent event) {
-		checkEntityManagedIfJpa( event.getEntityName(), event.getObject() );
 		try {
 			pulseTransactionCoordinator();
 			eventListenerGroups.eventListenerGroup_DELETE
@@ -949,7 +948,6 @@ private void fireDelete(final DeleteEvent event) {
 	}
 
 	private void fireDelete(final DeleteEvent event, final DeleteContext transientEntities) {
-		checkEntityManagedIfJpa( event.getEntityName(), event.getObject() );
 		try {
 			pulseTransactionCoordinator();
 			eventListenerGroups.eventListenerGroup_DELETE
@@ -1378,16 +1376,6 @@ private void checkEntityManaged(String entityName, Object entity) {
 		}
 	}
 
-	private void checkEntityManagedIfJpa(String entityName, Object entity) {
-		if ( getSessionFactoryOptions().isJpaBootstrap() ) {
-			if ( !managed( entityName, entity )
-					// just in case it was already deleted
-					&& !persistenceContext.isEntryFor( entity ) ) {
-				throw new IllegalArgumentException( "Given entity is not associated with the persistence context" );
-			}
-		}
-	}
-
 	private boolean managed(String entityName, Object entity) {
 		return entityName == null ? contains( entity ) : contains( entityName, entity );
 	}