@@ -2234,11 +2234,8 @@ private void addQueryMethod(
2234
2234
}
2235
2235
2236
2236
final AnnotationValue value = getAnnotationValue ( mirror , "value" );
2237
- if ( value != null ) {
2238
- final Object queryString = value .getValue ();
2239
- if ( queryString instanceof String ) {
2240
- addQueryMethod (method , returnType , containerTypeName , mirror , isNative , value , (String ) queryString );
2241
- }
2237
+ if ( value != null && value .getValue () instanceof String queryString ) {
2238
+ addQueryMethod ( method , returnType , containerTypeName , mirror , isNative , value , queryString );
2242
2239
}
2243
2240
}
2244
2241
@@ -2388,8 +2385,7 @@ else if ( isInsertUpdateDelete(hql) ) {
2388
2385
else {
2389
2386
final HqlLexer hqlLexer = HqlParseTreeBuilder .INSTANCE .buildHqlLexer ( hql );
2390
2387
final List <? extends Token > allTokens = hqlLexer .getAllTokens ();
2391
- for (int i = 0 ; i < allTokens .size (); i ++) {
2392
- final Token token = allTokens .get (i );
2388
+ for ( final Token token : allTokens ) {
2393
2389
switch ( token .getType () ) {
2394
2390
case FROM :
2395
2391
return hql ;
@@ -2449,8 +2445,8 @@ private void validateHql(
2449
2445
context .getEntityNameMappings (), context .getEnumTypesByValue (), context .isIndexing () )
2450
2446
);
2451
2447
if ( statement != null ) {
2452
- if ( statement instanceof SqmSelectStatement ) {
2453
- validateSelectHql ( method , returnType , mirror , value , ( SqmSelectStatement <?>) statement );
2448
+ if ( statement instanceof SqmSelectStatement <?> selectStatement ) {
2449
+ validateSelectHql ( method , returnType , mirror , value , selectStatement );
2454
2450
}
2455
2451
else {
2456
2452
validateUpdateHql ( method , returnType , mirror , value );
0 commit comments