HHH-19364 changes to Specifications to support Hibernate Processor

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

@@ -10,7 +10,8 @@
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Root;
 import org.hibernate.Incubating;
-import org.hibernate.SharedSessionContract;
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
 import org.hibernate.query.IllegalMutationQueryException;
 import org.hibernate.query.MutationQuery;
 import org.hibernate.query.SelectionQuery;
@@ -43,7 +44,7 @@ public interface MutationSpecification<T> extends QuerySpecification<T> {
 	 * Covariant override.
 	 */
 	@Override
-	MutationSpecification<T> restrict(Restriction<T> restriction);
+	MutationSpecification<T> restrict(Restriction<? super T> restriction);
 
 	/**
 	 * A function capable of modifying or augmenting a criteria query.
@@ -65,15 +66,21 @@ interface Augmentation<T> {
 	MutationSpecification<T> augment(Augmentation<T> augmentation);
 
 	/**
-	 * Finalize the building and create the {@linkplain SelectionQuery} instance.
+	 * Finalize the building and create the {@linkplain MutationQuery} instance.
 	 */
 	@Override
-	MutationQuery createQuery(SharedSessionContract session);
+	MutationQuery createQuery(Session session);
+
+	/**
+	 * Finalize the building and create the {@linkplain MutationQuery} instance.
+	 */
+	@Override
+	MutationQuery createQuery(StatelessSession 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#restrict restrictions}.
+	 * allowing the addition of {@linkplain #restrict 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.
@@ -91,7 +98,7 @@ static <T> MutationSpecification<T> create(Class<T> mutationTarget, String hql)
 	/**
 	 * 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#restrict restrictions}.
+	 * allowing the addition of {@linkplain #restrict restrictions}.
 	 *
 	 * @param criteriaUpdate The criteria update query
 	 *
@@ -104,7 +111,7 @@ static <T> MutationSpecification<T> create(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#restrict restrictions}.
+	 * allowing the addition of {@linkplain #restrict restrictions}.
 	 *
 	 * @param criteriaDelete The criteria delete query
 	 *

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

@@ -4,9 +4,12 @@
  */
 package org.hibernate.query.programmatic;
 
+import jakarta.persistence.EntityManager;
+
 import org.hibernate.Incubating;
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.SharedSessionContract;
+import org.hibernate.StatelessSession;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.CommonQueryContract;
 import org.hibernate.query.restriction.Restriction;
@@ -33,12 +36,22 @@
 	 *
 	 * @return {@code this} for method chaining.
 	 */
-	QuerySpecification<T> restrict(Restriction<T> restriction);
+	QuerySpecification<T> restrict(Restriction<? super T> restriction);
+
+	/**
+	 * Finalize the building and create executable query instance.
+	 */
+	CommonQueryContract createQuery(Session session);
+
+	/**
+	 * Finalize the building and create executable query instance.
+	 */
+	CommonQueryContract createQuery(StatelessSession session);
 
 	/**
 	 * Finalize the building and create executable query instance.
 	 */
-	CommonQueryContract createQuery(SharedSessionContract session);
+	CommonQueryContract createQuery(EntityManager entityManager);
 
 	/**
 	 * Validate the query.
@@ -47,7 +60,9 @@
 		// 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() ) {
+		final SessionFactoryImplementor factoryImplementor =
+				(SessionFactoryImplementor) factory;
+		try ( var session = factoryImplementor.openTemporarySession() ) {
 			createQuery( session );
 		}
 	}

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

@@ -4,11 +4,13 @@
  */
 package org.hibernate.query.programmatic;
 
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Root;
 import org.hibernate.Incubating;
-import org.hibernate.SharedSessionContract;
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
 import org.hibernate.query.IllegalSelectQueryException;
 import org.hibernate.query.Order;
 import org.hibernate.query.SelectionQuery;
@@ -63,7 +65,7 @@ public interface SelectionSpecification<T> extends QuerySpecification<T> {
 	 *
 	 * @return {@code this} for method chaining.
 	 */
-	SelectionSpecification<T> sort(Order<T> order);
+	SelectionSpecification<T> sort(Order<? super T> order);
 
 	/**
 	 * Sets the ordering for this selection specification.
@@ -74,7 +76,7 @@ public interface SelectionSpecification<T> extends QuerySpecification<T> {
 	 *
 	 * @return {@code this} for method chaining.
 	 */
-	SelectionSpecification<T> resort(Order<T> order);
+	SelectionSpecification<T> resort(Order<? super T> order);
 
 	/**
 	 * Sets the sorting for this selection specification.
@@ -85,13 +87,13 @@ public interface SelectionSpecification<T> extends QuerySpecification<T> {
 	 *
 	 * @return {@code this} for method chaining.
 	 */
-	SelectionSpecification<T> resort(List<Order<T>> orders);
+	SelectionSpecification<T> resort(List<Order<? super T>> orders);
 
 	/**
 	 * Covariant override.
 	 */
 	@Override
-	SelectionSpecification<T> restrict(Restriction<T> restriction);
+	SelectionSpecification<T> restrict(Restriction<? super T> restriction);
 
 	/**
 	 * Add a fetch {@linkplain Path path} to the specification.
@@ -133,7 +135,7 @@ interface Augmentation<T> {
 	 * SelectionSpecification.create(Book.class)
 	 *       .augment((builder, query, book) ->
 	 *           // eliminate explicit references to 'builder'
-	 *           new CriteriaDefinition<>(query) {{
+	 *           new CriteriaDefinition&lt;&gt;(query) {{
 	 *               where(like(entity.get(BasicEntity_.title), titlePattern),
 	 *                     greaterThan(book.get(Book_.pages), minPages));
 	 *               orderBy(asc(book.get(Book_.isbn)));
@@ -153,13 +155,22 @@ interface Augmentation<T> {
 	 * Covariant override.
 	 */
 	@Override
-	SelectionQuery<T> createQuery(SharedSessionContract session);
+	SelectionQuery<T> createQuery(Session session);
+
+	/**
+	 * Covariant override.
+	 */
+	@Override
+	SelectionQuery<T> createQuery(StatelessSession session);
+
+	@Override
+	SelectionQuery<T> createQuery(EntityManager entityManager);
 
 	/**
 	 * 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#sort sorting}
-	 * and {@linkplain SelectionSpecification#restrict restrictions}.
+	 * allowing the addition of {@linkplain #sort sorting}
+	 * and {@linkplain #restrict restrictions}.
 	 * This is effectively the same as calling {@linkplain #create(Class, String)}
 	 * with {@code "from {rootEntityType}"} as the HQL.
 	 *
@@ -175,8 +186,8 @@ static <T> SelectionSpecification<T> create(Class<T> rootEntityType) {
 	/**
 	 * 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#sort sorting}
-	 * and {@linkplain SelectionSpecification#restrict restrictions}.
+	 * allowing the addition of {@linkplain #sort sorting}
+	 * and {@linkplain #restrict restrictions}.
 	 *
 	 * @param hql The base HQL query.
 	 * @param resultType The result type which will ultimately be returned from the {@linkplain SelectionQuery}
@@ -194,8 +205,8 @@ static <T> SelectionSpecification<T> create(Class<T> resultType, String hql) {
 	/**
 	 * 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#sort sorting}
-	 * and {@linkplain SelectionSpecification#restrict restrictions}.
+	 * allowing the addition of {@linkplain #sort sorting}
+	 * and {@linkplain #restrict restrictions}.
 	 *
 	 * @param criteria The criteria query
 	 *

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

@@ -4,10 +4,13 @@
  */
 package org.hibernate.query.programmatic.internal;
 
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import org.hibernate.AssertionFailure;
+import org.hibernate.Session;
 import org.hibernate.SharedSessionContract;
+import org.hibernate.StatelessSession;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.programmatic.MutationSpecification;
 import org.hibernate.query.IllegalMutationQueryException;
@@ -62,7 +65,7 @@
 	}
 
 	@Override
-	public MutationSpecification<T> restrict(Restriction<T> restriction) {
+	public MutationSpecification<T> restrict(Restriction<? super T> restriction) {
 		specifications.add( (sqmStatement, mutationTargetRoot) -> {
 			final SqmPredicate sqmPredicate = (SqmPredicate) restriction.toPredicate(
 					mutationTargetRoot,
@@ -81,6 +84,15 @@
 	}
 
 	@Override
+	public MutationQuery createQuery(Session session) {
+		return createQuery( (SharedSessionContract) session );
+	}
+
+	@Override
+	public MutationQuery createQuery(StatelessSession session) {
+		return createQuery( (SharedSessionContract) session );
+	}
+
 	public MutationQuery createQuery(SharedSessionContract session) {
 		final var sessionImpl = (SharedSessionContractImplementor) session;
 		final SqmDeleteOrUpdateStatement<T> sqmStatement;
@@ -101,6 +113,11 @@
 		return new QuerySqmImpl<>( sqmStatement, true, null, sessionImpl );
 	}
 
+	@Override
+	public MutationQuery createQuery(EntityManager entityManager) {
+		return createQuery( (SharedSessionContract) entityManager );
+	}
+
 	/**
 	 * Used during construction to parse/interpret the incoming HQL
 	 * and produce the corresponding SQM tree.

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

@@ -4,9 +4,12 @@
  */
 package org.hibernate.query.programmatic.internal;
 
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaQuery;
 import org.hibernate.QueryException;
+import org.hibernate.Session;
 import org.hibernate.SharedSessionContract;
+import org.hibernate.StatelessSession;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.IllegalSelectQueryException;
 import org.hibernate.query.Order;
@@ -64,7 +67,7 @@
 	}
 
 	@Override
-	public SelectionSpecification<T> restrict(Restriction<T> restriction) {
+	public SelectionSpecification<T> restrict(Restriction<? super T> restriction) {
 		specifications.add( (sqmStatement, root) -> {
 			final SqmPredicate sqmPredicate = SqmUtil.restriction( sqmStatement, resultType, restriction );
 			sqmStatement.getQuerySpec().applyPredicate( sqmPredicate );
@@ -86,15 +89,15 @@
 	}
 
 	@Override
-	public SelectionSpecification<T> sort(Order<T> order) {
+	public SelectionSpecification<T> sort(Order<? super T> order) {
 		specifications.add( (sqmStatement, root) -> {
 			addOrder( order, sqmStatement );
 		} );
 		return this;
 	}
 
 	@Override
-	public final SelectionSpecification<T> resort(Order<T> order) {
+	public final SelectionSpecification<T> resort(Order<? super T> order) {
 		specifications.add( (sqmStatement, root) -> {
 			sqmStatement.getQuerySpec().setOrderByClause( new SqmOrderByClause() );
 			addOrder( order, sqmStatement );
@@ -103,15 +106,15 @@
 	}
 
 	@Override
-	public final SelectionSpecification<T> resort(List<Order<T>> orders) {
+	public final SelectionSpecification<T> resort(List<Order<? super T>> orders) {
 		specifications.add( (sqmStatement, root) -> {
 			sqmStatement.getQuerySpec().setOrderByClause( new SqmOrderByClause() );
 			orders.forEach( order -> addOrder( order, sqmStatement ) );
 		} );
 		return this;
 	}
 
-	private static <T> void addOrder(Order<T> order, SqmSelectStatement<T> sqmStatement) {
+	private static <T> void addOrder(Order<? super T> order, SqmSelectStatement<T> sqmStatement) {
 		final SqmSortSpecification sortSpecification = SqmUtil.sortSpecification( sqmStatement, order );
 		final var querySpec = sqmStatement.getQuerySpec();
 		if ( querySpec.getOrderByClause() == null ) {
@@ -121,6 +124,15 @@
 	}
 
 	@Override
+	public SelectionQuery<T> createQuery(Session session) {
+		return createQuery( (SharedSessionContract) session );
+	}
+
+	@Override
+	public SelectionQuery<T> createQuery(StatelessSession session) {
+		return createQuery( (SharedSessionContract) session );
+	}
+
 	public SelectionQuery<T> createQuery(SharedSessionContract session) {
 		final var sessionImpl = (SharedSessionContractImplementor) session;
 		final SqmSelectStatement<T> sqmStatement;
@@ -145,6 +157,11 @@
 		return new SqmSelectionQueryImpl<>( sqmStatement, true, resultType, sessionImpl );
 	}
 
+	@Override
+	public SelectionQuery<T> createQuery(EntityManager entityManager) {
+		return createQuery( (SharedSessionContract) entityManager );
+	}
+
 	/**
 	 * Used during construction to parse/interpret the incoming HQL
 	 * and produce the corresponding SQM tree.

hibernate-core/src/main/java/org/hibernate/query/restriction/NamedPathElement.java

@@ -6,7 +6,7 @@
 
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.FetchParent;
-
+import jakarta.persistence.criteria.JoinType;
 
 /**
  * A non-root element of a {@link Path}, using a stringly-typed
@@ -33,6 +33,6 @@ public jakarta.persistence.criteria.Path<V> path(Root<? extends X> root) {
 
 	@Override
 	public FetchParent<?, V> fetch(Root<? extends X> root) {
-		return parent.fetch( root ).fetch( attributeName );
+		return parent.fetch( root ).fetch( attributeName, JoinType.LEFT );
 	}
 }

hibernate-core/src/main/java/org/hibernate/query/restriction/PathElement.java

@@ -6,6 +6,7 @@
 
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.FetchParent;
+import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.metamodel.SingularAttribute;
 
 /**
@@ -27,6 +28,6 @@ public jakarta.persistence.criteria.Path<V> path(Root<? extends X> root) {
 
 	@Override
 	public FetchParent<?, V> fetch(Root<? extends X> root) {
-		return parent.fetch( root ).fetch( attribute );
+		return parent.fetch( root ).fetch( attribute, JoinType.LEFT );
 	}
 }

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

@@ -947,7 +947,7 @@ public static Class<?> resolveExpressibleJavaTypeClass(final SqmExpression<?> ex
 	public static <X> SqmPredicate restriction(
 			SqmSelectStatement<X> sqmStatement,
 			Class<X> resultType,
-			Restriction<X> restriction) {
+			Restriction<? super X> restriction) {
 		//noinspection unchecked
 		final JpaRoot<X> root = (JpaRoot<X>) sqmStatement.getRoot( 0, resultType );
 		return  (SqmPredicate) restriction.toPredicate( root, sqmStatement.nodeBuilder() );