Skip to content

very minor aesthetic cleanups in AbstractEntityPersister #10386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2025
Merged

very minor aesthetic cleanups in AbstractEntityPersister #10386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -2818,9 +2818,9 @@ public void applyDiscriminator(
SqlAstCreationState creationState) {
if ( needsDiscriminator() ) {
assert !creationState.supportsEntityNameUsage() : "Entity name usage should have been used instead";
final Map<String, EntityNameUse> entityNameUseMap;
final Collection<EntityMappingType> subMappingTypes = getSubMappingTypes();
entityNameUseMap = new HashMap<>( 1 + subMappingTypes.size() + ( isInherited() ? 1 : 0 ) );
final Map<String, EntityNameUse> entityNameUseMap =
new HashMap<>( 1 + subMappingTypes.size() + ( isInherited() ? 1 : 0 ) );
if ( subMappingTypes.isEmpty() ) {
entityNameUseMap.put( getEntityName(), EntityNameUse.TREAT );
}
Expand Down Expand Up @@ -3081,16 +3081,16 @@ private String getAliasInWhere(TableGroup tableGroup, boolean useQualifier) {
protected boolean shouldInnerJoinSubclassTable(int subclassTableNumber, Set<String> 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 );
}
Expand Down