HHH-19349 move ImmutableEntityUpdateQueryHandlingMode to the SPI package

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java

@@ -63,7 +63,7 @@
 import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.jpa.spi.MutableJpaCompliance;
 import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode;
+import org.hibernate.query.spi.ImmutableEntityUpdateQueryHandlingMode;
 import org.hibernate.query.NullPrecedence;
 import org.hibernate.query.criteria.ValueHandlingMode;
 import org.hibernate.query.hql.HqlTranslator;

hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java

@@ -27,7 +27,7 @@
 import org.hibernate.internal.BaselineSessionEventsListenerBuilder;
 import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode;
+import org.hibernate.query.spi.ImmutableEntityUpdateQueryHandlingMode;
 import org.hibernate.query.criteria.ValueHandlingMode;
 import org.hibernate.query.hql.HqlTranslator;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;

hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java

@@ -6,6 +6,7 @@
 
 import org.hibernate.Incubating;
 import org.hibernate.boot.spi.SessionFactoryOptions;
+import org.hibernate.query.spi.ImmutableEntityUpdateQueryHandlingMode;
 import org.hibernate.query.spi.QueryPlan;
 
 import jakarta.persistence.criteria.CriteriaDelete;
@@ -200,21 +201,21 @@ public interface QuerySettings {
 	/**
 	 * This setting defines how {@link org.hibernate.annotations.Immutable} entities
 	 * are handled when executing a bulk update query. Valid options are enumerated
-	 * by {@link org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode}:
+	 * by {@link ImmutableEntityUpdateQueryHandlingMode}:
 	 * <ul>
-	 *     <li>{@link org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode#WARNING "warning"}
+	 *     <li>{@link ImmutableEntityUpdateQueryHandlingMode#WARNING "warning"}
 	 *     specifies that a warning log message is issued when an
 	 *     {@linkplain org.hibernate.annotations.Immutable immutable} entity is to be
 	 *     updated via a bulk update statement, and
-	 *     <li>{@link org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode#EXCEPTION "exception"}
+	 *     <li>{@link ImmutableEntityUpdateQueryHandlingMode#EXCEPTION "exception"}
 	 *     specifies that a {@link org.hibernate.HibernateException} should be thrown.
 	 * </ul>
 	 *
-	 * @settingDefault {@link org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode#WARNING "warning"}
+	 * @settingDefault {@link ImmutableEntityUpdateQueryHandlingMode#WARNING "warning"}
 	 *
-	 * @since 5.2.17
+	 * @since 5.2
 	 *
-	 * @see org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode
+	 * @see ImmutableEntityUpdateQueryHandlingMode
 	 */
 	String IMMUTABLE_ENTITY_UPDATE_QUERY_HANDLING_MODE = "hibernate.query.immutable_entity_update_query_handling_mode";
 

hibernate-core/src/main/java/org/hibernate/query/ImmutableEntityUpdateQueryHandlingMode.java renamed to hibernate-core/src/main/java/org/hibernate/query/spi/ImmutableEntityUpdateQueryHandlingMode.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query;
+package org.hibernate.query.spi;
 
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.AvailableSettings;

hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngineOptions.java

@@ -7,7 +7,6 @@
 import java.util.Map;
 
 import org.hibernate.jpa.spi.JpaCompliance;
-import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode;
 import org.hibernate.query.criteria.ValueHandlingMode;
 import org.hibernate.query.hql.HqlTranslator;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;

hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java

@@ -19,7 +19,7 @@
 
 import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
-import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode;
+import org.hibernate.query.spi.ImmutableEntityUpdateQueryHandlingMode;
 import org.hibernate.query.NullPrecedence;
 import org.hibernate.query.SortDirection;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java

@@ -49,7 +49,7 @@
 import org.hibernate.metamodel.model.domain.internal.EntitySqmPathSource;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.query.BindableType;
-import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode;
+import org.hibernate.query.spi.ImmutableEntityUpdateQueryHandlingMode;
 import org.hibernate.query.NullPrecedence;
 import org.hibernate.query.BindingContext;
 import org.hibernate.metamodel.model.domain.ReturnableType;

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java

@@ -9,11 +9,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.criteria.JpaCriteriaUpdate;
 import org.hibernate.query.criteria.JpaRoot;
@@ -133,17 +133,15 @@ private void verifyImmutableEntityUpdate(String hql) {
 		final EntityPersister persister =
 				nodeBuilder().getMappingMetamodel().getEntityDescriptor( getTarget().getEntityName() );
 		if ( !persister.isMutable() ) {
-			final ImmutableEntityUpdateQueryHandlingMode mode =
-					nodeBuilder().getImmutableEntityUpdateQueryHandlingMode();
 			final String querySpaces = Arrays.toString( persister.getQuerySpaces() );
-			switch ( mode ) {
+			switch ( nodeBuilder().getImmutableEntityUpdateQueryHandlingMode() ) {
 				case WARNING:
 					LOG.immutableEntityUpdateQuery( hql, querySpaces );
 					break;
 				case EXCEPTION:
 					throw new HibernateException( "The query attempts to update an immutable entity: " + querySpaces );
 				default:
-					throw new UnsupportedOperationException( "The " + mode + " is not supported" );
+					throw new AssertionFailure( "Unrecognized mode" );
 			}
 		}
 	}