Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18868 ID and version properties are handled separately, do not process them twice

This commit is contained in:
Čedomir Igaly 2024-12-01 07:51:41 +01:00 committed by Marco Belladelli
parent be2551154f
commit 2e583d556d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
View File

@ -55,6 +55,7 @@ import java.util.Set;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import static java.util.Collections.unmodifiableMap; import static java.util.Collections.unmodifiableMap;
import static java.util.stream.Collectors.toSet;
import static org.hibernate.metamodel.internal.InjectionHelper.injectField; import static org.hibernate.metamodel.internal.InjectionHelper.injectField;
/** /**
@ -345,14 +346,16 @@ public class MetadataContext {
final MappedSuperclassDomainType<Object> jpaType = (MappedSuperclassDomainType<Object>) final MappedSuperclassDomainType<Object> jpaType = (MappedSuperclassDomainType<Object>)
mappedSuperclassByMappedSuperclassMapping.get( safeMapping ); mappedSuperclassByMappedSuperclassMapping.get( safeMapping );
applyIdMetadata( safeMapping, jpaType ); final Set<String> idProperties = applyIdMetadata( safeMapping, jpaType );
applyVersionAttribute( safeMapping, jpaType ); applyVersionAttribute( safeMapping, jpaType );
// applyNaturalIdAttribute( safeMapping, jpaType ); // applyNaturalIdAttribute( safeMapping, jpaType );
for ( Property property : safeMapping.getDeclaredProperties() ) { for ( Property property : safeMapping.getDeclaredProperties() ) {
if ( !safeMapping.isVersioned() if ( !idProperties.contains( property.getName() )
// skip already applied properties
&& (!safeMapping.isVersioned()
// skip the version property, it was already handled previously. // skip the version property, it was already handled previously.
|| property != safeMapping.getVersion() ) { || property != safeMapping.getVersion()) ) {
buildAttribute( property, jpaType ); buildAttribute( property, jpaType );
} }
} }
@ -568,7 +571,7 @@ public class MetadataContext {
return embeddableType; return embeddableType;
} }
private <X> void applyIdMetadata(MappedSuperclass mappingType, MappedSuperclassDomainType<X> jpaMappingType) { private <X> Set<String> applyIdMetadata(MappedSuperclass mappingType, MappedSuperclassDomainType<X> jpaMappingType) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final AttributeContainer<X> attributeContainer = (AttributeContainer<X>) jpaMappingType; final AttributeContainer<X> attributeContainer = (AttributeContainer<X>) jpaMappingType;
if ( mappingType.hasIdentifierProperty() ) { if ( mappingType.hasIdentifierProperty() ) {
@ -582,6 +585,7 @@ public class MetadataContext {
attributeFactory::buildIdAttribute attributeFactory::buildIdAttribute
); );
attributeContainer.getInFlightAccess().applyIdAttribute( attribute ); attributeContainer.getInFlightAccess().applyIdAttribute( attribute );
return Set.of(attribute.getName());
} }
} }
//a MappedSuperclass can have no identifier if the id is set below in the hierarchy //a MappedSuperclass can have no identifier if the id is set below in the hierarchy
@ -592,7 +596,9 @@ public class MetadataContext {
mappingType.getIdentifierMapper().getProperties() mappingType.getIdentifierMapper().getProperties()
); );
attributeContainer.getInFlightAccess().applyIdClassAttributes( attributes ); attributeContainer.getInFlightAccess().applyIdClassAttributes( attributes );
return attributes.stream().map( Attribute::getName ).collect( toSet());
} }
return Set.of();
} }
private <X> void applyVersionAttribute(PersistentClass persistentClass, EntityDomainType<X> jpaEntityType) { private <X> void applyVersionAttribute(PersistentClass persistentClass, EntityDomainType<X> jpaEntityType) {