Skip to content

Fixup problem after #10856 encapsulate EntityMetamodel within AbstractEntityPersister #10904

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
Sep 10, 2025
Merged

Fixup problem after #10856 encapsulate EntityMetamodel within AbstractEntityPersister #10904

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
14 changes: 7 additions & 7 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 @@ -4646,7 +4646,7 @@ private void prepareMappings(MappingModelCreationProcess creationProcess) {
creationProcess.getCreationContext().getBootModel()
.getEntityBinding( getEntityName() );
initializeSpecialAttributeMappings( creationProcess, persistentClass );
versionGenerator = createVersionGenerator( this, versionMapping );
versionGenerator = createVersionGenerator( super.getVersionGenerator(), versionMapping );
buildDeclaredAttributeMappings( creationProcess, persistentClass );
getAttributeMappings();
initializeNaturalIdMapping( creationProcess, persistentClass );
Expand Down Expand Up @@ -4705,15 +4705,15 @@ private void inheritSupertypeSpecialAttributeMappings() {
}
}

private static BeforeExecutionGenerator createVersionGenerator
(EntityMetamodel currentEntityMetamodel, EntityVersionMapping versionMapping) {
if ( currentEntityMetamodel.isVersioned() ) {
final var generator = currentEntityMetamodel.getVersionGenerator();
private static @Nullable BeforeExecutionGenerator createVersionGenerator(
@Nullable BeforeExecutionGenerator configuredGenerator,
@Nullable EntityVersionMapping versionMapping) {
if ( versionMapping != null ) {
// need to do this here because EntityMetamodel doesn't have the EntityVersionMapping :-(
return generator == null ? new VersionGeneration( versionMapping ) : generator;
return configuredGenerator == null ? new VersionGeneration( versionMapping ) : configuredGenerator;
}
else {
return null;
return configuredGenerator;
}
}

Expand Down
Loading