HHH-19364 move to a partially-detached model

Author: gavinking

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

@@ -58,8 +58,6 @@
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.programmatic.MutationSpecification;
-import org.hibernate.query.programmatic.SelectionSpecification;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.spi.QueryProducerImplementor;
 import org.hibernate.query.sql.spi.NativeQueryImplementor;
@@ -657,36 +655,6 @@ public MutationQuery createNamedMutationQuery(String name) {
 		return delegate.createNamedMutationQuery( name );
 	}
 
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(String hql, Class<T> resultType) {
-		return delegate.createSelectionSpecification( hql, resultType );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(Class<T> rootEntityType) {
-		return delegate.createSelectionSpecification( rootEntityType );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(CriteriaQuery<T> criteria) {
-		return delegate.createSelectionSpecification( criteria );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(String hql, Class<T> mutationTarget) {
-		return delegate.createMutationSpecification( hql, mutationTarget );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaUpdate<T> criteriaUpdate) {
-		return delegate.createMutationSpecification( criteriaUpdate );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaDelete<T> criteriaDelete) {
-		return delegate.createMutationSpecification( criteriaDelete );
-	}
-
 	@Override
 	public MutationQuery createNativeMutationQuery(String sqlString) {
 		return delegate.createNativeMutationQuery( sqlString );

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

@@ -53,8 +53,6 @@
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.programmatic.MutationSpecification;
-import org.hibernate.query.programmatic.SelectionSpecification;
 import org.hibernate.stat.SessionStatistics;
 
 import java.util.Collection;
@@ -750,36 +748,6 @@ public MutationQuery createNamedMutationQuery(String name) {
 		return this.lazySession.get().createNamedMutationQuery( name );
 	}
 
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(String hql, Class<T> resultType) {
-		return this.lazySession.get().createSelectionSpecification( hql, resultType );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(Class<T> rootEntityType) {
-		return this.lazySession.get().createSelectionSpecification( rootEntityType );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(CriteriaQuery<T> criteria) {
-		return this.lazySession.get().createSelectionSpecification( criteria );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(String hql, Class<T> mutationTarget) {
-		return this.lazySession.get().createMutationSpecification( hql, mutationTarget );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaUpdate<T> criteriaUpdate) {
-		return this.lazySession.get().createMutationSpecification( criteriaUpdate );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaDelete<T> criteriaDelete) {
-		return this.lazySession.get().createMutationSpecification( criteriaDelete );
-	}
-
 	@SuppressWarnings("rawtypes")
 	@Override
 	@Deprecated

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

@@ -36,8 +36,6 @@
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.programmatic.MutationSpecification;
-import org.hibernate.query.programmatic.SelectionSpecification;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.spi.QueryProducerImplementor;
 import org.hibernate.query.sql.spi.NativeQueryImplementor;
@@ -229,36 +227,6 @@ public MutationQuery createNamedMutationQuery(String name) {
 		return delegate.createNamedMutationQuery( name );
 	}
 
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(String hql, Class<T> resultType) {
-		return delegate.createSelectionSpecification( hql, resultType );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(Class<T> rootEntityType) {
-		return delegate.createSelectionSpecification( rootEntityType );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(CriteriaQuery<T> criteria) {
-		return delegate.createSelectionSpecification( criteria );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(String hql, Class<T> mutationTarget) {
-		return delegate.createMutationSpecification( hql, mutationTarget );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaUpdate<T> criteriaUpdate) {
-		return delegate.createMutationSpecification( criteriaUpdate );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaDelete<T> criteriaDelete) {
-		return delegate.createMutationSpecification( criteriaDelete );
-	}
-
 	@Override
 	public MutationQuery createNativeMutationQuery(String sqlString) {
 		return delegate.createNativeMutationQuery( sqlString );

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -71,10 +71,6 @@
 import org.hibernate.query.hql.spi.SqmQueryImplementor;
 import org.hibernate.query.named.NamedObjectRepository;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
-import org.hibernate.query.programmatic.MutationSpecification;
-import org.hibernate.query.programmatic.SelectionSpecification;
-import org.hibernate.query.programmatic.internal.MutationSpecificationImpl;
-import org.hibernate.query.programmatic.internal.SelectionSpecificationImpl;
 import org.hibernate.query.spi.HqlInterpretation;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sql.internal.NativeQueryImpl;
@@ -1260,36 +1256,6 @@ public MutationQuery createNamedMutationQuery(String queryName) {
 				memento -> createNativeQueryImplementor( queryName, memento ) );
 	}
 
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(String hql, Class<T> resultType) {
-		return new SelectionSpecificationImpl<>( hql, resultType, this );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(Class<T> rootEntityType) {
-		return new SelectionSpecificationImpl<>( rootEntityType, this );
-	}
-
-	@Override
-	public <T> SelectionSpecification<T> createSelectionSpecification(CriteriaQuery<T> criteria) {
-		return new SelectionSpecificationImpl<>( criteria, this );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(String hql, Class<T> mutationTarget) {
-		return new MutationSpecificationImpl<>( hql, mutationTarget, this );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaDelete<T> criteriaDelete) {
-		return new MutationSpecificationImpl<>( criteriaDelete, this );
-	}
-
-	@Override
-	public <T> MutationSpecification<T> createMutationSpecification(CriteriaUpdate<T> criteriaUpdate)  {
-		return new MutationSpecificationImpl<>( criteriaUpdate, this );
-	}
-
 	protected <T> NativeQueryImplementor<T> createNativeQueryImplementor(String queryName, NamedNativeQueryMemento<T> memento) {
 		final NativeQueryImplementor<T> query = memento.toQuery( this );
 		final Boolean isUnequivocallySelect = query.isSelectQuery();

hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java

@@ -9,10 +9,7 @@
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaUpdate;
-import org.hibernate.Incubating;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.programmatic.MutationSpecification;
-import org.hibernate.query.programmatic.SelectionSpecification;
 
 /**
  * Contract for things that can produce instances of {@link Query} and {@link NativeQuery}.
@@ -499,108 +496,6 @@ public interface QueryProducer {
 	 */
 	MutationQuery createNamedMutationQuery(String name);
 
-	/**
-	 * Returns a specification reference which can be used to programmatically,
-	 * iteratively build a {@linkplain SelectionQuery} based on a base HQL statement,
-	 * allowing the addition of {@linkplain SelectionSpecification#addOrdering sorting}
-	 * and {@linkplain SelectionSpecification#addRestriction restrictions}.
-	 *
-	 * @param hql The base HQL query.
-	 * @param resultType The result type which will ultimately be returned from the {@linkplain SelectionQuery}
-	 *
-	 * @param <T> The root entity type for the query.
-	 * {@code resultType} and {@code <T>} are both expected to refer to a singular query root.
-	 *
-	 * @throws IllegalSelectQueryException The given HQL is expected to be a {@code select} query.  This method will
-	 * throw an exception if not.
-	 *
-	 * @since 7.0
-	 */
-	@Incubating
-	<T> SelectionSpecification<T> createSelectionSpecification(String hql, Class<T> resultType)
-			throws IllegalSelectQueryException;
-
-	/**
-	 * Returns a specification reference which can be used to programmatically,
-	 * 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)}
-	 * 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.
-	 *
-	 * @since 7.0
-	 */
-	@Incubating
-	<T> SelectionSpecification<T> createSelectionSpecification(Class<T> rootEntityType);
-
-	/**
-	 * Returns a specification reference which can be used to programmatically,
-	 * iteratively build a {@linkplain SelectionQuery} for the given criteria query,
-	 * allowing the addition of {@linkplain SelectionSpecification#addOrdering sorting}
-	 * and {@linkplain SelectionSpecification#addRestriction restrictions}.
-	 *
-	 * @param criteria The criteria query
-	 *
-	 * @param <T> The entity type which is the root of the query.
-	 *
-	 * @since 7.0
-	 */
-	@Incubating
-	<T> SelectionSpecification<T> createSelectionSpecification(CriteriaQuery<T> criteria);
-
-	/**
-	 * Returns a specification reference which can be used to programmatically,
-	 * iteratively build a {@linkplain MutationQuery} based on a base HQL statement,
-	 * allowing the addition of {@linkplain MutationSpecification#addRestriction restrictions}.
-	 *
-	 * @param hql The base HQL query (expected to be an {@code update} or {@code delete} query).
-	 * @param mutationTarget The entity which is the target of the mutation.
-	 *
-	 * @param <T> The root entity type for the mutation (the "target").
-	 * {@code mutationTarget} and {@code <T>} are both expected to refer to the mutation target.
-	 *
-	 * @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}.
-	 *
-	 * @since 7.0
-	 */
-	@Incubating
-	<T> MutationSpecification<T> createMutationSpecification(String hql, Class<T> mutationTarget)
-			throws IllegalMutationQueryException;
-
-	/**
-	 * Returns a specification reference which can be used to programmatically,
-	 * iteratively build a {@linkplain MutationQuery} based on the given criteria update,
-	 * allowing the addition of {@linkplain MutationSpecification#addRestriction restrictions}.
-	 *
-	 * @param criteriaUpdate The criteria update query
-	 *
-	 * @param <T> The root entity type for the mutation (the "target").
-	 *
-	 * @since 7.0
-	 */
-	@Incubating
-	<T> MutationSpecification<T> createMutationSpecification(CriteriaUpdate<T> criteriaUpdate);
-
-	/**
-	 * Returns a specification reference which can be used to programmatically,
-	 * iteratively build a {@linkplain MutationQuery} based on the given criteria delete,
-	 * allowing the addition of {@linkplain MutationSpecification#addRestriction restrictions}.
-	 *
-	 * @param criteriaDelete The criteria delete query
-	 *
-	 * @param <T> The root entity type for the mutation (the "target").
-	 *
-	 * @since 7.0
-	 */
-	@Incubating
-	<T> MutationSpecification<T> createMutationSpecification(CriteriaDelete<T> criteriaDelete);
-
 	/**
 	 * Create a {@link Query} instance for the named query.
 	 *

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

@@ -4,10 +4,17 @@
  */
 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;
+import org.hibernate.query.programmatic.internal.MutationSpecificationImpl;
 import org.hibernate.query.restriction.Restriction;
 
 /**
@@ -20,7 +27,7 @@
  * kinds.
  * <p>
  * Once all {@linkplain #addRestriction restrictions} are specified, call
- * {@linkplain #createQuery()} to obtain an {@linkplain SelectionQuery an
+ * {@linkplain QuerySpecification#createQuery(SharedSessionContract)} to obtain an {@linkplain SelectionQuery an
  * executable mutation query object}.
  *
  * @param <T> The entity type which is the target of the mutation.
@@ -48,5 +55,49 @@ default Root<T> getMutationTarget() {
 	 * Finalize the building and create the {@linkplain SelectionQuery} instance.
 	 */
 	@Override
-	MutationQuery createQuery();
+	MutationQuery createQuery(SharedSessionContract session);
+
+	/**
+	 * Returns a specification reference which can be used to programmatically,
+	 * iteratively build a {@linkplain MutationQuery} based on a base HQL statement,
+	 * allowing the addition of {@linkplain MutationSpecification#addRestriction restrictions}.
+	 *
+	 * @param hql The base HQL query (expected to be an {@code update} or {@code delete} query).
+	 * @param mutationTarget The entity which is the target of the mutation.
+	 *
+	 * @param <T> The root entity type for the mutation (the "target").
+	 * {@code mutationTarget} and {@code <T>} are both expected to refer to the mutation target.
+	 *
+	 * @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 );
+	}
+
+	/**
+	 * Returns a specification reference which can be used to programmatically,
+	 * iteratively build a {@linkplain MutationQuery} based on the given criteria update,
+	 * allowing the addition of {@linkplain MutationSpecification#addRestriction restrictions}.
+	 *
+	 * @param criteriaUpdate The criteria update query
+	 *
+	 * @param <T> The root entity type for the mutation (the "target").
+	 */
+	static <T> MutationSpecification<T> create(CriteriaUpdate<T> criteriaUpdate) {
+		return new MutationSpecificationImpl<>( criteriaUpdate );
+	}
+
+	/**
+	 * Returns a specification reference which can be used to programmatically,
+	 * iteratively build a {@linkplain MutationQuery} based on the given criteria delete,
+	 * allowing the addition of {@linkplain MutationSpecification#addRestriction restrictions}.
+	 *
+	 * @param criteriaDelete The criteria delete query
+	 *
+	 * @param <T> The root entity type for the mutation (the "target").
+	 */
+	static <T> MutationSpecification<T> create(CriteriaDelete<T> criteriaDelete) {
+		return new MutationSpecificationImpl<>( criteriaDelete );
+	}
 }

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

@@ -7,6 +7,7 @@
 import jakarta.persistence.criteria.CommonAbstractCriteria;
 import jakarta.persistence.criteria.Root;
 import org.hibernate.Incubating;
+import org.hibernate.SharedSessionContract;
 import org.hibernate.query.CommonQueryContract;
 import org.hibernate.query.restriction.Restriction;
 
@@ -49,5 +50,5 @@ public interface QuerySpecification<T> {
 	/**
 	 * Finalize the building and create executable query instance.
 	 */
-	CommonQueryContract createQuery();
+	CommonQueryContract createQuery(SharedSessionContract session);
 }