first phase of strict checking of arguments to query parameters

Author: gavinking

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java

@@ -75,23 +75,21 @@ public <P> ProcedureParameterBinding<P> getQueryParameterBinding(ProcedureParame
 	}
 
 	@Override
-	public <P> ProcedureParameterBinding<P> getBinding(String name) {
+	public ProcedureParameterBinding<?> getBinding(String name) {
 		final var parameter = parameterMetadata.getQueryParameter( name );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "Parameter with name '" + name + "' does not exist" );
 		}
-		//noinspection unchecked
-		return getQueryParameterBinding( (ProcedureParameterImplementor<P>) parameter );
+		return getQueryParameterBinding( (ProcedureParameterImplementor<?>) parameter );
 	}
 
 	@Override
-	public <P> ProcedureParameterBinding<P> getBinding(int position) {
+	public ProcedureParameterBinding<?> getBinding(int position) {
 		final var parameter = parameterMetadata.getQueryParameter( position );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "Parameter at position " + position + "does not exist" );
 		}
-		//noinspection unchecked
-		return getQueryParameterBinding( (ProcedureParameterImplementor<P>) parameter );
+		return getQueryParameterBinding( (ProcedureParameterImplementor<?>) parameter );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/query/QueryArgumentTypeException.java

@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.query;
+
+/**
+ * Thrown when an argument bound to a query parameter is of an incompatible type.
+ *
+ * @since 7.2
+ *
+ * @author Gavin King
+ */
+public class QueryArgumentTypeException extends IllegalArgumentException {
+	private final Class<?> expectedType;
+	private final Class<?> actualType;
+
+	public QueryArgumentTypeException(String message, Class<?> expectedType, Class<?> actualType) {
+		super( message + " (" + actualType.getName() + " is not assignable to " + expectedType.getName() + ")" );
+		this.expectedType = expectedType;
+		this.actualType = actualType;
+	}
+
+	public Class<?> getExpectedType() {
+		return expectedType;
+	}
+
+	public Class<?> getActualType() {
+		return actualType;
+	}
+}

hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java

@@ -129,30 +129,29 @@ public <P> QueryParameterBinding<P> getBinding(QueryParameterImplementor<P> para
 					"Cannot create binding for parameter reference [" + parameter + "] - reference is not a parameter of this query"
 			);
 		}
+		//TODO: typecheck!
 		//noinspection unchecked
 		return (QueryParameterBinding<P>) binding;
 	}
 
 	@Override
-	public <P> QueryParameterBinding<P> getBinding(int position) {
+	public QueryParameterBinding<?> getBinding(int position) {
 		final var binding = parameterBindingMapByNameOrPosition.get( position );
 		if ( binding == null ) {
 			// Invoke this method to throw the exception
 			parameterMetadata.getQueryParameter( position );
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		return binding;
 	}
 
 	@Override
-	public <P> QueryParameterBinding<P> getBinding(String name) {
+	public QueryParameterBinding<?> getBinding(String name) {
 		final var binding = parameterBindingMapByNameOrPosition.get( name );
 		if ( binding == null ) {
 			// Invoke this method to throw the exception
 			parameterMetadata.getQueryParameter( name );
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		return binding;
 	}
 
 	@Override