diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java index d53ee57eeb..2cb0caddcf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java @@ -15,7 +15,7 @@ import org.hibernate.EntityMode; import org.hibernate.EntityNameResolver; import org.hibernate.Interceptor; import org.hibernate.MultiTenancyStrategy; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.SessionFactory; import org.hibernate.SessionFactoryObserver; import org.hibernate.cache.spi.TimestampsCacheFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java index 3cb7ab2882..ce1c30e1da 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java @@ -15,7 +15,7 @@ import org.hibernate.EntityMode; import org.hibernate.EntityNameResolver; import org.hibernate.Interceptor; import org.hibernate.MultiTenancyStrategy; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.SessionFactory; import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.SessionFactoryBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java index 9b9381b69a..6d8a925189 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java @@ -25,7 +25,7 @@ import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.MultiTenancyStrategy; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.SessionEventListener; import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.SchemaAutoTooling; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java index 97faa4bba8..37c12b19fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java @@ -15,7 +15,7 @@ import org.hibernate.EntityMode; import org.hibernate.EntityNameResolver; import org.hibernate.Interceptor; import org.hibernate.MultiTenancyStrategy; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.SessionFactory; import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.SessionFactoryBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java index bfebc7a47b..7580a4454c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java @@ -16,7 +16,7 @@ import org.hibernate.EntityMode; import org.hibernate.EntityNameResolver; import org.hibernate.Interceptor; import org.hibernate.MultiTenancyStrategy; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.SchemaAutoTooling; import org.hibernate.boot.TempTableDdlTransactionHandling; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java index 34a11b8c9c..abb44fb211 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java @@ -17,7 +17,7 @@ import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.MultiTenancyStrategy; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.SchemaAutoTooling; import org.hibernate.boot.TempTableDdlTransactionHandling; @@ -33,12 +33,7 @@ import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode; import org.hibernate.query.QueryLiteralRendering; import org.hibernate.query.criteria.LiteralHandlingMode; import org.hibernate.query.criteria.ValueHandlingMode; -import org.hibernate.query.hql.HqlTranslator; import org.hibernate.query.spi.QueryEngineOptions; -import org.hibernate.query.sqm.function.SqmFunctionDescriptor; -import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; -import org.hibernate.query.sqm.function.SqmFunctionRegistry; -import org.hibernate.query.sqm.sql.SqmTranslatorFactory; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; import org.hibernate.resource.jdbc.spi.StatementInspector; import org.hibernate.stat.Statistics; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java b/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java index 00c91ffd65..e20a47b1e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java @@ -11,7 +11,7 @@ import java.util.Map; import org.hibernate.ConnectionReleaseMode; import org.hibernate.EntityMode; import org.hibernate.MultiTenancyStrategy; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.boot.Metadata; import org.hibernate.boot.SchemaAutoTooling; import org.hibernate.boot.model.naming.Identifier; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java index 220143b1b8..81430795a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java @@ -8,7 +8,7 @@ package org.hibernate.dialect; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.NullOrdering; +import org.hibernate.query.NullOrdering; import org.hibernate.boot.TempTableDdlTransactionHandling; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.CommonFunctionFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java index 3be79b6138..fae2da23a7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java @@ -6,7 +6,6 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.Statement; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java index 504987614d..594e9681fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java @@ -7,7 +7,7 @@ package org.hibernate.dialect; import org.hibernate.LockOptions; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.function.DB2FormatEmulation; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java index 0c1dfcc218..80f47ff114 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java @@ -8,14 +8,13 @@ package org.hibernate.dialect; import java.util.List; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.MutationStatement; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.expression.ColumnReference; -import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.ast.tree.select.QueryGroup; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java index 0fd8866625..ce5b2b14b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java @@ -6,7 +6,6 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.expression.Literal; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java index 26b31bf025..de262bdfea 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java @@ -6,7 +6,6 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.expression.Literal; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DerbySqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DerbySqlAstTranslator.java index b8b9f7b161..6a009709fa 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DerbySqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DerbySqlAstTranslator.java @@ -6,7 +6,6 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.Statement; 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 6fd33b536f..89ca7d5a98 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -11,8 +11,8 @@ import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.MappingException; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.NullOrdering; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullOrdering; +import org.hibernate.query.NullPrecedence; import org.hibernate.ScrollMode; import org.hibernate.boot.model.TypeContributions; import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java index 497c5f4db6..0666d85737 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java @@ -8,7 +8,7 @@ package org.hibernate.dialect; import org.hibernate.HibernateException; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.NullOrdering; +import org.hibernate.query.NullOrdering; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.identity.FirebirdIdentityColumnSupport; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java index 761e7234d4..1ca9752e7b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -10,7 +10,7 @@ import java.sql.Types; import javax.persistence.TemporalType; -import org.hibernate.NullOrdering; +import org.hibernate.query.NullOrdering; import org.hibernate.PessimisticLockException; import org.hibernate.boot.TempTableDdlTransactionHandling; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java index 7993160a0d..14dd52e561 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -13,7 +13,7 @@ import javax.persistence.TemporalType; import org.hibernate.JDBCException; import org.hibernate.LockMode; -import org.hibernate.NullOrdering; +import org.hibernate.query.NullOrdering; import org.hibernate.StaleObjectStateException; import org.hibernate.boot.TempTableDdlTransactionHandling; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java index 0e6e0b3b78..85b854c1f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java @@ -7,8 +7,8 @@ package org.hibernate.dialect; import org.hibernate.LockOptions; -import org.hibernate.NullOrdering; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullOrdering; +import org.hibernate.query.NullPrecedence; import org.hibernate.PessimisticLockException; import org.hibernate.boot.TempTableDdlTransactionHandling; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java index 17b2a7a7e7..c6d97ebf1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java @@ -6,14 +6,11 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; -import org.hibernate.sql.ast.tree.MutationStatement; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.cte.CteStatement; -import org.hibernate.sql.ast.tree.expression.Expression; -import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.select.QueryGroup; import org.hibernate.sql.ast.tree.select.QueryPart; import org.hibernate.sql.ast.tree.select.QuerySpec; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/RDBMSOS2200SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/RDBMSOS2200SqlAstTranslator.java index 62c22dd936..34dcf06e3e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/RDBMSOS2200SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/RDBMSOS2200SqlAstTranslator.java @@ -6,9 +6,8 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.query.Limit; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.cte.CteStatement; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java index 18eb81c75a..d4937d85a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java @@ -24,6 +24,7 @@ import org.hibernate.exception.LockTimeoutException; import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.query.CastType; +import org.hibernate.query.NullPrecedence; import org.hibernate.query.TemporalUnit; import org.hibernate.query.spi.QueryEngine; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java index 97c021e7de..9a101e1295 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java @@ -8,7 +8,7 @@ package org.hibernate.dialect; import java.util.List; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java index 47f4488ce0..29869bf14d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java @@ -6,7 +6,6 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.Statement; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java index 450bc0b420..2b058fcebb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java @@ -6,7 +6,6 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.Statement; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java index 86818cb539..6f4484f58a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java @@ -6,7 +6,6 @@ */ package org.hibernate.dialect; -import org.hibernate.FetchClauseType; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.tree.Statement; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java index 6361a7b17d..562082dfcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java @@ -8,7 +8,7 @@ package org.hibernate.metamodel.mapping; import java.util.function.Consumer; -import org.hibernate.DotIdentifierSequence; +import org.hibernate.query.DotIdentifierSequence; import org.hibernate.boot.spi.SessionFactoryOptions; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java index 8a55c88aea..758776c0e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.mapping.internal; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.SortOrder; +import org.hibernate.query.SortOrder; import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; import org.hibernate.metamodel.mapping.EntityValuedModelPart; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java index 1b7206b7af..fc98e5d71a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.mapping.ordering.ast; -import org.hibernate.SortOrder; +import org.hibernate.query.SortOrder; import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.mapping.ModelPartContainer; import org.hibernate.metamodel.mapping.PluralAttributeMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java index 71875a4af6..50e987dbd6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java @@ -11,7 +11,7 @@ import java.util.Collections; import java.util.List; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.SortOrder; +import org.hibernate.query.SortOrder; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.select.QuerySpec; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java index 59cb6e2dfe..f34bce46b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.mapping.ordering.ast; -import org.hibernate.SortOrder; +import org.hibernate.query.SortOrder; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.select.QuerySpec; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java index 9820453f6f..3a9f8fde21 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java @@ -6,8 +6,8 @@ */ package org.hibernate.metamodel.mapping.ordering.ast; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; /** * An individual sort specification in an order-by fragment diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java index d1694393f6..a374dffe83 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hibernate.SortOrder; +import org.hibernate.query.SortOrder; import org.hibernate.grammars.ordering.OrderingParser; import org.hibernate.grammars.ordering.OrderingParser.ExpressionContext; import org.hibernate.grammars.ordering.OrderingParserBaseVisitor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java index 6896cf9381..b03e5ba059 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java @@ -8,7 +8,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Objects; -import org.hibernate.DotIdentifierSequence; +import org.hibernate.query.DotIdentifierSequence; import org.hibernate.internal.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/DotIdentifierSequence.java b/hibernate-core/src/main/java/org/hibernate/query/DotIdentifierSequence.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/DotIdentifierSequence.java rename to hibernate-core/src/main/java/org/hibernate/query/DotIdentifierSequence.java index 891a2fe05b..1e8c2899e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/DotIdentifierSequence.java +++ b/hibernate-core/src/main/java/org/hibernate/query/DotIdentifierSequence.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.util.function.BiFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/FetchClauseType.java b/hibernate-core/src/main/java/org/hibernate/query/FetchClauseType.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/FetchClauseType.java rename to hibernate-core/src/main/java/org/hibernate/query/FetchClauseType.java index 8f71d1bd0e..a69f8aaf86 100644 --- a/hibernate-core/src/main/java/org/hibernate/FetchClauseType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/FetchClauseType.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; /** * The kind of fetch to use for the FETCH clause. diff --git a/hibernate-core/src/main/java/org/hibernate/query/NavigablePath.java b/hibernate-core/src/main/java/org/hibernate/query/NavigablePath.java index 411f11c262..47e82f482a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/NavigablePath.java +++ b/hibernate-core/src/main/java/org/hibernate/query/NavigablePath.java @@ -6,7 +6,6 @@ */ package org.hibernate.query; -import org.hibernate.DotIdentifierSequence; import org.hibernate.internal.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/NullOrdering.java b/hibernate-core/src/main/java/org/hibernate/query/NullOrdering.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/NullOrdering.java rename to hibernate-core/src/main/java/org/hibernate/query/NullOrdering.java index 3b99c9d46f..0824e4a55d 100644 --- a/hibernate-core/src/main/java/org/hibernate/NullOrdering.java +++ b/hibernate-core/src/main/java/org/hibernate/query/NullOrdering.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 . */ -package org.hibernate; +package org.hibernate.query; /** * The order of null. diff --git a/hibernate-core/src/main/java/org/hibernate/NullPrecedence.java b/hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/NullPrecedence.java rename to hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java index d4d14a5806..f338f33575 100644 --- a/hibernate-core/src/main/java/org/hibernate/NullPrecedence.java +++ b/hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.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 . */ -package org.hibernate; +package org.hibernate.query; /** * Defines precedence of null values within {@code ORDER BY} clause. diff --git a/hibernate-core/src/main/java/org/hibernate/SetOperator.java b/hibernate-core/src/main/java/org/hibernate/query/SetOperator.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/SetOperator.java rename to hibernate-core/src/main/java/org/hibernate/query/SetOperator.java index 188a3bb641..116e7a54e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/SetOperator.java +++ b/hibernate-core/src/main/java/org/hibernate/query/SetOperator.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; /** * The SQL set operators. diff --git a/hibernate-core/src/main/java/org/hibernate/SortOrder.java b/hibernate-core/src/main/java/org/hibernate/query/SortOrder.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/SortOrder.java rename to hibernate-core/src/main/java/org/hibernate/query/SortOrder.java index a0fd5924cd..4519a04db8 100644 --- a/hibernate-core/src/main/java/org/hibernate/SortOrder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/SortOrder.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; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java index 0a3758d6e1..d6c8ae75a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java @@ -30,12 +30,11 @@ import javax.persistence.criteria.Selection; import javax.persistence.criteria.SetJoin; import javax.persistence.criteria.Subquery; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.query.sqm.SqmExpressable; import org.hibernate.query.sqm.tree.expression.SqmExpression; -import org.hibernate.query.sqm.tree.select.SqmSelectQuery; /** * Hibernate extensions to the JPA CriteriaBuilder. diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java index a749fb418b..20ec5168f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java @@ -16,7 +16,7 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Selection; import javax.persistence.metamodel.EntityType; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; /** * Extension of the JPA {@link CriteriaQuery} diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java index 01622c5d37..f7bde0a763 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java @@ -8,8 +8,8 @@ package org.hibernate.query.criteria; import javax.persistence.criteria.Order; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java index 331378fa98..7cf32d304d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java @@ -8,8 +8,8 @@ package org.hibernate.query.criteria; import java.util.List; -import org.hibernate.FetchClauseType; -import org.hibernate.SetOperator; +import org.hibernate.query.FetchClauseType; +import org.hibernate.query.SetOperator; /** * A query group i.e. query parts connected with a set operator. diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java index b4813fcbba..4ec8610f31 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java @@ -8,7 +8,7 @@ package org.hibernate.query.criteria; import java.util.List; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; /** * Models a query part i.e. the commonalities between a query group and a query specification. diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java index c5110cf200..25aae3d96f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java @@ -11,7 +11,7 @@ import java.util.Set; import javax.persistence.criteria.Expression; import javax.persistence.criteria.Predicate; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; /** * Models a {@code SELECT} query. Used as a delegate in diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java index aa816f9c14..35a01e8ca4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.hql.internal; -import org.hibernate.DotIdentifierSequence; +import org.hibernate.query.DotIdentifierSequence; import org.hibernate.query.hql.spi.SemanticPathPart; /** diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java index d5226cb513..8f03189654 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java @@ -30,12 +30,12 @@ import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.QueryException; -import org.hibernate.SetOperator; -import org.hibernate.SortOrder; +import org.hibernate.query.SetOperator; +import org.hibernate.query.SortOrder; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.grammars.hql.HqlLexer; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java index 2aa3c52947..690048b708 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java @@ -29,8 +29,8 @@ import javax.persistence.criteria.Selection; import javax.persistence.criteria.SetJoin; import javax.persistence.criteria.Subquery; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.metamodel.model.domain.JpaMetamodel; import org.hibernate.query.criteria.HibernateCriteriaBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java index 2624db6856..07d199b264 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java @@ -34,10 +34,10 @@ import javax.persistence.criteria.SetJoin; import javax.persistence.criteria.Subquery; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.NullPrecedence; +import org.hibernate.query.NullPrecedence; import org.hibernate.QueryException; -import org.hibernate.SetOperator; -import org.hibernate.SortOrder; +import org.hibernate.query.SetOperator; +import org.hibernate.query.SortOrder; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.metamodel.model.domain.AllowableFunctionReturnType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java index 1511c5e5da..e00631ae0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java @@ -8,13 +8,12 @@ package org.hibernate.query.sqm.tree.cte; import java.util.List; -import org.hibernate.CteSearchClauseKind; +import org.hibernate.sql.ast.tree.cte.CteSearchClauseKind; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.tree.AbstractSqmNode; import org.hibernate.query.sqm.tree.SqmStatement; import org.hibernate.query.sqm.tree.SqmVisitableNode; -import org.hibernate.query.sqm.tree.select.SqmQueryPart; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java index e8450c3f3e..f3870a1c25 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.sqm.tree.cte; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; /** * @author Christian Beikov diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java index 68db3da9a7..2f98390580 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java @@ -9,13 +9,12 @@ package org.hibernate.query.sqm.tree.select; import java.util.Collections; import java.util.List; -import org.hibernate.FetchClauseType; -import org.hibernate.SetOperator; +import org.hibernate.query.FetchClauseType; +import org.hibernate.query.SetOperator; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaOrder; import org.hibernate.query.criteria.JpaQueryGroup; -import org.hibernate.query.criteria.JpaQueryPart; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java index 8dd13cf4ca..8905f3d7c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java @@ -9,7 +9,7 @@ package org.hibernate.query.sqm.tree.select; import java.util.Collections; import java.util.List; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaOrder; import org.hibernate.query.criteria.JpaQueryPart; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java index a33dfaf764..245e61f3e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java @@ -14,7 +14,7 @@ import java.util.Set; import javax.persistence.criteria.Expression; import javax.persistence.criteria.Predicate; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaOrder; import org.hibernate.query.criteria.JpaPredicate; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java index 373a5ecaf8..0097cc27bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java @@ -21,7 +21,7 @@ import javax.persistence.criteria.ParameterExpression; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Selection; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.query.criteria.JpaCriteriaQuery; import org.hibernate.query.criteria.JpaExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java index ef689c8ff8..9e468b5e0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.sqm.tree.select; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaOrder; import org.hibernate.query.sqm.tree.expression.SqmExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java index 4d63c20d43..0f402b2f6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java @@ -19,12 +19,12 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; -import org.hibernate.CteSearchClauseKind; -import org.hibernate.FetchClauseType; +import org.hibernate.sql.ast.tree.cte.CteSearchClauseKind; +import org.hibernate.query.FetchClauseType; import org.hibernate.LockOptions; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.AbstractDelegatingWrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/CteSearchClauseKind.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/CteSearchClauseKind.java rename to hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.java index c1cc137c3f..c31c049d1a 100644 --- a/hibernate-core/src/main/java/org/hibernate/CteSearchClauseKind.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.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.sql.ast.tree.cte; /** * The kind of CTE search clause. diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java index 7bcbff423c..dce03b55ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java @@ -8,7 +8,6 @@ package org.hibernate.sql.ast.tree.cte; import java.util.List; -import org.hibernate.CteSearchClauseKind; import org.hibernate.sql.ast.tree.Statement; /** diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java index 666dd8a5b6..0358f1299c 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java @@ -6,8 +6,8 @@ */ package org.hibernate.sql.ast.tree.cte; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; /** * @author Christian Beikov diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java index eaea37dedf..ab721bc8f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java @@ -8,7 +8,7 @@ package org.hibernate.sql.ast.tree.select; import java.util.List; -import org.hibernate.SetOperator; +import org.hibernate.query.SetOperator; import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.results.graph.DomainResult; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java index 7867d70a2d..a61bd8a4a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import org.hibernate.FetchClauseType; +import org.hibernate.query.FetchClauseType; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java index 6502d49419..355f4ebb42 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java @@ -6,8 +6,8 @@ */ package org.hibernate.sql.ast.tree.select; -import org.hibernate.NullPrecedence; -import org.hibernate.SortOrder; +import org.hibernate.query.NullPrecedence; +import org.hibernate.query.SortOrder; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.sql.ast.tree.expression.Collate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java index abca316fff..f10cfb1943 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java @@ -11,7 +11,7 @@ import java.util.Arrays; import java.util.List; import org.hibernate.Session; -import org.hibernate.SortOrder; +import org.hibernate.query.SortOrder; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.ordering.OrderByFragmentImpl; import org.hibernate.metamodel.mapping.ordering.ast.OrderingSpecification; diff --git a/hibernate-core/src/test/java/org/hibernate/query/sqm/tree/select/HHH13884Test.java b/hibernate-core/src/test/java/org/hibernate/query/sqm/tree/select/HHH13884Test.java index 681a16ea0e..6b36138418 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/sqm/tree/select/HHH13884Test.java +++ b/hibernate-core/src/test/java/org/hibernate/query/sqm/tree/select/HHH13884Test.java @@ -12,9 +12,9 @@ import org.hibernate.query.sqm.tree.expression.SqmExpression; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import static org.hibernate.NullPrecedence.FIRST; -import static org.hibernate.SortOrder.ASCENDING; -import static org.hibernate.SortOrder.DESCENDING; +import static org.hibernate.query.NullPrecedence.FIRST; +import static org.hibernate.query.SortOrder.ASCENDING; +import static org.hibernate.query.SortOrder.DESCENDING; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; import static org.mockito.Mockito.mock;