32
32
33
33
import static org .hibernate .boot .model .internal .ClassPropertyHolder .addPropertyToMappedSuperclass ;
34
34
import static org .hibernate .boot .model .internal .ClassPropertyHolder .handleGenericComponentProperty ;
35
- import static org .hibernate .boot .model .internal .HCANNHelper .hasAnnotation ;
36
- import static org .hibernate .internal .util .NullnessUtil .castNonNull ;
37
35
import static org .hibernate .internal .util .StringHelper .isEmpty ;
38
36
import static org .hibernate .internal .util .StringHelper .qualifyConditionally ;
39
37
import static org .hibernate .spi .NavigablePath .IDENTIFIER_MAPPER_PROPERTY ;
@@ -70,7 +68,7 @@ public class ComponentPropertyHolder extends AbstractPropertyHolder {
70
68
private final Component component ;
71
69
private final boolean isOrWithinEmbeddedId ;
72
70
private final boolean isWithinElementCollection ;
73
- private final Map <XClass , InheritanceState > inheritanceStatePerClass ;
71
+ private final Map <ClassDetails , InheritanceState > inheritanceStatePerClass ;
74
72
75
73
private final String embeddedAttributeName ;
76
74
private final Map <String ,AttributeConversionInfo > attributeConversionInfoMap ;
@@ -81,7 +79,7 @@ public ComponentPropertyHolder(
81
79
PropertyData inferredData ,
82
80
PropertyHolder parent ,
83
81
MetadataBuildingContext context ,
84
- Map <XClass , InheritanceState > inheritanceStatePerClass ) {
82
+ Map <ClassDetails , InheritanceState > inheritanceStatePerClass ) {
85
83
super ( path , parent , inferredData .getPropertyType ().determineRawClass (), context );
86
84
final MemberDetails embeddedMemberDetails = inferredData .getAttributeMember ();
87
85
setCurrentProperty ( embeddedMemberDetails );
@@ -292,11 +290,11 @@ public Table getTable() {
292
290
293
291
@ Override
294
292
public void addProperty (Property prop , MemberDetails attributeMemberDetails , ClassDetails declaringClass ) {
295
- handleGenericComponentProperty ( prop , getContext () );
293
+ handleGenericComponentProperty ( prop , attributeMemberDetails , getContext () );
296
294
if ( declaringClass != null ) {
297
295
final InheritanceState inheritanceState = inheritanceStatePerClass .get ( declaringClass );
298
296
if ( inheritanceState != null && inheritanceState .isEmbeddableSuperclass () ) {
299
- addPropertyToMappedSuperclass ( prop , declaringClass , getContext () );
297
+ addPropertyToMappedSuperclass ( prop , attributeMemberDetails , declaringClass , getContext () );
300
298
}
301
299
}
302
300
component .addProperty ( prop , declaringClass );
0 commit comments