HHH-19706 If property is identifier property, treat it as simple property

Author: cigaly

hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java

@@ -727,8 +727,8 @@ private static Member resolveVirtualIdentifierMember( Property property, EntityP
 
 	private static Member resolveEntityMember(Property property, EntityPersister declaringEntity) {
 		final String propertyName = property.getName();
-		final AttributeMapping attributeMapping = declaringEntity.findAttributeMapping( propertyName );
-		return attributeMapping == null
+		return !propertyName.equals( declaringEntity.getIdentifierPropertyName() )
+			&& declaringEntity.findAttributeMapping( propertyName ) == null
 				// just like in #determineIdentifierJavaMember , this *should* indicate we have an IdClass mapping
 				? resolveVirtualIdentifierMember( property, declaringEntity )
 				: getter( declaringEntity, property, propertyName, property.getType().getReturnedClass() );