Merge branch 'main' into HHH-19208

Author: domids

hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java

@@ -170,7 +170,7 @@ default MultiIdentifierLoadAccess<T> with(RootGraph<T> graph) {
 	/**
 	 * Should {@link #multiLoad} return entity instances that have been
 	 * {@linkplain Session#remove(Object) marked for removal} in the
-	 * current session, but not yet {@code delete}d in the database?
+	 * current session, but not yet deleted in the database?
 	 * <p>
 	 * By default, instances marked for removal are replaced by null in
 	 * the returned list of entities when {@link #enableOrderedReturn}

hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java

@@ -116,7 +116,7 @@ default NaturalIdMultiLoadAccess<T> with(RootGraph<T> graph) {
 	/**
 	 * Should {@link #multiLoad} return entity instances that have been
 	 * {@link Session#remove(Object) marked for removal} in the current
-	 * session, but not yet {@code delete}d in the database?
+	 * session, but not yet deleted in the database?
 	 * <p>
 	 * By default, instances marked for removal are replaced by null in
 	 * the returned list of entities when {@link #enableOrderedReturn}

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

@@ -8,9 +8,7 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.event.spi.EventSource;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.CollectionType;
-import org.hibernate.type.Type;
 
 /**
  * A session action that may be cascaded from parent entity to its children
@@ -58,34 +56,6 @@ Iterator<?> getCascadableChildrenIterator(
 	 */
 	boolean deleteOrphans();
 
-
-	/**
-	 * Does the specified cascading action require verification of no cascade validity?
-	 *
-	 * @return True if this action requires no-cascade verification; false otherwise.
-	 *
-	 * @deprecated No longer used
-	 */
-	@Deprecated(since = "6.6", forRemoval = true)
-	default boolean requiresNoCascadeChecking() {
-		return false;
-	}
-
-	/**
-	 * Called (in the case of {@link #requiresNoCascadeChecking} returning true) to validate
-	 * that no cascade on the given property is considered a valid semantic.
-	 *
-	 * @param session The session within which the cascade is occurring.
-	 * @param parent The property value owner
-	 * @param persister The entity persister for the owner
-	 * @param propertyType The property type
-	 * @param propertyIndex The index of the property within the owner.
-	 *
-	 * @deprecated No longer used
-	 */
-	@Deprecated(since = "6.6", forRemoval = true)
-	default void noCascade(EventSource session, Object parent, EntityPersister persister, Type propertyType, int propertyIndex) {}
-
 	/**
 	 * Should this action be performed (or noCascade consulted) in the case of lazy properties.
 	 */

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java

@@ -40,7 +40,6 @@
 /**
  * DeleteHandler for the in-line strategy
  *
- * @author Evandro Pires da Silva
  * @author Vlad Mihalcea
  * @author Steve Ebersole
  */