HHH-8529 - AttributeConverter not applied to @ElementCollection

hibernate-core/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java

@@ -220,25 +220,56 @@ public class CollectionPropertyHolder extends AbstractPropertyHolder {
 				collection.getRole()
 		);
 
-		final Class elementClass = getMappings().getReflectionManager().toClass( elementXClass );
-		for ( AttributeConverterDefinition attributeConverterDefinition : getMappings().getAttributeConverters() ) {
-			if ( ! attributeConverterDefinition.isAutoApply() ) {
-				continue;
-			}
-			log.debugf(
-					"Checking auto-apply AttributeConverter [%s] type [%s] for match [%s]",
-					attributeConverterDefinition.toString(),
-					attributeConverterDefinition.getEntityAttributeType().getSimpleName(),
-					elementClass.getSimpleName()
-			);
-			if ( areTypeMatch( attributeConverterDefinition.getEntityAttributeType(), elementClass ) ) {
-				return attributeConverterDefinition;
+		final Class elementClass = determineElementClass( elementXClass );
+		if ( elementClass != null ) {
+			for ( AttributeConverterDefinition attributeConverterDefinition : getMappings().getAttributeConverters() ) {
+				if ( ! attributeConverterDefinition.isAutoApply() ) {
+					continue;
+				}
+				log.debugf(
+						"Checking auto-apply AttributeConverter [%s] type [%s] for match [%s]",
+						attributeConverterDefinition.toString(),
+						attributeConverterDefinition.getEntityAttributeType().getSimpleName(),
+						elementClass.getSimpleName()
+				);
+				if ( areTypeMatch( attributeConverterDefinition.getEntityAttributeType(), elementClass ) ) {
+					return attributeConverterDefinition;
+				}
 			}
 		}
 
 		return null;
 	}
 
+	private Class determineElementClass(XClass elementXClass) {
+		if ( elementXClass != null ) {
+			try {
+				return getMappings().getReflectionManager().toClass( elementXClass );
+			}
+			catch (Exception e) {
+				log.debugf(
+						"Unable to resolve XClass [%s] to Class for collection elements [%s]",
+						elementXClass.getName(),
+						collection.getRole()
+				);
+			}
+		}
+
+		if ( collection.getElement() != null ) {
+			if ( collection.getElement().getType() != null ) {
+				return collection.getElement().getType().getReturnedClass();
+			}
+		}
+
+		// currently this is called from paths where the element type really should be known,
+		// so log the fact that we could not resolve the collection element info
+		log.debugf(
+				"Unable to resolve element information for collection [%s]",
+				collection.getRole()
+		);
+		return null;
+	}
+
 	@Override
 	protected AttributeConversionInfo locateAttributeConversionInfo(XProperty property) {
 		if ( canElementBeConverted && canKeyBeConverted ) {

hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java

@@ -1274,6 +1274,15 @@ public abstract class CollectionBinder {
 			if ( BinderHelper.PRIMITIVE_NAMES.contains( collType.getName() ) ) {
 				classType = AnnotatedClassType.NONE;
 				elementClass = null;
+
+				holder = PropertyHolderBuilder.buildPropertyHolder(
+						collValue,
+						collValue.getRole(),
+						null,
+						property,
+						parentPropertyHolder,
+						mappings
+				);
 			}
 			else {
 				elementClass = collType;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/convert/CollectionElementConversionTest.java

@@ -109,7 +109,7 @@ public class CollectionElementConversionTest extends BaseUnitTestCase {
 		@CollectionTable(
 				name = "cust_color",
 				joinColumns = @JoinColumn(name = "cust_fk", nullable = false),
-				uniqueConstraints =  @UniqueConstraint(columnNames = { "customer_fk", "color" })
+				uniqueConstraints =  @UniqueConstraint(columnNames = { "cust_fk", "color" })
 		)
 		@Column(name = "color", nullable = false)
 		private Set<ColorType> colors = new HashSet<ColorType>();