From 8ab905e6cf510e9217159117aebd7eb6e6d1ec92 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 21 Jun 2025 14:24:36 +0200 Subject: [PATCH] very minor aesthetic cleanups in AbstractEntityPersister --- .../entity/AbstractEntityPersister.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index dcc15219b0b0..3af329a2b17c 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -2794,11 +2794,11 @@ public TableGroup createRootTableGroup( } if ( softDeleteMapping != null ) { - final TableReference tableReference = tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() ); - final Predicate softDeletePredicate = softDeleteMapping.createNonDeletedRestriction( - tableReference, - creationState.getSqlExpressionResolver() - ); + final TableReference tableReference = + tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() ); + final Predicate softDeletePredicate = + softDeleteMapping.createNonDeletedRestriction( tableReference, + creationState.getSqlExpressionResolver() ); additionalPredicateCollectorAccess.get().accept( softDeletePredicate ); if ( tableReference != rootTableReference && creationState.supportsEntityNameUsage() ) { // Register entity name usage for the hierarchy root table to avoid pruning @@ -2818,9 +2818,9 @@ public void applyDiscriminator( SqlAstCreationState creationState) { if ( needsDiscriminator() ) { assert !creationState.supportsEntityNameUsage() : "Entity name usage should have been used instead"; - final Map entityNameUseMap; final Collection subMappingTypes = getSubMappingTypes(); - entityNameUseMap = new HashMap<>( 1 + subMappingTypes.size() + ( isInherited() ? 1 : 0 ) ); + final Map entityNameUseMap = + new HashMap<>( 1 + subMappingTypes.size() + ( isInherited() ? 1 : 0 ) ); if ( subMappingTypes.isEmpty() ) { entityNameUseMap.put( getEntityName(), EntityNameUse.TREAT ); } @@ -3081,16 +3081,16 @@ private String getAliasInWhere(TableGroup tableGroup, boolean useQualifier) { protected boolean shouldInnerJoinSubclassTable(int subclassTableNumber, Set treatAsDeclarations) { if ( isClassOrSuperclassJoin( subclassTableNumber ) ) { // the table is either this persister's driving table or (one of) its superclass persister's driving - // tables which can be inner joined as long as the `shouldInnerJoin` condition resolves to true + // tables which can be inner-joined as long as the 'shouldInnerJoin' condition resolves to true return !isInverseTable( subclassTableNumber ) && !isNullableTable( subclassTableNumber ); } // otherwise we have a subclass table and need to look a little deeper... - // IMPL NOTE : By default includeSubclasses indicates that all subclasses should be joined and that each - // subclass ought to be joined by outer-join. However, TREAT-AS always requires that an inner-join be used - // so we give TREAT-AS higher precedence... + // IMPL NOTE: By default, 'includeSubclasses' indicates that all subclasses should be joined and that each + // subclass ought to be joined by outer join. However, 'TREAT AS' always requires that an inner join be used, + // so we give 'TREAT AS' higher precedence... return isSubclassTableIndicatedByTreatAsDeclarations( subclassTableNumber, treatAsDeclarations ); }