HHH-14827 Fix @AssociationOverride/@PrimaryKeyJoinColumn at type level being ignored when also using orm.xml

Author: yrodiere

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java

@@ -1794,9 +1794,10 @@ private void getAccessType(List<Annotation> annotationList, AccessType type) {
 	}
 
 	private AssociationOverrides getAssociationOverrides(ManagedType root, XMLContext.Default defaults) {
-		return root instanceof JaxbEntity
-				? getAssociationOverrides( ( (JaxbEntity) root ).getAssociationOverride(), defaults, true )
-				: null;
+		return getAssociationOverrides(
+				root instanceof JaxbEntity ? ( (JaxbEntity) root ).getAssociationOverride() : Collections.emptyList(),
+				defaults, true
+		);
 	}
 
 	/**
@@ -2742,9 +2743,10 @@ else if ( defaults.canUseJavaAnnotations() ) {
 	}
 
 	private PrimaryKeyJoinColumns getPrimaryKeyJoinColumns(ManagedType root, XMLContext.Default defaults) {
-		return root instanceof JaxbEntity
-				? getPrimaryKeyJoinColumns( ( (JaxbEntity) root ).getPrimaryKeyJoinColumn(), defaults, true )
-				: null;
+		return getPrimaryKeyJoinColumns(
+				root instanceof JaxbEntity ? ( (JaxbEntity) root ).getPrimaryKeyJoinColumn() : Collections.emptyList(),
+				defaults, true
+		);
 	}
 
 	/**