minor code cleanup in Cascade.cascade

Author: gavinking

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

@@ -10,7 +10,6 @@
 import java.util.List;
 
 import org.hibernate.HibernateException;
-import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CascadeStyle;
 import org.hibernate.engine.spi.CascadingAction;
@@ -89,12 +88,10 @@ public static <T> void cascade(
 			if ( traceEnabled ) {
 				LOG.tracev( "Processing cascade {0} for: {1}", action, persister.getEntityName() );
 			}
-			final PersistenceContext persistenceContext = eventSource.getPersistenceContextInternal();
-			final boolean enhancedForLazyLoading =
-					persister.getBytecodeEnhancementMetadata().isEnhancedForLazyLoading();
+			final var bytecodeEnhancement = persister.getBytecodeEnhancementMetadata();
 			final EntityEntry entry;
-			if ( enhancedForLazyLoading ) {
-				entry = persistenceContext.getEntry( parent );
+			if ( bytecodeEnhancement.isEnhancedForLazyLoading() ) {
+				entry = eventSource.getPersistenceContextInternal().getEntry( parent );
 				if ( entry != null
 						&& entry.getLoadedState() == null
 						&& entry.getStatus() == Status.MANAGED ) {
@@ -104,24 +101,26 @@ public static <T> void cascade(
 			else {
 				entry = null;
 			}
+
 			final Type[] types = persister.getPropertyTypes();
 			final String[] propertyNames = persister.getPropertyNames();
 			final CascadeStyle[] cascadeStyles = persister.getPropertyCascadeStyles();
-			final boolean hasUninitializedLazyProperties = persister.hasUninitializedLazyProperties( parent );
+			final boolean hasUninitializedLazyProperties = bytecodeEnhancement.hasUnFetchedAttributes( parent );
 
 			for ( int i = 0; i < types.length; i++) {
 				final CascadeStyle style = cascadeStyles[ i ];
 				final String propertyName = propertyNames[ i ];
 				final Type type = types[i];
 				final boolean isUninitializedProperty =
 						hasUninitializedLazyProperties
-								&& !persister.getBytecodeEnhancementMetadata()
-										.isAttributeLoaded( parent, propertyName );
+								&& !bytecodeEnhancement.isAttributeLoaded( parent, propertyName );
 
 				if ( action.appliesTo( type, style ) ) {
 					final Object child;
-					if ( isUninitializedProperty  ) {
-						assert enhancedForLazyLoading;
+					if ( isUninitializedProperty ) {
+						assert bytecodeEnhancement.isEnhancedForLazyLoading();
+						// Hibernate does not support lazy embeddables
+						assert !type.isComponentType();
 						// parent is a bytecode enhanced entity.
 						// Cascade to an uninitialized, lazy value only if
 						// parent is managed in the PersistenceContext.
@@ -132,31 +131,26 @@ public static <T> void cascade(
 							// parent was not in the PersistenceContext
 							continue;
 						}
-						if ( type instanceof CollectionType collectionType ) {
-							// CollectionType#getCollection gets the PersistentCollection
+						else if ( type instanceof CollectionType collectionType ) {
+							// CollectionType.getCollection() gets the PersistentCollection
 							// that corresponds to the uninitialized collection from the
 							// PersistenceContext. If not present, an uninitialized
 							// PersistentCollection will be added to the PersistenceContext.
 							// The action may initialize it later, if necessary.
-							// This needs to be done even when action.performOnLazyProperty() returns false.
+							// This needs to be done even when action.performOnLazyProperty()
+							// returns false.
 							child = collectionType.getCollection(
 									collectionType.getKeyOfOwner( parent, eventSource ),
 									eventSource,
 									parent,
 									null
 							);
 						}
-						else if ( type instanceof AnyType || type instanceof ComponentType ) {
-							// Hibernate does not support lazy embeddables, so this shouldn't happen.
-							throw new UnsupportedOperationException( "Lazy embeddables are not supported" );
-						}
 						else if ( action.performOnLazyProperty() && type instanceof EntityType ) {
-							// Only need to initialize a lazy entity attribute when action.performOnLazyProperty()
-							// returns true.
-							final LazyAttributeLoadingInterceptor interceptor =
-									persister.getBytecodeEnhancementMetadata()
-											.extractInterceptor( parent );
-							child = interceptor.fetchAttribute( parent, propertyName );
+							// Only need to initialize a lazy entity attribute when
+							// action.performOnLazyProperty() returns true.
+							child = bytecodeEnhancement.extractInterceptor( parent )
+									.fetchAttribute( parent, propertyName );
 
 						}
 						else {
@@ -181,21 +175,21 @@ else if ( action.performOnLazyProperty() && type instanceof EntityType ) {
 							false
 					);
 				}
-				else {
-					// If the property is uninitialized, then there cannot be any orphans.
-					if ( action.deleteOrphans() && !isUninitializedProperty && isLogicalOneToOne( type ) ) {
-						cascadeLogicalOneToOneOrphanRemoval(
-								action,
-								eventSource,
-								null,
-								parent,
-								persister.getValue( parent, i ),
-								type,
-								style,
-								propertyName,
-								false
-						);
-					}
+				else if ( action.deleteOrphans()
+						// If the property is uninitialized, there cannot be any orphans.
+						&& !isUninitializedProperty
+						&& isLogicalOneToOne( type ) ) {
+					cascadeLogicalOneToOneOrphanRemoval(
+							action,
+							eventSource,
+							null,
+							parent,
+							persister.getValue( parent, i ),
+							type,
+							style,
+							propertyName,
+							false
+					);
 				}
 			}
 
@@ -387,10 +381,11 @@ private static boolean isForeignKeyToParent(Type type) {
 	 *
 	 * @param type The type representing the attribute metadata
 	 *
-	 * @return True if the attribute represents a logical one to one association
+	 * @return True if the attribute represents a logical one-to-one association
 	 */
 	private static boolean isLogicalOneToOne(Type type) {
-		return type instanceof EntityType entityType && entityType.isLogicalOneToOne();
+		return type instanceof EntityType entityType
+			&& entityType.isLogicalOneToOne();
 	}
 
 	private static boolean cascadeAssociationNow(

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -4295,7 +4295,7 @@ protected void linkToSession(Object entity, SharedSessionContractImplementor ses
 
 	private void setSession(PersistentAttributeInterceptable entity, SharedSessionContractImplementor session) {
 		final BytecodeLazyAttributeInterceptor interceptor =
-				getEntityMetamodel().getBytecodeEnhancementMetadata()
+				entityMetamodel.getBytecodeEnhancementMetadata()
 						.extractLazyInterceptor( entity );
 		if ( interceptor != null ) {
 			interceptor.setSession( session );
@@ -4338,9 +4338,9 @@ && hasSubclasses()
 			// todo (6.0) : this previously used `org.hibernate.tuple.entity.EntityTuplizer#determineConcreteSubclassEntityName`
 			//		- we may need something similar here...
 			for ( EntityMappingType subclassMappingType : subclassMappingTypes.values() ) {
-				if ( subclassMappingType.getEntityPersister().getRepresentationStrategy()
-						.getInstantiator().isSameClass(instance ) ) {
-					return subclassMappingType.getEntityPersister();
+				final EntityPersister persister = subclassMappingType.getEntityPersister();
+				if ( persister.getRepresentationStrategy().getInstantiator().isSameClass( instance ) ) {
+					return persister;
 				}
 			}
 		}