@@ -2794,11 +2794,11 @@ public TableGroup createRootTableGroup(
27942794 }
27952795
27962796 if ( softDeleteMapping != null ) {
2797- final TableReference tableReference = tableGroup . resolveTableReference ( getSoftDeleteTableDetails (). getTableName () );
2798- final Predicate softDeletePredicate = softDeleteMapping . createNonDeletedRestriction (
2799- tableReference ,
2800- creationState . getSqlExpressionResolver ()
2801- );
2797+ final TableReference tableReference =
2798+ tableGroup . resolveTableReference ( getSoftDeleteTableDetails (). getTableName () );
2799+ final Predicate softDeletePredicate =
2800+ softDeleteMapping . createNonDeletedRestriction ( tableReference ,
2801+ creationState . getSqlExpressionResolver () );
28022802 additionalPredicateCollectorAccess .get ().accept ( softDeletePredicate );
28032803 if ( tableReference != rootTableReference && creationState .supportsEntityNameUsage () ) {
28042804 // Register entity name usage for the hierarchy root table to avoid pruning
@@ -2818,9 +2818,9 @@ public void applyDiscriminator(
28182818 SqlAstCreationState creationState ) {
28192819 if ( needsDiscriminator () ) {
28202820 assert !creationState .supportsEntityNameUsage () : "Entity name usage should have been used instead" ;
2821- final Map <String , EntityNameUse > entityNameUseMap ;
28222821 final Collection <EntityMappingType > subMappingTypes = getSubMappingTypes ();
2823- entityNameUseMap = new HashMap <>( 1 + subMappingTypes .size () + ( isInherited () ? 1 : 0 ) );
2822+ final Map <String , EntityNameUse > entityNameUseMap =
2823+ new HashMap <>( 1 + subMappingTypes .size () + ( isInherited () ? 1 : 0 ) );
28242824 if ( subMappingTypes .isEmpty () ) {
28252825 entityNameUseMap .put ( getEntityName (), EntityNameUse .TREAT );
28262826 }
@@ -3081,16 +3081,16 @@ private String getAliasInWhere(TableGroup tableGroup, boolean useQualifier) {
30813081 protected boolean shouldInnerJoinSubclassTable (int subclassTableNumber , Set <String > treatAsDeclarations ) {
30823082 if ( isClassOrSuperclassJoin ( subclassTableNumber ) ) {
30833083 // the table is either this persister's driving table or (one of) its superclass persister's driving
3084- // tables which can be inner joined as long as the ` shouldInnerJoin` condition resolves to true
3084+ // tables which can be inner- joined as long as the ' shouldInnerJoin' condition resolves to true
30853085 return !isInverseTable ( subclassTableNumber )
30863086 && !isNullableTable ( subclassTableNumber );
30873087 }
30883088
30893089 // otherwise we have a subclass table and need to look a little deeper...
30903090
3091- // IMPL NOTE : By default includeSubclasses indicates that all subclasses should be joined and that each
3092- // subclass ought to be joined by outer- join. However, TREAT-AS always requires that an inner- join be used
3093- // so we give TREAT-AS higher precedence...
3091+ // IMPL NOTE: By default, ' includeSubclasses' indicates that all subclasses should be joined and that each
3092+ // subclass ought to be joined by outer join. However, ' TREAT AS' always requires that an inner join be used,
3093+ // so we give ' TREAT AS' higher precedence...
30943094
30953095 return isSubclassTableIndicatedByTreatAsDeclarations ( subclassTableNumber , treatAsDeclarations );
30963096 }
0 commit comments