HHH-19364 move to a fully-detached model

Author: gavinking

hibernate-core/src/main/java/org/hibernate/query/programmatic/MutationSpecification.java

@@ -4,13 +4,10 @@
  */
 package org.hibernate.query.programmatic;
 
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.criteria.CriteriaDelete;
 import org.hibernate.Incubating;
 import org.hibernate.SharedSessionContract;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.IllegalMutationQueryException;
 import org.hibernate.query.MutationQuery;
 import org.hibernate.query.SelectionQuery;
@@ -27,7 +24,7 @@
  * kinds.
  * <p>
  * Once all {@linkplain #addRestriction restrictions} are specified, call
- * {@linkplain QuerySpecification#createQuery(SharedSessionContract)} to obtain an {@linkplain SelectionQuery an
+ * {@link #createQuery createQuery()} to obtain an {@linkplain SelectionQuery
  * executable mutation query object}.
  *
  * @param <T> The entity type which is the target of the mutation.
@@ -38,12 +35,6 @@
  */
 @Incubating
 public interface MutationSpecification<T> extends QuerySpecification<T> {
-	/**
-	 * The entity being mutated.
-	 */
-	default Root<T> getMutationTarget() {
-		return getRoot();
-	}
 
 	/**
 	 * Covariant override.
@@ -71,8 +62,8 @@ default Root<T> getMutationTarget() {
 	 * @throws IllegalMutationQueryException Only {@code update} and {@code delete} are supported;
 	 * this method will throw an exception if the given HQL query is not an {@code update} or {@code delete}.
 	 */
-	static <T> MutationSpecification<T> create(EntityManagerFactory factory, Class<T> entityClass, String hql) {
-		return new MutationSpecificationImpl<>( hql, entityClass, (SessionFactoryImplementor) factory );
+	static <T> MutationSpecification<T> create(Class<T> mutationTarget, String hql) {
+		return new MutationSpecificationImpl<>( hql, mutationTarget );
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/query/programmatic/QuerySpecification.java

@@ -4,39 +4,27 @@
  */
 package org.hibernate.query.programmatic;
 
-import jakarta.persistence.criteria.CommonAbstractCriteria;
-import jakarta.persistence.criteria.Root;
 import org.hibernate.Incubating;
+import org.hibernate.SessionFactory;
 import org.hibernate.SharedSessionContract;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.CommonQueryContract;
 import org.hibernate.query.restriction.Restriction;
 
 /**
  * Commonality for all query specifications which allow iterative,
  * programmatic building of a query.
  *
- * @apiNote Query specifications only support a {@linkplain #getRoot() single root}.
+ * @apiNote Query specifications only support a single root entity.
+ *
+ * @param <T> The root entity type.
  *
  * @author Steve Ebersole
  *
  * @since 7.0
  */
 @Incubating
 public interface QuerySpecification<T> {
-	/**
-	 * Get the root of the query.
-	 * E.g. given the HQL {@code "from Book"}, we have a single {@code Root<Book>}.
-	 */
-	Root<T> getRoot();
-
-	/**
-	 * Access to the criteria query which QuerySpecification is
-	 * managing and manipulating internally.
-	 * While it is allowable to directly mutate this tree, users
-	 * should instead prefer to manipulate the tree through the
-	 * methods exposed on the specification itself.
-	 */
-	CommonAbstractCriteria getCriteria();
 
 	/**
 	 * Adds a restriction to the query specification.
@@ -51,4 +39,16 @@ public interface QuerySpecification<T> {
 	 * Finalize the building and create executable query instance.
 	 */
 	CommonQueryContract createQuery(SharedSessionContract session);
+
+	/**
+	 * Validate the query.
+	 */
+	default void validate(SessionFactory factory) {
+		// Extremely temporary implementation.
+		// We don't actually want to open a session here,
+		// nor create an instance of CommonQueryContract.
+		try ( var session = ((SessionFactoryImplementor) factory).openTemporarySession() ) {
+			createQuery( session );
+		}
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/programmatic/SelectionSpecification.java

@@ -4,14 +4,11 @@
  */
 package org.hibernate.query.programmatic;
 
-import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.criteria.CriteriaQuery;
 import org.hibernate.Incubating;
 import org.hibernate.SharedSessionContract;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.IllegalSelectQueryException;
 import org.hibernate.query.Order;
-import org.hibernate.query.QueryProducer;
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.programmatic.internal.SelectionSpecificationImpl;
 import org.hibernate.query.restriction.Restriction;
@@ -31,11 +28,10 @@
  * </ul>
  * <p>
  * Once all {@linkplain #addOrdering sorting} and {@linkplain #addRestriction restrictions}
- * are specified, call {@linkplain QuerySpecification#createQuery(SharedSessionContract)} to obtain an {@linkplain SelectionQuery
- * executable selection query object}.
+ * are specified, call {@link #createQuery createQuery()} to obtain an
+ * {@linkplain SelectionQuery executable selection query object}.
  * <pre>
- * SelectionSpecification.create(factory, Book.class,
- *                               "from Book where discontinued = false")
+ * SelectionSpecification.create(Book.class, "from Book where discontinued = false")
  *         .addRestriction(Restriction.contains(Book_.title, "hibernate", false))
  *         .setOrdering(Order.desc(Book_.title))
  *         .createQuery(session)                       // obtain a SelectionQuery
@@ -49,8 +45,6 @@
  *
  * @param <T> The entity type returned by the query
  *
- * @see QueryProducer#createSelectionSpecification(String, Class)
- *
  * @author Steve Ebersole
  *
  * @since 7.0
@@ -89,12 +83,6 @@ public interface SelectionSpecification<T> extends QuerySpecification<T> {
 	 */
 	SelectionSpecification<T> setOrdering(List<Order<T>> orders);
 
-	/**
-	 * Covariant override.
-	 */
-	@Override
-	CriteriaQuery<T> getCriteria();
-
 	/**
 	 * Covariant override.
 	 */
@@ -112,20 +100,16 @@ public interface SelectionSpecification<T> extends QuerySpecification<T> {
 	 * iteratively build a {@linkplain SelectionQuery} for the given entity type,
 	 * allowing the addition of {@linkplain SelectionSpecification#addOrdering sorting}
 	 * and {@linkplain SelectionSpecification#addRestriction restrictions}.
-	 * This is effectively the same as calling {@linkplain QueryProducer#createSelectionSpecification(String, Class)}
+	 * This is effectively the same as calling {@linkplain #create(Class, String)}
 	 * with {@code "from {rootEntityType}"} as the HQL.
 	 *
 	 * @param rootEntityType The entity type which is the root of the query.
 	 *
 	 * @param <T> The entity type which is the root of the query.
 	 * {@code resultType} and {@code <T>} are both expected to refer to a singular query root.
 	 */
-	static <T> SelectionSpecification<T> create(EntityManagerFactory factory, Class<T> rootEntityType) {
-		var builder = factory.getCriteriaBuilder();
-		var query = builder.createQuery( rootEntityType );
-		var root = query.from( rootEntityType );
-		query.select( root );
-		return new SelectionSpecificationImpl<>( query );
+	static <T> SelectionSpecification<T> create(Class<T> rootEntityType) {
+		return new SelectionSpecificationImpl<>( rootEntityType );
 	}
 
 	/**
@@ -143,8 +127,8 @@ static <T> SelectionSpecification<T> create(EntityManagerFactory factory, Class<
 	 * @throws IllegalSelectQueryException The given HQL is expected to be a {@code select} query.  This method will
 	 * throw an exception if not.
 	 */
-	static <T> SelectionSpecification<T> create(EntityManagerFactory factory, Class<T> resultType, String hql) {
-		return new SelectionSpecificationImpl<>( hql, resultType, (SessionFactoryImplementor) factory );
+	static <T> SelectionSpecification<T> create(Class<T> resultType, String hql) {
+		return new SelectionSpecificationImpl<>( hql, resultType );
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/query/programmatic/internal/MutationSpecificationImpl.java

@@ -4,12 +4,10 @@
  */
 package org.hibernate.query.programmatic.internal;
 
-import jakarta.persistence.criteria.CommonAbstractCriteria;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaUpdate;
-import jakarta.persistence.criteria.Root;
+import org.hibernate.AssertionFailure;
 import org.hibernate.SharedSessionContract;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.programmatic.MutationSpecification;
 import org.hibernate.query.IllegalMutationQueryException;
@@ -26,7 +24,10 @@
 import org.hibernate.query.sqm.tree.predicate.SqmPredicate;
 import org.hibernate.query.sqm.tree.update.SqmUpdateStatement;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
+import java.util.function.BiConsumer;
 
 import static org.hibernate.query.sqm.tree.SqmCopyContext.noParamCopyContext;
 
@@ -37,54 +38,60 @@
  */
 public class MutationSpecificationImpl<T> implements MutationSpecification<T> {
 
-	private final SqmDeleteOrUpdateStatement<T> sqmStatement;
-	private final SqmRoot<T> mutationTargetRoot;
+	private final List<BiConsumer<SqmDeleteOrUpdateStatement<T>, SqmRoot<T>>> specifications = new ArrayList<>();
+	private final String hql;
+	private final Class<T> mutationTarget;
+	private final SqmDeleteOrUpdateStatement<T> deleteOrUpdateStatement;
 
-	public MutationSpecificationImpl(
-			String hql,
-			Class<T> mutationTarget,
-			SessionFactoryImplementor factory) {
-		this.sqmStatement = resolveSqmTree( hql, factory.getQueryEngine() );
-		this.mutationTargetRoot = resolveSqmRoot( this.sqmStatement, mutationTarget );
+	public MutationSpecificationImpl(String hql, Class<T> mutationTarget) {
+		this.hql = hql;
+		this.mutationTarget = mutationTarget;
+		this.deleteOrUpdateStatement = null;
 	}
 
 	public MutationSpecificationImpl(CriteriaUpdate<T> criteriaQuery) {
-		this.sqmStatement = (SqmUpdateStatement<T>) criteriaQuery;
-		this.mutationTargetRoot = resolveSqmRoot( sqmStatement,
-				sqmStatement.getTarget().getManagedType().getJavaType() );
+		this.deleteOrUpdateStatement = (SqmUpdateStatement<T>) criteriaQuery;
+		this.mutationTarget = deleteOrUpdateStatement.getTarget().getManagedType().getJavaType();
+		this.hql = null;
 	}
 
 	public MutationSpecificationImpl(CriteriaDelete<T> criteriaQuery) {
-		this.sqmStatement = (SqmDeleteStatement<T>) criteriaQuery;
-		this.mutationTargetRoot = resolveSqmRoot( sqmStatement,
-				sqmStatement.getTarget().getManagedType().getJavaType() );
-	}
-
-	@Override
-	public Root<T> getRoot() {
-		return mutationTargetRoot;
-	}
-
-	@Override
-	public CommonAbstractCriteria getCriteria() {
-		return sqmStatement;
+		this.deleteOrUpdateStatement = (SqmDeleteStatement<T>) criteriaQuery;
+		this.mutationTarget = deleteOrUpdateStatement.getTarget().getManagedType().getJavaType();
+		this.hql = null;
 	}
 
 	@Override
 	public MutationSpecification<T> addRestriction(Restriction<T> restriction) {
-		final SqmPredicate sqmPredicate = (SqmPredicate) restriction.toPredicate(
-				mutationTargetRoot,
-				sqmStatement.nodeBuilder()
-		);
-		sqmStatement.applyPredicate( sqmPredicate );
-
+		specifications.add( (sqmStatement, mutationTargetRoot) -> {
+			final SqmPredicate sqmPredicate = (SqmPredicate) restriction.toPredicate(
+					mutationTargetRoot,
+					sqmStatement.nodeBuilder()
+			);
+			sqmStatement.applyPredicate( sqmPredicate );
+		} );
 		return this;
 	}
 
 	@Override
 	public MutationQuery createQuery(SharedSessionContract session) {
-		return new QuerySqmImpl<>( sqmStatement, true, null,
-				(SharedSessionContractImplementor) session );
+		final var sessionImpl = (SharedSessionContractImplementor) session;
+		final SqmDeleteOrUpdateStatement<T> sqmStatement;
+		final SqmRoot<T> mutationTargetRoot;
+		if ( hql != null ) {
+			sqmStatement = resolveSqmTree( hql, sessionImpl.getFactory().getQueryEngine() );
+			mutationTargetRoot = resolveSqmRoot( sqmStatement, mutationTarget );
+		}
+		else if ( deleteOrUpdateStatement != null ) {
+			sqmStatement = deleteOrUpdateStatement;
+			mutationTargetRoot = resolveSqmRoot( sqmStatement,
+					sqmStatement.getTarget().getManagedType().getJavaType() );
+		}
+		else {
+			throw new AssertionFailure( "No HQL or criteria" );
+		}
+		specifications.forEach( consumer -> consumer.accept( sqmStatement, mutationTargetRoot ) );
+		return new QuerySqmImpl<>( sqmStatement, true, null, sessionImpl );
 	}
 
 	/**