HHH-16972 DomainType doesn't need to extend BindableType

gavinking · gavinking · commit 594608d10c14 · 2025-04-11T20:44:25.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java
@@ -129,7 +129,7 @@ private static SubGraphImplementor<?> createSubgraph(
 	private static <T, E, K> SubGraphImplementor<?> makeAttributeNodeValueSubgraph(
 			AttributeNodeImplementor<T, E, K> attributeNode, Class<?> subgraphType) {
 		final Class<?> attributeValueType =
-				attributeNode.getAttributeDescriptor().getValueGraphType().getBindableJavaType();
+				attributeNode.getAttributeDescriptor().getValueGraphType().getJavaType();
 		if ( !attributeValueType.isAssignableFrom( subgraphType ) ) {
 			throw new AnnotationException( "Named subgraph type '" + subgraphType.getName()
 										+ "' is not a subtype of the value type '" + attributeValueType.getName() + "'" );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
@@ -29,7 +29,7 @@ public class DdlTypeHelper {
 	public static BasicType<?> resolveArrayType(DomainType<?> elementType, TypeConfiguration typeConfiguration) {
 		@SuppressWarnings("unchecked") final BasicPluralJavaType<Object> arrayJavaType = (BasicPluralJavaType<Object>) typeConfiguration.getJavaTypeRegistry()
 				.getDescriptor(
-						Array.newInstance( elementType.getBindableJavaType(), 0 ).getClass()
+						Array.newInstance( elementType.getJavaType(), 0 ).getClass()
 				);
 		final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
 		return arrayJavaType.resolveType(
@@ -46,7 +46,7 @@ public static BasicType<?> resolveListType(DomainType<?> elementType, TypeConfig
 		@SuppressWarnings("unchecked") final BasicPluralJavaType<Object> arrayJavaType = (BasicPluralJavaType<Object>) typeConfiguration.getJavaTypeRegistry()
 				.getDescriptor( List.class )
 				.createJavaType(
-						new ParameterizedTypeImpl( List.class, new Type[]{ elementType.getBindableJavaType() }, null ),
+						new ParameterizedTypeImpl( List.class, new Type[]{ elementType.getJavaType() }, null ),
 						typeConfiguration
 				);
 		final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
@@ -81,7 +81,7 @@ public BasicValuedMapping resolveFunctionReturnType(
 
 	@AllowReflection
 	public static <T> BasicType<?> resolveJsonArrayType(DomainType<T> elementType, TypeConfiguration typeConfiguration) {
-		final Class<?> arrayClass = Array.newInstance( elementType.getBindableJavaType(), 0 ).getClass();
+		final Class<?> arrayClass = Array.newInstance( elementType.getJavaType(), 0 ).getClass();
 		@SuppressWarnings("unchecked")
 		final BasicPluralJavaType<T> arrayJavaType =
 				(BasicPluralJavaType<T>)
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java
@@ -352,7 +352,7 @@ public Map<Class<?>, SubGraphImplementor<?>> getSubGraphs() {
 		}
 		else {
 			final HashMap<Class<?>, SubGraphImplementor<?>> map = new HashMap<>( valueSubgraph.getTreatedSubgraphs() );
-			map.put( attribute.getValueGraphType().getBindableJavaType(), valueSubgraph );
+			map.put( attribute.getValueGraphType().getJavaType(), valueSubgraph );
 			return map;
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java
@@ -19,4 +19,9 @@ public interface BasicDomainType<J>
 	default PersistenceType getPersistenceType() {
 		return PersistenceType.BASIC;
 	}
+
+	@Override
+	default Class<J> getJavaType() {
+		return ReturnableType.super.getJavaType();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java
@@ -5,7 +5,6 @@
 package org.hibernate.metamodel.model.domain;
 
 import org.hibernate.Internal;
-import org.hibernate.query.BindableType;
 import org.hibernate.type.descriptor.java.JavaType;
 
 /**
@@ -26,10 +25,20 @@
  *
  * @author Steve Ebersole
  */
-public interface DomainType<J> extends BindableType<J> {
+public interface DomainType<J> {
 
+	/**
+	 * The {@link JavaType} representing this domain type.
+	 */
 	JavaType<J> getExpressibleJavaType();
 
+	/**
+	 * The Java class which represents by this domain type.
+	 *
+	 * @see jakarta.persistence.metamodel.Type#getJavaType
+	 */
+	Class<J> getJavaType();
+
 	/**
 	 * The name of the type.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java
@@ -15,7 +15,9 @@
  *
  * @author Steve Ebersole
  */
-public interface IdentifiableDomainType<J> extends ManagedDomainType<J>, IdentifiableType<J> {
+public interface IdentifiableDomainType<J>
+		extends ManagedDomainType<J>, IdentifiableType<J> {
+
 	PathSource<?> getIdentifierDescriptor();
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java
@@ -10,13 +10,15 @@
 import org.hibernate.metamodel.RepresentationMode;
 
 import jakarta.persistence.metamodel.ManagedType;
+import org.hibernate.query.BindableType;
 
 /**
  * Extensions to the JPA-defined {@link ManagedType} contract.
  *
  * @author Steve Ebersole
  */
-public interface ManagedDomainType<J> extends DomainType<J>, ManagedType<J> {
+public interface ManagedDomainType<J>
+		extends DomainType<J>, ManagedType<J>, BindableType<J> {
 	/**
 	 * Get the type name.
 	 *
@@ -34,6 +36,11 @@ public interface ManagedDomainType<J> extends DomainType<J>, ManagedType<J> {
 
 	RepresentationMode getRepresentationMode();
 
+	@Override
+	default Class<J> getJavaType() {
+		return getExpressibleJavaType().getJavaTypeClass();
+	}
+
 	/**
 	 * The descriptor of the supertype of this type.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java
@@ -4,14 +4,22 @@
  */
 package org.hibernate.metamodel.model.domain;
 
+import org.hibernate.query.BindableType;
+
 /**
  * Describes any non-collection type
  *
  * @author Steve Ebersole
  */
-public interface SimpleDomainType<J> extends DomainType<J>, jakarta.persistence.metamodel.Type<J> {
+public interface SimpleDomainType<J>
+		extends DomainType<J>, BindableType<J>, jakarta.persistence.metamodel.Type<J> {
 	@Override
 	default Class<J> getBindableJavaType() {
 		return getJavaType();
 	}
+
+	@Override
+	default Class<J> getJavaType() {
+		return getExpressibleJavaType().getJavaTypeClass();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDomainType.java
@@ -21,14 +21,4 @@ public AbstractDomainType(JavaType<J> javaType) {
 	public JavaType<J> getExpressibleJavaType() {
 		return javaType;
 	}
-
-	@Override
-	public Class<J> getJavaType() {
-		return getExpressibleJavaType().getJavaTypeClass();
-	}
-
-	@Override
-	public Class<J> getBindableJavaType() {
-		return getJavaType();
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractManagedType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractManagedType.java
@@ -93,6 +93,16 @@ public JpaMetamodelImplementor getMetamodel() {
 		return metamodel;
 	}
 
+	@Override
+	public Class<J> getJavaType() {
+		return super.getJavaType();
+	}
+
+	@Override
+	public Class<J> getBindableJavaType() {
+		return super.getBindableJavaType();
+	}
+
 	@Override
 	public ManagedDomainType<? super J> getSuperType() {
 		return supertype;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java
@@ -103,7 +103,7 @@ public SqmDomainType<J> getPathType() {
 	}
 
 	@Override
-	public DomainType<J> getValueGraphType() {
+	public SqmDomainType<J> getValueGraphType() {
 		return getPathType();
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java
@@ -11,7 +11,6 @@
 import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.EmbeddableDomainType;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
-import org.hibernate.query.BindableType;
 import org.hibernate.query.sqm.tuple.TupleType;
 import org.hibernate.metamodel.model.domain.internal.EntityDiscriminatorSqmPathSource;
 import org.hibernate.persister.entity.EntityPersister;
@@ -285,7 +284,7 @@ private static boolean areEntityTypesComparable(
 	}
 
 	private static boolean isDiscriminatorTypeComparable(
-			EntityDiscriminatorSqmPathSource<?> lhsDiscriminator, BindableType<?> rhsType,
+			EntityDiscriminatorSqmPathSource<?> lhsDiscriminator, DomainType<?> rhsType,
 			BindingContext bindingContext) {
 		final String entityName = lhsDiscriminator.getEntityDomainType().getHibernateEntityName();
 		final EntityPersister lhsEntity = bindingContext.getMappingMetamodel().getEntityDescriptor( entityName );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
@@ -5,7 +5,6 @@
 package org.hibernate.query.sqm.tree.domain;
 
 import org.hibernate.metamodel.mapping.CollectionPart;
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.spi.QueryEngine;
@@ -124,7 +123,7 @@ public SqmPath<?> resolveIndexedAccess(
 	}
 
 	private SelfRenderingSqmFunction<?> getIndexFunction(
-			SqmExpression<?> selector, DomainType<T> sqmPathType, QueryEngine queryEngine) {
+			SqmExpression<?> selector, SqmDomainType<T> sqmPathType, QueryEngine queryEngine) {
 		final SqmFunctionRegistry registry = queryEngine.getSqmFunctionRegistry();
 		if ( sqmPathType instanceof BasicPluralType<?, ?> ) {
 			return registry.findFunctionDescriptor( "array_get" )
@@ -147,7 +146,7 @@ else if ( getJavaTypeClass( sqmPathType ) == String.class ) {
 		}
 	}
 
-	private Class<?> getJavaTypeClass(DomainType<T> sqmPathType) {
+	private Class<?> getJavaTypeClass(SqmDomainType<T> sqmPathType) {
 		return sqmPathType.resolveExpressible( nodeBuilder() )
 				.getRelationalJavaType()
 				.getJavaTypeClass();
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDomainType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDomainType.java
@@ -5,9 +5,11 @@
 package org.hibernate.query.sqm.tree.domain;
 
 import org.hibernate.metamodel.model.domain.DomainType;
+import org.hibernate.query.BindableType;
 import org.hibernate.query.sqm.SqmExpressible;
 
-public interface SqmDomainType<T> extends DomainType<T>, SqmExpressible<T> {
+public interface SqmDomainType<T>
+		extends DomainType<T>, SqmExpressible<T>, BindableType<T> {
 	@Override
 	SqmDomainType<T> getSqmType();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java
@@ -25,7 +25,8 @@
  *
  * @author Steve Ebersole
  */
-public interface BasicType<T> extends Type, BasicDomainType<T>, MappingType, BasicValuedMapping, JdbcMapping, SqmDomainType<T> {
+public interface BasicType<T>
+		extends Type, BasicDomainType<T>, MappingType, BasicValuedMapping, JdbcMapping, SqmDomainType<T> {
 	/**
 	 * Get the names under which this type should be registered in the type registry.
 	 *

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ public Map<Class<?>, SubGraphImplementor<?>> getSubGraphs() {`
`352`	`352`	`}`
`353`	`353`	`else {`
`354`	`354`	`final HashMap<Class<?>, SubGraphImplementor<?>> map = new HashMap<>( valueSubgraph.getTreatedSubgraphs() );`
`355`		`- map.put( attribute.getValueGraphType().getBindableJavaType(), valueSubgraph );`
	`355`	`+ map.put( attribute.getValueGraphType().getJavaType(), valueSubgraph );`
`356`	`356`	`return map;`
`357`	`357`	`}`
`358`	`358`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,9 @@ public interface BasicDomainType<J>`
`19`	`19`	`default PersistenceType getPersistenceType() {`
`20`	`20`	`return PersistenceType.BASIC;`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+ @Override`
	`24`	`+ default Class<J> getJavaType() {`
	`25`	`+ return ReturnableType.super.getJavaType();`
	`26`	`+ }`
`22`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public SqmDomainType<J> getPathType() {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Override`
`106`		`- public DomainType<J> getValueGraphType() {`
	`106`	`+ public SqmDomainType<J> getValueGraphType() {`
`107`	`107`	`return getPathType();`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Steve Ebersole`
`27`	`27`	`*/`
`28`		`-public interface BasicType<T> extends Type, BasicDomainType<T>, MappingType, BasicValuedMapping, JdbcMapping, SqmDomainType<T> {`
	`28`	`+public interface BasicType<T>`
	`29`	`+ extends Type, BasicDomainType<T>, MappingType, BasicValuedMapping, JdbcMapping, SqmDomainType<T> {`
`29`	`30`	`/**`
`30`	`31`	`* Get the names under which this type should be registered in the type registry.`
`31`	`32`	`*`