HHH-15023 - Move Query and NativeQuery back to org.hibernate.query

documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java

@@ -917,7 +917,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 		doInJPA(this::entityManagerFactory, entityManager -> {
 			QueryProducer session = entityManager.unwrap(Session.class);
 			//tag::hql-api-example[]
-			org.hibernate.Query<Person> query = session.createQuery(
+			org.hibernate.query.Query<Person> query = session.createQuery(
 				"select p " +
 				"from Person p " +
 				"where p.name like :name",
@@ -931,7 +931,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 		doInJPA(this::entityManagerFactory, entityManager -> {
 			QueryProducer session = entityManager.unwrap(Session.class);
 			//tag::hql-api-named-query-example[]
-			org.hibernate.Query<Person> query = session.createNamedQuery(
+			org.hibernate.query.Query<Person> query = session.createNamedQuery(
 				"get_person_by_name",
 				Person.class);
 			//end::hql-api-named-query-example[]
@@ -943,7 +943,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 		doInJPA(this::entityManagerFactory, entityManager -> {
 			QueryProducer session = entityManager.unwrap(Session.class);
 			//tag::hql-api-basic-usage-example[]
-			org.hibernate.Query<Person> query = session.createQuery(
+			org.hibernate.query.Query<Person> query = session.createQuery(
 				"select p " +
 				"from Person p " +
 				"where p.name like :name",
@@ -965,7 +965,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 		doInJPA(this::entityManagerFactory, entityManager -> {
 			QueryProducer session = entityManager.unwrap(Session.class);
 			//tag::hql-api-parameter-example[]
-			org.hibernate.Query<Person> query = session.createQuery(
+			org.hibernate.query.Query<Person> query = session.createQuery(
 				"select p " +
 				"from Person p " +
 				"where p.name like :name",
@@ -980,7 +980,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 		doInJPA(this::entityManagerFactory, entityManager -> {
 			QueryProducer session = entityManager.unwrap(Session.class);
 			//tag::hql-api-parameter-inferred-type-example[]
-			org.hibernate.Query<Person> query = session.createQuery(
+			org.hibernate.query.Query<Person> query = session.createQuery(
 				"select p " +
 				"from Person p " +
 				"where p.name like :name",
@@ -996,7 +996,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 			LocalDateTime timestamp = LocalDateTime.now();
 			QueryProducer session = entityManager.unwrap(Session.class);
 			//tag::hql-api-parameter-short-form-example[]
-			org.hibernate.Query<Person> query = session.createQuery(
+			org.hibernate.query.Query<Person> query = session.createQuery(
 				"select p " +
 				"from Person p " +
 				"where p.name like :name " +
@@ -1014,7 +1014,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 			Date timestamp = new Date();
 			QueryProducer session = entityManager.unwrap(Session.class);
 			//tag::hql-api-ordinal-parameter-example[]
-			org.hibernate.Query<Person> query = session.createQuery(
+			org.hibernate.query.Query<Person> query = session.createQuery(
 				"select p " +
 				"from Person p " +
 				"where p.name like ?",
@@ -2984,7 +2984,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase {
 				"where p.number = :phoneNumber ",
 				Call.class)
 			.setParameter("phoneNumber", "123-456-7890")
-			.unwrap( org.hibernate.Query.class)
+			.unwrap( org.hibernate.query.Query.class)
 			.setReadOnly(true)
 			.getResultList();
 			//end::hql-read-only-entities-native-example[]

documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java

@@ -25,7 +25,7 @@ import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.RequiresDialect;
 import org.junit.Test;

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 import org.hibernate.LockOptions;
 import org.hibernate.community.dialect.CacheDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.Transaction;

hibernate-core/src/main/java/org/hibernate/LockOptions.java

@@ -13,6 +13,8 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.hibernate.query.Query;
+
 /**
  * Contains locking details (LockMode, Timeout and Scope).
  * 

hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java

@@ -6,6 +6,8 @@
  */
 package org.hibernate;
 
+import org.hibernate.query.Query;
+
 /**
  * Thrown when the application calls {@link Query#uniqueResult()}
  * and the query returned more than one result.  Unlike all other Hibernate exceptions,

hibernate-core/src/main/java/org/hibernate/ScrollableResults.java

@@ -8,6 +8,8 @@ package org.hibernate;
 
 import java.io.Closeable;
 
+import org.hibernate.query.Query;
+
 /**
  * A result iterator that allows moving around within the results
  * by arbitrary increments. The {@code Query} / {@code ScrollableResults}

hibernate-core/src/main/java/org/hibernate/Session.java

@@ -14,6 +14,7 @@ import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import org.hibernate.graph.RootGraph;
+import org.hibernate.query.Query;
 import org.hibernate.stat.SessionStatistics;
 
 /**

hibernate-core/src/main/java/org/hibernate/SessionBuilder.java

@@ -9,6 +9,7 @@ package org.hibernate;
 import java.sql.Connection;
 import java.util.TimeZone;
 
+import org.hibernate.query.Query;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 

hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java

@@ -8,6 +8,8 @@ package org.hibernate;
 
 import java.sql.Connection;
 
+import org.hibernate.query.Query;
+
 /**
  * Represents a consolidation of all stateless session creation options into a builder style delegate.
  *

hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java

@@ -10,7 +10,7 @@ import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.ElementType.TYPE;

hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java

@@ -10,7 +10,7 @@ import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.ElementType.TYPE;

hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java

@@ -7,8 +7,8 @@
 package org.hibernate.annotations;
 
 import org.hibernate.FlushMode;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 /**
  * List of hints that may be passed to {@link jakarta.persistence.Query#setHint(String, Object)}

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

@@ -9,8 +9,8 @@ package org.hibernate.cfg;
 import java.util.function.Supplier;
 
 import org.hibernate.HibernateException;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Transaction;
 import org.hibernate.boot.MetadataBuilder;
 import org.hibernate.boot.registry.classloading.internal.TcclLookupPrecedence;

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

@@ -43,7 +43,7 @@ import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.ScrollMode;
 import org.hibernate.boot.TempTableDdlTransactionHandling;
 import org.hibernate.boot.model.TypeContributions;

hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java

@@ -11,7 +11,7 @@ import java.sql.SQLException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.Limit;
 
 import static java.util.regex.Pattern.CASE_INSENSITIVE;

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

@@ -16,7 +16,7 @@ import java.util.function.Supplier;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.internal.util.MarkerObject;
 import org.hibernate.persister.collection.CollectionPersister;

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

@@ -15,7 +15,7 @@ import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.SharedSessionContract;
 import org.hibernate.Transaction;
 import org.hibernate.cache.spi.CacheTransactionSynchronization;

hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java

@@ -80,7 +80,7 @@ public final class EntityGraphs {
 	 */
 	@SuppressWarnings("unchecked")
 	public static List executeList(Query query, EntityGraph graph, GraphSemantic semantic) {
-		return query.unwrap( org.hibernate.Query.class )
+		return query.unwrap( org.hibernate.query.Query.class )
 				.applyGraph( (RootGraph) graph, semantic )
 				.list();
 	}
@@ -114,7 +114,7 @@ public final class EntityGraphs {
 	 */
 	@SuppressWarnings({"unused", "unchecked"})
 	public static List executeList(Query query, EntityGraph graph, String semanticJpaHintName) {
-		return query.unwrap( org.hibernate.Query.class )
+		return query.unwrap( org.hibernate.query.Query.class )
 				.applyGraph( (RootGraph) graph, GraphSemantic.fromJpaHintName( semanticJpaHintName ) )
 				.list();
 	}
@@ -149,7 +149,7 @@ public final class EntityGraphs {
 	 */
 	@SuppressWarnings({"unused", "unchecked"})
 	public static List executeList(Query query, EntityGraph graph) {
-		return query.unwrap( org.hibernate.Query.class )
+		return query.unwrap( org.hibernate.query.Query.class )
 				.applyFetchGraph( (RootGraph) graph )
 				.list();
 	}

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

@@ -56,7 +56,7 @@ import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.procedure.ProcedureCall;
 import org.hibernate.procedure.internal.ProcedureCallImpl;
 import org.hibernate.procedure.spi.NamedCallableQueryMemento;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.hql.spi.HqlQueryImplementor;
 import org.hibernate.query.hql.spi.NamedHqlQueryMemento;

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

@@ -120,7 +120,7 @@ import org.hibernate.procedure.ProcedureCall;
 import org.hibernate.procedure.spi.NamedCallableQueryMemento;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.UnknownSqlResultSetMappingException;
 import org.hibernate.resource.transaction.TransactionRequiredForJoinException;
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java

@@ -45,7 +45,7 @@ import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.procedure.spi.ProcedureCallImplementor;
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 import org.hibernate.query.BindableType;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.internal.QueryOptionsImpl;
 import org.hibernate.query.named.NamedQueryMemento;

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

@@ -8,7 +8,6 @@ package org.hibernate.query;
 
 import org.hibernate.Incubating;
 import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.Query;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.sqm.SqmExpressable;
 

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

@@ -7,7 +7,6 @@
 
 package org.hibernate.query;
 
-import org.hibernate.Query;
 import org.hibernate.QueryException;
 
 /**

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

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate;
+package org.hibernate.query;
 
 import java.time.Instant;
 import java.util.Calendar;
@@ -18,15 +18,14 @@ import jakarta.persistence.Parameter;
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.metamodel.SingularAttribute;
 
+import org.hibernate.CacheMode;
+import org.hibernate.FlushMode;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.MappingException;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.model.domain.BasicDomainType;
-import org.hibernate.query.BindableType;
-import org.hibernate.query.NavigablePath;
-import org.hibernate.query.QueryParameter;
-import org.hibernate.query.ResultListTransformer;
-import org.hibernate.query.SynchronizeableQuery;
-import org.hibernate.query.TupleTransformer;
 import org.hibernate.transform.ResultTransformer;
 import org.hibernate.type.BasicTypeReference;
 

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

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate;
+package org.hibernate.query;
 
 import java.time.Instant;
 import java.util.Calendar;
@@ -15,16 +15,18 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.hibernate.CacheMode;
+import org.hibernate.FlushMode;
+import org.hibernate.Incubating;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.NonUniqueResultException;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.SharedSessionContract;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
-import org.hibernate.query.BindableType;
-import org.hibernate.query.CommonQueryContract;
-import org.hibernate.query.ParameterMetadata;
-import org.hibernate.query.QueryParameter;
-import org.hibernate.query.QueryProducer;
-import org.hibernate.query.ResultListTransformer;
-import org.hibernate.query.TupleTransformer;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.transform.ResultTransformer;
 

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

@@ -6,9 +6,6 @@
  */
 package org.hibernate.query;
 
-import org.hibernate.NativeQuery;
-import org.hibernate.Query;
-
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaUpdate;

hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.query.criteria;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import jakarta.persistence.criteria.CommonAbstractCriteria;
 

hibernate-core/src/main/java/org/hibernate/query/hql/package-info.java

@@ -9,7 +9,7 @@
  * Package defining support for HQL queries (including supprt for JPQL
  * as a subset of HQL).
  *
- * This includes transformation via Antlr, {@link org.hibernate.Query}
+ * This includes transformation via Antlr, {@link org.hibernate.query.Query}
  * manipulation and execution
  *
  * @see org.hibernate.query.hql.HqlTranslator

hibernate-core/src/main/java/org/hibernate/query/results/Builders.java

@@ -14,7 +14,7 @@ import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.SingularAttribute;
 
 import org.hibernate.LockMode;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.RuntimeMetamodels;

hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java

@@ -10,7 +10,7 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import org.hibernate.Incubating;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;

hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java

@@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.EntityValuedModelPart;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FromClauseAccessImpl;

hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java

@@ -14,7 +14,7 @@ import java.util.function.BiFunction;
 import org.hibernate.LockMode;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.results.BasicValuedFetchBuilder;
 import org.hibernate.query.results.DomainResultCreationStateImpl;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java

@@ -8,7 +8,7 @@ package org.hibernate.query.results.dynamic;
 
 import java.util.List;
 
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.FetchBuilder;
 
 /**

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java

@@ -20,7 +20,7 @@ import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FetchBuilder;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java

@@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.ResultsHelper;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.query.results.dynamic;
 
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.ResultBuilder;
 
 /**

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java

@@ -11,7 +11,7 @@ import java.util.function.BiFunction;
 
 import org.hibernate.metamodel.mapping.SingularAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.ResultSetMappingSqlSelection;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java

@@ -9,7 +9,7 @@ package org.hibernate.query.results.dynamic;
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.results.ResultsHelper;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java

@@ -11,7 +11,7 @@ import java.util.function.BiFunction;
 import org.hibernate.LockMode;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.ResultsHelper;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java

@@ -20,7 +20,7 @@ import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.ResultSetMappingSqlSelection;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.function.BiFunction;
 
 import org.hibernate.query.DynamicInstantiationNature;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.Builders;
 import org.hibernate.query.results.ResultBuilderInstantiationValued;
 import org.hibernate.sql.results.graph.DomainResult;

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.query.results.dynamic;
 
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 
 /**
  * Contract for handling Hibernate's legacy way of representing fetches through

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/package-info.java

@@ -7,12 +7,12 @@
 
 /**
  * Support for mutable result/fetch builder graphs nodes built dynamically via
- * Hibernate's {@link org.hibernate.NativeQuery} APIs
+ * Hibernate's {@link org.hibernate.query.NativeQuery} APIs
  *
- * @see org.hibernate.NativeQuery#addScalar
+ * @see org.hibernate.query.NativeQuery#addScalar
- * @see org.hibernate.NativeQuery#addEntity
+ * @see org.hibernate.query.NativeQuery#addEntity
- * @see org.hibernate.NativeQuery#addJoin
+ * @see org.hibernate.query.NativeQuery#addJoin
- * @see org.hibernate.NativeQuery#addFetch
+ * @see org.hibernate.query.NativeQuery#addFetch
- * @see org.hibernate.NativeQuery#addRoot
+ * @see org.hibernate.query.NativeQuery#addRoot
  */
 package org.hibernate.query.results.dynamic;

hibernate-core/src/main/java/org/hibernate/query/results/package-info.java

@@ -6,7 +6,7 @@
  */
 
 /**
- * Support for defining result-set mappings used in {@link org.hibernate.NativeQuery}
+ * Support for defining result-set mappings used in {@link org.hibernate.query.NativeQuery}
  * and {@link org.hibernate.procedure.ProcedureCall} / {@link jakarta.persistence.StoredProcedureQuery}.
  * These result-set mappings are used to map the values in the JDBC {@link java.sql.ResultSet}
  * into the query result graph.
@@ -15,7 +15,7 @@
  * and multiple impls for performance reasons.  The classes in {@link org.hibernate.query.results.complete}
  * represent result/fetch definitions that are completely known up-front and are faster to
  * resolve.  The definitions in {@link org.hibernate.query.results.dynamic} are built incrementally
- * via Hibernate's {@link org.hibernate.NativeQuery} contract need to resolve themselves
+ * via Hibernate's {@link org.hibernate.query.NativeQuery} contract need to resolve themselves
  * against other dynamic result/fetch definitions and therefore take more resources to resolve.  The
  * classes in {@link org.hibernate.query.results.implicit} represent results that are implied
  *

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

@@ -6,7 +6,7 @@
  */
 package org.hibernate.query.spi;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.sql.exec.spi.Callback;
 

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

@@ -17,7 +17,7 @@ import org.hibernate.Incubating;
 import org.hibernate.ScrollMode;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.BindableType;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.QueryParameter;
 
 import jakarta.persistence.Parameter;

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 import org.hibernate.Incubating;
 import org.hibernate.ScrollMode;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 /**
  * General contract for performing execution of a query returning results.  These

hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java

@@ -43,9 +43,9 @@ import org.hibernate.jpa.internal.util.LockModeTypeHelper;
 import org.hibernate.jpa.spi.NativeQueryTupleTransformer;
 import org.hibernate.metamodel.model.domain.BasicDomainType;
 import org.hibernate.query.BindableType;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.ParameterMetadata;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;

hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java

@@ -31,7 +31,7 @@ import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.Joinable;
 import org.hibernate.persister.entity.Loadable;
 import org.hibernate.persister.entity.SQLLoadable;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.ResultSetMapping;

hibernate-core/src/main/java/org/hibernate/query/sql/package-info.java

@@ -8,7 +8,7 @@
 /**
  * Package defining support for native SQL queries
  *
- * @see org.hibernate.NativeQuery
+ * @see org.hibernate.query.NativeQuery
  * @see org.hibernate.query.sql.spi.NativeQueryImplementor
  * @see org.hibernate.query.sql.spi.NamedNativeQueryMemento
  *

hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java

@@ -20,7 +20,7 @@ import org.hibernate.LockOptions;
 import org.hibernate.MappingException;
 import org.hibernate.metamodel.model.domain.BasicDomainType;
 import org.hibernate.query.BindableType;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;

hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.query.sql.spi;
 
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.query.spi.QueryPlan;
 
 /**

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

@@ -12,7 +12,7 @@ import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.ScrollMode;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.jdbc.spi.JdbcServices;

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

@@ -34,7 +34,7 @@ import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.QueryTypeMismatchException;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.criteria.JpaExpression;

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java

@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;

hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java

@@ -12,6 +12,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.hibernate.query.Query;
 import org.hibernate.stat.QueryStatistics;
 
 /**
@@ -72,8 +73,8 @@ public class QueryStatisticsImpl implements QueryStatistics {
 
 	/**
 	 * Number of lines returned by all the executions of this query (from DB)
-	 * For now, {@link org.hibernate.Query#iterate()}
+	 * For now, {@link Query#iterate()}
-	 * and {@link org.hibernate.Query#scroll()} do not fill this statistic
+	 * and {@link Query#scroll()} do not fill this statistic
 	 *
 	 * @return The number of rows cumulatively returned by the given query; iterate
 	 *         and scroll queries do not effect this total as their number of returned rows

hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java

@@ -8,7 +8,7 @@ package org.hibernate.transform;
 
 import java.io.Serializable;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
 

hibernate-core/src/test/java/NoPackageTest.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java

@@ -9,7 +9,7 @@
 package org.hibernate.orm.test.annotations;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java

@@ -23,7 +23,7 @@ import org.hibernate.Transaction;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
 import org.hibernate.type.StandardBasicTypes;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java

@@ -14,7 +14,7 @@ import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 
 import org.hibernate.Session;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.orm.junit.DomainModel;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java

@@ -17,7 +17,7 @@ import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.ForeignKey;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.orm.junit.DomainModel;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java

@@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
 import java.util.List;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.orm.junit.DomainModel;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.orm.test.util.SchemaUtil;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java

@@ -19,7 +19,7 @@ import java.util.Set;
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.RequiresDialectFeature;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java

@@ -10,7 +10,7 @@
 package org.hibernate.orm.test.annotations.idclass;
 
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java

@@ -7,7 +7,7 @@
 package org.hibernate.orm.test.annotations.idclass.xml;
 
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java

@@ -18,7 +18,7 @@ import org.hibernate.HibernateException;
 import org.hibernate.annotations.Immutable;
 import org.hibernate.cfg.AvailableSettings;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java

@@ -15,7 +15,7 @@ import org.hibernate.orm.test.annotations.inheritance.singletable.Funk;
 import org.hibernate.orm.test.annotations.inheritance.singletable.Music;
 import org.hibernate.orm.test.annotations.inheritance.singletable.Noise;
 import org.hibernate.orm.test.annotations.inheritance.singletable.Rock;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java

@@ -15,7 +15,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Locale;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.boot.MetadataBuilder;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java

@@ -7,7 +7,7 @@
 package org.hibernate.orm.test.annotations.lob.hhh4635;
 
 import org.hibernate.dialect.OracleDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java

@@ -11,7 +11,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.hibernate.Hibernate;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java

@@ -22,7 +22,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java

@@ -15,7 +15,7 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.metadata.ClassMetadata;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.stat.Statistics;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java

@@ -34,7 +34,7 @@ import org.hibernate.graph.RootGraph;
 import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.collection.QueryableCollection;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.sql.SimpleSelect;
 
 import org.hibernate.testing.RequiresDialect;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java

@@ -12,7 +12,7 @@ import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.mapping.Column;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java

@@ -22,8 +22,8 @@ import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.AbstractHANADialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.NativeQuery;
+import org.hibernate.query.NativeQuery;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.stat.Statistics;
 import org.hibernate.type.StandardBasicTypes;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java

@@ -9,7 +9,7 @@ package org.hibernate.orm.test.annotations.subselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java

@@ -10,7 +10,7 @@ import java.util.List;
 import jakarta.persistence.PersistenceException;
 
 import org.hibernate.JDBCException;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;

hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java

@@ -18,7 +18,7 @@ import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.orm.test.bootstrap.binding.annotations.embedded.FloatLeg.RateIndex;
 import org.hibernate.orm.test.bootstrap.binding.annotations.embedded.Leg.Frequency;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.orm.junit.DomainModel;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java

@@ -24,7 +24,7 @@ import org.hibernate.StatelessSession;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DerbyDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java

@@ -26,7 +26,7 @@ import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
 import org.hibernate.testing.TestForIssue;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java

@@ -19,7 +19,7 @@ import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DerbyDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java

@@ -21,7 +21,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DerbyDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;

hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java

@@ -33,7 +33,7 @@ package org.hibernate.orm.test.cdi.converters.legacy;
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.orm.test.jpa.model.AbstractJPATest;

hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java

@@ -23,7 +23,7 @@ import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
 import org.hibernate.collection.spi.PersistentMap;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.orm.junit.DomainModel;

hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java

@@ -14,7 +14,7 @@ import jakarta.persistence.criteria.Root;
 import org.hibernate.CacheMode;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.collection.spi.PersistentSet;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.stat.CollectionStatistics;
 
 import org.hibernate.testing.orm.junit.DomainModel;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.dialect.AbstractHANADialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 
 import org.junit.Test;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.dialect.MySQLDialect;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java

@@ -32,7 +32,7 @@ import java.util.Calendar;
 import java.util.Date;
 
 import org.hibernate.dialect.SybaseASEDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java

@@ -18,7 +18,7 @@ import jakarta.persistence.PersistenceException;
 
 import org.hibernate.Session;
 import org.hibernate.dialect.AbstractHANADialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java

@@ -21,7 +21,7 @@ import jakarta.persistence.criteria.Root;
 
 import org.hibernate.Session;
 import org.hibernate.dialect.AbstractHANADialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java

@@ -18,7 +18,7 @@ import jakarta.persistence.Id;
 
 import org.hibernate.Session;
 import org.hibernate.dialect.AbstractHANADialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java

@@ -10,7 +10,7 @@ import java.sql.PreparedStatement;
 
 import org.hibernate.Transaction;
 import org.hibernate.dialect.HANAColumnStoreDialect;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.orm.junit.DomainModel;

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java

@@ -26,7 +26,7 @@ import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.exception.LockTimeoutException;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;

hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java

@@ -9,7 +9,7 @@ package org.hibernate.orm.test.embeddable;
 import java.util.List;
 
 import org.hibernate.Session;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java

@@ -19,7 +19,7 @@ import jakarta.persistence.OrderBy;
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.metamodel.CollectionClassification;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java

@@ -19,7 +19,7 @@ import jakarta.persistence.OrderBy;
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.metamodel.CollectionClassification;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java

@@ -26,7 +26,7 @@ import org.hibernate.cache.spi.access.CollectionDataAccess;
 import org.hibernate.cache.spi.entry.CollectionCacheEntry;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.transform.DistinctRootEntityResultTransformer;
 
 import org.hibernate.testing.DialectChecks;

hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java

@@ -26,7 +26,7 @@ import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.FilterDefs;
 import org.hibernate.annotations.Filters;
 import org.hibernate.annotations.ParamDef;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;