Skip to content

Commit 9ff87c6

Browse files
gavinkinggavinking
committed
clean up warnings in tests for NativeQuery
1 parent 341ab5c commit 9ff87c6

File tree

2 files changed

+38
-39
lines changed

2 files changed

+38
-39
lines changed

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public void testRecordInstantiationWithoutAlias(SessionFactoryScope scope) {
4747
session -> {
4848
session.persist(new Thing(1L, "thing"));
4949
Record result = session.createSelectionQuery("select id, upper(name) from Thing", Record.class).getSingleResult();
50-
assertEquals( result.id(), 1L );
51-
assertEquals( result.name(), "THING" );
50+
assertEquals( 1L, result.id() );
51+
assertEquals( "THING", result.name() );
5252
session.getTransaction().setRollbackOnly();
5353
}
5454
);
@@ -59,11 +59,11 @@ public void testSqlRecordInstantiationWithoutMapping(SessionFactoryScope scope)
5959
scope.inTransaction(
6060
session -> {
6161
session.persist(new Thing(1L, "thing"));
62-
Record result = (Record) session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
62+
Record result = session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
6363
.addSynchronizedEntityClass(Thing.class)
6464
.getSingleResult();
65-
assertEquals( result.id(), 1L );
66-
assertEquals( result.name(), "THING" );
65+
assertEquals( 1L, result.id() );
66+
assertEquals( "THING", result.name() );
6767
session.getTransaction().setRollbackOnly();
6868
}
6969
);
@@ -74,13 +74,13 @@ public void testSqlRecordInstantiationWithMapping(SessionFactoryScope scope) {
7474
scope.inTransaction(
7575
session -> {
7676
session.persist(new Thing(1L, "thing"));
77-
Record result = (Record) session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
77+
Record result = session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
7878
.addScalar("id", Long.class)
7979
.addScalar("name", String.class)
8080
.addSynchronizedEntityClass(Thing.class)
8181
.getSingleResult();
82-
assertEquals( result.id(), 1L );
83-
assertEquals( result.name(), "THING" );
82+
assertEquals( 1L, result.id() );
83+
assertEquals( "THING", result.name() );
8484
session.getTransaction().setRollbackOnly();
8585
}
8686
);
@@ -92,8 +92,8 @@ public void testTupleInstantiationWithAlias(SessionFactoryScope scope) {
9292
session -> {
9393
session.persist(new Thing(1L, "thing"));
9494
Tuple result = session.createQuery("select id as id, upper(name) as name from Thing", Tuple.class).getSingleResult();
95-
assertEquals( result.get("id"), 1L );
96-
assertEquals( result.get("name"), "THING" );
95+
assertEquals( 1L, result.get("id") );
96+
assertEquals( "THING", result.get("name") );
9797
session.getTransaction().setRollbackOnly();
9898
}
9999
);
@@ -105,8 +105,8 @@ public void testTupleInstantiationWithoutAlias(SessionFactoryScope scope) {
105105
session -> {
106106
session.persist(new Thing(1L, "thing"));
107107
Tuple result = session.createSelectionQuery("select id, upper(name) from Thing", Tuple.class).getSingleResult();
108-
assertEquals( result.get(0), 1L );
109-
assertEquals( result.get(1), "THING" );
108+
assertEquals( 1L, result.get(0) );
109+
assertEquals( "THING", result.get(1) );
110110
session.getTransaction().setRollbackOnly();
111111
}
112112
);
@@ -117,9 +117,9 @@ public void testMapInstantiationWithoutAlias(SessionFactoryScope scope) {
117117
scope.inTransaction(
118118
session -> {
119119
session.persist(new Thing(1L, "thing"));
120-
Map result = session.createSelectionQuery("select id, upper(name) from Thing", Map.class).getSingleResult();
121-
assertEquals( result.get("0"), 1L );
122-
assertEquals( result.get("1"), "THING" );
120+
Map<?,?> result = session.createSelectionQuery("select id, upper(name) from Thing", Map.class).getSingleResult();
121+
assertEquals( 1L, result.get("0") );
122+
assertEquals( "THING", result.get("1") );
123123
session.getTransaction().setRollbackOnly();
124124
}
125125
);
@@ -130,9 +130,9 @@ public void testMapInstantiationWithAlias(SessionFactoryScope scope) {
130130
scope.inTransaction(
131131
session -> {
132132
session.persist(new Thing(1L, "thing"));
133-
Map result = session.createQuery("select id as id, upper(name) as name from Thing", Map.class).getSingleResult();
134-
assertEquals( result.get("id"), 1L );
135-
assertEquals( result.get("name"), "THING" );
133+
Map<?,?> result = session.createQuery("select id as id, upper(name) as name from Thing", Map.class).getSingleResult();
134+
assertEquals( 1L, result.get("id") );
135+
assertEquals( "THING", result.get("name") );
136136
session.getTransaction().setRollbackOnly();
137137
}
138138
);
@@ -143,9 +143,9 @@ public void testListInstantiationWithoutAlias(SessionFactoryScope scope) {
143143
scope.inTransaction(
144144
session -> {
145145
session.persist(new Thing(1L, "thing"));
146-
List result = session.createSelectionQuery("select id, upper(name) from Thing", List.class).getSingleResult();
147-
assertEquals( result.get(0), 1L );
148-
assertEquals( result.get(1), "THING" );
146+
List<?> result = session.createSelectionQuery("select id, upper(name) from Thing", List.class).getSingleResult();
147+
assertEquals( 1L, result.get(0) );
148+
assertEquals( "THING", result.get(1) );
149149
session.getTransaction().setRollbackOnly();
150150
}
151151
);
@@ -156,9 +156,9 @@ public void testListInstantiationWithAlias(SessionFactoryScope scope) {
156156
scope.inTransaction(
157157
session -> {
158158
session.persist(new Thing(1L, "thing"));
159-
List result = session.createQuery("select id as id, upper(name) as name from Thing", List.class).getSingleResult();
160-
assertEquals( result.get(0), 1L );
161-
assertEquals( result.get(1), "THING" );
159+
List<?> result = session.createQuery("select id as id, upper(name) as name from Thing", List.class).getSingleResult();
160+
assertEquals( 1L, result.get(0) );
161+
assertEquals( "THING", result.get(1) );
162162
session.getTransaction().setRollbackOnly();
163163
}
164164
);
@@ -169,11 +169,11 @@ public void testSqlTupleInstantiationWithAlias(SessionFactoryScope scope) {
169169
scope.inTransaction(
170170
session -> {
171171
session.persist(new Thing(1L, "thing"));
172-
Tuple result = (Tuple) session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Tuple.class)
172+
Tuple result = session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Tuple.class)
173173
.addSynchronizedEntityClass(Thing.class)
174174
.getSingleResult();
175-
assertEquals( result.get("id"), 1L );
176-
assertEquals( result.get("name"), "THING" );
175+
assertEquals( 1L, result.get("id") );
176+
assertEquals( "THING", result.get("name") );
177177
session.getTransaction().setRollbackOnly();
178178
}
179179
);
@@ -184,11 +184,11 @@ public void testSqlMapInstantiationWithAlias(SessionFactoryScope scope) {
184184
scope.inTransaction(
185185
session -> {
186186
session.persist(new Thing(1L, "thing"));
187-
Map result = (Map) session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Map.class)
187+
Map<?,?> result = session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Map.class)
188188
.addSynchronizedEntityClass(Thing.class)
189189
.getSingleResult();
190-
assertEquals( result.get("id"), 1L );
191-
assertEquals( result.get("name"), "THING" );
190+
assertEquals( 1L, result.get("id") );
191+
assertEquals( "THING", result.get("name") );
192192
session.getTransaction().setRollbackOnly();
193193
}
194194
);
@@ -199,11 +199,11 @@ public void testSqlListInstantiationWithoutAlias(SessionFactoryScope scope) {
199199
scope.inTransaction(
200200
session -> {
201201
session.persist(new Thing(1L, "thing"));
202-
List result = (List) session.createNativeQuery( "select id, upper(name) as name from thingy_table", List.class)
202+
List<?> result = session.createNativeQuery( "select id, upper(name) as name from thingy_table", List.class)
203203
.addSynchronizedEntityClass(Thing.class)
204204
.getSingleResult();
205-
assertEquals( result.get(0), 1L );
206-
assertEquals( result.get(1), "THING" );
205+
assertEquals( 1L, result.get(0) );
206+
assertEquals( "THING", result.get(1) );
207207
session.getTransaction().setRollbackOnly();
208208
}
209209
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
2121
import org.hibernate.query.NativeQuery;
2222
import org.hibernate.testing.orm.domain.gambit.BasicEntity;
23-
import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
2423
import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
2524
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
2625

@@ -245,8 +244,8 @@ public void explicitConversionTest(SessionFactoryScope scope) {
245244
);
246245
}
247246

248-
private Matcher matchesOrdinal(Enum enumValue) {
249-
return new CustomMatcher<Object>( "Enum ordinal value" ) {
247+
private Matcher<Object> matchesOrdinal(Enum<?> enumValue) {
248+
return new CustomMatcher<>( "Enum ordinal value" ) {
250249
@Override
251250
public boolean matches(Object item) {
252251
return ( (Number) item ).intValue() == enumValue.ordinal();
@@ -258,7 +257,7 @@ public boolean matches(Object item) {
258257
public void testConvertedAttributeBasedBuilder(SessionFactoryScope scope) {
259258
scope.inTransaction(
260259
session -> {
261-
final NativeQuery qry = session.createNativeQuery(
260+
final var qry = session.createNativeQuery(
262261
"select converted_gender from EntityOfBasics"
263262
);
264263

@@ -268,7 +267,7 @@ public void testConvertedAttributeBasedBuilder(SessionFactoryScope scope) {
268267
"convertedGender"
269268
);
270269

271-
final List results = qry.list();
270+
final var results = qry.list();
272271
assertThat( results.size(), is( 1 ) );
273272

274273
final Object result = results.get( 0 );
@@ -332,7 +331,7 @@ public void verifyModel(SessionFactoryScope scope) {
332331

333332
assertThat( attrMapping.getJavaType().getJavaTypeClass(), equalTo( EntityOfBasics.Gender.class ) );
334333

335-
final BasicValueConverter valueConverter = attrMapping.getJdbcMapping().getValueConverter();
334+
final var valueConverter = attrMapping.getJdbcMapping().getValueConverter();
336335
assertThat( valueConverter, instanceOf( JpaAttributeConverter.class ) );
337336
assertThat( valueConverter.getDomainJavaType(), is( attrMapping.getJavaType() ) );
338337
assertThat( valueConverter.getRelationalJavaType().getJavaTypeClass(), equalTo( Character.class ) );

0 commit comments

Comments
 (0)