HHH-18733 - Add a prepareMappingModel phase to collection persisters

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

@@ -12,6 +12,7 @@
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 import org.hibernate.type.AnyType;
 import org.hibernate.type.Type;
 import org.hibernate.type.MappingContext;
@@ -301,9 +302,13 @@ public void setKey(BasicValue keyDescriptor) {
 		}
 	}
 
+	/**
+	 * The discriminator {@linkplain Value}
+	 */
 	public static class MetaValue extends SimpleValue {
 		private String typeName;
 		private String columnName;
+		private AnyDiscriminatorValueStrategy valueStrategy;
 
 		private final Consumer<Selectable> selectableConsumer;
 
@@ -396,6 +401,10 @@ public boolean isValid(MappingContext mappingContext) {
 			return columnName != null
 				&& getType().getColumnSpan( mappingContext ) == 1;
 		}
+
+		public AnyDiscriminatorValueStrategy getValueStrategy() {
+			return valueStrategy;
+		}
 	}
 
 	public static class KeyValue extends SimpleValue {

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

@@ -22,6 +22,7 @@
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.resource.beans.spi.ProvidedInstanceManagedBeanImpl;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 import org.hibernate.type.AnyType;
 import org.hibernate.type.CollectionType;
 import org.hibernate.type.CustomCollectionType;
@@ -123,15 +124,22 @@ public static void injectParameters(Object type, Supplier<Properties> parameterA
 	}
 
 	public static AnyType anyMapping(
-			Type metaType,
+			Type discriminatorType,
 			Type identifierType,
-			Map<Object, String> metaValueToEntityNameMap,
+			Map<Object, String> explicitValeMappings,
 			boolean lazy,
 			MetadataBuildingContext buildingContext) {
-		if ( metaValueToEntityNameMap != null ) {
-			metaType = new MetaType( metaValueToEntityNameMap, metaType );
-		}
+		return anyMapping( discriminatorType, identifierType, AnyDiscriminatorValueStrategy.AUTO, explicitValeMappings, lazy, buildingContext );
+	}
 
+	public static AnyType anyMapping(
+			Type discriminatorType,
+			Type identifierType,
+			AnyDiscriminatorValueStrategy discriminatorValueStrategy,
+			Map<Object, String> explicitValeMappings,
+			boolean lazy,
+			MetadataBuildingContext buildingContext) {
+		final MetaType metaType = new MetaType( discriminatorType, discriminatorValueStrategy, explicitValeMappings );
 		return new AnyType( buildingContext.getBootstrapContext().getTypeConfiguration(), metaType, identifierType, lazy );
 	}