From 9fe3c861ca73bcc8f30ef7678f0bdda0d5236406 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 14 Jan 2022 14:49:17 -0600 Subject: [PATCH] HHH-15023 - Move Query and NativeQuery back to org.hibernate.query --- .../org/hibernate/userguide/hql/HQLTest.java | 16 ++++++++-------- .../userguide/locking/ExplicitLockingTest.java | 2 +- .../cache/SQLFunctionsInterSystemsTest.java | 2 +- .../main/java/org/hibernate/LockOptions.java | 2 ++ .../hibernate/NonUniqueResultException.java | 2 ++ .../java/org/hibernate/ScrollableResults.java | 2 ++ .../src/main/java/org/hibernate/Session.java | 1 + .../java/org/hibernate/SessionBuilder.java | 1 + .../org/hibernate/StatelessSessionBuilder.java | 2 ++ .../annotations/NamedNativeQuery.java | 2 +- .../org/hibernate/annotations/NamedQuery.java | 2 +- .../org/hibernate/annotations/QueryHints.java | 4 ++-- .../org/hibernate/cfg/AvailableSettings.java | 4 ++-- .../java/org/hibernate/dialect/Dialect.java | 2 +- .../pagination/AbstractLimitHandler.java | 2 +- .../engine/spi/PersistenceContext.java | 2 +- .../spi/SharedSessionContractImplementor.java | 2 +- .../java/org/hibernate/graph/EntityGraphs.java | 6 +++--- .../AbstractSharedSessionContract.java | 2 +- .../org/hibernate/internal/SessionImpl.java | 2 +- .../procedure/internal/ProcedureCallImpl.java | 2 +- .../java/org/hibernate/query/BindableType.java | 1 - .../query/IllegalQueryOperationException.java | 1 - .../org/hibernate/{ => query}/NativeQuery.java | 13 ++++++------- .../java/org/hibernate/{ => query}/Query.java | 18 ++++++++++-------- .../org/hibernate/query/QueryProducer.java | 3 --- .../query/criteria/JpaQueryableCriteria.java | 2 +- .../org/hibernate/query/hql/package-info.java | 2 +- .../org/hibernate/query/results/Builders.java | 2 +- .../query/results/ResultSetMapping.java | 2 +- ...ompleteResultBuilderCollectionStandard.java | 2 +- .../CompleteResultBuilderEntityStandard.java | 2 +- .../results/dynamic/DynamicFetchBuilder.java | 2 +- .../dynamic/DynamicFetchBuilderLegacy.java | 2 +- .../dynamic/DynamicFetchBuilderStandard.java | 2 +- .../results/dynamic/DynamicResultBuilder.java | 2 +- .../dynamic/DynamicResultBuilderAttribute.java | 2 +- .../DynamicResultBuilderBasicStandard.java | 2 +- .../DynamicResultBuilderEntityCalculated.java | 2 +- .../DynamicResultBuilderEntityStandard.java | 2 +- .../DynamicResultBuilderInstantiation.java | 2 +- .../results/dynamic/LegacyFetchResolver.java | 2 +- .../query/results/dynamic/package-info.java | 12 ++++++------ .../hibernate/query/results/package-info.java | 4 ++-- .../query/spi/DomainQueryExecutionContext.java | 2 +- .../hibernate/query/spi/QueryImplementor.java | 2 +- .../hibernate/query/spi/SelectQueryPlan.java | 2 +- .../query/sql/internal/NativeQueryImpl.java | 4 ++-- .../internal/ResultSetMappingProcessor.java | 2 +- .../org/hibernate/query/sql/package-info.java | 2 +- .../query/sql/spi/NativeQueryImplementor.java | 2 +- .../query/sql/spi/NativeQueryPlan.java | 2 +- .../internal/ConcreteSqmSelectQueryPlan.java | 2 +- .../query/sqm/internal/QuerySqmImpl.java | 2 +- .../JdbcValuesMappingProducerStandard.java | 2 +- .../stat/internal/QueryStatisticsImpl.java | 5 +++-- .../hibernate/transform/ResultTransformer.java | 2 +- .../src/test/java/NoPackageTest.java | 2 +- .../test/annotations/ConfigurationTest.java | 2 +- .../orm/test/annotations/EntityTest.java | 2 +- .../test/annotations/cid/CompositeIdTest.java | 2 +- .../DefaultNamingCollectionElementTest.java | 2 +- .../OneToOneWithDerivedIdentityTest.java | 2 +- ...ivedIdentitySimpleParentIdClassDepTest.java | 2 +- .../entity/BasicHibernateAnnotationsTest.java | 2 +- .../idclass/IdClassCompositePKTest.java | 2 +- .../idclass/xml/IdClassXmlTest.java | 2 +- ...tyUpdateQueryHandlingModeExceptionTest.java | 2 +- .../annotations/inheritance/SubclassTest.java | 2 +- .../orm/test/annotations/join/JoinTest.java | 2 +- .../test/annotations/lob/hhh4635/LobTest.java | 2 +- .../annotations/manytoone/ManyToOneTest.java | 2 +- .../ImmutableNaturalKeyLookupTest.java | 2 +- .../annotations/naturalid/NaturalIdTest.java | 2 +- .../annotations/onetomany/OrderByTest.java | 2 +- .../annotations/onetoone/OneToOneTest.java | 2 +- .../annotations/query/QueryAndSQLTest.java | 4 ++-- .../annotations/subselect/SubselectTest.java | 2 +- .../tableperclass/TablePerClassTest.java | 2 +- .../annotations/embedded/EmbeddedTest.java | 2 +- .../lazy/StatelessQueryScrollingTest.java | 2 +- .../enhancement/lazy/proxy/FetchGraphTest.java | 2 +- ...WithInheritanceProxyEagerManyToOneTest.java | 2 +- ...QueryScrollingWithInheritanceProxyTest.java | 2 +- .../converters/legacy/ConvertBetweenTest.java | 2 +- .../test/collection/map/PersistentMapTest.java | 2 +- .../test/collection/set/PersistentSetTest.java | 2 +- .../dialect/function/HANAFunctionsTest.java | 2 +- .../function/MySQLRoundFunctionTest.java | 2 +- .../function/SybaseASEFunctionTest.java | 2 +- .../dialect/functional/HANABooleanTest.java | 2 +- .../dialect/functional/HANACalcViewTest.java | 2 +- .../dialect/functional/HANADecimalTest.java | 2 +- .../dialect/functional/HANASearchTest.java | 2 +- .../functional/SQLServerDialectTest.java | 2 +- .../embeddable/MappedByEmbeddableTest.java | 2 +- .../embeddable/OrderByEmbeddableToOneTest.java | 2 +- .../embeddable/OrderByEmbeddableX2Test.java | 2 +- .../orm/test/filter/DynamicFilterTest.java | 2 +- .../filter/OneToManyWithDynamicFilterTest.java | 2 +- .../orm/test/hql/ASTParserLoadingTest.java | 2 +- .../orm/test/hql/BulkManipulationTest.java | 2 +- .../CollectionMapWithComponentValueTest.java | 2 +- .../test/hql/DeleteWhereFunctionCallTest.java | 2 +- .../orm/test/hql/NaturalIdDereferenceTest.java | 2 +- .../orm/test/hql/ParameterCollectionTest.java | 2 +- .../orm/test/hql/TreatKeywordTest.java | 2 +- .../hibernate/orm/test/hql/WithClauseTest.java | 2 +- .../QueryScrollingWithInheritanceTest.java | 2 +- .../orm/test/id/array/ByteArrayIdTest.java | 2 +- .../test/id/array/CharacterArrayIdTest.java | 2 +- .../id/array/PrimitiveByteArrayIdTest.java | 2 +- .../array/PrimitiveCharacterArrayIdTest.java | 2 +- .../test/id/enhanced/SharedSequenceTest.java | 2 +- ...reSQLMultipleTypesOtherContributorTest.java | 2 +- .../inet/PostgreSQLInetTypesOtherTest.java | 2 +- .../uuid/PostgreSQLUUIDGeneratedValueTest.java | 2 +- .../IdentifierPropertyReferencesTest.java | 2 +- .../cachemodes/SharedCacheModesTest.java | 2 +- .../compliance/tck2_2/ClosedManagerTests.java | 2 +- .../tck2_2/JpaPositionalParameterTest.java | 2 +- .../jpa/criteria/CriteriaCompilingTest.java | 2 +- .../alias/CriteriaMultiselectAliasTest.java | 2 +- .../jpa/criteria/basic/ExpressionsTest.java | 2 +- .../CriteriaToScrollableResultsFetchTest.java | 2 +- .../test/jpa/lock/LockTimeoutPropertyTest.java | 6 +++--- .../orm/test/jpa/lock/QueryLockingTest.java | 8 ++++---- .../orm/test/jpa/ql/JPAQLComplianceTest.java | 2 +- .../orm/test/jpa/ql/NamedNativeQueryTest.java | 2 +- .../test/jpa/query/NamedQueryCommentTest.java | 6 +++--- .../jpa/query/NamedQueryFlushModeTest.java | 4 ++-- .../orm/test/jpa/query/NamedQueryTest.java | 10 +++++----- .../NativeQueryOrdinalParametersTest.java | 2 +- .../jpa/query/TypedValueParametersTest.java | 2 +- .../hibernate/orm/test/lob/LobStringTest.java | 2 +- .../orm/test/lob/PostgreSqlLobStringTest.java | 2 +- .../test/locking/AbstractSkipLockedTest.java | 2 +- .../PessimisticWriteLockTimeoutTest.java | 2 +- .../test/locking/UpgradeSkipLockedTest.java | 2 +- .../locking/paging/PagingAndLockingTest.java | 4 ++-- .../locking/warning/LockNoneWarmingTest.java | 2 +- .../converted/converter/ConverterTest.java | 2 +- .../converter/LongToDateConversionTest.java | 2 +- .../converter/literal/QueryLiteralTest.java | 2 +- .../formula/FormulaNativeQueryTest.java | 4 ++-- .../nationalized/StringNationalizedTest.java | 2 +- .../orm/test/pagination/PaginationTest.java | 4 ++-- .../orm/test/query/AddNamedQueryTest.java | 12 ++++++------ .../orm/test/query/QueryTimeOutTest.java | 4 ++-- .../query/hql/AggregateFilterClauseTest.java | 2 +- .../orm/test/query/hql/ILikeCriteriaTest.java | 2 +- .../orm/test/query/hql/ILikeTest.java | 2 +- .../test/query/hql/LegacyParameterTests.java | 2 +- .../query/hql/MultiValuedParameterTest.java | 2 +- .../orm/test/query/hql/ParameterTests.java | 2 +- .../QueryParametersValidationArrayTest.java | 2 +- .../orm/test/query/hql/ScrollableTest.java | 2 +- ...thPackageNamesStartingWithKeywordsTest.java | 2 +- .../AbstractNullPrecedenceTest.java | 2 +- .../named/simple/SimpleNamedQueryTests.java | 2 +- .../orm/test/query/returns/ResultListTest.java | 2 +- .../query/returns/ScrollableResultsTests.java | 2 +- .../orm/test/query/sql/package-info.java | 2 +- ...bstractQueryCacheResultTransformerTest.java | 2 +- .../orm/test/querycache/QueryCacheTest.java | 4 ++-- .../test/queryhint/OracleQueryHintTest.java | 2 +- .../queryhint/QueryHintSQLServer2012Test.java | 2 +- .../orm/test/readonly/ReadOnlySessionTest.java | 2 +- .../SchemaUpdateWithFunctionIndexTest.java | 2 +- .../SchemaUpdateWithViewsTest.java | 2 +- .../orm/test/sql/exec/SmokeTests.java | 2 +- .../custom/CustomStoredProcTestSupport.java | 2 +- .../NativeSqlAndQuotedIdentifiersTest.java | 2 +- .../internal/QueryPlanCacheStatisticsTest.java | 2 +- .../StatelessSessionNativeQueryInsertTest.java | 2 +- .../stateless/StatelessSessionQueryTest.java | 4 ++-- .../fetching/StatelessSessionFetchingTest.java | 2 +- .../MySQL57TimestampFspFunctionTest.java | 2 +- .../temporal/MySQL57TimestampPropertyTest.java | 2 +- .../orm/test/temporal/TimePropertyTest.java | 2 +- .../test/temporal/TimestampPropertyTest.java | 2 +- .../orm/test/type/BigDecimalTypeTest.java | 2 +- .../orm/test/type/OffsetDateTimeTest.java | 2 +- .../orm/test/type/ZonedDateTimeTest.java | 2 +- .../type/contributor/ArrayCustomTypeTest.java | 2 +- .../contributor/ArrayTypeCompositionTest.java | 2 +- .../test/unionsubclass/UnionSubclassTest.java | 2 +- .../test/unionsubclass/alias/SellCarTest.java | 2 +- .../orm/test/where/hbm/WhereTest.java | 2 +- .../joinedsubclass/JoinedSubclassTest.java | 2 +- .../test/queryhint/QueryHintHANATest.java | 2 +- .../ResultTransformerTest.java | 2 +- .../test/sql/NativeQueryScrollableResults.java | 2 +- .../sql/hand/query/NativeSQLQueriesTest.java | 4 ++-- .../entities/mapper/id/QueryParameterData.java | 2 +- .../query/AbstractRelationQueryGenerator.java | 2 +- .../relation/query/RelationQueryGenerator.java | 2 +- .../internal/reader/AuditReaderImpl.java | 2 +- .../CrossTypeRevisionChangesReaderImpl.java | 2 +- .../revisioninfo/RevisionInfoQueryCreator.java | 2 +- .../internal/tools/query/QueryBuilder.java | 2 +- .../internal/tools/query/UpdateBuilder.java | 2 +- .../internal/impl/AbstractAuditQuery.java | 2 +- .../internal/impl/EntitiesAtRevisionQuery.java | 2 +- .../impl/EntitiesModifiedAtRevisionQuery.java | 2 +- .../orm/test/jcache/domain/EventManager.java | 2 +- .../functions/FunctionTestTemplate.java | 4 ++-- migration-guide.adoc | 2 +- release/src/release/javadoc/overview.html | 2 +- 209 files changed, 270 insertions(+), 263 deletions(-) rename hibernate-core/src/main/java/org/hibernate/{ => query}/NativeQuery.java (98%) rename hibernate-core/src/main/java/org/hibernate/{ => query}/Query.java (98%) diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java index 58b600902a..8a92b82bdb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java +++ b/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 query = session.createQuery( + org.hibernate.query.Query 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 query = session.createNamedQuery( + org.hibernate.query.Query 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 query = session.createQuery( + org.hibernate.query.Query 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 query = session.createQuery( + org.hibernate.query.Query 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 query = session.createQuery( + org.hibernate.query.Query 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 query = session.createQuery( + org.hibernate.query.Query 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 query = session.createQuery( + org.hibernate.query.Query 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[] diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java index b64bbc9838..eb368e4645 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java +++ b/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; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java index 3ce394bec0..e122ea95eb 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/LockOptions.java b/hibernate-core/src/main/java/org/hibernate/LockOptions.java index 3a1884fcfa..31bb90e4f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/LockOptions.java +++ b/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). * diff --git a/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java b/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java index 90b1d54822..efad153b33 100644 --- a/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java +++ b/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, diff --git a/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java index 8962fd4a5a..f0243b8509 100644 --- a/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java +++ b/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} diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java index a76201967e..8b4ae83d42 100644 --- a/hibernate-core/src/main/java/org/hibernate/Session.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java index 3e6eccae87..dccfb51b6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java index b8ba197e47..fe120b0f20 100644 --- a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java +++ b/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. * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java index b669e41ed0..b0d02cb803 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java index e37a908ac6..0829749ca8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java index 57ab37a622..b5e5e471da 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java +++ b/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; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; /** * List of hints that may be passed to {@link jakarta.persistence.Query#setHint(String, Object)} diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index bab3fb1fc5..7e1bfee69c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/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; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.Transaction; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.registry.classloading.internal.TcclLookupPrecedence; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 2312469196..b3f3277c02 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java index 5d0ad29219..82824c6ad0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java index cb364d7f2f..f5e26294aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java index 8400f96b26..0377822bc3 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java index ae61d1c33d..87fa9a1932 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java +++ b/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(); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java index 93b6fe5c80..b4c83b1cbe 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java index b72806f11e..8b05106ccf 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index 088265f9d7..d7c3ae3c94 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/BindableType.java b/hibernate-core/src/main/java/org/hibernate/query/BindableType.java index ca26276fac..f53729027d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/BindableType.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/IllegalQueryOperationException.java b/hibernate-core/src/main/java/org/hibernate/query/IllegalQueryOperationException.java index 820270098d..3f7ff232b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/IllegalQueryOperationException.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/NativeQuery.java rename to hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java index 18f70b75f2..2cad104263 100644 --- a/hibernate-core/src/main/java/org/hibernate/NativeQuery.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/Query.java b/hibernate-core/src/main/java/org/hibernate/query/Query.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/Query.java rename to hibernate-core/src/main/java/org/hibernate/query/Query.java index b0b032e01e..b1dced8bda 100644 --- a/hibernate-core/src/main/java/org/hibernate/Query.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java index e6398e1260..8d21d9348a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java index 671d660bc5..8fafbfd259 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/hql/package-info.java index c93784c7e3..bbf46ed395 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/package-info.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java b/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java index ff4e1bf799..b9b1f85c23 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java index b74d96a01c..5ff2f01021 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java index 0913c0f6c7..26ea8f2227 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java index 48f4361a3b..4ed1d6391e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java index 516efb8cdb..d13f72cebc 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java index fff49bd799..580bddc5ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java index 77b42e8e78..0251150a22 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java index c28d0a2298..511cf7b53a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java index bac20c3516..8eb235d2e0 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java index bad70d6673..9662d0c31d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java index abce9dcee5..bffeaa1598 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java index e4c62067c1..ea927d1b2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java index 7509bfa70c..28a272aab5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java index d47cb6bfd7..c435509f5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/package-info.java index d0d50bff64..84e852fbb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/package-info.java +++ b/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.NativeQuery#addEntity - * @see org.hibernate.NativeQuery#addJoin - * @see org.hibernate.NativeQuery#addFetch - * @see org.hibernate.NativeQuery#addRoot + * @see org.hibernate.query.NativeQuery#addScalar + * @see org.hibernate.query.NativeQuery#addEntity + * @see org.hibernate.query.NativeQuery#addJoin + * @see org.hibernate.query.NativeQuery#addFetch + * @see org.hibernate.query.NativeQuery#addRoot */ package org.hibernate.query.results.dynamic; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/results/package-info.java index e57cdc6f38..959666ff63 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/package-info.java +++ b/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 * diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java index a385629b2f..dba1689225 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryImplementor.java index fee73a7fb9..72340234d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryImplementor.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SelectQueryPlan.java index 29cbe4141b..50b48a1464 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/SelectQueryPlan.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java index 4d205f540b..964711a3b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java index a336e4ce64..ccaadda318 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/sql/package-info.java index 3466cb0ebb..d4531b11ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/package-info.java +++ b/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 * diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java index cbe6391270..d927baeb09 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java index 3ed9727391..6f8486bc5f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java +++ b/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; /** 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 index dcc12af6c8..c8043714e3 100644 --- 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 @@ -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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java index ecceeee65a..f07fb7fe5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java index 2727eeeba7..1a05962fdc 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java index 8ab76bc3b0..b6ca4c28f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java +++ b/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()} - * and {@link org.hibernate.Query#scroll()} do not fill this statistic + * For now, {@link Query#iterate()} + * 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 diff --git a/hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java b/hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java index 149af072db..cb2b6d161d 100644 --- a/hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java +++ b/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; diff --git a/hibernate-core/src/test/java/NoPackageTest.java b/hibernate-core/src/test/java/NoPackageTest.java index 64c714400a..5c8e20aef3 100644 --- a/hibernate-core/src/test/java/NoPackageTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java index 94aaf05d04..55d29a0d25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java index e2c62118eb..aa943a64a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java index 6263d7cc2a..aa69e4c2fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java index 0230fab8ae..76be5a39e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java index 6f308c130f..c788220978 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java index b2e6a0fd4e..208f20706b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java index 48a18859c0..acd165857b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java index 2299bff71f..4c3f6e7ec7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java index 327277378d..ef1339acb3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java index bc5882079b..0553f1548b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java index 95818f3855..15280304c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java index 4e149e40cd..30455b04b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java index c6610a8509..c38cd9f5d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java index 644ded1e3b..44ba13f496 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java index 5346b498ea..9602a0b540 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java index be741b90df..ebc5937f95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java index 441f00a900..0be6537c4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java index 846a8d3a29..1f6b62b5ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java index 7f6513c22b..8161f372db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java +++ b/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; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.stat.Statistics; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java index c2d4252da3..f40dba6bef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java index e1aab2ba83..b48b7c6277 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java index 1840aaf27b..2bd174b04f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java index 8acbfec05f..b58cb33b16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java index 8ab7e9afea..c2c0593896 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java index 0c75e85faf..8ac1e92669 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java index 2d8cdf08d9..726ad64569 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java index f8a258d3c4..49bf0a7986 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java index 97b1ca4162..5adf8be469 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java index e53581ba3b..d45cb8e956 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java index 69ac8e3666..f83238be8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java index 69247db1a6..c2d00bb9d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java index a316368af3..661c99d614 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java index 098b802589..cd64b8abac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java index 9c6329c9c0..79d6d94c7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java index f1478babf6..572c8e1226 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java index c92d3a2858..7df88d3f89 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java index abc190c72f..10a98365a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java index 6782a6f575..886481ee04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java index 13aa624105..82227d161a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java index 9386b99714..1c98d9b879 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java index 416df7be20..8455bace48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java index 635cd0ab81..318d958ff7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java +++ b/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; 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 index 4b89711e18..83b7793497 100644 --- 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 @@ -46,7 +46,7 @@ import org.hibernate.orm.test.any.hbm.IntegerPropertyValue; import org.hibernate.orm.test.any.hbm.PropertySet; import org.hibernate.orm.test.any.hbm.PropertyValue; import org.hibernate.orm.test.any.hbm.StringPropertyValue; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.query.sqm.ParsingException; import org.hibernate.query.sqm.SqmExpressable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java index d25a299173..c01c80e74a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java @@ -26,7 +26,7 @@ import org.hibernate.id.BulkInsertionCapableIdentifierGenerator; import org.hibernate.id.IdentifierGenerator; import org.hibernate.metamodel.CollectionClassification; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java index ed87a301c7..489de5137a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java index b2af5991e5..657d645215 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.hql; 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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java index 7de2465985..11571788eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.hql; import org.hibernate.annotations.NaturalId; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInspector; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java index e0a99b696e..4463a3a9a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.List; import org.hibernate.Session; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java index 25f76634c8..cd870d89ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.hql; import java.util.List; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java index 9809bb9014..0d727b98cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java @@ -13,7 +13,7 @@ import java.util.List; import org.hibernate.HibernateException; import org.hibernate.QueryException; import org.hibernate.dialect.DerbyDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.SkipForDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java index 7a95f1aa57..4b2f0f81a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java @@ -16,7 +16,7 @@ import org.hibernate.ScrollableResults; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.Dialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java index 69a4648236..89caa7f801 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java index 1d123bca73..dbf5c08590 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java index 5a43f6f220..02912ead1e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java index 0563329529..0a7812edf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java index f201f54e8d..3f2166311b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java index 8b634e8f1c..0210374e15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java @@ -21,7 +21,7 @@ import org.hibernate.boot.spi.MetadataBuilderImplementor; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.SqlTypes; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java index 8ceeb368c5..fac6a65d72 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java @@ -14,7 +14,7 @@ import org.hibernate.boot.spi.MetadataBuilderImplementor; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.spi.TypeConfiguration; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java index b379980f64..12157f2edc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java index c8697c6b93..8eec58f37f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.idprops; import org.hibernate.Session; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java index 8ebb3d4b32..d556da9155 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.CacheRetrieveMode; import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java index ba6ed1c06c..638133191d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2; import org.hibernate.Session; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.orm.test.jpa.model.AbstractJPATest; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java index af48981731..54e175f3f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.orm.test.jpa.model.AbstractJPATest; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java index a67df17c39..835c73005b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.criteria.Root; import jakarta.persistence.metamodel.EntityType; import org.hibernate.CacheMode; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java index 6a3fa3b492..4761a91d20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.transform.Transformers; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java index cf8836a9d8..761c9d5bd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.orm.test.jpa.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.orm.test.jpa.metamodel.Phone; import org.hibernate.orm.test.jpa.metamodel.Product; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java index c01cc7b038..bbd32acf36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.ScrollableResults; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java index 6a78039377..8d7de3af9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java @@ -41,7 +41,7 @@ public class LockTimeoutPropertyTest extends BaseEntityManagerFunctionalTestCase Query query = em.createNamedQuery( "getAll" ); query.setLockMode( LockModeType.PESSIMISTIC_READ ); - int timeout = query.unwrap( org.hibernate.Query.class ).getLockOptions().getTimeOut(); + int timeout = query.unwrap( org.hibernate.query.Query.class ).getLockOptions().getTimeOut(); assertEquals( 3000, timeout ); } @@ -55,14 +55,14 @@ public class LockTimeoutPropertyTest extends BaseEntityManagerFunctionalTestCase assertTrue( b ); int timeout = Integer.valueOf( em.getProperties().get( AvailableSettings.JPA_LOCK_TIMEOUT ).toString() ); assertEquals( 2000, timeout); - org.hibernate.Query q = (org.hibernate.Query) em.createQuery( "select u from UnversionedLock u" ); + org.hibernate.query.Query q = (org.hibernate.query.Query) em.createQuery( "select u from UnversionedLock u" ); timeout = q.getLockOptions().getTimeOut(); assertEquals( 2000, timeout ); Query query = em.createQuery( "select u from UnversionedLock u" ); query.setLockMode(LockModeType.PESSIMISTIC_WRITE); query.setHint( AvailableSettings.JPA_LOCK_TIMEOUT, 3000 ); - q = (org.hibernate.Query) query; + q = (org.hibernate.query.Query) query; timeout = q.getLockOptions().getTimeOut(); assertEquals( 3000, timeout ); em.getTransaction().rollback(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java index a0ca7cfd88..1a9077c79f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java @@ -14,7 +14,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.internal.SessionImpl; import org.hibernate.jpa.QueryHints; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialect; @@ -56,7 +56,7 @@ public class QueryLockingTest extends BaseEntityManagerFunctionalTestCase { public void testOverallLockMode() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); - org.hibernate.Query query = em.createQuery( "from Lockable l" ).unwrap( org.hibernate.Query.class ); + org.hibernate.query.Query query = em.createQuery( "from Lockable l" ).unwrap( org.hibernate.query.Query.class ); assertEquals( LockMode.NONE, query.getLockOptions().getLockMode() ); assertNull( query.getLockOptions().getAliasSpecificLockMode( "l" ) ); assertEquals( LockMode.NONE, query.getLockOptions().getEffectiveLockMode( "l" ) ); @@ -81,7 +81,7 @@ public class QueryLockingTest extends BaseEntityManagerFunctionalTestCase { public void testNoneLockModeForNonSelectQueryAllowed() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); - org.hibernate.Query query = em.createQuery( "delete from Lockable l" ).unwrap( org.hibernate.Query.class ); + org.hibernate.query.Query query = em.createQuery( "delete from Lockable l" ).unwrap( org.hibernate.query.Query.class ); assertEquals( LockMode.NONE, query.getLockOptions().getLockMode() ); @@ -92,7 +92,7 @@ public class QueryLockingTest extends BaseEntityManagerFunctionalTestCase { // ensure other modes still throw the exception em.getTransaction().begin(); - query = em.createQuery( "delete from Lockable l" ).unwrap( org.hibernate.Query.class ); + query = em.createQuery( "delete from Lockable l" ).unwrap( org.hibernate.query.Query.class ); assertEquals( LockMode.NONE, query.getLockOptions().getLockMode() ); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java index 596242df6f..df25e87c14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.ql; import java.util.ArrayList; import java.util.List; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.SemanticException; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java index 1baf17558d..73e849e85a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SQLServerDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java index 9e96cfd74c..a05f743d6e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java @@ -174,7 +174,7 @@ public class NamedQueryCommentTest { Query query = entityManager.createNamedQuery( "UpdateNamedNativeQuery" ); query.setParameter( "title", GAME_TITLES[0] ); query.setParameter( "id", 1L ); - query.unwrap( org.hibernate.Query.class ).addQueryHint( "INDEX (game idx_game_id)" ); + query.unwrap( org.hibernate.query.Query.class ).addQueryHint( "INDEX (game idx_game_id)" ); int updateCount = query.executeUpdate(); assertEquals( 1, updateCount ); @@ -197,7 +197,7 @@ public class NamedQueryCommentTest { Query query = entityManager.createNamedQuery( "UpdateNamedNativeQuery" ); query.setParameter( "title", GAME_TITLES[0] ); query.setParameter( "id", 1L ); - query.unwrap( org.hibernate.Query.class ).addQueryHint( "INDEX (game idx_game_id)" ); + query.unwrap( org.hibernate.query.Query.class ).addQueryHint( "INDEX (game idx_game_id)" ); int updateCount = query.executeUpdate(); assertEquals( 1, updateCount ); @@ -220,7 +220,7 @@ public class NamedQueryCommentTest { Query query = entityManager.createNamedQuery( "SelectNamedQuery" ); query.setParameter( "title", GAME_TITLES[0] ); - query.unwrap( org.hibernate.Query.class ).addQueryHint( "idx_game_id" ); + query.unwrap( org.hibernate.query.Query.class ).addQueryHint( "idx_game_id" ); List list = query.getResultList(); assertEquals( 1, list.size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java index cf55750ff8..c82ea89fc4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java @@ -15,8 +15,8 @@ import org.hibernate.Session; import org.hibernate.annotations.FlushModeType; import org.hibernate.annotations.NamedNativeQuery; import org.hibernate.annotations.NamedQuery; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java index 7a4ce16904..470480aaf7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java @@ -20,7 +20,7 @@ import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.jpa.QueryHints; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.testing.TestForIssue; import org.junit.After; @@ -83,7 +83,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { assertEquals( 1, list.size() ); final Session session = entityManager.unwrap( Session.class ); - final org.hibernate.Query sessionQuery = session.createQuery( "select g from Game g where title = ?1" ); + final org.hibernate.query.Query sessionQuery = session.createQuery( "select g from Game g where title = ?1" ); sessionQuery.setParameter( 1, GAME_TITLES[0] ); list = sessionQuery.getResultList(); @@ -102,7 +102,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { assertEquals( 1, list.size() ); final Session session = entityManager.unwrap( Session.class ); - final org.hibernate.Query sessionQuery = session.getNamedQuery( "NamedQuery" ); + final org.hibernate.query.Query sessionQuery = session.getNamedQuery( "NamedQuery" ); sessionQuery.setParameter( 1, GAME_TITLES[0] ); list = sessionQuery.getResultList(); @@ -132,7 +132,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { assertEquals( 1, list.size() ); final Session session = entityManager.unwrap( Session.class ); - final org.hibernate.Query sessionQuery = session.createNativeQuery( + final org.hibernate.query.Query sessionQuery = session.createNativeQuery( "select * from Game g where title = ?" ); sessionQuery.setParameter( 1, GAME_TITLES[0] ); list = sessionQuery.getResultList(); @@ -152,7 +152,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { assertEquals( 1, list.size() ); final Session session = entityManager.unwrap( Session.class ); - final org.hibernate.Query sessionQuery = session.getNamedNativeQuery( + final org.hibernate.query.Query sessionQuery = session.getNamedNativeQuery( "NamedNativeQuery" ); sessionQuery.setParameter( 1, GAME_TITLES[0] ); list = sessionQuery.getResultList(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java index fc6fa000ea..e62c329253 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java @@ -20,7 +20,7 @@ import jakarta.validation.constraints.Size; import org.hibernate.Session; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java index 2a8ca1566f..22e8519adc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java @@ -73,7 +73,7 @@ public class TypedValueParametersTest { scope.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class ).getTypeConfiguration() ); - org.hibernate.Query hibernateQuery = q.unwrap( org.hibernate.Query.class ); + org.hibernate.query.Query hibernateQuery = q.unwrap( org.hibernate.query.Query.class ); hibernateQuery.setParameter( "tags", Arrays.asList( "important", "business" ), customType ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java index 59eab9c37d..2978114b15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java @@ -13,7 +13,7 @@ import java.util.List; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java index e88bc3f6d1..af70fce8c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java @@ -13,7 +13,7 @@ import java.sql.Statement; import java.util.List; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java index e4c917ce9b..aeb28e8e12 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java @@ -13,7 +13,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java index d46a85c11d..54469cb5da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.locking; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java index b532e85b36..5513de0b5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.locking; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Query; +import org.hibernate.query.Query; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java index 0a15027412..bef64c48c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java @@ -12,8 +12,8 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.LockMode; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java index f4ba968442..b9da8efe4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.Table; import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java index 8847fa562c..0de863768b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java @@ -15,7 +15,7 @@ import org.hibernate.SessionFactory; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.BindableType; import org.hibernate.metamodel.spi.MetamodelImplementor; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.type.Type; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java index 1f39cce729..a300557e22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.Date; import java.util.stream.Stream; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java index 4c877d436f..2c4ae01d64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.sql.ast.SqlTreeCreationException; import org.hibernate.testing.orm.ExceptionHelper; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java index 5d8325a2ca..0cfd18ab0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java @@ -14,8 +14,8 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import org.hibernate.annotations.Formula; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java index 911ec713bc..543730c088 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java index 0651e87e63..11f613bd4c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java @@ -13,8 +13,8 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java index 9db9c48771..3d3c4d47b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java @@ -116,7 +116,7 @@ public class AddNamedQueryTest { q = em.createNamedQuery( name ); assertEquals( LockMode.OPTIMISTIC, - q.unwrap( org.hibernate.Query.class ).getLockOptions().getLockMode() + q.unwrap( org.hibernate.query.Query.class ).getLockOptions().getLockMode() ); assertEquals( LockModeType.OPTIMISTIC, q.getLockMode() ); } @@ -147,7 +147,7 @@ public class AddNamedQueryTest { q = em.createNamedQuery( name ); assertEquals( FlushMode.COMMIT, - q.unwrap( org.hibernate.Query.class ).getHibernateFlushMode() + q.unwrap( org.hibernate.query.Query.class ).getHibernateFlushMode() ); assertEquals( FlushModeType.COMMIT, q.getFlushMode() ); } @@ -160,7 +160,7 @@ public class AddNamedQueryTest { scope.inTransaction( em -> { Query query = em.createNamedQuery( name ); - org.hibernate.Query hibernateQuery = (org.hibernate.Query) query; + org.hibernate.query.Query hibernateQuery = (org.hibernate.query.Query) query; // assert the state of the query config settings based on the initial named query // // NOTE: here we check "query options" via the Hibernate contract (allowing nullness checking); see below for access via the JPA contract @@ -177,7 +177,7 @@ public class AddNamedQueryTest { em.getEntityManagerFactory().addNamedQuery( name, query ); query = em.createNamedQuery( name ); - hibernateQuery = (org.hibernate.Query) query; + hibernateQuery = (org.hibernate.query.Query) query; // assert the state of the query config settings based on the initial named query // // NOTE: here we check "query options" via the JPA contract @@ -193,7 +193,7 @@ public class AddNamedQueryTest { em.getEntityManagerFactory().addNamedQuery( name, query ); query = em.createNamedQuery( name ); - hibernateQuery = (org.hibernate.Query) query; + hibernateQuery = (org.hibernate.query.Query) query; // assert the state of the query config settings based on the initial named query assertEquals( 0, hibernateQuery.getFirstResult() ); assertEquals( Integer.MAX_VALUE, hibernateQuery.getMaxResults() ); @@ -207,7 +207,7 @@ public class AddNamedQueryTest { em.getEntityManagerFactory().addNamedQuery( name, query ); query = em.createNamedQuery( name ); - hibernateQuery = (org.hibernate.Query) query; + hibernateQuery = (org.hibernate.query.Query) query; // assert the state of the query config settings based on the initial named query assertEquals( 51, hibernateQuery.getFirstResult() ); assertEquals( Integer.MAX_VALUE, hibernateQuery.getMaxResults() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java index 8fd5f06432..803d42b756 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java @@ -17,8 +17,8 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.SybaseDialect; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.jpa.QueryHints; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.type.descriptor.java.StringJavaTypeDescriptor; import org.hibernate.type.descriptor.jdbc.JdbcType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java index 6f542f3b53..e18b9222ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hql; import java.util.Date; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.sqm.ParsingException; import org.hibernate.testing.orm.domain.StandardDomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java index ed43c401c0..aedc59ecb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java @@ -10,7 +10,7 @@ import java.util.List; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.testing.orm.domain.StandardDomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java index c36f2114ca..ce395c8bbd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hql; import java.util.List; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.gambit.BasicEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java index c57d65d5fd..c6f51dcbec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.domain.StandardDomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java index fcacd6b36c..eecfc44f0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.List; import org.hibernate.boot.MetadataSources; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.domain.contacts.Contact; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java index 7aaf61698d..7680072d9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java @@ -19,7 +19,7 @@ import jakarta.persistence.TemporalType; import org.hibernate.Session; import org.hibernate.orm.test.query.sqm.BaseSqmUnitTest; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.DomainQueryExecutionContext; import org.hibernate.query.spi.QueryParameterBinding; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java index 1b0cb594a6..456d42f827 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.type.AbstractSingleColumnStandardBasicType; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java index e736583cc3..b23cd4f1a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java @@ -15,7 +15,7 @@ import java.util.List; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Session; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java index 8500a0b924..89e01d0942 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java @@ -10,7 +10,7 @@ import from.In; import in.from.Any; import org.hibernate.Session; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.resource.transaction.spi.TransactionStatus; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java index be5b8850d3..69f116d16b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java index 9f6bcc6a73..b8bcbd6a23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.query.named.simple; import jakarta.persistence.FlushModeType; import org.hibernate.CacheMode; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.hql.spi.NamedHqlQueryMemento; import org.hibernate.query.named.NamedObjectRepository; import org.hibernate.query.spi.QueryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java index 450c7a365c..ade1265789 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java @@ -11,7 +11,7 @@ import java.util.function.Consumer; import jakarta.persistence.Tuple; import jakarta.persistence.TupleElement; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.testing.orm.domain.gambit.BasicEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java index b0a833b852..14b99d4346 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java @@ -14,7 +14,7 @@ import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.query.spi.ScrollableResultsImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java index 499990a8b8..84687881ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java @@ -6,6 +6,6 @@ */ /** - * Tests for {@link org.hibernate.NativeQuery} + * Tests for {@link org.hibernate.query.NativeQuery} */ package org.hibernate.orm.test.query.sql; \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java index 559c2d7700..ceeae5762b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java @@ -22,7 +22,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.criteria.JpaCriteriaQuery; import org.hibernate.query.criteria.JpaRoot; import org.hibernate.query.criteria.JpaSelection; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java index 1d14e760f7..7b8f1c1667 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java @@ -22,8 +22,8 @@ import org.hibernate.Session; import org.hibernate.SessionBuilder; import org.hibernate.Transaction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.stat.EntityStatistics; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.spi.StatisticsImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java index e5943a807f..4d33240dc1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.OracleDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInspector; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java index 4780568662..6561973f02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java index 4225704387..de51a1fdf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java @@ -16,7 +16,7 @@ import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java index 4e234a0905..efdb914e6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Index; import jakarta.persistence.Table; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java index bc855653ef..0733fd4667 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java index d3120c9b5c..30aba578ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java @@ -23,7 +23,7 @@ import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.util.collections.CollectionHelper; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.stat.spi.StatisticsImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java index 05082b4877..d6c55521b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java @@ -12,7 +12,7 @@ import java.util.List; import org.junit.Test; import org.hibernate.HibernateException; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.engine.query.ParameterRecognitionException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java index 6c32d226e2..60d9195afd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.sql.hand.quotedidentifiers; import org.hibernate.Session; import org.hibernate.dialect.Dialect; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.testing.DialectCheck; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java index 4375908c5a..87f488a7d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.TypedQuery; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.Statistics; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java index 2476664b57..9d739d8a1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import org.hibernate.StatelessSession; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java index 26e3ff7bbd..9e13ff05ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java @@ -11,8 +11,8 @@ import java.util.List; import org.hibernate.cfg.Environment; import org.hibernate.dialect.AbstractHANADialect; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java index 94e7b27fda..96c0d68134 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java @@ -15,7 +15,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.Dialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampFspFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampFspFunctionTest.java index 745f5692cc..2fa6708552 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampFspFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampFspFunctionTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.temporal; import java.sql.Timestamp; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.domain.StandardDomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampPropertyTest.java index e2474bbd65..735c9227f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampPropertyTest.java @@ -14,7 +14,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java index 3d3ede0bd1..c6228e2a51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java @@ -12,7 +12,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java index 741ec6fa3c..8348265861 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java @@ -15,7 +15,7 @@ import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java index eef7b98580..198ff92932 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.type; import org.hibernate.Session; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.resource.transaction.spi.TransactionStatus; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java index b5a6536848..0eec2eea53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.dialect.MariaDBDialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SybaseDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java index cb910ca444..da649141d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.dialect.MariaDBDialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SybaseDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java index b84039592d..ab3fa4ebf3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.annotations.Type; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java index 2bad592875..4f068b3cb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.annotations.JavaType; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java index bfa4b6e862..d9f180c242 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java @@ -14,7 +14,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java index 2b484b4e74..4273a916cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.unionsubclass.alias; 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.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java index e9ca521123..157811f704 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java @@ -19,7 +19,7 @@ import org.junit.Before; import org.junit.Test; import org.hibernate.Hibernate; -import org.hibernate.NativeQuery; +import org.hibernate.query.NativeQuery; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java index d77642b8b4..ca06b1cdb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java index 319c1e30a2..54b23ee869 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java @@ -28,7 +28,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java index 0d030d61f8..e65eb8a822 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.Test; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java b/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java index 6ba1baf34a..0e3decc636 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java +++ b/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java @@ -15,7 +15,7 @@ import java.util.List; import org.hibernate.ScrollableResults; import org.hibernate.Session; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java index 40e37f913d..839048654d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java @@ -34,8 +34,8 @@ import org.hibernate.orm.test.sql.hand.Product; import org.hibernate.orm.test.sql.hand.SpaceShip; import org.hibernate.orm.test.sql.hand.Speech; import org.hibernate.orm.test.sql.hand.TextHolder; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.transform.BasicTransformerAdapter; import org.hibernate.transform.DistinctRootEntityResultTransformer; import org.hibernate.transform.Transformers; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java index 6847e526f5..a496af6087 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java @@ -8,7 +8,7 @@ package org.hibernate.envers.internal.entities.mapper.id; import java.util.Objects; -import org.hibernate.Query; +import org.hibernate.query.Query; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java index f4041cfcaf..17e2f00727 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java @@ -20,7 +20,7 @@ import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; import org.hibernate.envers.internal.tools.query.Parameters; import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.strategy.AuditStrategy; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.type.BasicType; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java index c4df5c3793..638107c61c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java @@ -7,7 +7,7 @@ package org.hibernate.envers.internal.entities.mapper.relation.query; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.Query; +import org.hibernate.query.Query; /** * Implementations of this interface provide a method to generate queries on a diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java index a26da9e132..8e7fc2a3a5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java @@ -30,7 +30,7 @@ import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQueryCreator; import org.hibernate.event.spi.EventSource; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.Query; +import org.hibernate.query.Query; import static org.hibernate.envers.internal.tools.ArgumentsTools.checkNotNull; import static org.hibernate.envers.internal.tools.ArgumentsTools.checkPositive; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java index 70e1f808ba..fe9736ec48 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java @@ -22,7 +22,7 @@ import org.hibernate.envers.boot.internal.EnversService; import org.hibernate.envers.internal.tools.EntityTools; import org.hibernate.envers.query.criteria.internal.RevisionTypeAuditExpression; import org.hibernate.envers.tools.Pair; -import org.hibernate.Query; +import org.hibernate.query.Query; import static org.hibernate.envers.internal.tools.ArgumentsTools.checkNotNull; import static org.hibernate.envers.internal.tools.ArgumentsTools.checkPositive; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java index 58a47cb2f9..b0de04808a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java @@ -12,7 +12,7 @@ import java.util.Locale; import java.util.Set; import org.hibernate.Session; -import org.hibernate.Query; +import org.hibernate.query.Query; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java index 03809e9a7e..e4794c9120 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java @@ -32,7 +32,7 @@ import org.hibernate.envers.query.criteria.AuditProperty; import org.hibernate.envers.query.criteria.internal.CriteriaTools; import org.hibernate.envers.query.order.NullPrecedence; import org.hibernate.envers.tools.Pair; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.query.internal.QueryLiteralHelper; import org.hibernate.type.BasicType; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java index 5caf75b509..7bc10d4890 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java @@ -11,7 +11,7 @@ import java.util.Map; import org.hibernate.Session; import org.hibernate.envers.internal.tools.MutableInteger; -import org.hibernate.Query; +import org.hibernate.query.Query; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java index b0784e9f5e..17ad72e160 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java @@ -33,7 +33,7 @@ import org.hibernate.envers.query.criteria.internal.CriteriaTools; import org.hibernate.envers.query.order.AuditOrder; import org.hibernate.envers.query.projection.AuditProjection; import org.hibernate.envers.tools.Pair; -import org.hibernate.Query; +import org.hibernate.query.Query; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java index 5398cd868c..c34b21de43 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java @@ -20,7 +20,7 @@ import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.envers.query.AuditAssociationQuery; import org.hibernate.envers.query.AuditQuery; import org.hibernate.envers.query.criteria.AuditCriterion; -import org.hibernate.Query; +import org.hibernate.query.Query; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java index d8e6c65e2e..b8cc656955 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java @@ -17,7 +17,7 @@ import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.envers.query.AuditAssociationQuery; import org.hibernate.envers.query.AuditQuery; import org.hibernate.envers.query.criteria.AuditCriterion; -import org.hibernate.Query; +import org.hibernate.query.Query; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java index 3acc0558be..ae8d09e99e 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java +++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java @@ -15,7 +15,7 @@ import java.util.ListIterator; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java index 2efe7d41dc..b291c96d9d 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java @@ -21,8 +21,8 @@ import java.util.stream.Stream; import org.hibernate.Session; import org.hibernate.mapping.PersistentClass; -import org.hibernate.NativeQuery; -import org.hibernate.Query; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.hibernate.spatial.CommonSpatialFunction; import org.hibernate.spatial.GeomCodec; import org.hibernate.spatial.integration.Model; diff --git a/migration-guide.adoc b/migration-guide.adoc index 673e5adcc1..554203ceb3 100644 --- a/migration-guide.adoc +++ b/migration-guide.adoc @@ -253,7 +253,7 @@ for details of using `@CollectionTypeRegistration` [[query-stream]] === Stream -`jakarta.persistence.Query#getResultStream()` and `org.hibernate.Query#stream()` no longer +`jakarta.persistence.Query#getResultStream()` and `org.hibernate.query.Query#stream()` no longer return a `Stream` decorator. In order to close the underlying IO resources, it is now necessary to explicitly call the `Stream#close()` method. diff --git a/release/src/release/javadoc/overview.html b/release/src/release/javadoc/overview.html index 0c3c8d7942..7e7d783c8f 100644 --- a/release/src/release/javadoc/overview.html +++ b/release/src/release/javadoc/overview.html @@ -24,7 +24,7 @@ In addition to SessionFactory and Session, applications using the native API wil interfaces:
  • {@link org.hibernate.cfg.Configuration}
  • {@link org.hibernate.Transaction}
    • -
  • {@link org.hibernate.Query}
    • +
  • {@link org.hibernate.query.Query}
  • {@link org.hibernate.Criteria}
  • {@link org.hibernate.criterion.Projection}
  • {@link org.hibernate.criterion.Projections}