HHH-19394 recover the functionality of hibernate.unowned_association_transient_check

Author: gavinking

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

@@ -16,7 +16,6 @@
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.PersistenceContext;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.Status;
 import org.hibernate.event.spi.DeleteContext;
 import org.hibernate.event.spi.EventSource;
@@ -31,13 +30,11 @@
 import org.hibernate.type.CompositeType;
 import org.hibernate.type.EntityType;
 import org.hibernate.type.ForeignKeyDirection;
-import org.hibernate.type.ManyToOneType;
 import org.hibernate.type.OneToOneType;
 import org.hibernate.type.Type;
 
 import static java.util.Collections.EMPTY_LIST;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
-import static org.hibernate.engine.spi.CascadingActions.CHECK_ON_FLUSH;
 import static org.hibernate.pretty.MessageHelper.infoString;
 
 /**
@@ -217,11 +214,7 @@ private static <T> void cascadeProperty(
 
 		if ( child != null ) {
 			if ( type instanceof EntityType || type instanceof CollectionType || type instanceof AnyType ) {
-				final AssociationType associationType = (AssociationType) type;
-				final boolean unownedTransient = eventSource.getSessionFactory()
-						.getSessionFactoryOptions()
-						.isUnownedAssociationTransientCheck();
-				if ( cascadeAssociationNow( action, cascadePoint, associationType, eventSource.getFactory(), unownedTransient ) ) {
+				if ( action.cascadeNow( cascadePoint, (AssociationType) type, eventSource.getFactory() ) ) {
 					cascadeAssociation(
 							action,
 							cascadePoint,
@@ -388,33 +381,6 @@ private static boolean isLogicalOneToOne(Type type) {
 			&& entityType.isLogicalOneToOne();
 	}
 
-	private static boolean cascadeAssociationNow(
-			CascadingAction<?> action,
-			CascadePoint cascadePoint,
-			AssociationType associationType,
-			SessionFactoryImplementor factory,
-			boolean unownedTransient) {
-		return associationType.getForeignKeyDirection().cascadeNow( cascadePoint )
-			// For check on flush, we should only check unowned associations when strictness is enforced
-			&& ( action != CHECK_ON_FLUSH || unownedTransient || !isUnownedAssociation( associationType, factory ) );
-	}
-
-	private static boolean isUnownedAssociation(AssociationType associationType, SessionFactoryImplementor factory) {
-		if ( associationType instanceof ManyToOneType manyToOne ) {
-			// logical one-to-one + non-null unique key property name indicates unowned
-			return manyToOne.isLogicalOneToOne() && manyToOne.getRHSUniqueKeyPropertyName() != null;
-		}
-		else if ( associationType instanceof OneToOneType oneToOne ) {
-			// constrained false + non-null unique key property name indicates unowned
-			return oneToOne.isNullable() && oneToOne.getRHSUniqueKeyPropertyName() != null;
-		}
-		else if ( associationType instanceof CollectionType collectionType ) {
-			// for collections, we can ask the persister if we're on the inverse side
-			return collectionType.isInverse( factory );
-		}
-		return false;
-	}
-
 	private static <T> void cascadeComponent(
 			final CascadingAction<T> action,
 			final CascadePoint cascadePoint,

hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java

@@ -7,8 +7,10 @@
 import java.util.Iterator;
 
 import org.hibernate.HibernateException;
+import org.hibernate.engine.internal.CascadePoint;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.AssociationType;
 import org.hibernate.type.CollectionType;
 import org.hibernate.type.Type;
 
@@ -77,4 +79,14 @@ Iterator<?> getCascadableChildrenIterator(
 	 * @since 7
 	 */
 	boolean appliesTo(Type type, CascadeStyle style);
+
+	/**
+	 * Does this action cascade to the given association at the given {@link CascadePoint}?
+	 *
+	 * @since 7
+	 */
+	boolean cascadeNow(
+			CascadePoint cascadePoint,
+			AssociationType associationType,
+			SessionFactoryImplementor factory);
 }

hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java

@@ -11,14 +11,18 @@
 import org.hibernate.ReplicationMode;
 import org.hibernate.TransientObjectException;
 import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.internal.CascadePoint;
 import org.hibernate.event.spi.DeleteContext;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.MergeContext;
 import org.hibernate.event.spi.PersistContext;
 import org.hibernate.event.spi.RefreshContext;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.AssociationType;
 import org.hibernate.type.CollectionType;
+import org.hibernate.type.ManyToOneType;
+import org.hibernate.type.OneToOneType;
 import org.hibernate.type.Type;
 import org.jboss.logging.Logger;
 
@@ -395,7 +399,12 @@ public boolean anythingToCascade(EntityPersister persister) {
 			// with cascade NONE on all associations
 			// if the entity has no associations, we can just ignore it
 			return persister.hasToOnes()
-				|| persister.hasOwnedCollections();
+				|| persister.hasOwnedCollections()
+				// when hibernate.unowned_association_transient_check
+				// is enabled, we have to check unowned associations
+				|| persister.hasCollections()
+					&& persister.getFactory().getSessionFactoryOptions()
+							.isUnownedAssociationTransientCheck();
 		}
 
 		@Override
@@ -409,6 +418,32 @@ public boolean appliesTo(Type type, CascadeStyle style) {
 				&& ( type.isComponentType() || type.isAssociationType() );
 		}
 
+		@Override
+		public boolean cascadeNow(
+				CascadePoint cascadePoint,
+				AssociationType associationType,
+				SessionFactoryImplementor factory) {
+			return super.cascadeNow( cascadePoint, associationType, factory )
+				&& ( factory.getSessionFactoryOptions().isUnownedAssociationTransientCheck()
+						|| !isUnownedAssociation( associationType, factory ) );
+		}
+
+		private static boolean isUnownedAssociation(AssociationType associationType, SessionFactoryImplementor factory) {
+			if ( associationType instanceof ManyToOneType manyToOne ) {
+				// logical one-to-one + non-null unique key property name indicates unowned
+				return manyToOne.isLogicalOneToOne() && manyToOne.getRHSUniqueKeyPropertyName() != null;
+			}
+			else if ( associationType instanceof OneToOneType oneToOne ) {
+				// constrained false + non-null unique key property name indicates unowned
+				return oneToOne.isNullable() && oneToOne.getRHSUniqueKeyPropertyName() != null;
+			}
+			else if ( associationType instanceof CollectionType collectionType ) {
+				// for collections, we can ask the persister if we're on the inverse side
+				return collectionType.isInverse( factory );
+			}
+			return false;
+		}
+
 		@Override
 		public boolean deleteOrphans() {
 			return false;
@@ -507,6 +542,14 @@ public boolean anythingToCascade(EntityPersister persister) {
 		public boolean appliesTo(Type type, CascadeStyle style) {
 			return style.doCascade( this );
 		}
+
+		@Override
+		public boolean cascadeNow(
+				CascadePoint cascadePoint,
+				AssociationType associationType,
+				SessionFactoryImplementor factory) {
+			return associationType.getForeignKeyDirection().cascadeNow( cascadePoint );
+		}
 	}
 
 	/**