Skip to content

several extremely trivial code cleanups in AbstractEntityPersister #9962

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
Apr 5, 2025
Merged

several extremely trivial code cleanups in AbstractEntityPersister #9962

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
63 changes: 29 additions & 34 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 @@ -621,10 +621,7 @@ public AbstractEntityPersister(
foundFormula = true;
final Formula formula = (Formula) selectable;
formula.setFormula( substituteBrackets( formula.getFormula() ) );
formulaTemplates[k] = selectable.getTemplate(
dialect,
typeConfiguration
);
formulaTemplates[k] = selectable.getTemplate( dialect, typeConfiguration );
}
else {
final Column column = (Column) selectable;
Expand Down Expand Up @@ -811,14 +808,15 @@ protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {
final NamedQueryMemento<?> memento = getNamedQueryMemento( null );
return new SingleIdEntityLoaderProvidedQueryImpl<>( this, memento );
}
return buildSingleIdEntityLoader( new LoadQueryInfluencers( factory ) );
else {
return buildSingleIdEntityLoader( new LoadQueryInfluencers( factory ) );
}
}

private SingleIdEntityLoader<?> buildSingleIdEntityLoader(LoadQueryInfluencers loadQueryInfluencers) {
if ( loadQueryInfluencers.effectivelyBatchLoadable( this ) ) {
final int batchSize = loadQueryInfluencers.effectiveBatchSize( this );
return factory.getServiceRegistry()
.requireService( BatchLoaderFactory.class )
return factory.getServiceRegistry().requireService( BatchLoaderFactory.class )
.createEntityBatchLoader( batchSize, this, loadQueryInfluencers );
}
else {
Expand Down Expand Up @@ -1219,7 +1217,6 @@ private SingleIdArrayLoadPlan createLazyLoadPlan(List<LazyAttributeDescriptor> f
// use the subclass closure
partsToSelect.add( getAttributeMapping( getSubclassPropertyIndex( lazyAttributeDescriptor.getName() ) ) );
}

return createLazyLoanPlan( partsToSelect );
}

Expand Down Expand Up @@ -1386,8 +1383,10 @@ protected Predicate generateJoinPredicate(

identifierMapping.forEachSelectable(
(columnIndex, selection) -> {
final SqlExpressionResolver sqlExpressionResolver = creationState.getSqlExpressionResolver();

final String rootPkColumnName = pkColumnNames[ columnIndex ];
final Expression pkColumnExpression = creationState.getSqlExpressionResolver().resolveSqlExpression(
final Expression pkColumnExpression = sqlExpressionResolver.resolveSqlExpression(
createColumnReferenceKey(
rootTableReference,
rootPkColumnName,
Expand All @@ -1403,7 +1402,7 @@ protected Predicate generateJoinPredicate(
);

final String fkColumnName = fkColumnNames[ columnIndex ];
final Expression fkColumnExpression = creationState.getSqlExpressionResolver().resolveSqlExpression(
final Expression fkColumnExpression = sqlExpressionResolver.resolveSqlExpression(
createColumnReferenceKey(
joinedTableReference,
fkColumnName,
Expand Down Expand Up @@ -1521,19 +1520,16 @@ public Object initializeLazyProperty(String fieldName, Object entity, SharedSess
EntityEntry ownerEntry,
SharedSessionContractImplementor session) {
final CollectionType collectionType = persister.getCollectionType();

if ( ownerEntry != null ) {
// this call only works when the owner is associated with the Session, which is not always the case
return collectionType.getKeyOfOwner( owner, session );
}

final EntityPersister ownerPersister = persister.getOwnerEntityPersister();
if ( collectionType.getLHSPropertyName() == null ) {
// collection key is defined by the owning entity identifier
return ownerPersister.getIdentifier( owner, session );
}
else {
return ownerPersister.getPropertyValue( owner, collectionType.getLHSPropertyName() );
final EntityPersister ownerPersister = persister.getOwnerEntityPersister();
return collectionType.getLHSPropertyName() == null
// collection key is defined by the owning entity identifier
? ownerPersister.getIdentifier( owner, session )
: ownerPersister.getPropertyValue( owner, collectionType.getLHSPropertyName() );
}
}

Expand Down Expand Up @@ -1593,12 +1589,11 @@ protected Object initializeLazyPropertiesFromDatastore(

LOG.tracef( "Initializing lazy properties from datastore (triggered for `%s`)", fieldName );

final String fetchGroup = getEntityMetamodel().getBytecodeEnhancementMetadata()
.getLazyAttributesMetadata()
.getFetchGroupName( fieldName );
final List<LazyAttributeDescriptor> fetchGroupAttributeDescriptors = getEntityMetamodel().getBytecodeEnhancementMetadata()
.getLazyAttributesMetadata()
.getFetchGroupAttributeDescriptors( fetchGroup );
final LazyAttributesMetadata lazyAttributesMetadata =
getEntityMetamodel().getBytecodeEnhancementMetadata().getLazyAttributesMetadata();
final String fetchGroup = lazyAttributesMetadata.getFetchGroupName( fieldName );
final List<LazyAttributeDescriptor> fetchGroupAttributeDescriptors =
lazyAttributesMetadata.getFetchGroupAttributeDescriptors( fetchGroup );

final Set<String> initializedLazyAttributeNames = interceptor.getInitializedLazyAttributeNames();

Expand Down Expand Up @@ -3286,17 +3281,17 @@ protected EntityTableMapping[] buildTableMappings() {

final boolean inverseTable = isInverseTable( relativePosition );
if ( existing == null ) {
final Consumer<SelectableConsumer> selectableConsumerConsumer = tableKeyColumnVisitationSupplier.get();
final List<EntityTableMapping.KeyColumn> keyColumns = new ArrayList<>();
selectableConsumerConsumer.accept( (selectionIndex, selectableMapping) -> {
keyColumns.add( new EntityTableMapping.KeyColumn(
tableExpression,
selectableMapping.getSelectionExpression(),
selectableMapping.getWriteExpression(),
selectableMapping.isFormula(),
selectableMapping.getJdbcMapping()
) );
} );
tableKeyColumnVisitationSupplier.get()
.accept( (selectionIndex, selectableMapping) -> {
keyColumns.add( new EntityTableMapping.KeyColumn(
tableExpression,
selectableMapping.getSelectionExpression(),
selectableMapping.getWriteExpression(),
selectableMapping.isFormula(),
selectableMapping.getJdbcMapping()
) );
} );

final boolean isIdentifierTable = isIdentifierTable( tableExpression );

Expand Down