HHH-19291 Expressions.nullExpresion() in querydsl result in NPE in SqmExpressible with named parameters

Author: dreab8

hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java

@@ -753,22 +753,26 @@ public CommonQueryContract setParameter(String name, Object value) {
 		}
 
 		final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( name );
-		final QueryParameter<Object> param = binding.getQueryParameter();
-		if ( param.allowsMultiValuedBinding() ) {
-			final BindableType<?> hibernateType = param.getHibernateType();
-			if ( hibernateType == null || isInstance( hibernateType, value ) ) {
-				if ( value instanceof Collection && !isRegisteredAsBasicType( value.getClass() ) ) {
-					//noinspection rawtypes
-					return setParameterList( name, (Collection) value );
-				}
-			}
+		if ( multipleBinding( binding.getQueryParameter(), value )
+			&& value instanceof Collection<?> collectionValue
+			&& !isRegisteredAsBasicType( value.getClass() ) ) {
+			return setParameterList( name, collectionValue );
 		}
 
 		binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 
 		return this;
 	}
 
+	private boolean multipleBinding(QueryParameter<Object> param, Object value){
+		if ( param.allowsMultiValuedBinding() ) {
+			final BindableType<?> hibernateType = param.getHibernateType();
+			if ( hibernateType == null || hibernateType instanceof NullSqmExpressible || isInstance( hibernateType, value ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
 
 	private boolean isInstance(BindableType<?> parameterType, Object value) {
 		final SqmExpressible<?> sqmExpressible =
@@ -842,15 +846,10 @@ public CommonQueryContract setParameter(int position, Object value) {
 		}
 
 		final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( position );
-		final QueryParameter<Object> param = binding.getQueryParameter();
-		if ( param.allowsMultiValuedBinding() ) {
-			final BindableType<?> hibernateType = param.getHibernateType();
-			if ( hibernateType == null || hibernateType instanceof NullSqmExpressible || isInstance( hibernateType, value ) ) {
-				if ( value instanceof Collection && !isRegisteredAsBasicType( value.getClass() ) ) {
-					//noinspection rawtypes
-					return setParameterList( position, (Collection) value );
-				}
-			}
+		if ( multipleBinding( binding.getQueryParameter(), value )
+			&& value instanceof Collection<?> collectionValue
+			&& !isRegisteredAsBasicType( value.getClass() ) ) {
+			return setParameterList( position, collectionValue );
 		}
 
 		binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );