Skip to content

Commit 15458fb

Browse files
gavinkinggavinking
committed
sort out typing issues with NamedCriteriaQueryMemento
check the result type
1 parent f2a1902 commit 15458fb

File tree

6 files changed

+107
-65
lines changed

6 files changed

+107
-65
lines changed

‎hibernate-core/src/main/java/org/hibernate/query/criteria/internal/NamedCriteriaQueryMementoImpl.java‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
package org.hibernate.query.criteria.internal;
66

77
import java.io.Serializable;
8+
import java.util.Locale;
89
import java.util.Map;
910

1011
import org.hibernate.CacheMode;
1112
import org.hibernate.FlushMode;
1213
import org.hibernate.LockOptions;
1314
import org.hibernate.engine.spi.SharedSessionContractImplementor;
15+
import org.hibernate.query.IllegalSelectQueryException;
16+
import org.hibernate.query.QueryTypeMismatchException;
1417
import org.hibernate.query.hql.spi.SqmQueryImplementor;
1518
import org.hibernate.query.named.AbstractNamedQueryMemento;
1619
import org.hibernate.query.spi.QueryEngine;
@@ -21,6 +24,7 @@
2124
import org.hibernate.query.sqm.tree.SqmStatement;
2225

2326
import org.checkerframework.checker.nullness.qual.Nullable;
27+
import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
2428

2529
public class NamedCriteriaQueryMementoImpl<E> extends AbstractNamedQueryMemento<E>
2630
implements NamedSqmQueryMemento<E>, Serializable {
@@ -60,12 +64,32 @@ public NamedCriteriaQueryMementoImpl(
6064

6165
@Override
6266
public void validate(QueryEngine queryEngine) {
67+
// nothing to do
68+
}
6369

70+
private static <T> void checkResultType(Class<T> resultType, SqmSelectStatement<?> selectStatement) {
71+
final Class<?> expectedResultType = selectStatement.getResultType();
72+
if ( expectedResultType != null
73+
&& !resultType.isAssignableFrom( expectedResultType ) ) {
74+
throw new QueryTypeMismatchException(
75+
String.format(
76+
Locale.ROOT,
77+
"Incorrect query result type: query produces '%s' but type '%s' was given",
78+
expectedResultType.getName(),
79+
resultType.getName()
80+
)
81+
);
82+
}
6483
}
6584

6685
@Override
6786
public <T> SqmQueryImplementor<T> toQuery(SharedSessionContractImplementor session, Class<T> resultType) {
68-
return new QuerySqmImpl<>( this, resultType, session );
87+
if ( sqmStatement instanceof SqmSelectStatement<?> selectStatement ) {
88+
checkResultType( resultType, selectStatement );
89+
}
90+
@SuppressWarnings("unchecked") // we just checked the result type
91+
final SqmStatement<T> statement = (SqmStatement<T>) sqmStatement;
92+
return new QuerySqmImpl<>( this, statement, resultType, session );
6993
}
7094

7195
@Override
@@ -75,7 +99,13 @@ public SqmQueryImplementor<E> toQuery(SharedSessionContractImplementor session)
7599

76100
@Override
77101
public <T> SqmSelectionQuery<T> toSelectionQuery(Class<T> resultType, SharedSessionContractImplementor session) {
78-
return new SqmSelectionQueryImpl<>( this, resultType, session );
102+
if ( !( sqmStatement instanceof SqmSelectStatement<?> selectStatement ) ) {
103+
throw new IllegalSelectQueryException( "Named query is not a SELECT statement: " + getName() );
104+
}
105+
checkResultType( resultType, selectStatement );
106+
@SuppressWarnings("unchecked") // we just checked the result type
107+
final SqmSelectStatement<T> statement = (SqmSelectStatement<T>) selectStatement;
108+
return new SqmSelectionQueryImpl<>( this, statement, resultType, session );
79109
}
80110

81111
@Override
@@ -110,7 +140,7 @@ public Map<String, String> getParameterTypes() {
110140

111141
@Override
112142
public NamedSqmQueryMemento<E> makeCopy(String name) {
113-
return new NamedCriteriaQueryMementoImpl<E>(
143+
return new NamedCriteriaQueryMementoImpl<>(
114144
name,
115145
getResultType(),
116146
sqmStatement,

‎hibernate-core/src/main/java/org/hibernate/query/named/NameableQuery.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,25 @@
44
*/
55
package org.hibernate.query.named;
66

7+
import jakarta.persistence.Query;
78
import org.hibernate.Incubating;
89

910
/**
10-
* Contract for Query impls that can be converted to a named query memento to be
11-
* stored in the {@link NamedObjectRepository}
11+
* Contract for {@linkplain org.hibernate.query.spi.QueryImplementor query implementations}
12+
* which can be converted to {@linkplain NamedQueryMemento named query mementos} for storage
13+
* in the {@link NamedObjectRepository}.
1214
*
1315
* @author Steve Ebersole
16+
*
17+
* @see NamedQueryMemento
1418
*/
1519
@Incubating
1620
public interface NameableQuery {
1721
/**
18-
* Convert the query into the memento
22+
* Convert this query into the memento.
23+
*
24+
* @see org.hibernate.SessionFactory#addNamedQuery(String, Query)
25+
* @see NamedObjectRepository#registerNamedQuery(String, Query)
1926
*/
2027
NamedQueryMemento<?> toMemento(String name);
2128
}

‎hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.hibernate.query.restriction.Restriction;
1717
import org.hibernate.query.SelectionQuery;
1818
import org.hibernate.query.criteria.JpaSelection;
19-
import org.hibernate.query.hql.internal.NamedHqlQueryMementoImpl;
2019
import org.hibernate.query.hql.internal.QuerySplitter;
2120
import org.hibernate.query.spi.AbstractSelectionQuery;
2221
import org.hibernate.query.spi.HqlInterpretation;
@@ -169,7 +168,7 @@ public KeyedResultList<R> getKeyedResultList(KeyedPage<R> keyedPage) {
169168
final List<KeyedResult<R>> results =
170169
new SqmSelectionQueryImpl<KeyedResult<R>>( this, keyedPage )
171170
.getResultList();
172-
int pageSize = keyedPage.getPage().getSize();
171+
final int pageSize = keyedPage.getPage().getSize();
173172
return new KeyedResultList<>(
174173
collectResults( results, pageSize, keyedPage.getKeyInterpretation() ),
175174
collectKeys( results, pageSize ),
@@ -388,7 +387,7 @@ else if ( queryPart instanceof SqmQueryGroup<?> queryGroup ) {
388387
}
389388

390389
protected static <T> HqlInterpretation<T> interpretation(
391-
NamedHqlQueryMementoImpl<?> memento,
390+
NamedSqmQueryMemento<?> memento,
392391
Class<T> expectedResultType,
393392
SharedSessionContractImplementor session) {
394393
final QueryEngine queryEngine = session.getFactory().getQueryEngine();

‎hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
import jakarta.persistence.TemporalType;
9494
import org.hibernate.sql.results.spi.SingleResultConsumer;
9595

96+
import static java.util.Collections.emptyMap;
9697
import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
9798
import static org.hibernate.jpa.HibernateHints.HINT_CACHE_MODE;
9899
import static org.hibernate.jpa.HibernateHints.HINT_CACHE_REGION;
@@ -132,27 +133,31 @@ public class QuerySqmImpl<R>
132133
private final TupleMetadata tupleMetadata;
133134

134135
/**
135-
* Creates a Query instance from a named HQL memento
136+
* Creates a {@link org.hibernate.query.Query}
137+
* instance from a named HQL memento.
138+
* Form used from {@link NamedHqlQueryMementoImpl}.
136139
*/
137140
public QuerySqmImpl(
138-
NamedHqlQueryMementoImpl<?> memento,
141+
NamedSqmQueryMemento<?> memento,
139142
Class<R> expectedResultType,
140143
SharedSessionContractImplementor session) {
141-
this(
142-
memento.getHqlString(),
144+
this( memento.getHqlString(),
143145
interpretation( memento, expectedResultType, session ),
144-
expectedResultType,
145-
session
146-
);
146+
expectedResultType, session );
147147
applySqmOptions( memento );
148148
}
149149

150+
/**
151+
* Creates a {@link org.hibernate.query.Query}
152+
* instance from a named criteria query memento.
153+
* Form used from {@link NamedCriteriaQueryMementoImpl}
154+
*/
150155
public QuerySqmImpl(
151-
NamedCriteriaQueryMementoImpl<?> memento,
156+
NamedSqmQueryMemento<?> memento,
157+
SqmStatement<R> statement,
152158
Class<R> resultType,
153159
SharedSessionContractImplementor session) {
154-
this( (SqmStatement<R>) memento.getSqmStatement(), resultType, session );
155-
160+
this( statement, resultType, session );
156161
applySqmOptions( memento );
157162
}
158163

@@ -177,10 +182,8 @@ public QuerySqmImpl(
177182
if ( sqm instanceof SqmSelectStatement<?> ) {
178183
hqlInterpretation.validateResultType( resultType );
179184
}
180-
else {
181-
if ( resultType != null ) {
182-
throw new IllegalQueryOperationException( "Result type given for a non-SELECT Query", hql, null );
183-
}
185+
else if ( resultType != null ) {
186+
throw new IllegalQueryOperationException( "Result type given for a non-SELECT Query", hql, null );
184187
}
185188
setComment( hql );
186189

@@ -882,18 +885,12 @@ public SqmQueryImplementor<R> applyGraph(@SuppressWarnings("rawtypes") RootGraph
882885
@Override
883886
public NamedSqmQueryMemento<R> toMemento(String name) {
884887
if ( CRITERIA_HQL_STRING.equals( getQueryString() ) ) {
885-
final SqmStatement<R> sqmStatement;
886-
if ( !getSession().isCriteriaCopyTreeEnabled() ) {
887-
sqmStatement = getSqmStatement().copy( SqmCopyContext.simpleContext() );
888-
}
889-
else {
890-
// the statement has already been copied
891-
sqmStatement = getSqmStatement();
892-
}
893888
return new NamedCriteriaQueryMementoImpl<>(
894889
name,
895890
getResultType(),
896-
sqmStatement,
891+
getSession().isCriteriaCopyTreeEnabled()
892+
? getSqmStatement() // the statement has already been copied
893+
: getSqmStatement().copy( SqmCopyContext.simpleContext() ),
897894
getQueryOptions().getLimit().getFirstRow(),
898895
getQueryOptions().getLimit().getMaxRows(),
899896
isCacheable(),
@@ -905,29 +902,30 @@ public NamedSqmQueryMemento<R> toMemento(String name) {
905902
getTimeout(),
906903
getFetchSize(),
907904
getComment(),
908-
Collections.emptyMap(),
905+
emptyMap(),
906+
getHints()
907+
);
908+
}
909+
else {
910+
return new NamedHqlQueryMementoImpl<>(
911+
name,
912+
getResultType(),
913+
getQueryString(),
914+
getQueryOptions().getLimit().getFirstRow(),
915+
getQueryOptions().getLimit().getMaxRows(),
916+
isCacheable(),
917+
getCacheRegion(),
918+
getCacheMode(),
919+
getQueryOptions().getFlushMode(),
920+
isReadOnly(),
921+
getLockOptions(),
922+
getTimeout(),
923+
getFetchSize(),
924+
getComment(),
925+
emptyMap(),
909926
getHints()
910927
);
911928
}
912-
913-
return new NamedHqlQueryMementoImpl<>(
914-
name,
915-
getResultType(),
916-
getQueryString(),
917-
getQueryOptions().getLimit().getFirstRow(),
918-
getQueryOptions().getLimit().getMaxRows(),
919-
isCacheable(),
920-
getCacheRegion(),
921-
getCacheMode(),
922-
getQueryOptions().getFlushMode(),
923-
isReadOnly(),
924-
getLockOptions(),
925-
getTimeout(),
926-
getFetchSize(),
927-
getComment(),
928-
Collections.emptyMap(),
929-
getHints()
930-
);
931929
}
932930

933931

‎hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ public class SqmSelectionQueryImpl<R> extends AbstractSqmSelectionQuery<R>
9999
private final Class<?> resultType;
100100
private final TupleMetadata tupleMetadata;
101101

102+
/**
103+
* Form used for HQL queries
104+
*/
102105
public SqmSelectionQueryImpl(
103106
String hql,
104107
HqlInterpretation<R> hqlInterpretation,
@@ -114,7 +117,6 @@ public SqmSelectionQueryImpl(
114117
this.domainParameterXref = hqlInterpretation.getDomainParameterXref();
115118
this.parameterBindings = parameterMetadata.createBindings( session.getFactory() );
116119

117-
118120
this.expectedResultType = expectedResultType;
119121
this.resultType = determineResultType( sqm, expectedResultType );
120122
this.tupleMetadata = buildTupleMetadata( sqm, expectedResultType );
@@ -123,29 +125,38 @@ public SqmSelectionQueryImpl(
123125
setComment( hql );
124126
}
125127

128+
/**
129+
* Creates a {@link org.hibernate.query.SelectionQuery}
130+
* instance from a named HQL memento.
131+
* Form used from {@link NamedHqlQueryMementoImpl}.
132+
*/
126133
public SqmSelectionQueryImpl(
127134
NamedHqlQueryMementoImpl<?> memento,
128135
Class<R> resultType,
129136
SharedSessionContractImplementor session) {
130-
this(
131-
memento.getHqlString(),
137+
this( memento.getHqlString(),
132138
interpretation( memento, resultType, session ),
133-
resultType,
134-
session
135-
);
136-
139+
resultType, session );
137140
applySqmOptions( memento );
138141
}
139142

143+
/**
144+
* Creates a {@link org.hibernate.query.SelectionQuery}
145+
* instance from a named criteria query memento.
146+
* Form used from {@link NamedCriteriaQueryMementoImpl}
147+
*/
140148
public SqmSelectionQueryImpl(
141149
NamedCriteriaQueryMementoImpl<?> memento,
150+
SqmSelectStatement<R> selectStatement,
142151
Class<R> expectedResultType,
143152
SharedSessionContractImplementor session) {
144-
//noinspection unchecked
145-
this( (SqmSelectStatement<R>) memento.getSqmStatement(), expectedResultType, session );
153+
this( selectStatement, expectedResultType, session );
146154
applySqmOptions( memento );
147155
}
148156

157+
/**
158+
* Form used for criteria queries
159+
*/
149160
public SqmSelectionQueryImpl(
150161
SqmSelectStatement<R> criteria,
151162
Class<R> expectedResultType,

‎hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,7 @@ private SqmSelectStatement(
124124
@Override
125125
public SqmSelectStatement<T> copy(SqmCopyContext context) {
126126
final SqmSelectStatement<T> existing = context.getCopy( this );
127-
if ( existing != null ) {
128-
return existing;
129-
}
130-
return createCopy( context, getResultType() );
127+
return existing != null ? existing : createCopy( context, getResultType() );
131128
}
132129

133130
@Internal

0 commit comments

Comments
 (0)