HHH-18728 - Allow mixed discriminator-value mappings for ANY

hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminator.java

@@ -8,11 +8,13 @@
 import java.lang.annotation.Target;
 
 import jakarta.persistence.DiscriminatorType;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.hibernate.type.AnyDiscriminatorValueStrategy.AUTO;
 
 /**
  * A simplified way to specify the type of the discriminator in an {@link Any}
@@ -44,4 +46,12 @@
 	 * or {@link JdbcTypeCode}.
 	 */
 	DiscriminatorType value() default DiscriminatorType.STRING;
+
+	/**
+	 * How the discriminator value should be handled in regard to explicit
+	 * {@linkplain AnyDiscriminatorValue} mappings, if any.
+	 *
+	 * @since 7.0
+	 */
+	AnyDiscriminatorValueStrategy valueStrategy() default AUTO;
 }

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

@@ -8,6 +8,7 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
+import org.hibernate.annotations.AnyDiscriminator;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.Columns;
 import org.hibernate.annotations.Formula;
@@ -107,6 +108,11 @@ private static void bindAny(
 				context
 		);
 
+		final AnyDiscriminator anyDiscriminator = property.getDirectAnnotationUsage( AnyDiscriminator.class );
+		if ( anyDiscriminator != null ) {
+			value.setDiscriminatorValueStrategy( anyDiscriminator.valueStrategy() );
+		}
+
 		final PropertyBinder binder = new PropertyBinder();
 		binder.setName( inferredData.getPropertyName() );
 		binder.setValue( value );

hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java

@@ -9,24 +9,28 @@
 
 import org.hibernate.annotations.AnyDiscriminator;
 import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 
 @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
 @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
 public class AnyDiscriminatorAnnotation implements AnyDiscriminator {
 	private jakarta.persistence.DiscriminatorType value;
+	private AnyDiscriminatorValueStrategy valueStrategy;
 
 	/**
 	 * Used in creating dynamic annotation instances (e.g. from XML)
 	 */
 	public AnyDiscriminatorAnnotation(SourceModelBuildingContext modelContext) {
 		this.value = jakarta.persistence.DiscriminatorType.STRING;
+		this.valueStrategy = AnyDiscriminatorValueStrategy.AUTO;
 	}
 
 	/**
 	 * Used in creating annotation instances from JDK variant
 	 */
 	public AnyDiscriminatorAnnotation(AnyDiscriminator annotation, SourceModelBuildingContext modelContext) {
 		this.value = annotation.value();
+		this.valueStrategy = annotation.valueStrategy();
 	}
 
 	/**
@@ -50,5 +54,14 @@ public void value(jakarta.persistence.DiscriminatorType value) {
 		this.value = value;
 	}
 
+	@Override
+	public AnyDiscriminatorValueStrategy valueStrategy() {
+		return valueStrategy;
+	}
+
+	public void valueStrategy(AnyDiscriminatorValueStrategy valueStrategy) {
+		this.valueStrategy = valueStrategy;
+	}
+
 
 }

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

@@ -9,6 +9,7 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 
+import org.hibernate.Incubating;
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
@@ -34,6 +35,7 @@ public class Any extends SimpleValue {
 
 	// common
 	private Map<Object,String> metaValueToEntityNameMap;
+	private AnyDiscriminatorValueStrategy discriminatorValueStrategy = AnyDiscriminatorValueStrategy.AUTO;
 	private boolean lazy = true;
 
 	private AnyType resolvedType;
@@ -73,6 +75,7 @@ public Any(Any original) {
 		this.metaValueToEntityNameMap = original.metaValueToEntityNameMap == null
 				? null
 				: new HashMap<>(original.metaValueToEntityNameMap);
+		this.discriminatorValueStrategy = original.discriminatorValueStrategy;
 		this.lazy = original.lazy;
 	}
 
@@ -128,6 +131,28 @@ public void setIdentifierType(String identifierType) {
 		this.keyMapping.setTypeName( identifierType );
 	}
 
+	/**
+	 * Current strategy for interpreting {@linkplain org.hibernate.annotations.AnyDiscriminatorValue} definitions,
+	 * especially in terms of implicit, explicit and potentially missing values.
+	 *
+	 * @since 7.0
+	 */
+	@Incubating
+	public AnyDiscriminatorValueStrategy getDiscriminatorValueStrategy() {
+		return discriminatorValueStrategy;
+	}
+
+	/**
+	 * Set the strategy
+	 *
+	 * @see #getDiscriminatorValueStrategy
+	 * @since 7.0
+	 */
+	@Incubating
+	public void setDiscriminatorValueStrategy(AnyDiscriminatorValueStrategy discriminatorValueStrategy) {
+		this.discriminatorValueStrategy = discriminatorValueStrategy;
+	}
+
 	@Override
 	public AnyType getType() throws MappingException {
 		if ( resolvedType == null ) {
@@ -150,6 +175,7 @@ public AnyType getType() throws MappingException {
 			resolvedType = MappingHelper.anyMapping(
 					discriminatorType,
 					identifierType,
+					discriminatorValueStrategy,
 					metaValueToEntityNameMap,
 					isLazy(),
 					getBuildingContext()

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java

@@ -4,7 +4,9 @@
  */
 package org.hibernate.metamodel.mapping;
 
+import org.hibernate.Incubating;
 import org.hibernate.metamodel.RepresentationMode;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 import org.hibernate.type.descriptor.java.JavaType;
 
@@ -16,7 +18,6 @@
  * @author Gavin King
  */
 public abstract class DiscriminatorConverter<O,R> implements BasicValueConverter<O,R> {
-
 	private final String discriminatorName;
 	private final JavaType<O> domainJavaType;
 	private final JavaType<R> relationalJavaType;
@@ -30,6 +31,9 @@ public DiscriminatorConverter(
 		this.relationalJavaType = relationalJavaType;
 	}
 
+	@Incubating
+	public abstract AnyDiscriminatorValueStrategy getValueStrategy();
+
 	public String getDiscriminatorName() {
 		return discriminatorName;
 	}

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorConverter.java

@@ -4,21 +4,22 @@
  */
 package org.hibernate.metamodel.mapping;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.metamodel.mapping.internal.EmbeddableDiscriminatorValueDetailsImpl;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
 /**
  * Handles conversion of discriminator values for embeddable subtype classes
  * to their domain typed form.
@@ -65,6 +66,12 @@ public EmbeddableDiscriminatorConverter(
 		} );
 	}
 
+	@Override
+	public AnyDiscriminatorValueStrategy getValueStrategy() {
+		// discriminators for embeddables are always explicit
+		return AnyDiscriminatorValueStrategy.EXPLICIT;
+	}
+
 	@Override
 	public O toDomainValue(R relationalForm) {
 		assert relationalForm == null || getRelationalJavaType().isInstance( relationalForm );

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitDiscriminatorConverter.java

@@ -12,6 +12,7 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 import org.hibernate.type.descriptor.java.CharacterJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.StringJavaType;
@@ -60,6 +61,19 @@ public ExplicitDiscriminatorConverter(
 		} );
 	}
 
+	@Override
+	public AnyDiscriminatorValueStrategy getValueStrategy() {
+		return AnyDiscriminatorValueStrategy.EXPLICIT;
+	}
+
+	public Map<Object, DiscriminatorValueDetails> getDetailsByValue() {
+		return detailsByValue;
+	}
+
+	public Map<String, DiscriminatorValueDetails> getDetailsByEntityName() {
+		return detailsByEntityName;
+	}
+
 	@Override
 	public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object relationalForm) {
 		if ( relationalForm == null ) {
@@ -80,13 +94,13 @@ public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object relation
 		if ( relationalForm.getClass().isEnum() ) {
 			final Object enumValue;
 			if ( getRelationalJavaType() instanceof StringJavaType ) {
-				enumValue = ( (Enum) relationalForm ).name();
+				enumValue = ( (Enum<?>) relationalForm ).name();
 			}
 			else if ( getRelationalJavaType() instanceof CharacterJavaType ) {
-				enumValue = ( (Enum) relationalForm ).name().charAt( 0 );
+				enumValue = ( (Enum<?>) relationalForm ).name().charAt( 0 );
 			}
 			else {
-				enumValue = ( (Enum) relationalForm ).ordinal();
+				enumValue = ( (Enum<?>) relationalForm ).ordinal();
 			}
 			final DiscriminatorValueDetails enumMatch = detailsByValue.get( enumValue );
 			if ( enumMatch != null ) {
@@ -108,7 +122,7 @@ public DiscriminatorValueDetails getDetailsForEntityName(String entityName) {
 		if ( valueDetails != null) {
 			return valueDetails;
 		}
-		throw new HibernateException( "Unknown entity name (" + discriminatorRole + ") : " + entityName );
+		throw new HibernateException( "Entity not explicitly mapped for ANY discriminator (" + discriminatorRole + ") : " + entityName );
 	}
 
 

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImplicitDiscriminatorConverter.java

@@ -12,6 +12,7 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 import org.hibernate.type.descriptor.java.JavaType;
 
 import java.util.Map;
@@ -51,17 +52,28 @@ public ImplicitDiscriminatorConverter(
 		this.detailsByEntityName = CollectionHelper.concurrentMap( 8 );
 	}
 
+	@Override
+	public AnyDiscriminatorValueStrategy getValueStrategy() {
+		return AnyDiscriminatorValueStrategy.IMPLICIT;
+	}
+
+	public Map<Object, DiscriminatorValueDetails> getDetailsByValue() {
+		return detailsByValue;
+	}
+
+	public Map<String, DiscriminatorValueDetails> getDetailsByEntityName() {
+		return detailsByEntityName;
+	}
+
 	@Override
 	public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object value) {
 		if ( value instanceof String incoming ) {
 			final DiscriminatorValueDetails existingDetails = detailsByValue.get( incoming );
 			if ( existingDetails != null ) {
 				return existingDetails;
 			}
-			final String entityName = mappingMetamodel.getImportedName( incoming );
-			final EntityPersister persister = mappingMetamodel.findEntityDescriptor( entityName );
+			final EntityPersister persister = mappingMetamodel.findEntityDescriptor( incoming );
 			if ( persister != null ) {
-				assert persister.getImportedName().equals( incoming );
 				return register( incoming, persister );
 			}
 		}
@@ -76,7 +88,7 @@ public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object value) {
 	private DiscriminatorValueDetails register(Object value, EntityPersister entityDescriptor) {
 		final DiscriminatorValueDetails details = new DiscriminatorValueDetailsImpl( value, entityDescriptor );
 		detailsByValue.put( value, details );
-		detailsByEntityName.put( entityDescriptor.getImportedName(), details );
+		detailsByEntityName.put( entityDescriptor.getEntityName(), details );
 		return details;
 	}
 
@@ -88,7 +100,7 @@ public DiscriminatorValueDetails getDetailsForEntityName(String entityName) {
 		}
 		final EntityPersister persister = mappingMetamodel.findEntityDescriptor( entityName );
 		if ( persister!= null ) {
-			return register( persister.getImportedName(), persister );
+			return register( persister.getEntityName(), persister );
 		}
 		throw new HibernateException( String.format(
 				ROOT,

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MixedDiscriminatorConverter.java

@@ -11,6 +11,7 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.AnyDiscriminatorValueStrategy;
 import org.hibernate.type.descriptor.java.CharacterJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.StringJavaType;
@@ -59,6 +60,19 @@ private DiscriminatorValueDetails register(Object value, EntityPersister entityD
 		return details;
 	}
 
+	@Override
+	public AnyDiscriminatorValueStrategy getValueStrategy() {
+		return AnyDiscriminatorValueStrategy.MIXED;
+	}
+
+	public Map<Object, DiscriminatorValueDetails> getDetailsByValue() {
+		return detailsByValue;
+	}
+
+	public Map<String, DiscriminatorValueDetails> getDetailsByEntityName() {
+		return detailsByEntityName;
+	}
+
 	@Override
 	public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object relationalForm) {
 		if ( relationalForm == null ) {
@@ -79,13 +93,13 @@ public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object relation
 		if ( relationalForm.getClass().isEnum() ) {
 			final Object enumValue;
 			if ( getRelationalJavaType() instanceof StringJavaType ) {
-				enumValue = ( (Enum) relationalForm ).name();
+				enumValue = ( (Enum<?>) relationalForm ).name();
 			}
 			else if ( getRelationalJavaType() instanceof CharacterJavaType ) {
-				enumValue = ( (Enum) relationalForm ).name().charAt( 0 );
+				enumValue = ( (Enum<?>) relationalForm ).name().charAt( 0 );
 			}
 			else {
-				enumValue = ( (Enum) relationalForm ).ordinal();
+				enumValue = ( (Enum<?>) relationalForm ).ordinal();
 			}
 			final DiscriminatorValueDetails enumMatch = detailsByValue.get( enumValue );
 			if ( enumMatch != null ) {

hibernate-core/src/main/java/org/hibernate/type/AnyDiscriminatorValueStrategy.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.type;
 
+import org.hibernate.Incubating;
 import org.hibernate.annotations.AnyDiscriminatorValue;
 
 /**
@@ -12,8 +13,10 @@
  *
  * @see AnyDiscriminatorValue
  *
+ * @since 7.0
  * @author Steve Ebersole
  */
+@Incubating
 public enum AnyDiscriminatorValueStrategy {
 	/**
 	 * Pick between {@link #IMPLICIT} and {@link #EXPLICIT} based on