Skip to content

Commit 8228432

Browse files
committed
use 'instanceof' instead of isFormula()
eventually this will be a switch (pattern match)
1 parent 7cd47f0 commit 8228432

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -597,14 +597,12 @@ public AbstractEntityPersister(
597597
for ( int k = 0; k < selectables.size(); k++ ) {
598598
final var selectable = selectables.get(k);
599599
colAliases[k] = selectable.getAlias( dialect, propertyValue.getTable() );
600-
if ( selectable.isFormula() ) {
600+
if ( selectable instanceof Formula formula ) {
601601
foundFormula = true;
602-
final var formula = (Formula) selectable;
603602
formula.setFormula( substituteBrackets( formula.getFormula() ) );
604603
formulaTemplates[k] = selectable.getTemplate( dialect, typeConfiguration );
605604
}
606-
else {
607-
final var column = (Column) selectable;
605+
else if ( selectable instanceof Column column ) {
608606
colNames[k] = column.getQuotedName( dialect );
609607
}
610608
}
@@ -655,9 +653,9 @@ public AbstractEntityPersister(
655653

656654
if ( persistentClass.hasSubclasses() ) {
657655
for ( var selectable : persistentClass.getIdentifier().getSelectables() ) {
658-
if ( !selectable.isFormula() ) {
656+
if ( selectable instanceof Column column ) {
659657
// Identifier columns are always shared between subclasses
660-
sharedColumnNames.add( ( (Column) selectable ).getQuotedName( dialect ) );
658+
sharedColumnNames.add( column.getQuotedName( dialect ) );
661659
}
662660
}
663661
}
@@ -674,23 +672,21 @@ public AbstractEntityPersister(
674672
final var selectables = prop.getSelectables();
675673
for ( int i = 0; i < selectables.size(); i++ ) {
676674
final var selectable = selectables.get(i);
677-
if ( selectable.isFormula() ) {
675+
if ( selectable instanceof Formula ) {
678676
final String template = selectable.getTemplate( dialect, typeConfiguration );
679677
forms[i] = template;
680678
final String formulaAlias = selectable.getAlias( dialect );
681679
if ( prop.isSelectable() && !formulaAliases.contains( formulaAlias ) ) {
682680
formulaAliases.add( formulaAlias );
683681
}
684682
}
685-
else {
686-
final var column = (Column) selectable;
683+
else if ( selectable instanceof Column column ) {
687684
final String colName = column.getQuotedName(dialect);
688685
cols[i] = colName;
689686
final String columnAlias = selectable.getAlias( dialect, prop.getValue().getTable() );
690687
if ( prop.isSelectable() && !aliases.contains( columnAlias ) ) {
691688
aliases.add( columnAlias );
692689
}
693-
694690
readers[i] = column.getReadExpr( dialect );
695691
readerTemplates[i] = column.getTemplate( dialect, typeConfiguration );
696692
if ( thisClassProperties.contains( prop )

0 commit comments

Comments
 (0)