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

HHH-15030 - SelectQuery, MutationQuery, etc

This commit is contained in:
Steve Ebersole 2022-01-21 22:22:14 -06:00
parent 3365a4fe54
commit dd41ebc3cf
4 changed files with 4 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,8 @@ import org.hibernate.procedure.spi.NamedCallableQueryMemento;
import org.hibernate.query.IllegalMutationQueryException; import org.hibernate.query.IllegalMutationQueryException;
import org.hibernate.query.IllegalNamedQueryOptionsException; import org.hibernate.query.IllegalNamedQueryOptionsException;
import org.hibernate.query.IllegalSelectQueryException; import org.hibernate.query.IllegalSelectQueryException;
import org.hibernate.query.JpaQuery;
import org.hibernate.query.MutationQuery; import org.hibernate.query.MutationQuery;
import org.hibernate.query.Query;
import org.hibernate.query.SelectionQuery; import org.hibernate.query.SelectionQuery;
import org.hibernate.query.UnknownNamedQueryException; import org.hibernate.query.UnknownNamedQueryException;
import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.criteria.HibernateCriteriaBuilder;
@ -938,7 +938,7 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
protected void applyQuerySettingsAndHints(SelectionQuery query) { protected void applyQuerySettingsAndHints(SelectionQuery query) {
} }
protected void applyQuerySettingsAndHints(JpaQuery query) { protected void applyQuerySettingsAndHints(Query<?> query) {
} }
@Override @SuppressWarnings("rawtypes") @Override @SuppressWarnings("rawtypes")

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

@ -120,7 +120,6 @@ import org.hibernate.procedure.ProcedureCall;
import org.hibernate.procedure.spi.NamedCallableQueryMemento; import org.hibernate.procedure.spi.NamedCallableQueryMemento;
import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer; import org.hibernate.proxy.LazyInitializer;
import org.hibernate.query.JpaQuery;
import org.hibernate.query.Query; import org.hibernate.query.Query;
import org.hibernate.query.SelectionQuery; import org.hibernate.query.SelectionQuery;
import org.hibernate.query.UnknownSqlResultSetMappingException; import org.hibernate.query.UnknownSqlResultSetMappingException;
@ -308,8 +307,7 @@ public class SessionImpl
} }
} }
@Override protected void applyQuerySettingsAndHints(Query query) {
protected void applyQuerySettingsAndHints(JpaQuery query) {
applyQuerySettingsAndHints( (SelectionQuery) query ); applyQuerySettingsAndHints( (SelectionQuery) query );
final Integer specLockTimeout = LegacySpecHelper.getInteger( final Integer specLockTimeout = LegacySpecHelper.getInteger(

198
hibernate-core/src/main/java/org/hibernate/query/JpaQuery.java
View File

@ -1,198 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* 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;
import java.time.Instant;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
import org.hibernate.CacheMode;
import org.hibernate.FlushMode;
import org.hibernate.query.spi.QueryOptions;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.Parameter;
import jakarta.persistence.TemporalType;
/**
* Adaptation of {@link jakarta.persistence.Query} to the
* {@link org.hibernate.query.Query} hierarchy
*
* @apiNote Jakarta Persistence defines its {@link jakarta.persistence.Query}
* contract as modeling both selection and mutation queries,
* {@link SelectionQuery} and {@link MutationQuery} respectively
*
* @author Steve Ebersole
*/
public interface JpaQuery extends SelectionQuery, MutationQuery, jakarta.persistence.Query {
@Override
default List<?> getResultList() {
return SelectionQuery.super.getResultList();
}
@Override
default Stream<?> getResultStream() {
return SelectionQuery.super.getResultStream();
}
QueryOptions getQueryOptions();
@Override
JpaQuery setHibernateFlushMode(FlushMode flushMode);
@Override
JpaQuery setCacheMode(CacheMode cacheMode);
@Override
JpaQuery setCacheable(boolean cacheable);
@Override
JpaQuery setCacheRegion(String cacheRegion);
@Override
JpaQuery setTimeout(int timeout);
@Override
JpaQuery setFetchSize(int fetchSize);
@Override
JpaQuery setReadOnly(boolean readOnly);
@Override
JpaQuery setMaxResults(int maxResult);
@Override
JpaQuery setFirstResult(int startPosition);
@Override
JpaQuery setHint(String hintName, Object value);
@Override
JpaQuery setFlushMode(FlushModeType flushMode);
@Override
JpaQuery setLockMode(LockModeType lockMode);
@Override
JpaQuery setParameter(String name, Object value);
@Override
<P> JpaQuery setParameter(String name, P value, Class<P> type);
@Override
<P> JpaQuery setParameter(String name, P value, BindableType<P> type);
@Override
JpaQuery setParameter(String name, Instant value, TemporalType temporalType);
@Override
JpaQuery setParameter(String name, Calendar value, TemporalType temporalType);
@Override
JpaQuery setParameter(String name, Date value, TemporalType temporalType);
@Override
JpaQuery setParameter(int position, Object value);
@Override
<P> JpaQuery setParameter(int position, P value, Class<P> type);
@Override
<P> JpaQuery setParameter(int position, P value, BindableType<P> type);
@Override
JpaQuery setParameter(int position, Instant value, TemporalType temporalType);
@Override
JpaQuery setParameter(int position, Date value, TemporalType temporalType);
@Override
JpaQuery setParameter(int position, Calendar value, TemporalType temporalType);
@Override
<T> JpaQuery setParameter(QueryParameter<T> parameter, T value);
@Override
<P> JpaQuery setParameter(QueryParameter<P> parameter, P value, Class<P> type);
@Override
<P> JpaQuery setParameter(QueryParameter<P> parameter, P val, BindableType<P> type);
@Override
<T> JpaQuery setParameter(Parameter<T> param, T value);
@Override
JpaQuery setParameter(Parameter<Calendar> param, Calendar value, TemporalType temporalType);
@Override
JpaQuery setParameter(Parameter<Date> param, Date value, TemporalType temporalType);
@Override
JpaQuery setParameterList(String name, @SuppressWarnings("rawtypes") Collection values);
@Override
<P> JpaQuery setParameterList(String name, Collection<? extends P> values, Class<P> javaType);
@Override
<P> JpaQuery setParameterList(String name, Collection<? extends P> values, BindableType<P> type);
@Override
JpaQuery setParameterList(String name, Object[] values);
@Override
<P> JpaQuery setParameterList(String name, P[] values, Class<P> javaType);
@Override
<P> JpaQuery setParameterList(String name, P[] values, BindableType<P> type);
@Override
JpaQuery setParameterList(int position, @SuppressWarnings("rawtypes") Collection values);
@Override
<P> JpaQuery setParameterList(int position, Collection<? extends P> values, Class<P> javaType);
@Override
<P> JpaQuery setParameterList(int position, Collection<? extends P> values, BindableType<P> type);
@Override
JpaQuery setParameterList(int position, Object[] values);
@Override
<P> JpaQuery setParameterList(int position, P[] values, Class<P> javaType);
@Override
<P> JpaQuery setParameterList(int position, P[] values, BindableType<P> type);
@Override
<P> JpaQuery setParameterList(QueryParameter<P> parameter, Collection<? extends P> values);
@Override
<P> JpaQuery setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, Class<P> javaType);
@Override
<P> JpaQuery setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, BindableType<P> type);
@Override
<P> JpaQuery setParameterList(QueryParameter<P> parameter, P[] values);
@Override
<P> JpaQuery setParameterList(QueryParameter<P> parameter, P[] values, Class<P> javaType);
@Override
<P> JpaQuery setParameterList(QueryParameter<P> parameter, P[] values, BindableType<P> type);
@Override
JpaQuery setProperties(Object bean);
@Override
JpaQuery setProperties(Map bean);
}

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

@ -48,7 +48,7 @@ import jakarta.persistence.TypedQuery;
* @param <R> The query result type, for typed queries, or {@code Object} for untyped queries * @param <R> The query result type, for typed queries, or {@code Object} for untyped queries
*/ */
@Incubating @Incubating
public interface Query<R> extends SelectionQuery, MutationQuery, JpaQuery, TypedQuery<R> { public interface Query<R> extends SelectionQuery, MutationQuery, TypedQuery<R> {
/** /**
* Execute the query and return the query results as a {@link List}. * Execute the query and return the query results as a {@link List}.