HHH-17355 Support binding single element value for basic plural parameter types

beikov · beikov · commit 6bbf58973e7f · 2023-11-07T18:55:31.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
@@ -24,6 +24,7 @@
 import org.hibernate.loader.ast.spi.MultiNaturalIdLoader;
 import org.hibernate.loader.ast.spi.NaturalIdLoader;
 import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingType;
@@ -43,7 +44,8 @@
 /**
  * Single-attribute NaturalIdMapping implementation
  */
-public class SimpleNaturalIdMapping extends AbstractNaturalIdMapping implements JavaType.CoercionContext {
+public class SimpleNaturalIdMapping extends AbstractNaturalIdMapping implements JavaType.CoercionContext,
+		BasicValuedMapping {
 	private final SingularAttributeMapping attribute;
 	private final SessionFactoryImplementor sessionFactory;
 	private final TypeConfiguration typeConfiguration;
@@ -241,6 +243,11 @@ public JdbcMapping getSingleJdbcMapping() {
 		return attribute.getSingleJdbcMapping();
 	}
 
+	@Override
+	public JdbcMapping getJdbcMapping() {
+		return attribute.getSingleJdbcMapping();
+	}
+
 	@Override
 	public int forEachJdbcType(int offset, IndexedConsumer<JdbcMapping> action) {
 		return attribute.forEachJdbcType( offset, action );
@@ -317,4 +324,9 @@ public AttributeMapping asAttributeMapping() {
 	public boolean hasPartitionedSelectionMapping() {
 		return attribute.hasPartitionedSelectionMapping();
 	}
+
+	@Override
+	public MappingType getMappedType() {
+		return attribute.getMappedType();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
@@ -14,7 +14,6 @@
 import org.hibernate.query.BindableType;
 import org.hibernate.query.QueryArgumentException;
 import org.hibernate.query.sqm.SqmExpressible;
-import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 
 import jakarta.persistence.TemporalType;
@@ -142,13 +141,6 @@ else if ( temporalType != null ) {
 
 			return parameterDeclarationIsTemporal && bindIsTemporal;
 		}
-		// Allow binding a single element for a basic plural parameter type
-		else if ( expectedJavaType instanceof BasicPluralJavaType<?> ) {
-			final JavaType<?> elementJavaType = ( (BasicPluralJavaType<?>) expectedJavaType ).getElementJavaType();
-			if ( elementJavaType.isInstance( value ) ) {
-				return true;
-			}
-		}
 
 		return false;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java
@@ -9,9 +9,11 @@
 import org.hibernate.cache.MutableCacheKeyBuilder;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.IndexedConsumer;
+import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.DiscriminatorType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
+import org.hibernate.metamodel.mapping.MappingType;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.Queryable;
 import org.hibernate.query.sqm.sql.internal.DomainResultProducer;
@@ -27,7 +29,7 @@
  * @author Steve Ebersole
  */
 public class EntityTypeLiteral
-		implements Expression, MappingModelExpressible<Object>, DomainResultProducer<Object>, JavaTypedExpressible<Object> {
+		implements Expression, DomainResultProducer<Object>, BasicValuedMapping {
 	private final EntityPersister entityTypeDescriptor;
 	private final DiscriminatorType<?> discriminatorType;
 
@@ -41,13 +43,23 @@ public EntityPersister getEntityTypeDescriptor() {
 	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// MappingModelExpressible
+	// BasicValuedMapping
 
 	@Override
 	public MappingModelExpressible getExpressionType() {
 		return this;
 	}
 
+	@Override
+	public JdbcMapping getJdbcMapping() {
+		return discriminatorType;
+	}
+
+	@Override
+	public MappingType getMappedType() {
+		return discriminatorType;
+	}
+
 	@Override
 	public int getJdbcTypeCount() {
 		return discriminatorType.getJdbcTypeCount();
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java
@@ -13,8 +13,10 @@
 import org.hibernate.cache.MutableCacheKeyBuilder;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.IndexedConsumer;
+import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
+import org.hibernate.metamodel.mapping.MappingType;
 import org.hibernate.metamodel.mapping.SqlExpressible;
 import org.hibernate.metamodel.model.domain.internal.BasicTypeImpl;
 import org.hibernate.query.BindableType;
@@ -38,7 +40,7 @@
  * @author Steve Ebersole
  */
 public abstract class AbstractJdbcParameter
-		implements JdbcParameter, JdbcParameterBinder, MappingModelExpressible, SqlExpressible {
+		implements JdbcParameter, JdbcParameterBinder, MappingModelExpressible, SqlExpressible, BasicValuedMapping {
 
 	private final JdbcMapping jdbcMapping;
 
@@ -56,6 +58,11 @@ public JdbcMapping getJdbcMapping() {
 		return jdbcMapping;
 	}
 
+	@Override
+	public MappingType getMappedType() {
+		return jdbcMapping;
+	}
+
 	@Override
 	public void accept(SqlAstWalker sqlTreeWalker) {
 		sqlTreeWalker.visitParameter( this );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java
@@ -11,6 +11,7 @@
 import java.util.function.BiConsumer;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.Bindable;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.query.internal.BindingTypeHelper;
@@ -74,8 +75,15 @@ default int registerParametersForEachJdbcValue(
 			Bindable bindable,
 			JdbcParametersList jdbcParameters,
 			SharedSessionContractImplementor session) {
+		final Object valueToBind;
+		if ( bindable instanceof BasicValuedMapping ) {
+			valueToBind = ( (BasicValuedMapping) bindable ).getJdbcMapping().getMappedJavaType().wrap( value, session );
+		}
+		else {
+			valueToBind = value;
+		}
 		return bindable.forEachJdbcValue(
-				value,
+				valueToBind,
 				offset,
 				jdbcParameters,
 				session.getFactory().getTypeConfiguration(),
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
@@ -6,10 +6,8 @@
  */
 package org.hibernate.type;
 
-import java.lang.reflect.Array;
 import java.util.Objects;
 
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
@@ -56,20 +54,6 @@ public <X> BasicType<X> resolveIndicatedType(JdbcTypeIndicators indicators, Java
 		return (BasicType<X>) this;
 	}
 
-	@Override
-	public Object disassemble(Object value, SharedSessionContractImplementor session) {
-		if ( value == null ) {
-			return null;
-		}
-		if ( baseDescriptor.isInstance( (E) value ) ) {
-			// Support binding a single element as parameter value
-			final Object array = Array.newInstance( baseDescriptor.getJavaType(), 1 );
-			Array.set( array, 0, value );
-			return array;
-		}
-		return value;
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		return o == this || o.getClass() == BasicArrayType.class
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java
@@ -6,11 +6,9 @@
  */
 package org.hibernate.type;
 
-import java.lang.reflect.Array;
 import java.util.Collection;
 import java.util.Objects;
 
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.spi.BasicCollectionJavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
@@ -77,21 +75,6 @@ public <X> BasicType<X> resolveIndicatedType(JdbcTypeIndicators indicators, Java
 		return (BasicType<X>) this;
 	}
 
-	@Override
-	public Object disassemble(Object value, SharedSessionContractImplementor session) {
-		if ( value == null ) {
-			return null;
-		}
-		if ( baseDescriptor.isInstance( (E) value ) ) {
-			// Support binding a single element as parameter value
-			final BasicCollectionJavaType<C, E> javaType = (BasicCollectionJavaType<C, E>) getJavaTypeDescriptor();
-			final C collection = javaType.getSemantics().instantiateRaw( 1, null );
-			collection.add( (E) value );
-			return collection;
-		}
-		return value;
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		return o == this || o.getClass() == BasicCollectionType.class
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java
@@ -6,10 +6,8 @@
  */
 package org.hibernate.type;
 
-import java.lang.reflect.Array;
 import java.util.Objects;
 
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
@@ -78,20 +76,6 @@ public <X> BasicType<X> resolveIndicatedType(JdbcTypeIndicators indicators, Java
 		return (BasicType<X>) this;
 	}
 
-	@Override
-	public Object disassemble(Object value, SharedSessionContractImplementor session) {
-		if ( value == null ) {
-			return null;
-		}
-		if ( baseDescriptor.isInstance( (E) value ) ) {
-			// Support binding a single element as parameter value
-			final Object array = Array.newInstance( baseDescriptor.getJavaType(), 1 );
-			Array.set( array, 0, value );
-			return array;
-		}
-		return value;
-	}
-
 	@Override
 	public BasicValueConverter<T, ?> getValueConverter() {
 		return converter;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java
@@ -320,6 +320,14 @@ else if ( value instanceof BinaryStream ) {
 			// When the value is a BinaryStream, this is a deserialization request
 			return fromBytes( ( (BinaryStream) value ).getBytes() );
 		}
+		else if ( getElementJavaType().isInstance( value ) ) {
+			// Support binding a single element as parameter value
+			//noinspection unchecked
+			final T[] wrapped = (T[]) java.lang.reflect.Array.newInstance( getElementJavaType().getJavaTypeClass(), 1 );
+			//noinspection unchecked
+			wrapped[0] = (T) value;
+			return wrapped;
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java
@@ -168,6 +168,10 @@ else if ( value.getClass().isArray() ) {
 			}
 			return wrapped;
 		}
+		else if ( value instanceof Boolean ) {
+			// Support binding a single element as parameter value
+			return new boolean[]{ (boolean) value };
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java
@@ -168,6 +168,10 @@ else if ( value.getClass().isArray() ) {
 			}
 			return wrapped;
 		}
+		else if ( value instanceof Double ) {
+			// Support binding a single element as parameter value
+			return new double[]{ (double) value };
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java
@@ -168,6 +168,10 @@ else if ( value.getClass().isArray() ) {
 			}
 			return wrapped;
 		}
+		else if ( value instanceof Float ) {
+			// Support binding a single element as parameter value
+			return new float[]{ (float) value };
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java
@@ -168,6 +168,10 @@ else if ( value.getClass().isArray() ) {
 			}
 			return wrapped;
 		}
+		else if ( value instanceof Integer ) {
+			// Support binding a single element as parameter value
+			return new int[]{ (int) value };
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java
@@ -168,6 +168,10 @@ else if ( value.getClass().isArray() ) {
 			}
 			return wrapped;
 		}
+		else if ( value instanceof Long ) {
+			// Support binding a single element as parameter value
+			return new long[]{ (long) value };
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java
@@ -136,6 +136,10 @@ public <X> byte[] wrap(X value, WrapperOptions options) {
 				throw new HibernateException( "Unable to access lob stream", e );
 			}
 		}
+		else if ( value instanceof Byte ) {
+			// Support binding a single element as parameter value
+			return new byte[]{ (byte) value };
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java
@@ -90,6 +90,10 @@ public <X> char[] wrap(X value, WrapperOptions options) {
 		if (value instanceof Reader) {
 			return DataHelper.extractString( ( (Reader) value ) ).toCharArray();
 		}
+		else if ( value instanceof Character ) {
+			// Support binding a single element as parameter value
+			return new char[]{ (char) value };
+		}
 		throw unknownWrap( value.getClass() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java
@@ -168,6 +168,10 @@ else if ( value.getClass().isArray() ) {
 			}
 			return wrapped;
 		}
+		else if ( value instanceof Short ) {
+			// Support binding a single element as parameter value
+			return new short[]{ (short) value };
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java
@@ -463,6 +463,13 @@ else if ( value.getClass().isArray() ) {
 			}
 			return wrapped;
 		}
+		else if ( getElementJavaType().isInstance( value ) ) {
+			// Support binding a single element as parameter value
+			final C wrapped = semantics.instantiateRaw( 1, null );
+			//noinspection unchecked
+			wrapped.add( (E) value );
+			return wrapped;
+		}
 
 		throw unknownWrap( value.getClass() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java
@@ -70,8 +70,10 @@ public void testEmpty(SessionFactoryScope scope) {
 	@Test
 	public void testNonExisting(SessionFactoryScope scope) {
 		scope.inSession( em -> {
+			//tag::hql-array-example[]
 			List<EntityWithArrays> results = em.createQuery( "from EntityWithArrays e where e.theArray = array('abc')", EntityWithArrays.class )
 					.getResultList();
+			//end::hql-array-example[]
 			assertEquals( 0, results.size() );
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java

Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,14 @@ else if ( value instanceof BinaryStream ) {`
`320`	`320`	`// When the value is a BinaryStream, this is a deserialization request`
`321`	`321`	`return fromBytes( ( (BinaryStream) value ).getBytes() );`
`322`	`322`	`}`
	`323`	`+ else if ( getElementJavaType().isInstance( value ) ) {`
	`324`	`+ // Support binding a single element as parameter value`
	`325`	`+ //noinspection unchecked`
	`326`	`+ final T[] wrapped = (T[]) java.lang.reflect.Array.newInstance( getElementJavaType().getJavaTypeClass(), 1 );`
	`327`	`+ //noinspection unchecked`
	`328`	`+ wrapped[0] = (T) value;`
	`329`	`+ return wrapped;`
	`330`	`+ }`
`323`	`331`
`324`	`332`	`throw unknownWrap( value.getClass() );`
`325`	`333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,10 @@ else if ( value.getClass().isArray() ) {`
`168`	`168`	`}`
`169`	`169`	`return wrapped;`
`170`	`170`	`}`
	`171`	`+ else if ( value instanceof Boolean ) {`
	`172`	`+ // Support binding a single element as parameter value`
	`173`	`+ return new boolean[]{ (boolean) value };`
	`174`	`+ }`
`171`	`175`
`172`	`176`	`throw unknownWrap( value.getClass() );`
`173`	`177`	`}`