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

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

This commit is contained in:
Steve Ebersole 2022-01-11 21:01:56 -06:00
parent e446b7c99b
commit fda6e96c5e
212 changed files with 343 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java
View File

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

2
documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java
View File

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.RequiresDialect;
import org.junit.Test;

2
hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java vendored
View File

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

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

@ -116,7 +116,7 @@ public class LockOptions implements Serializable {
* @param lockMode The lock mode to apply to the given alias
* @return this LockRequest instance for operation chaining.
*
* @see org.hibernate.query.Query#setLockMode(String, LockMode)
* @see Query#setLockMode(String, LockMode)
*/
public LockOptions setAliasSpecificLockMode(String alias, LockMode lockMode) {
if ( aliasSpecificLockModes == null ) {

15
hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java → hibernate-core/src/main/java/org/hibernate/NativeQuery.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.query;
package org.hibernate;
import java.time.Instant;
import java.util.Calendar;
@ -18,14 +18,15 @@ 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;
@ -38,7 +39,7 @@ import org.hibernate.type.BasicTypeReference;
* </li>
* <li>
* Tables used via {@link #addSynchronizedQuerySpace}, {@link #addSynchronizedEntityName} and
* {@link SynchronizeableQuery#addSynchronizedEntityClass}. This allows Hibernate to know how to properly deal with
* {@link org.hibernate.query.SynchronizeableQuery#addSynchronizedEntityClass}. This allows Hibernate to know how to properly deal with
* auto-flush checking as well as cached query results if the results of the query are being
* cached.
* </li>

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

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

18
hibernate-core/src/main/java/org/hibernate/query/Query.java → hibernate-core/src/main/java/org/hibernate/Query.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.query;
package org.hibernate;
import java.time.Instant;
import java.util.Calendar;
@ -15,18 +15,16 @@ 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;

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

@ -8,8 +8,6 @@ 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}

9
hibernate-core/src/main/java/org/hibernate/Session.java
View File

@ -14,7 +14,6 @@ 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;
/**
@ -266,10 +265,10 @@ public interface Session extends SharedSessionContract, EntityManager {
* <p>
* To override this session's read-only/modifiable setting for all
* entities and proxies loaded by a certain {@code Query} use
* {@link org.hibernate.query.Query#setReadOnly(boolean)}.
* {@link Query#setReadOnly(boolean)}.
*
* @see #setReadOnly(Object,boolean)
* @see org.hibernate.query.Query#setReadOnly(boolean)
* @see Query#setReadOnly(boolean)
*
* @param readOnly {@code true}, the default for loaded entities/proxies is read-only;
* {@code false}, the default for loaded entities/proxies is modifiable
@ -1130,10 +1129,10 @@ public interface Session extends SharedSessionContract, EntityManager {
* <p>
* To override this session's read-only/modifiable setting for entities
* and proxies loaded by a {@code Query} use
* {@link org.hibernate.query.Query#setReadOnly(boolean)}
* {@link Query#setReadOnly(boolean)}
*
* @see #setDefaultReadOnly(boolean)
* @see org.hibernate.query.Query#setReadOnly(boolean)
* @see Query#setReadOnly(boolean)
*
* @param entityOrProxy an entity or proxy
* @param readOnly {@code true} if the entity or proxy should be made read-only;

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

@ -135,7 +135,7 @@ public interface SessionBuilder<T extends SessionBuilder> {
T jdbcTimeZone(TimeZone timeZone);
/**
* Should {@link org.hibernate.query.Query#setParameter} perform parameter validation
* Should {@link Query#setParameter} perform parameter validation
* when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory}
*
* @param enabled {@code true} indicates the validation should be performed, {@code false} otherwise

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

@ -40,7 +40,7 @@ public interface StatelessSessionBuilder<T extends StatelessSessionBuilder> {
T tenantIdentifier(String tenantIdentifier);
/**
* Should {@link org.hibernate.query.Query#setParameter} perform parameter validation
* Should {@link Query#setParameter} perform parameter validation
* when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory}
*
* @param enabled {@code true} indicates the validation should be performed, {@code false} otherwise

4
hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java
View File

@ -10,6 +10,8 @@ import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.hibernate.NativeQuery;
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@ -19,7 +21,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author Emmanuel Bernard
*
* @see org.hibernate.query.NativeQuery
* @see NativeQuery
*/
@Target({TYPE, PACKAGE})
@Retention(RUNTIME)

4
hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java
View File

@ -10,6 +10,8 @@ import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.hibernate.Query;
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@ -19,7 +21,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author Carlos Gonzalez-Cadenas
*
* @see org.hibernate.query.Query
* @see Query
*/
@Target({TYPE, PACKAGE})
@Retention(RUNTIME)

36
hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java
View File

@ -7,11 +7,13 @@
package org.hibernate.annotations;
import org.hibernate.FlushMode;
import org.hibernate.NativeQuery;
import org.hibernate.Query;
/**
* List of hints that may be passed to {@link jakarta.persistence.Query#setHint(String, Object)}
* to control execution of a query. Each of these hints corresponds to a typesafe operation of
* the {@link org.hibernate.query.Query} interface, and so hints are only necessary for programs
* the {@link Query} interface, and so hints are only necessary for programs
* working with the JPA APIs.
*
* @see org.hibernate.jpa.QueryHints
@ -26,24 +28,24 @@ public class QueryHints {
/**
* The cache mode to use.
*
* @see org.hibernate.query.Query#setCacheMode
* @see org.hibernate.query.NativeQuery#setCacheMode
* @see Query#setCacheMode
* @see NativeQuery#setCacheMode
*/
public static final String CACHE_MODE = "org.hibernate.cacheMode";
/**
* The cache region to use.
*
* @see org.hibernate.query.Query#setCacheRegion
* @see org.hibernate.query.NativeQuery#setCacheRegion
* @see Query#setCacheRegion
* @see NativeQuery#setCacheRegion
*/
public static final String CACHE_REGION = "org.hibernate.cacheRegion";
/**
* Are the query results cacheable?
*
* @see org.hibernate.query.Query#setCacheable
* @see org.hibernate.query.NativeQuery#setCacheable
* @see Query#setCacheable
* @see NativeQuery#setCacheable
*/
public static final String CACHEABLE = "org.hibernate.cacheable";
@ -55,24 +57,24 @@ public class QueryHints {
/**
* Defines a comment to be applied to the SQL sent to the database.
*
* @see org.hibernate.query.Query#setComment
* @see org.hibernate.query.NativeQuery#setComment
* @see Query#setComment
* @see NativeQuery#setComment
*/
public static final String COMMENT = "org.hibernate.comment";
/**
* Defines the JDBC fetch size to use.
*
* @see org.hibernate.query.Query#setFetchSize
* @see org.hibernate.query.NativeQuery#setFetchSize
* @see Query#setFetchSize
* @see NativeQuery#setFetchSize
*/
public static final String FETCH_SIZE = "org.hibernate.fetchSize";
/**
* The flush mode to associate with the execution of the query.
*
* @see org.hibernate.query.Query#setHibernateFlushMode
* @see org.hibernate.query.NativeQuery#setHibernateFlushMode
* @see Query#setHibernateFlushMode
* @see NativeQuery#setHibernateFlushMode
* @see org.hibernate.Session#setHibernateFlushMode
*/
public static final String FLUSH_MODE = "org.hibernate.flushMode";
@ -80,8 +82,8 @@ public class QueryHints {
/**
* Should entities returned from the query be set in read only mode?
*
* @see org.hibernate.query.Query#setReadOnly
* @see org.hibernate.query.NativeQuery#setReadOnly
* @see Query#setReadOnly
* @see NativeQuery#setReadOnly
* @see org.hibernate.Session#setReadOnly
*/
public static final String READ_ONLY = "org.hibernate.readOnly";
@ -89,8 +91,8 @@ public class QueryHints {
/**
* Apply a Hibernate query timeout, which is defined in <b>seconds</b>.
*
* @see org.hibernate.query.Query#setTimeout
* @see org.hibernate.query.NativeQuery#setTimeout
* @see Query#setTimeout
* @see NativeQuery#setTimeout
*/
public static final String TIMEOUT_HIBERNATE = "org.hibernate.timeout";

6
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -9,6 +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.Transaction;
import org.hibernate.boot.MetadataBuilder;
import org.hibernate.boot.registry.classloading.internal.TcclLookupPrecedence;
@ -884,7 +886,7 @@ public interface AvailableSettings {
* their declaration, whereas the binding position is implicit with ordinal
* parameters based on its ordinal position in the query. As of 6.0, support
* for this ordinal parameter declaration form has been removed from HQL and
* is now only valid for {@link org.hibernate.query.NativeQuery}s.
* is now only valid for {@link NativeQuery}s.
* <p/>
* Historically Hibernate followed JDBC conventions for ordinal parameter binding
* such that the implied positions were 0-based. This presents a mismatch between
@ -2039,7 +2041,7 @@ public interface AvailableSettings {
/**
* Setting which indicates if {@link org.hibernate.query.Query#setParameter} should not perform parameters validation
* Setting which indicates if {@link Query#setParameter} should not perform parameters validation
*
* This setting is applied only when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory}
*

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

@ -43,6 +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.ScrollMode;
import org.hibernate.boot.TempTableDdlTransactionHandling;
import org.hibernate.boot.model.TypeContributions;
@ -1768,8 +1769,8 @@ public abstract class Dialect implements ConversionContext {
/**
* Returns a {@link LimitHandler} that implements support for
* {@link org.hibernate.query.Query#setMaxResults(int)} and
* {@link org.hibernate.query.Query#setFirstResult(int)} for
* {@link Query#setMaxResults(int)} and
* {@link Query#setFirstResult(int)} for
* this dialect.
*/
public LimitHandler getLimitHandler() {

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

@ -11,6 +11,7 @@ import java.sql.SQLException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.hibernate.Query;
import org.hibernate.query.Limit;
import static java.util.regex.Pattern.CASE_INSENSITIVE;
@ -87,10 +88,10 @@ public abstract class AbstractLimitHandler implements LimitHandler {
/**
* Does the limit clause expect the number of the last row, or the
* "page size", the maximum number of rows we want to receive?
* Hibernate's {@link org.hibernate.query.Query#setMaxResults(int)}
* Hibernate's {@link Query#setMaxResults(int)}
* accepts the page size, so the number of the last row is obtained
* by adding the number of the first row, which is one greater than
* {@link org.hibernate.query.Query#setFirstResult(int)}.
* {@link Query#setFirstResult(int)}.
*
* @return true if the limit clause expects the number of
* the last row, false if it expects the page size
@ -115,7 +116,7 @@ public abstract class AbstractLimitHandler implements LimitHandler {
}
/**
* Hibernate {@link org.hibernate.query.Query#setFirstResult(int)} accepts
* Hibernate {@link Query#setFirstResult(int)} accepts
* a zero-based offset. Does this dialect require a one-based offset to be
* specified in the offset clause?
* <p/>

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

@ -16,6 +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.collection.spi.PersistentCollection;
import org.hibernate.internal.util.MarkerObject;
import org.hibernate.persister.collection.CollectionPersister;
@ -658,7 +659,7 @@ public interface PersistenceContext {
*
* To override this session's read-only/modifiable setting for entities
* and proxies loaded by a Query:
* @see org.hibernate.query.Query#setReadOnly(boolean)
* @see Query#setReadOnly(boolean)
*
* @param readOnly true, the default for loaded entities/proxies is read-only;
* false, the default for loaded entities/proxies is modifiable
@ -701,7 +702,7 @@ public interface PersistenceContext {
*
* @see org.hibernate.Session#setDefaultReadOnly
* @see org.hibernate.Session#setReadOnly
* @see org.hibernate.query.Query#setReadOnly
* @see Query#setReadOnly
*/
void setReadOnly(Object entityOrProxy, boolean readOnly);

2
hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
View File

@ -50,8 +50,6 @@ import org.hibernate.jdbc.ReturningWork;
import org.hibernate.jdbc.Work;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.procedure.ProcedureCall;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
import org.hibernate.query.spi.QueryImplementor;
import org.hibernate.query.spi.QueryProducerImplementor;

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

@ -6,7 +6,6 @@
*/
package org.hibernate.engine.spi;
import java.sql.Connection;
import java.util.Set;
import java.util.UUID;
import jakarta.persistence.FlushModeType;
@ -16,6 +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.SharedSessionContract;
import org.hibernate.Transaction;
import org.hibernate.cache.spi.CacheTransactionSynchronization;
@ -173,7 +173,7 @@ public interface SharedSessionContractImplementor
void checkOpen(boolean markForRollbackIfClosed);
/**
* Prepare for the execution of a {@link org.hibernate.query.Query} or
* Prepare for the execution of a {@link Query} or
* {@link org.hibernate.procedure.ProcedureCall}
*/
void prepareForQueryExecution(boolean requiresTxn);

6
hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java
View File

@ -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.Query.class )
return query.unwrap( org.hibernate.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.Query.class )
return query.unwrap( org.hibernate.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.Query.class )
return query.unwrap( org.hibernate.Query.class )
.applyFetchGraph( (RootGraph) graph )
.list();
}

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
import org.hibernate.query.hql.spi.HqlQueryImplementor;
import org.hibernate.query.hql.spi.NamedHqlQueryMemento;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.query.UnknownSqlResultSetMappingException;
import org.hibernate.resource.transaction.TransactionRequiredForJoinException;
import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.query.QueryParameter;
import org.hibernate.query.internal.QueryOptionsImpl;
import org.hibernate.query.named.NamedQueryMemento;

3
hibernate-core/src/main/java/org/hibernate/query/BindableType.java
View File

@ -8,6 +8,7 @@ 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;
@ -15,7 +16,7 @@ import jakarta.persistence.AttributeConverter;
import jakarta.persistence.metamodel.ManagedType;
/**
* Types that can be used to handle binding {@link org.hibernate.query.Query} parameters
* Types that can be used to handle binding {@link Query} parameters
*
* @see org.hibernate.type.BasicTypeReference
* @see org.hibernate.type.StandardBasicTypes

54
hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java
View File

@ -10,36 +10,31 @@ import org.hibernate.CacheMode;
import org.hibernate.FlushMode;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.engine.spi.SessionFactoryImplementor;
/**
* Defines the aspects of query definition that apply to all forms of
* querying (HQL, JPQL, criteria) across all forms of persistence contexts
* (Session, StatelessSession, EntityManager).
* querying - HQL, Criteria and ProcedureCall
*
* @author Steve Ebersole
* @author Gavin King
*/
public interface CommonQueryContract {
/**
* Obtain the FlushMode in effect for this query. By default, the query inherits the FlushMode of the Session
* from which it originates.
*
* @return The query FlushMode.
* Obtain the FlushMode in effect for this query. By default, the query
* inherits the FlushMode of the Session from which it originates.
*
* @see Session#getHibernateFlushMode
* @see FlushMode
*/
FlushMode getHibernateFlushMode();
/**
* (Re)set the current FlushMode in effect for this query.
* Set the current FlushMode in effect for this query.
*
* @param flushMode The new FlushMode to use.
* @implNote Setting to {@code null} ultimately indicates to use the FlushMode of the Session
*
* @return {@code this}, for method chaining
*
* @see Session#getHibernateFlushMode()
* @see #getHibernateFlushMode()
* @see Session#getHibernateFlushMode()
*/
CommonQueryContract setHibernateFlushMode(FlushMode flushMode);
@ -49,43 +44,37 @@ public interface CommonQueryContract {
* <p/>
* NOTE: The CacheMode here describes reading-from/writing-to the
* entity/collection caches as we process query results. For caching of
* the actual (unparsed) query results, see {@link #isCacheable()} and
* the actual query results, see {@link #isCacheable()} and
* {@link #getCacheRegion()}
* <p/>
* In order for this setting to have any affect, second-level caching would
* have to be enabled and the entities/collections in question configured
* for caching.
*
* @return The query CacheMode.
*
* @see Session#getCacheMode()
* @see CacheMode
*/
CacheMode getCacheMode();
/**
* (Re)set the current CacheMode in effect for this query.
* Set the current CacheMode in effect for this query.
*
* @param cacheMode The new CacheMode to use.
*
* @return {@code this}, for method chaining
* @implNote Setting to {@code null} ultimately indicates to use the CacheMode of the Session
*
* @see #getCacheMode()
* @see Session#setCacheMode
*/
CommonQueryContract setCacheMode(CacheMode cacheMode);
/**
* Are the results of this query eligible for second level query caching?
* Should the results of the query be stored in the second level cache?
* <p/>
* This is different that second level caching of any returned entities and collections, which
* This is different than second level caching of any returned entities and collections, which
* is controlled by {@link #getCacheMode()}.
* <p/>
* NOTE: the query being "eligible" for caching does not necessarily mean its results will be cached. Second level
* query caching still has to be enabled on the {@link SessionFactory} for this to happen. Usually that is
* controlled by the {@code hibernate.cache.use_query_cache} configuration setting.
*
* @return {@code true} if the query results are eligible for caching, {@code false} otherwise.
*
* @see org.hibernate.cfg.AvailableSettings#USE_QUERY_CACHE
*/
boolean isCacheable();
@ -93,10 +82,6 @@ public interface CommonQueryContract {
/**
* Enable/disable second level query (result) caching for this query.
*
* @param cacheable Should the query results be cacheable?
*
* @return {@code this}, for method chaining
*
* @see #isCacheable
*/
CommonQueryContract setCacheable(boolean cacheable);
@ -105,19 +90,12 @@ public interface CommonQueryContract {
* Obtain the name of the second level query cache region in which query results will be stored (if they are
* cached, see the discussion on {@link #isCacheable()} for more information). {@code null} indicates that the
* default region should be used.
*
* @return The specified cache region name into which query results should be placed; {@code null} indicates
* the default region.
*/
String getCacheRegion();
/**
* Set the name of the cache region where query results should be cached (if cached at all).
*
* @param cacheRegion the name of a query cache region, or {@code null} to indicate that the default region
* should be used.
*
* @return {@code this}, for method chaining
* Set the name of the cache region where query results should be cached
* (assuming {@link #isCacheable}). {@code null} indicates to use the default region.
*
* @see #getCacheRegion()
*/
@ -127,8 +105,6 @@ public interface CommonQueryContract {
* Obtain the query timeout <b>in seconds</b>. This value is eventually passed along to the JDBC query via
* {@link java.sql.Statement#setQueryTimeout(int)}. Zero indicates no timeout.
*
* @return The timeout <b>in seconds</b>
*
* @see java.sql.Statement#getQueryTimeout()
* @see java.sql.Statement#setQueryTimeout(int)
*/

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

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

3
hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
View File

@ -6,6 +6,9 @@
*/
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;

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

@ -6,11 +6,13 @@
*/
package org.hibernate.query.criteria;
import org.hibernate.Query;
import jakarta.persistence.criteria.CommonAbstractCriteria;
/**
* Common contract for the forms of criteria that are "queryable" - can be
* converted into a {@link org.hibernate.query.Query}.
* converted into a {@link Query}.
*
* Hibernate extension to the JPA {@link CommonAbstractCriteria} contract.
*

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

@ -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.Query}
* This includes transformation via Antlr, {@link org.hibernate.Query}
* manipulation and execution
*
* @see org.hibernate.query.hql.HqlTranslator

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

@ -14,6 +14,7 @@ import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.SingularAttribute;
import org.hibernate.LockMode;
import org.hibernate.NativeQuery;
import org.hibernate.NotYetImplementedFor6Exception;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.metamodel.RuntimeMetamodels;
@ -207,10 +208,10 @@ public class Builders {
/**
* Creates a EntityResultBuilder that does not allow any further configuring of the mapping.
*
* @see org.hibernate.query.NativeQuery#addEntity(Class)
* @see org.hibernate.query.NativeQuery#addEntity(String)
* @see org.hibernate.query.NativeQuery#addEntity(String, Class)
* @see org.hibernate.query.NativeQuery#addEntity(String, String)
* @see NativeQuery#addEntity(Class)
* @see NativeQuery#addEntity(String)
* @see NativeQuery#addEntity(String, Class)
* @see NativeQuery#addEntity(String, String)
*/
public static DynamicResultBuilderEntityCalculated entityCalculated(
String tableAlias,
@ -223,8 +224,8 @@ public class Builders {
* Creates a EntityResultBuilder that does not allow any further configuring of the mapping.
*
* @see #entityCalculated(String, String, SessionFactoryImplementor)
* @see org.hibernate.query.NativeQuery#addEntity(String, Class, LockMode)
* @see org.hibernate.query.NativeQuery#addEntity(String, String, LockMode)
* @see NativeQuery#addEntity(String, Class, LockMode)
* @see NativeQuery#addEntity(String, String, LockMode)
*/
public static DynamicResultBuilderEntityCalculated entityCalculated(
String tableAlias,

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

@ -10,12 +10,13 @@ import java.util.function.BiConsumer;
import java.util.function.Consumer;
import org.hibernate.Incubating;
import org.hibernate.NativeQuery;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
/**
* Acts as the {@link JdbcValuesMappingProducer} for {@link org.hibernate.query.NativeQuery}
* Acts as the {@link JdbcValuesMappingProducer} for {@link NativeQuery}
* or {@link org.hibernate.procedure.ProcedureCall} / {@link jakarta.persistence.StoredProcedureQuery}
* instances.
*
@ -25,11 +26,11 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
* </li>
* <li>
* dynamically via Hibernate-specific APIs:<ul>
* <li>{@link org.hibernate.query.NativeQuery#addScalar}</li>
* <li>{@link org.hibernate.query.NativeQuery#addEntity}</li>
* <li>{@link org.hibernate.query.NativeQuery#addJoin}</li>
* <li>{@link org.hibernate.query.NativeQuery#addFetch}</li>
* <li>{@link org.hibernate.query.NativeQuery#addRoot}</li>
* <li>{@link NativeQuery#addScalar}</li>
* <li>{@link NativeQuery#addEntity}</li>
* <li>{@link NativeQuery#addJoin}</li>
* <li>{@link NativeQuery#addFetch}</li>
* <li>{@link NativeQuery#addRoot}</li>
* </ul>
* </li>
* </ul>

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.results.DomainResultCreationStateImpl;
import org.hibernate.query.results.FromClauseAccessImpl;

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.results.BasicValuedFetchBuilder;
import org.hibernate.query.results.DomainResultCreationStateImpl;

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

@ -8,9 +8,8 @@ package org.hibernate.query.results.dynamic;
import java.util.List;
import org.hibernate.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.results.FetchBuilder;
import org.hibernate.sql.results.graph.Fetchable;
/**
* @author Steve Ebersole

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.results.DomainResultCreationStateImpl;
import org.hibernate.query.results.FetchBuilder;

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.results.DomainResultCreationStateImpl;
import org.hibernate.query.results.ResultsHelper;

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

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

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.results.ResultSetMappingSqlSelection;
import org.hibernate.sql.ast.spi.SqlExpressionResolver;
import org.hibernate.sql.ast.spi.SqlSelection;

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

@ -9,6 +9,7 @@ package org.hibernate.query.results.dynamic;
import java.util.Objects;
import java.util.function.BiFunction;
import org.hibernate.NativeQuery;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.metamodel.mapping.BasicValuedMapping;
import org.hibernate.query.results.ResultsHelper;
@ -25,7 +26,7 @@ import org.hibernate.type.descriptor.java.JavaType;
/**
* Standard DynamicResultBuilder for basic values.
*
* @see org.hibernate.query.NativeQuery#addScalar
* @see NativeQuery#addScalar
*
* @author Steve Ebersole
*/

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

@ -11,10 +11,9 @@ import java.util.function.BiFunction;
import org.hibernate.LockMode;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.results.DomainResultCreationStateImpl;
import org.hibernate.query.results.ResultBuilder;
import org.hibernate.query.results.ResultsHelper;
import org.hibernate.sql.ast.spi.SqlAliasBaseConstant;
import org.hibernate.sql.ast.tree.from.TableGroup;

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.results.DomainResultCreationStateImpl;
import org.hibernate.query.results.ResultSetMappingSqlSelection;

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

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

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

@ -6,9 +6,11 @@
*/
package org.hibernate.query.results.dynamic;
import org.hibernate.NativeQuery;
/**
* Contract for handling Hibernate's legacy way of representing fetches through
* {@link org.hibernate.query.NativeQuery#addFetch}, {@link org.hibernate.query.NativeQuery#addJoin},
* {@link NativeQuery#addFetch}, {@link NativeQuery#addJoin},
* `hbm.xml` mappings, etc
*
* @see org.hibernate.query.results.DomainResultCreationStateImpl#getLegacyFetchResolver()

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

@ -7,12 +7,12 @@
/**
* Support for mutable result/fetch builder graphs nodes built dynamically via
* Hibernate's {@link org.hibernate.query.NativeQuery} APIs
* Hibernate's {@link org.hibernate.NativeQuery} APIs
*
* @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
* @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
*/
package org.hibernate.query.results.dynamic;

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

@ -6,7 +6,7 @@
*/
/**
* Support for defining result-set mappings used in {@link org.hibernate.query.NativeQuery}
* Support for defining result-set mappings used in {@link org.hibernate.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.query.NativeQuery} contract need to resolve themselves
* via Hibernate's {@link org.hibernate.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
*

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

@ -6,11 +6,12 @@
*/
package org.hibernate.query.spi;
import org.hibernate.Query;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.sql.exec.spi.Callback;
/**
* Context for execution of {@link org.hibernate.query.Query}"
* Context for execution of {@link Query}"
*/
public interface DomainQueryExecutionContext {
QueryOptions getQueryOptions();

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.query.QueryParameter;
import jakarta.persistence.Parameter;

2
hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
View File

@ -12,8 +12,6 @@ import jakarta.persistence.criteria.CriteriaUpdate;
import org.hibernate.CacheMode;
import org.hibernate.FlushMode;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.query.QueryProducer;
import org.hibernate.query.sql.spi.NativeQueryImplementor;

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

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

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.ParameterMetadata;
import org.hibernate.query.Query;
import org.hibernate.Query;
import org.hibernate.query.QueryParameter;
import org.hibernate.query.ResultListTransformer;
import org.hibernate.query.TupleTransformer;

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.results.FetchBuilder;
import org.hibernate.query.results.ResultSetMapping;

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

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

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

@ -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.query.NativeQuery;
import org.hibernate.NativeQuery;
import org.hibernate.query.QueryParameter;
import org.hibernate.query.ResultListTransformer;
import org.hibernate.query.TupleTransformer;

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

@ -6,10 +6,11 @@
*/
package org.hibernate.query.sql.spi;
import org.hibernate.NativeQuery;
import org.hibernate.query.spi.QueryPlan;
/**
* Specialization of {@link QueryPlan} for {@link org.hibernate.query.NativeQuery}
* Specialization of {@link QueryPlan} for {@link NativeQuery}
* plans
*
* @author Steve Ebersole

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

@ -12,6 +12,7 @@ import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import org.hibernate.Query;
import org.hibernate.ScrollMode;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
import org.hibernate.engine.jdbc.spi.JdbcServices;
@ -63,7 +64,7 @@ import static org.hibernate.query.sqm.internal.QuerySqmImpl.CRITERIA_HQL_STRING;
/**
* Standard Hibernate implementation of SelectQueryPlan for SQM-backed
* {@link org.hibernate.query.Query} implementations, which means
* {@link Query} implementations, which means
* HQL/JPQL or {@link jakarta.persistence.criteria.CriteriaQuery}
*
* @author Steve Ebersole

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.query.QueryTypeMismatchException;
import org.hibernate.query.SemanticException;
import org.hibernate.query.criteria.JpaExpression;

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

@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.hibernate.NativeQuery;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.sql.ast.spi.SqlSelection;
import org.hibernate.sql.results.graph.DomainResult;
@ -20,7 +21,7 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
/**
* Hibernate's standard ResultSetMappingDescriptor implementation for cases
* where Hibernate itself creates the mappings. Basically this covers all
* scenarios *except* {@link org.hibernate.query.NativeQuery} processing -
* scenarios *except* {@link NativeQuery} processing -
* an important distinction as it means we do not have to perform any
* {@link java.sql.ResultSetMetaData} resolutions.
*

3
hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java
View File

@ -8,6 +8,7 @@ package org.hibernate.transform;
import java.io.Serializable;
import org.hibernate.Query;
import org.hibernate.query.ResultListTransformer;
import org.hibernate.query.TupleTransformer;
@ -15,7 +16,7 @@ import org.hibernate.query.TupleTransformer;
* Implementors define a strategy for transforming query results into the
* actual application-visible query result list.
*
* @see org.hibernate.query.Query#setResultTransformer(ResultTransformer)
* @see Query#setResultTransformer(ResultTransformer)
*
* @author Gavin King
*

2
hibernate-core/src/test/java/NoPackageTest.java
View File

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

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

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

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.schema.TargetType;
import org.hibernate.type.StandardBasicTypes;

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

@ -14,11 +14,10 @@ import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.hibernate.Query;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.FailureExpected;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.DomainModel;

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

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

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.SessionFactory;

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

@ -19,10 +19,9 @@ import java.util.Set;
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.query.Query;
import org.hibernate.Query;
import org.hibernate.testing.DialectChecks;
import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.RequiresDialectFeature;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.testing.orm.junit.NotImplementedYet;

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

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

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

@ -7,10 +7,9 @@
package org.hibernate.orm.test.annotations.idclass.xml;
import org.hibernate.query.Query;
import org.hibernate.Query;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.FailureExpected;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Test;

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

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

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

@ -11,12 +11,11 @@ import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.orm.test.annotations.inheritance.Apple;
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.Query;
import org.hibernate.Query;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.SessionFactory;

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

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

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

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

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

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

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

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

@ -6,8 +6,6 @@
*/
package org.hibernate.orm.test.annotations.naturalid;
import java.util.List;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
@ -17,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.Query;
import org.hibernate.Query;
import org.hibernate.stat.Statistics;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.sql.SimpleSelect;
import org.hibernate.testing.RequiresDialect;

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

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

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

@ -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.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.NativeQuery;
import org.hibernate.Query;
import org.hibernate.stat.Statistics;
import org.hibernate.type.StandardBasicTypes;

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

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

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

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

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.DomainModel;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.stat.spi.StatisticsImplementor;
import org.hibernate.testing.TestForIssue;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.stat.spi.StatisticsImplementor;
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.stat.spi.StatisticsImplementor;
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;

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

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

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

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

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.stat.CollectionStatistics;
import org.hibernate.testing.orm.junit.DomainModel;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.TestForIssue;

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

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

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;

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

@ -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.Query;
import org.hibernate.Query;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;

Some files were not shown because too many files have changed in this diff Show More