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

Do not expose id class embeddables through getManagedTypes

This commit is contained in:
Christian Beikov 2022-03-10 13:33:34 +01:00
parent 7f4a4afd64
commit 955e8265dc
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,10 +375,13 @@ public class MetadataContext {
} }
( ( AttributeContainer<?>) embeddable ).getInFlightAccess().finishUp(); ( ( AttributeContainer<?>) embeddable ).getInFlightAccess().finishUp();
embeddables.put( embeddable.getJavaType(), embeddable ); // Do not process embeddables for entity types i.e. id-classes
if ( !( embeddable.getExpressibleJavaType() instanceof EntityJavaType<?> ) ) {
embeddables.put( embeddable.getJavaType(), embeddable );
if ( staticMetamodelScanEnabled ) { if ( staticMetamodelScanEnabled ) {
populateStaticMetamodel( embeddable ); populateStaticMetamodel( embeddable );
}
} }
} }
} }

4
hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
View File

@ -509,6 +509,10 @@ public class JpaMetamodelImpl implements JpaMetamodelImplementor, Serializable {
} }
for ( EmbeddableDomainType<?> embeddable : context.getEmbeddableTypeSet() ) { for ( EmbeddableDomainType<?> embeddable : context.getEmbeddableTypeSet() ) {
// Do not register the embeddable types for id classes
if ( embeddable.getExpressibleJavaType() instanceof EntityJavaType<?> ) {
continue;
}
switch ( jpaMetaModelPopulationSetting ) { switch ( jpaMetaModelPopulationSetting ) {
case IGNORE_UNSUPPORTED: case IGNORE_UNSUPPORTED:
if ( embeddable.getJavaType() != null && embeddable.getJavaType() != Map.class ) { if ( embeddable.getJavaType() != null && embeddable.getJavaType() != Map.class ) {