HHH-18028 TCK test failure with attribute converter and Embeddable

Author: dreab8

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java

@@ -126,7 +126,7 @@ public void startingProperty(MemberDetails property) {
 			return;
 		}
 
-		final String propertyName = property.getName();
+		final String propertyName = property.resolveAttributeName();
 		if ( attributeConversionInfoMap.containsKey( propertyName ) ) {
 			return;
 		}
@@ -144,7 +144,7 @@ public void startingProperty(MemberDetails property) {
 
 	@Override
 	protected AttributeConversionInfo locateAttributeConversionInfo(MemberDetails attributeMember) {
-		return locateAttributeConversionInfo( attributeMember.getName() );
+		return locateAttributeConversionInfo( attributeMember.resolveAttributeName() );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java

@@ -192,21 +192,22 @@ public void startingProperty(MemberDetails propertyMemberDetails) {
 
 		// technically we should only do this for properties of "basic type"
 
-		final String path = embeddedAttributeName + '.' + propertyMemberDetails.getName();
+		final String attributeName = propertyMemberDetails.resolveAttributeName();
+		final String path = embeddedAttributeName + '.' + attributeName;
 		if ( attributeConversionInfoMap.containsKey( path ) ) {
 			return;
 		}
 
 		propertyMemberDetails.forEachAnnotationUsage( Convert.class, (usage) -> {
 			final AttributeConversionInfo info = new AttributeConversionInfo( usage, propertyMemberDetails );
-			attributeConversionInfoMap.put( propertyMemberDetails.getName(), info );
+			attributeConversionInfoMap.put( attributeName, info );
 		} );
 	}
 
 	@Override
 	protected AttributeConversionInfo locateAttributeConversionInfo(MemberDetails attributeMember) {
 		// conversions on parent would have precedence
-		return locateAttributeConversionInfo( attributeMember.getName() );
+		return locateAttributeConversionInfo( attributeMember.resolveAttributeName() );
 	}
 
 	@Override