Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move several new types out of the root package 

The namespace org.hibernate is already much too cluttered and
we should try hard to not make it worse in H6.

Furthermore, some of these things look to be of more interest
to developers of Hibernate than to users.

Now, I'm not sure that org.hibernate.query is absolutely the
best place either, but it's at least better.
This commit is contained in:
Gavin King 2021-03-24 14:42:04 +01:00
parent af84daa416
commit ef69465f48
67 changed files with 80 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
View File

@ -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;

7
hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
View File

@ -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;

3
hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/DerbySqlAstTranslator.java
View File

@ -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;

4
hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
View File

@ -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;

4
hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
View File

@ -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;

5
hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java
View File

@ -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;

3
hibernate-core/src/main/java/org/hibernate/dialect/RDBMSOS2200SqlAstTranslator.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
View File

@ -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;

1
hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java
View File

@ -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;
/**

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java
View File

@ -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;

4
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java
View File

@ -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

2
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java
View File

@ -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;
/**

2
hibernate-core/src/main/java/org/hibernate/DotIdentifierSequence.java → hibernate-core/src/main/java/org/hibernate/query/DotIdentifierSequence.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/FetchClauseType.java → hibernate-core/src/main/java/org/hibernate/query/FetchClauseType.java
View File

@ -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.

1
hibernate-core/src/main/java/org/hibernate/query/NavigablePath.java
View File

@ -6,7 +6,6 @@
*/
package org.hibernate.query;
import org.hibernate.DotIdentifierSequence;
import org.hibernate.internal.util.StringHelper;
/**

2
hibernate-core/src/main/java/org/hibernate/NullOrdering.java → hibernate-core/src/main/java/org/hibernate/query/NullOrdering.java
View File

@ -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 order of null.

2
hibernate-core/src/main/java/org/hibernate/NullPrecedence.java → hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java
View File

@ -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;
/**
* Defines precedence of null values within {@code ORDER BY} clause.

2
hibernate-core/src/main/java/org/hibernate/SetOperator.java → hibernate-core/src/main/java/org/hibernate/query/SetOperator.java
View File

@ -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.

2
hibernate-core/src/main/java/org/hibernate/SortOrder.java → hibernate-core/src/main/java/org/hibernate/query/SortOrder.java
View File

@ -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

5
hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
View File

@ -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.

2
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java
View File

@ -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}

4
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java
View File

@ -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

4
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java
View File

@ -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.

2
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java
View File

@ -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.

2
hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java
View File

@ -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

2
hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java
View File

@ -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;
/**

8
hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
View File

@ -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;

4
hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
View File

@ -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;

6
hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
View File

@ -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;

3
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java
View File

@ -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

4
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java
View File

@ -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

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
View File

@ -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;

4
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java
View File

@ -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;

8
hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/CteSearchClauseKind.java → hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.java
View File

@ -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.

1
hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java
View File

@ -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;
/**

4
hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java
View File

@ -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

2
hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java
View File

@ -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;

2
hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java
View File

@ -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;

4
hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java
View File

@ -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;

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java
View File

@ -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;

6
hibernate-core/src/test/java/org/hibernate/query/sqm/tree/select/HHH13884Test.java
View File

@ -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;