Skip to content

Commit da9337a

Browse files
gavinkinggavinking
committed
get rid of unnecessary use of SqmQueryImpl in tests
1 parent 3544f5c commit da9337a

File tree

3 files changed

+26
-33
lines changed

3 files changed

+26
-33
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.hibernate.Session;
1616
import org.hibernate.cfg.AvailableSettings;
1717
import org.hibernate.cfg.Configuration;
18-
import org.hibernate.query.sqm.internal.SqmQueryImpl;
1918

2019
import org.hibernate.testing.orm.junit.JiraKey;
2120
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -144,7 +143,7 @@ public void hhh17743Test() throws Exception {
144143
MyEntity entity = new MyEntity("N1");
145144
entityManager.persist(entity);
146145

147-
SqmQueryImpl<?> q = (SqmQueryImpl<?>) entityManager.createNamedQuery("deleteByName");
146+
var q = entityManager.createNamedQuery("deleteByName");
148147
q.setParameter("name", "N1");
149148
int d = q.executeUpdate();
150149
assertEquals(0, d);

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
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.SqmQuery;
4142
import org.hibernate.query.sqm.SqmExpressible;
42-
import org.hibernate.query.sqm.internal.SqmQueryImpl;
4343
import org.hibernate.query.sqm.tree.domain.SqmPath;
4444
import org.hibernate.query.sqm.tree.expression.SqmFunction;
4545
import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -235,11 +235,10 @@ public void testJpaTypeOperator(SessionFactoryScope scope) {
235235
// select clause
236236

237237
// control
238-
Query<?> query = session
239-
.createQuery( "select a.class from Animal a where a.class = Dog" );
238+
Query<?> query = session.createQuery( "select a.class from Animal a where a.class = Dog" );
240239
query.list();
241-
SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap( SqmQueryImpl.class )
242-
.getSqmStatement();
240+
SqmSelectStatement<?> sqmStatement =
241+
(SqmSelectStatement<?>) query.unwrap( SqmQuery.class ).getSqmStatement();
243242
List<SqmSelection<?>> selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
244243
assertThat( selections.size() ).isEqualTo( 1 );
245244
SqmSelection<?> typeSelection = selections.get( 0 );
@@ -249,7 +248,7 @@ public void testJpaTypeOperator(SessionFactoryScope scope) {
249248
// test
250249
query = session.createQuery( "select type(a) from Animal a where type(a) = Dog" );
251250
query.list();
252-
sqmStatement = (SqmSelectStatement<?>) query.unwrap( SqmQueryImpl.class ).getSqmStatement();
251+
sqmStatement = (SqmSelectStatement<?>) query.unwrap( SqmQuery.class ).getSqmStatement();
253252
selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
254253
assertThat( selections.size() ).isEqualTo( 1 );
255254
typeSelection = selections.get( 0 );
@@ -1454,8 +1453,8 @@ public void testComponentQueries(SessionFactoryScope scope) {
14541453
scope.inTransaction(
14551454
session -> {
14561455
final Query<?> query = session.createQuery( "select h.name from Human h" );
1457-
final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap(
1458-
SqmQueryImpl.class ).getSqmStatement();
1456+
final SqmSelectStatement<?> sqmStatement =
1457+
(SqmSelectStatement<?>) query.unwrap( SqmQuery.class ).getSqmStatement();
14591458
assertThat( sqmStatement.getQuerySpec().getSelectClause().getSelections().size() ).isEqualTo( 1 );
14601459
final SqmSelection<?> selection = sqmStatement.getQuerySpec().getSelectClause().getSelections()
14611460
.get( 0 );
@@ -1837,8 +1836,8 @@ public void testQueryMetadataRetrievalWithFetching(SessionFactoryScope scope) {
18371836
scope.inSession(
18381837
session -> {
18391838
final Query query = session.createQuery( "from Animal a inner join fetch a.mother" );
1840-
final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) query.unwrap(
1841-
SqmQueryImpl.class ).getSqmStatement();
1839+
final SqmSelectStatement<?> sqmStatement =
1840+
(SqmSelectStatement<?>) query.unwrap( SqmQuery.class ).getSqmStatement();
18421841
assertThat( sqmStatement.getQuerySpec().getSelectClause().getSelections().size() ).isEqualTo( 1 );
18431842
final SqmSelection<?> selection = sqmStatement.getQuerySpec().getSelectClause().getSelections()
18441843
.get( 0 );
@@ -2150,8 +2149,7 @@ public void testSelectClauseImplicitJoin(SessionFactoryScope scope) {
21502149
}
21512150

21522151
private static void verifyAnimalZooSelection(Query q) {
2153-
final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQueryImpl.class )
2154-
.getSqmStatement();
2152+
final SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQuery.class ).getSqmStatement();
21552153
final SqmSelection<?> sqmSelection = sqmStatement.getQuerySpec().getSelectClause().getSelections().get( 0 );
21562154
assertThat( sqmSelection.getSelectableNode() ).isInstanceOf( SqmPath.class );
21572155
final SqmPath<?> selectedPath = (SqmPath<?>) sqmSelection.getSelectableNode();
@@ -2584,15 +2582,15 @@ public void testAliases(SessionFactoryScope scope) {
25842582
session.persist( a );
25852583

25862584
Query<?> q = session.createQuery( "select a.bodyWeight as abw, a.description from Animal a" );
2587-
SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQueryImpl.class )
2585+
SqmSelectStatement<?> sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQuery.class )
25882586
.getSqmStatement();
25892587
List<SqmSelection<?>> selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
25902588
assertThat( selections.size() ).isEqualTo( 2 );
25912589
assertThat( selections.get( 0 ).getAlias() ).isEqualTo( "abw" );
25922590
assertThat( selections.get( 1 ).getAlias() ).isNull();
25932591

25942592
q = session.createQuery( "select count(*), avg(a.bodyWeight) as avg from Animal a" );
2595-
sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQueryImpl.class ).getSqmStatement();
2593+
sqmStatement = (SqmSelectStatement<?>) q.unwrap( SqmQuery.class ).getSqmStatement();
25962594
selections = sqmStatement.getQuerySpec().getSelectClause().getSelections();
25972595
assertThat( selections.size() ).isEqualTo( 2 );
25982596

‎hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NamedQueryTest.java‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
package org.hibernate.orm.test.jpa.criteria.query;
66

7-
import org.hibernate.query.sqm.internal.SqmQueryImpl;
7+
import org.hibernate.query.Query;
88

99
import org.hibernate.testing.orm.domain.gambit.BasicEntity;
1010
import org.hibernate.testing.orm.junit.DomainModel;
@@ -62,43 +62,39 @@ public void tearDown(SessionFactoryScope scope) {
6262
@Test
6363
public void testCriteria(SessionFactoryScope scope) {
6464
scope.inTransaction( session -> {
65-
final TypedQuery<BasicEntity> query = session.createNamedQuery( "criteria_query", BasicEntity.class );
66-
final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
67-
assertNull( querySqm.getQueryOptions().getLimit().getFirstRow() );
68-
assertNull( querySqm.getQueryOptions().getLimit().getMaxRows() );
65+
final Query<BasicEntity> query = session.createNamedQuery( "criteria_query", BasicEntity.class );
66+
assertNull( query.getQueryOptions().getLimit().getFirstRow() );
67+
assertNull( query.getQueryOptions().getLimit().getMaxRows() );
6968
assertEquals( 2, query.getResultList().size() );
7069
} );
7170
}
7271

7372
@Test
7473
public void testCriteriaLimit(SessionFactoryScope scope) {
7574
scope.inTransaction( session -> {
76-
final TypedQuery<BasicEntity> query = session.createNamedQuery( "criteria_query_limit", BasicEntity.class );
77-
final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
78-
assertEquals( 1, querySqm.getQueryOptions().getLimit().getFirstRow() );
79-
assertEquals( 1, querySqm.getQueryOptions().getLimit().getMaxRows() );
75+
final Query<BasicEntity> query = session.createNamedQuery( "criteria_query_limit", BasicEntity.class );
76+
assertEquals( 1, query.getQueryOptions().getLimit().getFirstRow() );
77+
assertEquals( 1, query.getQueryOptions().getLimit().getMaxRows() );
8078
assertEquals( 1, query.getResultList().size() );
8179
} );
8280
}
8381

8482
@Test
8583
public void testHql(SessionFactoryScope scope) {
8684
scope.inTransaction( session -> {
87-
final TypedQuery<BasicEntity> query = session.createNamedQuery( "hql_query", BasicEntity.class );
88-
final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
89-
assertNull( querySqm.getQueryOptions().getLimit().getFirstRow() );
90-
assertNull( querySqm.getQueryOptions().getLimit().getMaxRows() );
85+
final Query<BasicEntity> query = session.createNamedQuery( "hql_query", BasicEntity.class );
86+
assertNull( query.getQueryOptions().getLimit().getFirstRow() );
87+
assertNull( query.getQueryOptions().getLimit().getMaxRows() );
9188
assertEquals( 2, query.getResultList().size() );
9289
} );
9390
}
9491

9592
@Test
9693
public void testHqlLimit(SessionFactoryScope scope) {
9794
scope.inTransaction( session -> {
98-
final TypedQuery<BasicEntity> query = session.createNamedQuery( "hql_query_limit", BasicEntity.class );
99-
final SqmQueryImpl<BasicEntity> querySqm = (SqmQueryImpl<BasicEntity>) query;
100-
assertEquals( 1, querySqm.getQueryOptions().getLimit().getFirstRow() );
101-
assertEquals( 1, querySqm.getQueryOptions().getLimit().getMaxRows() );
95+
final Query<BasicEntity> query = session.createNamedQuery( "hql_query_limit", BasicEntity.class );
96+
assertEquals( 1, query.getQueryOptions().getLimit().getFirstRow() );
97+
assertEquals( 1, query.getQueryOptions().getLimit().getMaxRows() );
10298
assertEquals( 1, query.getResultList().size() );
10399
} );
104100
}

0 commit comments

Comments
 (0)