@@ -597,14 +597,12 @@ public AbstractEntityPersister(
597
597
for ( int k = 0 ; k < selectables .size (); k ++ ) {
598
598
final var selectable = selectables .get (k );
599
599
colAliases [k ] = selectable .getAlias ( dialect , propertyValue .getTable () );
600
- if ( selectable . isFormula () ) {
600
+ if ( selectable instanceof Formula formula ) {
601
601
foundFormula = true ;
602
- final var formula = (Formula ) selectable ;
603
602
formula .setFormula ( substituteBrackets ( formula .getFormula () ) );
604
603
formulaTemplates [k ] = selectable .getTemplate ( dialect , typeConfiguration );
605
604
}
606
- else {
607
- final var column = (Column ) selectable ;
605
+ else if ( selectable instanceof Column column ) {
608
606
colNames [k ] = column .getQuotedName ( dialect );
609
607
}
610
608
}
@@ -655,9 +653,9 @@ public AbstractEntityPersister(
655
653
656
654
if ( persistentClass .hasSubclasses () ) {
657
655
for ( var selectable : persistentClass .getIdentifier ().getSelectables () ) {
658
- if ( ! selectable . isFormula () ) {
656
+ if ( selectable instanceof Column column ) {
659
657
// Identifier columns are always shared between subclasses
660
- sharedColumnNames .add ( ( ( Column ) selectable ) .getQuotedName ( dialect ) );
658
+ sharedColumnNames .add ( column .getQuotedName ( dialect ) );
661
659
}
662
660
}
663
661
}
@@ -674,23 +672,21 @@ public AbstractEntityPersister(
674
672
final var selectables = prop .getSelectables ();
675
673
for ( int i = 0 ; i < selectables .size (); i ++ ) {
676
674
final var selectable = selectables .get (i );
677
- if ( selectable . isFormula () ) {
675
+ if ( selectable instanceof Formula ) {
678
676
final String template = selectable .getTemplate ( dialect , typeConfiguration );
679
677
forms [i ] = template ;
680
678
final String formulaAlias = selectable .getAlias ( dialect );
681
679
if ( prop .isSelectable () && !formulaAliases .contains ( formulaAlias ) ) {
682
680
formulaAliases .add ( formulaAlias );
683
681
}
684
682
}
685
- else {
686
- final var column = (Column ) selectable ;
683
+ else if ( selectable instanceof Column column ) {
687
684
final String colName = column .getQuotedName (dialect );
688
685
cols [i ] = colName ;
689
686
final String columnAlias = selectable .getAlias ( dialect , prop .getValue ().getTable () );
690
687
if ( prop .isSelectable () && !aliases .contains ( columnAlias ) ) {
691
688
aliases .add ( columnAlias );
692
689
}
693
-
694
690
readers [i ] = column .getReadExpr ( dialect );
695
691
readerTemplates [i ] = column .getTemplate ( dialect , typeConfiguration );
696
692
if ( thisClassProperties .contains ( prop )
0 commit comments