HHH-18274 Properly resolving Java type in binary and unary expressions

Author: cigaly

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

@@ -443,8 +443,8 @@ public static void assertAssignable(
 	}
 
 	public static void assertOperable(SqmExpression<?> left, SqmExpression<?> right, BinaryArithmeticOperator op) {
-		final SqmExpressible<?> leftNodeType = left.getNodeType();
-		final SqmExpressible<?> rightNodeType = right.getNodeType();
+		final SqmExpressible<?> leftNodeType = left.getExpressible();
+		final SqmExpressible<?> rightNodeType = right.getExpressible();
 		if ( leftNodeType != null && rightNodeType != null ) {
 			final Class<?> leftJavaType = leftNodeType.getRelationalJavaType().getJavaTypeClass();
 			final Class<?> rightJavaType = rightNodeType.getRelationalJavaType().getJavaTypeClass();
@@ -579,7 +579,7 @@ public static void assertDuration(SqmExpression<?> expression) {
 	}
 
 	public static void assertNumeric(SqmExpression<?> expression, UnaryArithmeticOperator op) {
-		final SqmExpressible<?> nodeType = expression.getNodeType();
+		final SqmExpressible<?> nodeType = expression.getExpressible();
 		if ( nodeType != null ) {
 			final DomainType<?> domainType = nodeType.getSqmType();
 			if ( !( domainType instanceof JdbcMapping ) || !( (JdbcMapping) domainType ).getJdbcType().isNumber() ) {

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java

@@ -14,8 +14,6 @@
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import static org.hibernate.query.sqm.BinaryArithmeticOperator.ADD;
 import static org.hibernate.query.sqm.BinaryArithmeticOperator.SUBTRACT;
 import static org.hibernate.type.spi.TypeConfiguration.isDuration;
@@ -37,8 +35,8 @@ public SqmBinaryArithmetic(
 		//noinspection unchecked
 		super(
 				(SqmExpressible<T>) domainModel.getTypeConfiguration().resolveArithmeticType(
-						lhsOperand.getNodeType(),
-						rhsOperand.getNodeType(),
+						lhsOperand.getExpressible(),
+						rhsOperand.getExpressible(),
 						operator
 				),
 				nodeBuilder
@@ -52,8 +50,8 @@ public SqmBinaryArithmetic(
 				( operator == ADD || operator == SUBTRACT ) ) {
 			return;
 		}
-		this.lhsOperand.applyInferableType( rhsOperand.getNodeType() );
-		this.rhsOperand.applyInferableType( lhsOperand.getNodeType() );
+		this.lhsOperand.applyInferableType( rhsOperand.getExpressible() );
+		this.rhsOperand.applyInferableType( lhsOperand.getExpressible() );
 	}
 
 	public SqmBinaryArithmetic(

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java

@@ -25,7 +25,7 @@ public SqmUnaryOperation(UnaryArithmeticOperator operation, SqmExpression<T> ope
 				operation,
 				operand,
 				operand.nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType(
-						operand.getNodeType().getRelationalJavaType().getJavaType()
+						operand.getExpressible().getRelationalJavaType().getJavaType()
 				)
 		);
 	}