HHH-19449 simplify solution to HHH-17405

seems we can just use getExpressible() which already calls getResolvedModel()

Author: gavinking

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

@@ -17,6 +17,7 @@
 import org.hibernate.metamodel.model.domain.SimpleDomainType;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.sqm.NodeBuilder;
+import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.hql.spi.SqmCreationState;
 import org.hibernate.query.sqm.internal.SqmMappingModelHelper;
@@ -138,6 +139,11 @@ public SqmPathSource<J> getSqmPathSource() {
 		return sqmPathSource;
 	}
 
+	@Override
+	public SqmExpressible<J> getExpressible() {
+		return sqmPathSource;
+	}
+
 	@Override
 	public boolean isGeneric() {
 		return sqmPathSource.isGeneric();

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java

@@ -106,7 +106,6 @@
 import org.hibernate.query.sqm.tree.domain.SqmPluralValuedSimplePath;
 import org.hibernate.query.sqm.tree.domain.SqmSetJoin;
 import org.hibernate.query.sqm.tree.domain.SqmSingularJoin;
-import org.hibernate.query.sqm.tree.domain.SqmSingularPersistentAttribute;
 import org.hibernate.query.sqm.tree.domain.SqmTreatedRoot;
 import org.hibernate.query.sqm.tree.domain.SqmTreatedSingularJoin;
 import org.hibernate.query.sqm.tree.expression.*;
@@ -2095,7 +2094,11 @@ public <T> SqmExpression<T> value(T value, SqmExpression<? extends T> typeInfere
 			//noinspection unchecked
 			return (SqmExpression<T>) value;
 		}
-		return inlineValue( value ) ? literal( value, typeInferenceSource ) : valueParameter( value, typeInferenceSource );
+		else {
+			return inlineValue( value )
+					? literal( value, typeInferenceSource )
+					: valueParameter( value, typeInferenceSource );
+		}
 	}
 
 	private <E> SqmExpression<? extends Collection<?>> collectionValue(Collection<E> value, SqmExpression<E> typeInferenceSource) {
@@ -2120,7 +2123,7 @@ else if ( value instanceof SqmExpression<?> ) {
 		}
 	}
 
-	private <T> boolean isInstance(BindableType<T> bindableType, T value) {
+	private <T> boolean isInstance(BindableType<? extends T> bindableType, T value) {
 		if ( bindableType instanceof SqmExpressible<?> expressible ) {
 			return expressible.getExpressibleJavaType().isInstance( value );
 		}
@@ -2130,50 +2133,49 @@ private <T> boolean isInstance(BindableType<T> bindableType, T value) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
-	private static <T> BindableType<T> resolveInferredParameterType(
-			T value,
-			SqmExpression<? extends T> typeInferenceSource,
+	private static <X, T extends X> BindableType<? extends X> resolveInferredParameterType(
+			X value,
+			SqmExpression<T> typeInferenceSource,
 			TypeConfiguration typeConfiguration) {
 
 		if ( typeInferenceSource != null ) {
 			if ( typeInferenceSource instanceof BindableType ) {
+				//noinspection unchecked
 				return (BindableType<T>) typeInferenceSource;
 			}
-			final SqmExpressible<?> nodeType = getNodeType( typeInferenceSource );
+			final SqmExpressible<T> nodeType = typeInferenceSource.getExpressible();
 			if ( nodeType != null ) {
-				return (BindableType<T>) nodeType;
+				return nodeType;
 			}
 		}
 
-		return value == null ? null : (BasicType<T>) typeConfiguration.getBasicTypeForJavaType( value.getClass() );
-	}
-
-	private static SqmExpressible<?> getNodeType(SqmExpression<?> expression) {
-		if ( expression instanceof SqmPath<?> sqmPath ) {
-			return sqmPath.getResolvedModel() instanceof SqmSingularPersistentAttribute<?,?> attribute
-					? attribute.getSqmPathSource()
-					: sqmPath.getResolvedModel();
-//					: sqmPath.getExpressible();
+		if ( value == null ) {
+			return null;
 		}
 		else {
-			return expression.getNodeType();
+			@SuppressWarnings("unchecked") // this is completely safe
+			final Class<? extends X> valueClass = (Class<? extends X>) value.getClass();
+			return typeConfiguration.getBasicTypeForJavaType( valueClass );
 		}
 	}
 
 	private <T> ValueBindJpaCriteriaParameter<T> valueParameter(T value, SqmExpression<? extends T> typeInferenceSource) {
-		final BindableType<T> bindableType =
-				resolveInferredParameterType( value, typeInferenceSource, getTypeConfiguration() );
+		final var bindableType = resolveInferredParameterType( value, typeInferenceSource, getTypeConfiguration() );
 		if ( bindableType == null || isInstance( bindableType, value) ) {
-			return new ValueBindJpaCriteriaParameter<>( bindableType, value, this );
+			@SuppressWarnings("unchecked") // safe, we just checked
+			final var widerType = (BindableType<? super T>) bindableType;
+			return new ValueBindJpaCriteriaParameter<>( widerType, value, this );
 		}
 		final T coercedValue =
 				resolveExpressible( bindableType ).getExpressibleJavaType()
-						.coerce(value, this::getTypeConfiguration );
-		return isInstance( bindableType, coercedValue )
-				? new ValueBindJpaCriteriaParameter<>( bindableType, coercedValue, this )
-				// ignore typeInferenceSource and fall back the value type
-				: new ValueBindJpaCriteriaParameter<>( getParameterBindType( value ), value, this );
+						.coerce( value, this::getTypeConfiguration );
+		// ignore typeInferenceSource and fall back the value type
+		if ( isInstance( bindableType, coercedValue ) ) {
+			@SuppressWarnings("unchecked") // safe, we just checked
+			final var widerType = (BindableType<? super T>) bindableType;
+			return new ValueBindJpaCriteriaParameter<>( widerType, coercedValue, this );
+		}
+		return new ValueBindJpaCriteriaParameter<>( getParameterBindType( value ), value, this );
 	}
 
 	private <E> ValueBindJpaCriteriaParameter<? extends Collection<E>> collectionValueParameter(Collection<E> value, SqmExpression<E> elementTypeInferenceSource) {

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java

@@ -170,6 +170,4 @@ default <Y> SqmPath<Y> get(String attributeName, boolean includeSubtypes) {
 
 	@Override
 	SqmPath<T> copy(SqmCopyContext context);
-
-
 }