type inference in the SQM tree + change coerce() signature

- fixed the unsoundness of the coerce() method
- fixed a method which depended on an unchecked cast

Author: gavinking

hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java

@@ -67,7 +67,7 @@ public static Object staticCreateEntityKey(Object id, EntityPersister persister,
 
 	private static Object getCoercedId(Object id, SessionFactoryImplementor factory, Type keyType) {
 		return keyType instanceof BasicType<?> basicType
-				? basicType.getJavaTypeDescriptor().coerce( id, factory::getTypeConfiguration )
+				? basicType.getJavaTypeDescriptor().coerce( id )
 				: id;
 	}
 

hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java

@@ -229,7 +229,7 @@ public boolean containsEntity(String entityName, Object identifier) {
 		if ( cacheAccess != null ) {
 			final Object idValue =
 					persister.getIdentifierMapping().getJavaType()
-							.coerce( identifier, sessionFactory::getTypeConfiguration );
+							.coerce( identifier );
 			final Object key = cacheAccess.generateCacheKey(
 					idValue,
 					persister.getRootEntityDescriptor().getEntityPersister(),

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java

@@ -161,7 +161,7 @@ private List<T> orderedMultiLoad(
 	}
 
 	private Object coerce(SharedSessionContractImplementor session, JavaType<?> idType, Object id) {
-		return idCoercionEnabled ? idType.coerce( id, session ) : id;
+		return idCoercionEnabled ? idType.coerce( id ) : id;
 	}
 
 	private static LockOptions lockOptions(MultiIdLoadOptions loadOptions) {

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java

@@ -188,7 +188,7 @@ public static <K> K[] normalizeKeys(
 		}
 		else {
 			for ( int i = 0; i < keys.length; i++ ) {
-				typedArray[i] = keyJavaType.coerce( keys[i], session );
+				typedArray[i] = keyJavaType.cast( keyJavaType.coerce( keys[i] ) );
 			}
 		}
 		return typedArray;

hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java

@@ -26,8 +26,6 @@
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
@@ -37,7 +35,7 @@
  * @author Steve Ebersole
  */
 // Hibernate Reactive extends this class: see ReactiveIdentifierLoadAccessImpl
-public class IdentifierLoadAccessImpl<T> implements IdentifierLoadAccess<T>, JavaType.CoercionContext {
+public class IdentifierLoadAccessImpl<T> implements IdentifierLoadAccess<T> {
 	private final LoadAccessContext context;
 	private final EntityPersister entityPersister;
 
@@ -199,7 +197,7 @@ protected Object coerceId(Object id, SessionFactoryImplementor factory) {
 				final var identifierMapping = entityPersister.getIdentifierMapping();
 				return identifierMapping.isVirtual()
 						? id // special case for a class with an @IdClass
-						: identifierMapping.getJavaType().coerce( id, this );
+						: identifierMapping.getJavaType().coerce( id );
 			}
 			catch ( Exception e ) {
 				throw new IllegalArgumentException( "Argument '" + id
@@ -233,11 +231,6 @@ private static boolean isLoadByIdComplianceEnabled(SessionFactoryImplementor fac
 		return factory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();
 	}
 
-	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return context.getSession().getSessionFactory().getTypeConfiguration();
-	}
-
 	@Override
 	public IdentifierLoadAccess<T> enableFetchProfile(String profileName) {
 		if ( !context.getSession().getFactory().containsFetchProfileDefinition( profileName ) ) {

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

@@ -42,10 +42,9 @@
  * Single-attribute NaturalIdMapping implementation
  */
 public class SimpleNaturalIdMapping extends AbstractNaturalIdMapping
-		implements JavaType.CoercionContext, BasicValuedMapping {
+		implements BasicValuedMapping {
 	private final SingularAttributeMapping attribute;
 	private final SessionFactoryImplementor sessionFactory;
-	private final TypeConfiguration typeConfiguration;
 
 	public SimpleNaturalIdMapping(
 			SingularAttributeMapping attribute,
@@ -54,7 +53,6 @@ public SimpleNaturalIdMapping(
 		super( declaringType, attribute.getAttributeMetadata().isUpdatable() );
 		this.attribute = attribute;
 		this.sessionFactory = creationProcess.getCreationContext().getSessionFactory();
-		this.typeConfiguration = creationProcess.getCreationContext().getTypeConfiguration();
 	}
 
 	public SingularAttributeMapping getAttribute() {
@@ -143,7 +141,7 @@ public Object normalizeInput(Object incoming) {
 		final Object normalizedValue = normalizedValue( incoming );
 		return isLoadByIdComplianceEnabled()
 				? normalizedValue
-				: getJavaType().coerce( normalizedValue, this );
+				: getJavaType().coerce( normalizedValue );
 	}
 
 	private Object normalizedValue(Object incoming) {
@@ -295,11 +293,6 @@ private Dialect getDialect() {
 		return sessionFactory.getJdbcServices().getDialect();
 	}
 
-	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return typeConfiguration;
-	}
-
 	@Override
 	public AttributeMapping asAttributeMapping() {
 		return getAttribute();

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java

@@ -29,7 +29,7 @@ protected AnyDiscriminatorSqmPath(
 
 	@Override
 	public AnyDiscriminatorSqmPath<T> copy(SqmCopyContext context) {
-		final AnyDiscriminatorSqmPath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java

@@ -52,7 +52,7 @@ public EmbeddableDomainType<T> getEmbeddableDomainType() {
 
 	@Override
 	public EmbeddedDiscriminatorSqmPath<T> copy(SqmCopyContext context) {
-		final EmbeddedDiscriminatorSqmPath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java

@@ -64,7 +64,7 @@ public EntityMappingType getEntityDescriptor() {
 
 	@Override
 	public EntityDiscriminatorSqmPath copy(SqmCopyContext context) {
-		final EntityDiscriminatorSqmPath existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}

hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java

@@ -198,8 +198,7 @@ private SemanticPathPart resolvePath(String identifier, boolean isTerminal, SqmC
 			if ( pathRootByExposedNavigable != null ) {
 				// identifier is an "unqualified attribute reference"
 				validateAsRoot( pathRootByExposedNavigable );
-				final SqmPath<?> sqmPath =
-						pathRootByExposedNavigable.get( identifier, true );
+				final var sqmPath = pathRootByExposedNavigable.get( identifier, true );
 				return isTerminal ? sqmPath : new DomainPathPart( sqmPath );
 			}