Skip to content

Commit 3d4ad41

Browse files
gavinkinggavinking
committed
get rid of completely unnecessary use of [Native]QueryImplementor in tests
1 parent 37b6480 commit 3d4ad41

File tree

68 files changed

+249
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+249
-261
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import jakarta.persistence.JoinTable;
1616
import jakarta.persistence.ManyToOne;
1717

18-
import org.hibernate.query.spi.QueryImplementor;
18+
import org.hibernate.query.Query;
1919

2020
import org.hibernate.testing.orm.junit.DomainModel;
2121
import org.hibernate.testing.orm.junit.SessionFactory;
@@ -38,7 +38,7 @@ public void testMemberOfQuery(SessionFactoryScope scope) {
3838
session -> {
3939
Address a = new Address();
4040
a.setStreet( "Lollard Street" );
41-
QueryImplementor query = session.createQuery( "from Person p where :address member of p.addresses" );
41+
Query query = session.createQuery( "from Person p where :address member of p.addresses" );
4242
query.setParameter( "address", a );
4343
query.list();
4444
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
package org.hibernate.orm.test.any.annotations;
66

7-
import org.hibernate.query.spi.QueryImplementor;
7+
import org.hibernate.query.Query;
88
import org.hibernate.testing.orm.junit.JiraKey;
99
import org.hibernate.testing.orm.junit.DomainModel;
1010
import org.hibernate.testing.orm.junit.SessionFactory;
@@ -247,7 +247,7 @@ public void testHqlTypeQueryWithParameter(SessionFactoryScope scope) {
247247
public void testDefaultAnyAssociation(SessionFactoryScope scope) {
248248
scope.inTransaction(
249249
session -> {
250-
final QueryImplementor<ImplicitPropertySet> query = session.createQuery(
250+
final Query<ImplicitPropertySet> query = session.createQuery(
251251
"select s from ImplicitPropertySet s where name = :name",
252252
ImplicitPropertySet.class
253253
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.List;
88

99
import org.hibernate.LazyInitializationException;
10-
import org.hibernate.query.spi.QueryImplementor;
10+
import org.hibernate.query.Query;
1111

1212
import org.hibernate.testing.orm.junit.JiraKey;
1313
import org.hibernate.testing.orm.junit.DomainModel;
@@ -259,7 +259,7 @@ public void testHqlTypeQueryWithParameter(SessionFactoryScope scope) {
259259
public void testDefaultAnyAssociation(SessionFactoryScope scope) {
260260
scope.inTransaction(
261261
session -> {
262-
final QueryImplementor<PropertySet> query = session.createQuery(
262+
final Query<PropertySet> query = session.createQuery(
263263
"select s from PropertySet s where name = :name",
264264
PropertySet.class
265265
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import org.hibernate.Hibernate;
1313
import org.hibernate.cfg.AvailableSettings;
14-
import org.hibernate.query.spi.QueryImplementor;
14+
import org.hibernate.query.Query;
1515

1616
import org.hibernate.testing.jdbc.SQLStatementInspector;
1717
import org.hibernate.testing.orm.junit.DomainModel;
@@ -74,7 +74,7 @@ public void testGetResultStreamCollectSingleResult(SessionFactoryScope scope) {
7474
sqlStatementInterceptor.clear();
7575
scope.inTransaction(
7676
session -> {
77-
QueryImplementor<Child> query = session
77+
Query<Child> query = session
7878
.createQuery( "select c from Child as c where c.parent.someField=:someField", Child.class )
7979
.setParameter( "someField", FIELD_VALUE );
8080
try (Stream<Child> resultStream = query.getResultStream()) {
@@ -103,7 +103,7 @@ public void testGetResultStreamCollect(SessionFactoryScope scope) {
103103
sqlStatementInterceptor.clear();
104104
scope.inTransaction(
105105
session -> {
106-
QueryImplementor<Child> query = session
106+
Query<Child> query = session
107107
.createQuery( "select c from Child as c ", Child.class );
108108
try (Stream<Child> resultStream = query.getResultStream()) {
109109

@@ -137,7 +137,7 @@ public void testGetResultStreamCollect(SessionFactoryScope scope) {
137137
public void testGetResultStreamForEach(SessionFactoryScope scope) {
138138
scope.inTransaction(
139139
session -> {
140-
QueryImplementor<Child> query = session
140+
Query<Child> query = session
141141
.createQuery( "select c from Child as c", Child.class );
142142

143143
try (Stream<Child> resultStream = query.getResultStream()) {
@@ -153,7 +153,7 @@ public void testGetResultStreamForEach(SessionFactoryScope scope) {
153153
public void testGetResultStreamFindFirst(SessionFactoryScope scope) {
154154
scope.inTransaction(
155155
session -> {
156-
QueryImplementor<Child> query = session
156+
Query<Child> query = session
157157
.createQuery( "select c from Child as c where c.parent.someField=:someField", Child.class )
158158
.setParameter( "someField", FIELD_VALUE );
159159
try (Stream<Child> resultStream = query.getResultStream()) {

‎hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneStreamTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
import org.hibernate.Hibernate;
1313
import org.hibernate.cfg.AvailableSettings;
14-
import org.hibernate.query.spi.QueryImplementor;
1514

15+
import org.hibernate.query.Query;
1616
import org.hibernate.testing.jdbc.SQLStatementInspector;
1717
import org.hibernate.testing.orm.junit.DomainModel;
1818
import org.hibernate.testing.orm.junit.JiraKey;
@@ -75,7 +75,7 @@ public void testGetResultStreamCollectSingleResult(SessionFactoryScope scope) {
7575
sqlStatementInterceptor.clear();
7676
scope.inTransaction(
7777
session -> {
78-
QueryImplementor<Child> query = session
78+
Query<Child> query = session
7979
.createQuery( "select c from Child as c where c.parent.someField=:someField", Child.class )
8080
.setParameter( "someField", FIELD_VALUE );
8181
try (Stream<Child> resultStream = query.getResultStream()) {
@@ -103,7 +103,7 @@ public void testGetResultStreamCollect(SessionFactoryScope scope) {
103103
sqlStatementInterceptor.clear();
104104
scope.inTransaction(
105105
session -> {
106-
QueryImplementor<Child> query = session
106+
Query<Child> query = session
107107
.createQuery( "select c from Child as c order by id", Child.class );
108108
try (Stream<Child> resultStream = query.getResultStream()) {
109109

@@ -137,7 +137,7 @@ public void testGetResultStreamCollect(SessionFactoryScope scope) {
137137
public void testGetResultStreamFindFirst(SessionFactoryScope scope) {
138138
scope.inTransaction(
139139
session -> {
140-
QueryImplementor<Child> query = session
140+
Query<Child> query = session
141141
.createQuery( "select c from Child as c where c.parent.someField=:someField", Child.class )
142142
.setParameter( "someField", FIELD_VALUE );
143143
try (Stream<Child> resultStream = query.getResultStream()) {

‎hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
2323
import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
2424
import org.hibernate.persister.entity.EntityPersister;
25+
import org.hibernate.query.Query;
2526
import org.hibernate.query.hql.spi.SqmQueryImplementor;
26-
import org.hibernate.query.spi.QueryImplementor;
2727
import org.hibernate.query.sqm.internal.QuerySqmImpl;
2828
import org.hibernate.query.sqm.sql.SqmTranslation;
2929
import org.hibernate.query.sqm.sql.internal.StandardSqmTranslator;
@@ -396,7 +396,7 @@ private <T> SelectStatement buildSqlSelectAst(
396396
CriteriaQuery<T> criteriaQuery = criteriaBuilder.createQuery( entityType );
397397
criteriaQuery.select( criteriaQuery.from( entityType ) );
398398

399-
final QueryImplementor<T> query = session.createQuery( criteriaQuery );
399+
final Query<T> query = session.createQuery( criteriaQuery );
400400
final SqmQueryImplementor<String> hqlQuery = (SqmQueryImplementor<String>) query;
401401
hqlQuery.applyGraph( entityGraph, mode );
402402

@@ -406,7 +406,7 @@ private <T> SelectStatement buildSqlSelectAst(
406406
sqmStatement,
407407
hqlQuery.getQueryOptions(),
408408
( (QuerySqmImpl<?>) hqlQuery ).getDomainParameterXref(),
409-
query.getParameterBindings(),
409+
hqlQuery.getParameterBindings(),
410410
loadQueryInfluencers,
411411
session.getSessionFactory().getSqlTranslationEngine(),
412412
true

‎hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
2323
import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
2424
import org.hibernate.persister.entity.EntityPersister;
25+
import org.hibernate.query.Query;
2526
import org.hibernate.query.hql.spi.SqmQueryImplementor;
26-
import org.hibernate.query.spi.QueryImplementor;
2727
import org.hibernate.query.sqm.internal.QuerySqmImpl;
2828
import org.hibernate.query.sqm.sql.SqmTranslation;
2929
import org.hibernate.query.sqm.sql.internal.StandardSqmTranslator;
@@ -391,10 +391,7 @@ private <T> SelectStatement buildSqlSelectAst(
391391

392392
final LoadQueryInfluencers loadQueryInfluencers = new LoadQueryInfluencers( session.getSessionFactory() );
393393

394-
final QueryImplementor<T> query = session.createQuery(
395-
hql,
396-
entityType
397-
);
394+
final Query<T> query = session.createQuery( hql, entityType );
398395
final SqmQueryImplementor<String> hqlQuery = (SqmQueryImplementor<String>) query;
399396
hqlQuery.applyGraph( entityGraph, mode );
400397

@@ -404,7 +401,7 @@ private <T> SelectStatement buildSqlSelectAst(
404401
sqmStatement,
405402
hqlQuery.getQueryOptions(),
406403
( (QuerySqmImpl<?>) hqlQuery ).getDomainParameterXref(),
407-
query.getParameterBindings(),
404+
hqlQuery.getParameterBindings(),
408405
loadQueryInfluencers,
409406
session.getSessionFactory().getSqlTranslationEngine(),
410407
true

‎hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.hibernate.Hibernate;
1111
import org.hibernate.annotations.Fetch;
1212
import org.hibernate.annotations.FetchMode;
13-
import org.hibernate.query.spi.QueryImplementor;
1413

14+
import org.hibernate.query.Query;
1515
import org.hibernate.testing.orm.junit.JiraKey;
1616
import org.hibernate.testing.jdbc.SQLStatementInspector;
1717
import org.hibernate.testing.orm.junit.DomainModel;
@@ -65,7 +65,7 @@ public void testSelect(SessionFactoryScope scope) {
6565
scope.inTransaction(
6666
session -> {
6767

68-
QueryImplementor<Client> query = session.createQuery(
68+
Query<Client> query = session.createQuery(
6969
"from " + Client.class.getName() + " c where c.name='fab'",
7070
Client.class
7171
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1818
import org.hibernate.cfg.AvailableSettings;
1919
import org.hibernate.graph.spi.RootGraphImplementor;
20-
import org.hibernate.query.spi.QueryImplementor;
20+
import org.hibernate.query.Query;
2121

2222
import org.hibernate.testing.FailureExpected;
2323
import org.hibernate.testing.orm.junit.JiraKey;
@@ -107,7 +107,7 @@ public void testFetchingFromManagedEntityEntityGraphHql() {
107107
final RootGraphImplementor<RootEntity> entityGraph = session.createEntityGraph( RootEntity.class );
108108
entityGraph.addAttributeNode( "child" );
109109

110-
final QueryImplementor<RootEntity> query = session.createQuery(
110+
final Query<RootEntity> query = session.createQuery(
111111
"select r from RootEntity r",
112112
RootEntity.class
113113
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.hibernate.orm.test.cid.Product;
3939
import org.hibernate.query.Query;
4040
import org.hibernate.query.SyntaxException;
41-
import org.hibernate.query.spi.QueryImplementor;
4241
import org.hibernate.query.sqm.SqmExpressible;
4342
import org.hibernate.query.sqm.internal.QuerySqmImpl;
4443
import org.hibernate.query.sqm.tree.domain.SqmPath;
@@ -1451,7 +1450,7 @@ public void testJPAPositionalParameterList(SessionFactoryScope scope) {
14511450
public void testComponentQueries(SessionFactoryScope scope) {
14521451
scope.inTransaction(
14531452
session -> {
1454-
final QueryImplementor<?> query = session.createQuery( "select h.name from Human h" );
1453+
final Query<?> query = session.createQuery( "select h.name from Human h" );
14551454
final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap(
14561455
QuerySqmImpl.class ).getSqmStatement();
14571456
assertThat( sqmStatement.getQuerySpec().getSelectClause().getSelections().size() ).isEqualTo( 1 );

0 commit comments

Comments
 (0)