rename QuerySqmImpl to SqmQueryImpl for consistency

gavinking · gavinking · commit 93ce93796d27 · 2025-06-14T16:29:42.000+02:00
diff --git a/design/sqm.adoc b/design/sqm.adoc
@@ -6,7 +6,7 @@ represents an atomic piece of the query.  E.g. `SqmSelectClause` represents the
 `SqmSelectClause` is ultimately a collection of one or more `SqmSelection` references representing the individual
 selections to be returned from the query (called the domain results).  Etc
 
-All of these details are handled by the `QuerySqmImpl` implementation of `Query`.  This is what Hibernate
+All of these details are handled by the `SqmQueryImpl` implementation of `Query`.  This is what Hibernate
 uses for both HQL and Criteria queries.
 
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -81,7 +81,7 @@
 import org.hibernate.query.sql.spi.NamedNativeQueryMemento;
 import org.hibernate.query.sql.spi.NativeQueryImplementor;
 import org.hibernate.query.sqm.SqmSelectionQuery;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.internal.SqmSelectionQueryImpl;
 import org.hibernate.query.sqm.spi.NamedSqmQueryMemento;
 import org.hibernate.query.sqm.tree.SqmDmlStatement;
@@ -888,7 +888,7 @@ public <T> QueryImplementor<T> createQuery(String queryString, Class<T> expected
 		checksBeforeQueryCreation();
 		try {
 			final HqlInterpretation<T> interpretation = interpretHql( queryString, expectedResultType );
-			final QuerySqmImpl<T> query = new QuerySqmImpl<>( queryString, interpretation, expectedResultType, this );
+			final SqmQueryImpl<T> query = new SqmQueryImpl<>( queryString, interpretation, expectedResultType, this );
 			applyQuerySettingsAndHints( query );
 			query.setComment( queryString );
 			return query;
@@ -904,11 +904,11 @@ public <R> QueryImplementor<R> createQuery(TypedQueryReference<R> typedQueryRefe
 		checksBeforeQueryCreation();
 		if ( typedQueryReference instanceof SelectionSpecificationImpl<R> specification ) {
 			final CriteriaQuery<R> query = specification.buildCriteria( getCriteriaBuilder() );
-			return new QuerySqmImpl<>( (SqmStatement<R>) query, specification.getResultType(), this );
+			return new SqmQueryImpl<>( (SqmStatement<R>) query, specification.getResultType(), this );
 		}
 		else if ( typedQueryReference instanceof MutationSpecificationImpl<?> specification ) {
 			final CommonAbstractCriteria query = specification.buildCriteria( getCriteriaBuilder() );
-			return new QuerySqmImpl<>( (SqmStatement<R>) query, (Class<R>) specification.getResultType(), this );
+			return new SqmQueryImpl<>( (SqmStatement<R>) query, (Class<R>) specification.getResultType(), this );
 		}
 		else {
 			@SuppressWarnings("unchecked")
@@ -1502,7 +1502,7 @@ public QueryImplementor<?> createQuery(@SuppressWarnings("rawtypes") CriteriaDel
 	}
 
 	protected <T> QueryImplementor<T> createCriteriaQuery(SqmStatement<T> criteria, Class<T> resultType) {
-		final QuerySqmImpl<T> query = new QuerySqmImpl<>( criteria, resultType, this );
+		final SqmQueryImpl<T> query = new SqmQueryImpl<>( criteria, resultType, this );
 		applyQuerySettingsAndHints( query );
 		return query;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/NamedCriteriaQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/NamedCriteriaQueryMementoImpl.java
@@ -18,7 +18,7 @@
 import org.hibernate.query.named.AbstractNamedQueryMemento;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.SqmSelectionQuery;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.internal.SqmSelectionQueryImpl;
 import org.hibernate.query.sqm.spi.NamedSqmQueryMemento;
 import org.hibernate.query.sqm.tree.SqmStatement;
@@ -89,7 +89,7 @@ public <T> SqmQueryImplementor<T> toQuery(SharedSessionContractImplementor sessi
 		}
 		@SuppressWarnings("unchecked") // we just checked the result type
 		final SqmStatement<T> statement = (SqmStatement<T>) sqmStatement;
-		return new QuerySqmImpl<>( this, statement, resultType, session );
+		return new SqmQueryImpl<>( this, statement, resultType, session );
 	}
 
 	@Override
@@ -110,7 +110,7 @@ public <T> SqmSelectionQuery<T> toSelectionQuery(Class<T> resultType, SharedSess
 
 	@Override
 	public String getHqlString() {
-		return QuerySqmImpl.CRITERIA_HQL_STRING;
+		return SqmQueryImpl.CRITERIA_HQL_STRING;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java
@@ -15,7 +15,7 @@
 import org.hibernate.query.named.AbstractNamedQueryMemento;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.SqmSelectionQuery;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.internal.SqmSelectionQueryImpl;
 import org.hibernate.query.sqm.spi.NamedSqmQueryMemento;
 import org.hibernate.query.sqm.tree.SqmStatement;
@@ -147,6 +147,6 @@ public SqmStatement<R> getSqmStatement() {
 
 	@Override
 	public <T> SqmQueryImplementor<T> toQuery(SharedSessionContractImplementor session, Class<T> resultType) {
-		return new QuerySqmImpl<>( this, resultType, session );
+		return new SqmQueryImpl<>( this, resultType, session );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/MutationSpecificationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/MutationSpecificationImpl.java
@@ -24,7 +24,7 @@
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SqmQuerySource;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.internal.SqmUtil;
 import org.hibernate.query.sqm.tree.AbstractSqmDmlStatement;
 import org.hibernate.query.sqm.tree.SqmDeleteOrUpdateStatement;
@@ -124,7 +124,7 @@ public MutationQuery createQuery(StatelessSession session) {
 	public MutationQuery createQuery(SharedSessionContract session) {
 		final var sessionImpl = session.unwrap(SharedSessionContractImplementor.class);
 		final SqmDeleteOrUpdateStatement<T> sqmStatement = build( sessionImpl.getFactory().getQueryEngine() );
-		return new QuerySqmImpl<>( sqmStatement, true, null, sessionImpl );
+		return new SqmQueryImpl<>( sqmStatement, true, null, sessionImpl );
 	}
 
 	private SqmDeleteOrUpdateStatement<T> build(QueryEngine queryEngine) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
@@ -61,7 +61,7 @@
 import static org.hibernate.internal.util.ReflectHelper.isClass;
 import static org.hibernate.internal.util.collections.ArrayHelper.toStringArray;
 import static org.hibernate.query.sqm.internal.AppliedGraphs.containsCollectionFetches;
-import static org.hibernate.query.sqm.internal.QuerySqmImpl.CRITERIA_HQL_STRING;
+import static org.hibernate.query.sqm.internal.SqmQueryImpl.CRITERIA_HQL_STRING;
 import static org.hibernate.query.sqm.internal.SqmUtil.generateJdbcParamsXref;
 import static org.hibernate.query.sqm.internal.SqmUtil.isSelectionAssignableToResultType;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryImpl.java
@@ -115,7 +115,7 @@
  *
  * @author Steve Ebersole
  */
-public class QuerySqmImpl<R>
+public class SqmQueryImpl<R>
 		extends AbstractSqmSelectionQuery<R>
 		implements SqmQueryImplementor<R>, InterpretationsKeySource, DomainQueryExecutionContext {
 
@@ -136,7 +136,7 @@ public class QuerySqmImpl<R>
 	 * instance from a named HQL memento.
 	 * Form used from {@link NamedHqlQueryMementoImpl}.
 	 */
-	public QuerySqmImpl(
+	public SqmQueryImpl(
 			NamedSqmQueryMemento<?> memento,
 			Class<R> expectedResultType,
 			SharedSessionContractImplementor session) {
@@ -151,7 +151,7 @@ public QuerySqmImpl(
 	 * instance from a named criteria query memento.
 	 * Form used from {@link NamedCriteriaQueryMementoImpl}
 	 */
-	public QuerySqmImpl(
+	public SqmQueryImpl(
 			NamedSqmQueryMemento<?> memento,
 			SqmStatement<R> statement,
 			Class<R> resultType,
@@ -163,7 +163,7 @@ public QuerySqmImpl(
 	/**
 	 * Form used for HQL queries
 	 */
-	public QuerySqmImpl(
+	public SqmQueryImpl(
 			String hql,
 			HqlInterpretation<R> hqlInterpretation,
 			Class<R> resultType,
@@ -193,7 +193,7 @@ else if ( resultType != null ) {
 	/**
 	 * Form used for criteria queries
 	 */
-	public QuerySqmImpl(
+	public SqmQueryImpl(
 			SqmStatement<R> criteria,
 			Class<R> expectedResultType,
 			SharedSessionContractImplementor producer) {
@@ -203,7 +203,7 @@ public QuerySqmImpl(
 	/**
 	 * Used for specifications.
 	 */
-	public QuerySqmImpl(
+	public SqmQueryImpl(
 			SqmStatement<R> criteria,
 			boolean copyAst,
 			Class<R> expectedResultType,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java
@@ -24,7 +24,7 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.Query;
 import org.hibernate.query.hql.spi.SqmQueryImplementor;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.sql.SqmTranslation;
 import org.hibernate.query.sqm.sql.internal.StandardSqmTranslator;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -405,7 +405,7 @@ private <T> SelectStatement buildSqlSelectAst(
 		final StandardSqmTranslator<SelectStatement> sqmConverter = new StandardSqmTranslator<>(
 				sqmStatement,
 				hqlQuery.getQueryOptions(),
-				( (QuerySqmImpl<?>) hqlQuery ).getDomainParameterXref(),
+				( (SqmQueryImpl<?>) hqlQuery ).getDomainParameterXref(),
 				hqlQuery.getParameterBindings(),
 				loadQueryInfluencers,
 				session.getSessionFactory().getSqlTranslationEngine(),
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java
@@ -24,7 +24,7 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.Query;
 import org.hibernate.query.hql.spi.SqmQueryImplementor;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.sql.SqmTranslation;
 import org.hibernate.query.sqm.sql.internal.StandardSqmTranslator;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -400,7 +400,7 @@ private <T> SelectStatement buildSqlSelectAst(
 		final StandardSqmTranslator<SelectStatement> sqmConverter = new StandardSqmTranslator<>(
 				sqmStatement,
 				hqlQuery.getQueryOptions(),
-				( (QuerySqmImpl<?>) hqlQuery ).getDomainParameterXref(),
+				( (SqmQueryImpl<?>) hqlQuery ).getDomainParameterXref(),
 				hqlQuery.getParameterBindings(),
 				loadQueryInfluencers,
 				session.getSessionFactory().getSqlTranslationEngine(),
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java
@@ -15,7 +15,7 @@
 import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -144,7 +144,7 @@ public void hhh17743Test() throws Exception {
 			MyEntity entity = new MyEntity("N1");
 			entityManager.persist(entity);
 
-			QuerySqmImpl q = (QuerySqmImpl)entityManager.createNamedQuery("deleteByName");
+			SqmQueryImpl<?> q = (SqmQueryImpl<?>) entityManager.createNamedQuery("deleteByName");
 			q.setParameter("name", "N1");
 			int d = q.executeUpdate();
 			assertEquals(0, d);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java
@@ -39,7 +39,7 @@
 import org.hibernate.query.Query;
 import org.hibernate.query.SyntaxException;
 import org.hibernate.query.sqm.SqmExpressible;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.expression.SqmFunction;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -238,7 +238,7 @@ public void testJpaTypeOperator(SessionFactoryScope scope) {
 					Query<?> query = session
 							.createQuery( "select a.class from Animal a where a.class = Dog" );
 					query.list();
-					SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap( QuerySqmImpl.class )
+					SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap( SqmQueryImpl.class )
 							.getSqmStatement();
 					List<SqmSelection<?>> selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
 					assertThat( selections.size() ).isEqualTo( 1 );
@@ -249,7 +249,7 @@ public void testJpaTypeOperator(SessionFactoryScope scope) {
 					// test
 					query = session.createQuery( "select type(a) from Animal a where type(a) = Dog" );
 					query.list();
-					sqmStatement = (SqmSelectStatement<?>) query.unwrap( QuerySqmImpl.class ).getSqmStatement();
+					sqmStatement = (SqmSelectStatement<?>) query.unwrap( SqmQueryImpl.class ).getSqmStatement();
 					selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
 					assertThat( selections.size() ).isEqualTo( 1 );
 					typeSelection = selections.get( 0 );
@@ -1455,7 +1455,7 @@ public void testComponentQueries(SessionFactoryScope scope) {
 				session -> {
 					final Query<?> query = session.createQuery( "select h.name from Human h" );
 					final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap(
-							QuerySqmImpl.class ).getSqmStatement();
+							SqmQueryImpl.class ).getSqmStatement();
 					assertThat( sqmStatement.getQuerySpec().getSelectClause().getSelections().size() ).isEqualTo( 1 );
 					final SqmSelection<?> selection = sqmStatement.getQuerySpec().getSelectClause().getSelections()
 							.get( 0 );
@@ -1838,7 +1838,7 @@ public void testQueryMetadataRetrievalWithFetching(SessionFactoryScope scope) {
 				session -> {
 					final Query query = session.createQuery( "from Animal a inner join fetch a.mother" );
 					final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap(
-							QuerySqmImpl.class ).getSqmStatement();
+							SqmQueryImpl.class ).getSqmStatement();
 					assertThat( sqmStatement.getQuerySpec().getSelectClause().getSelections().size() ).isEqualTo( 1 );
 					final SqmSelection<?> selection = sqmStatement.getQuerySpec().getSelectClause().getSelections()
 							.get( 0 );
@@ -2150,7 +2150,7 @@ public void testSelectClauseImplicitJoin(SessionFactoryScope scope) {
 	}
 
 	private static void verifyAnimalZooSelection(Query q) {
-		final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( QuerySqmImpl.class )
+		final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQueryImpl.class )
 				.getSqmStatement();
 		final SqmSelection<?> sqmSelection = sqmStatement.getQuerySpec().getSelectClause().getSelections().get( 0 );
 		assertThat( sqmSelection.getSelectableNode() ).isInstanceOf( SqmPath.class );
@@ -2584,15 +2584,15 @@ public void testAliases(SessionFactoryScope scope) {
 					session.persist( a );
 
 					Query<?> q = session.createQuery( "select a.bodyWeight as abw, a.description from Animal a" );
-					SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( QuerySqmImpl.class )
+					SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQueryImpl.class )
 							.getSqmStatement();
 					List<SqmSelection<?>> selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
 					assertThat( selections.size() ).isEqualTo( 2 );
 					assertThat( selections.get( 0 ).getAlias() ).isEqualTo( "abw" );
 					assertThat( selections.get( 1 ).getAlias() ).isNull();
 
 					q = session.createQuery( "select count(*), avg(a.bodyWeight) as avg from Animal a" );
-					sqmStatement = (SqmSelectStatement<?>) q.unwrap( QuerySqmImpl.class ).getSqmStatement();
+					sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQueryImpl.class ).getSqmStatement();
 					selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
 					assertThat( selections.size() ).isEqualTo( 2 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NamedQueryTest.java
@@ -4,7 +4,7 @@
  */
 package org.hibernate.orm.test.jpa.criteria.query;
 
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 
 import org.hibernate.testing.orm.domain.gambit.BasicEntity;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -63,7 +63,7 @@ public void tearDown(SessionFactoryScope scope) {
 	public void testCriteria(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final TypedQuery<BasicEntity> query = session.createNamedQuery( "criteria_query", BasicEntity.class );
-			final QuerySqmImpl<BasicEntity> querySqm = (QuerySqmImpl<BasicEntity>) query;
+			final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
 			assertNull( querySqm.getQueryOptions().getLimit().getFirstRow() );
 			assertNull( querySqm.getQueryOptions().getLimit().getMaxRows() );
 			assertEquals( 2, query.getResultList().size() );
@@ -74,7 +74,7 @@ public void testCriteria(SessionFactoryScope scope) {
 	public void testCriteriaLimit(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final TypedQuery<BasicEntity> query = session.createNamedQuery( "criteria_query_limit", BasicEntity.class );
-			final QuerySqmImpl<BasicEntity> querySqm = (QuerySqmImpl<BasicEntity>) query;
+			final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
 			assertEquals( 1, querySqm.getQueryOptions().getLimit().getFirstRow() );
 			assertEquals( 1, querySqm.getQueryOptions().getLimit().getMaxRows() );
 			assertEquals( 1, query.getResultList().size() );
@@ -85,7 +85,7 @@ public void testCriteriaLimit(SessionFactoryScope scope) {
 	public void testHql(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final TypedQuery<BasicEntity> query = session.createNamedQuery( "hql_query", BasicEntity.class );
-			final QuerySqmImpl<BasicEntity> querySqm = (QuerySqmImpl<BasicEntity>) query;
+			final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
 			assertNull( querySqm.getQueryOptions().getLimit().getFirstRow() );
 			assertNull( querySqm.getQueryOptions().getLimit().getMaxRows() );
 			assertEquals( 2, query.getResultList().size() );
@@ -96,7 +96,7 @@ public void testHql(SessionFactoryScope scope) {
 	public void testHqlLimit(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final TypedQuery<BasicEntity> query = session.createNamedQuery( "hql_query_limit", BasicEntity.class );
-			final QuerySqmImpl<BasicEntity> querySqm = (QuerySqmImpl<BasicEntity>) query;
+			final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
 			assertEquals( 1, querySqm.getQueryOptions().getLimit().getFirstRow() );
 			assertEquals( 1, querySqm.getQueryOptions().getLimit().getMaxRows() );
 			assertEquals( 1, query.getResultList().size() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/ParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/ParameterTest.java
@@ -7,7 +7,7 @@
 import org.hibernate.query.Query;
 import org.hibernate.query.spi.QueryParameterImplementor;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 
 import org.hibernate.testing.orm.domain.StandardDomainModel;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -50,7 +50,7 @@ public void testParametersWithQueryInterpretationCache(SessionFactoryScope scope
 		scope.inTransaction(
 				session -> {
 					Query q = session.createQuery( query );
-					DomainParameterXref xref = q.unwrap( QuerySqmImpl.class ).getDomainParameterXref();
+					DomainParameterXref xref = q.unwrap( SqmQueryImpl.class ).getDomainParameterXref();
 					for ( QueryParameterImplementor<?> p : xref.getQueryParameters().keySet() ) {
 						Assertions.assertTrue( q.getParameterMetadata().containsReference( p ) );
 					}
@@ -59,7 +59,7 @@ public void testParametersWithQueryInterpretationCache(SessionFactoryScope scope
 		scope.inTransaction(
 				session -> {
 					Query q = session.createQuery( query );
-					DomainParameterXref xref = q.unwrap( QuerySqmImpl.class ).getDomainParameterXref();
+					DomainParameterXref xref = q.unwrap( SqmQueryImpl.class ).getDomainParameterXref();
 					for ( QueryParameterImplementor<?> p : xref.getQueryParameters().keySet() ) {
 						Assertions.assertTrue( q.getParameterMetadata().containsReference( p ) );
 					}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java
@@ -11,7 +11,7 @@
 import org.hibernate.query.hql.spi.SqmQueryImplementor;
 import org.hibernate.query.Query;
 import org.hibernate.query.spi.QueryOptions;
-import org.hibernate.query.sqm.internal.QuerySqmImpl;
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.hibernate.query.sqm.sql.SqmTranslation;
 import org.hibernate.query.sqm.sql.internal.StandardSqmTranslator;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -113,7 +113,7 @@ public void testConvertedHqlInterpretation(SessionFactoryScope scope) {
 					final StandardSqmTranslator<SelectStatement> sqmConverter = new StandardSqmTranslator<>(
 							sqmStatement,
 							hqlQuery.getQueryOptions(),
-							( (QuerySqmImpl<?>) hqlQuery ).getDomainParameterXref(),
+							( (SqmQueryImpl<?>) hqlQuery ).getDomainParameterXref(),
 							hqlQuery.getParameterBindings(),
 							session.getLoadQueryInfluencers(),
 							scope.getSessionFactory().getSqlTranslationEngine(),
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstHelper.java
