HHH-9475 Cannot mix @mapkey with @convert - Moved classes to reuse in test case; Added copy of type from referenced MapKey

(cherry picked from commit 80e851e)

Author: janario

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

@@ -6,11 +6,18 @@
  */
 package org.hibernate.cfg.annotations;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.MapKeyClass;
+
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.FetchMode;
 import org.hibernate.MappingException;
-import org.hibernate.annotations.MapKeyType;
 import org.hibernate.annotations.common.reflection.ClassLoadingException;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.XProperty;
@@ -44,14 +51,6 @@
 import org.hibernate.mapping.Value;
 import org.hibernate.sql.Template;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.MapKeyClass;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Random;
-
 /**
  * Implementation to bind a Map
  *
@@ -390,8 +389,7 @@ else if ( value instanceof SimpleValue ) {
 			}
 			else {
 				targetValue = new SimpleValue( getBuildingContext().getMetadataCollector(), collection.getCollectionTable() );
-				targetValue.setTypeName( sourceValue.getTypeName() );
-				targetValue.setTypeParameters( sourceValue.getTypeParameters() );
+				targetValue.copyTypeFrom( sourceValue );
 			}
 			Iterator columns = sourceValue.getColumnIterator();
 			Random random = new Random();

hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java

@@ -525,6 +525,14 @@ public Properties getTypeParameters() {
 		return typeParameters;
 	}
 
+	public void copyTypeFrom( SimpleValue sourceValue ) {
+		setTypeName( sourceValue.getTypeName() );
+		setTypeParameters( sourceValue.getTypeParameters() );
+
+		type = sourceValue.type;
+		attributeConverterDescriptor = sourceValue.attributeConverterDescriptor;
+	}
+
 	@Override
 	public String toString() {
 		return getClass().getName() + '(' + columns.toString() + ')';

hibernate-core/src/test/java/org/hibernate/test/converter/map/ColorType.java

@@ -0,0 +1,42 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.converter.map;
+
+/**
+ * @author Steve Ebersole
+ * an enum-like class (converters are technically not allowed to apply to enums)
+ */
+public class ColorType {
+	public static ColorType BLUE = new ColorType( "blue" );
+	public static ColorType RED = new ColorType( "red" );
+	public static ColorType YELLOW = new ColorType( "yellow" );
+
+	private final String color;
+
+	public ColorType(String color) {
+		this.color = color;
+	}
+
+	public String toExternalForm() {
+		return color;
+	}
+
+	public static ColorType fromExternalForm(String color) {
+		if ( BLUE.color.equals( color ) ) {
+			return BLUE;
+		}
+		else if ( RED.color.equals( color ) ) {
+			return RED;
+		}
+		else if ( YELLOW.color.equals( color ) ) {
+			return YELLOW;
+		}
+		else {
+			throw new RuntimeException( "Unknown color : " + color );
+		}
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/converter/map/ColorTypeConverter.java

@@ -0,0 +1,27 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.converter.map;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+/**
+ * @author Steve Ebersole
+ */
+@Converter(autoApply = true)
+public class ColorTypeConverter implements AttributeConverter<ColorType, String> {
+
+	@Override
+	public String convertToDatabaseColumn(ColorType attribute) {
+		return attribute == null ? null : attribute.toExternalForm();
+	}
+
+	@Override
+	public ColorType convertToEntityAttribute(String dbData) {
+		return dbData == null ? null : ColorType.fromExternalForm( dbData );
+	}
+}