fixed the unsoundness of the coerce() method

gavinking · gavinking · commit 211c4e0d491d · 2025-12-07T19:03:36.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java
@@ -45,7 +45,7 @@ public class DefaultCacheKeysFactory implements CacheKeysFactory {
 
 	public static Object staticCreateCollectionKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
 		final Type keyType = persister.getKeyType();
-		final var coercedId = getCoercedId( id, factory, keyType );
+		final var coercedId = getCoercedId( id, keyType );
 		final var disassembledKey = keyType.disassemble( coercedId, factory );
 		final boolean idIsArray = disassembledKey.getClass().isArray();
 		final String role = persister.getRole();
@@ -56,7 +56,7 @@ public static Object staticCreateCollectionKey(Object id, CollectionPersister pe
 
 	public static Object staticCreateEntityKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
 		final Type keyType = persister.getIdentifierType();
-		final var coercedId = getCoercedId( id, factory, keyType );
+		final var coercedId = getCoercedId( id, keyType );
 		final var disassembledKey = keyType.disassemble( coercedId, factory );
 		final boolean idIsArray = disassembledKey.getClass().isArray();
 		final String rootEntityName = persister.getRootEntityName();
@@ -65,9 +65,9 @@ public static Object staticCreateEntityKey(Object id, EntityPersister persister,
 				: new CacheKeyImplementation( coercedId, disassembledKey, keyType, rootEntityName, tenantIdentifier );
 	}
 
-	private static Object getCoercedId(Object id, SessionFactoryImplementor factory, Type keyType) {
+	private static Object getCoercedId(Object id, Type keyType) {
 		return keyType instanceof BasicType<?> basicType
-				? basicType.getJavaTypeDescriptor().coerce( id, factory::getTypeConfiguration )
+				? basicType.getJavaTypeDescriptor().coerce( id )
 				: id;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
@@ -227,11 +227,9 @@ public boolean containsEntity(String entityName, Object identifier) {
 		final var persister = getEntityDescriptor( entityName );
 		final var cacheAccess = persister.getCacheAccessStrategy();
 		if ( cacheAccess != null ) {
-			final Object idValue =
-					persister.getIdentifierMapping().getJavaType()
-							.coerce( identifier, sessionFactory::getTypeConfiguration );
 			final Object key = cacheAccess.generateCacheKey(
-					idValue,
+					persister.getIdentifierMapping().getJavaType()
+							.coerce( identifier ),
 					persister.getRootEntityDescriptor().getEntityPersister(),
 					sessionFactory,
 					null
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
@@ -130,7 +130,7 @@ private List<T> orderedMultiLoad(
 		final var lockOptions = lockOptions( loadOptions );
 
 		for ( int i = 0; i < ids.length; i++ ) {
-			final Object id = coerce( session, idType, ids[i] );
+			final Object id = coerce( idType, ids[i] );
 			final var entityKey = new EntityKey( id, getLoadable().getEntityPersister() );
 			if ( !loadFromEnabledCaches( loadOptions, session, id, lockOptions, entityKey, results, i ) ) {
 				// if we did not hit any of the continues above,
@@ -160,8 +160,8 @@ private List<T> orderedMultiLoad(
 		return (List<T>) results;
 	}
 
-	private Object coerce(SharedSessionContractImplementor session, JavaType<?> idType, Object id) {
-		return idCoercionEnabled ? idType.coerce( id, session ) : id;
+	private Object coerce(JavaType<?> idType, Object id) {
+		return idCoercionEnabled ? idType.coerce( id ) : id;
 	}
 
 	private static LockOptions lockOptions(MultiIdLoadOptions loadOptions) {
@@ -342,7 +342,7 @@ private <R> List<Object> unresolvedIds(
 		final var idType = getLoadable().getIdentifierMapping().getJavaType();
 		List<Object> unresolvedIds = null;
 		for ( int i = 0; i < ids.length; i++ ) {
-			final Object id = coerce( session, idType, ids[i] );
+			final Object id = coerce( idType, ids[i] );
 			unresolvedIds =
 					loadFromCaches(
 							loadOptions,
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
@@ -188,7 +188,7 @@ public static <K> K[] normalizeKeys(
 		}
 		else {
 			for ( int i = 0; i < keys.length; i++ ) {
-				typedArray[i] = keyJavaType.coerce( keys[i], session );
+				typedArray[i] = keyJavaType.cast( keyJavaType.coerce( keys[i] ) );
 			}
 		}
 		return typedArray;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
@@ -26,8 +26,6 @@
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
@@ -37,7 +35,7 @@
  * @author Steve Ebersole
  */
 // Hibernate Reactive extends this class: see ReactiveIdentifierLoadAccessImpl
-public class IdentifierLoadAccessImpl<T> implements IdentifierLoadAccess<T>, JavaType.CoercionContext {
+public class IdentifierLoadAccessImpl<T> implements IdentifierLoadAccess<T> {
 	private final LoadAccessContext context;
 	private final EntityPersister entityPersister;
 
@@ -199,7 +197,7 @@ protected Object coerceId(Object id, SessionFactoryImplementor factory) {
 				final var identifierMapping = entityPersister.getIdentifierMapping();
 				return identifierMapping.isVirtual()
 						? id // special case for a class with an @IdClass
-						: identifierMapping.getJavaType().coerce( id, this );
+						: identifierMapping.getJavaType().coerce( id );
 			}
 			catch ( Exception e ) {
 				throw new IllegalArgumentException( "Argument '" + id
@@ -233,11 +231,6 @@ private static boolean isLoadByIdComplianceEnabled(SessionFactoryImplementor fac
 		return factory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();
 	}
 
-	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return context.getSession().getSessionFactory().getTypeConfiguration();
-	}
-
 	@Override
 	public IdentifierLoadAccess<T> enableFetchProfile(String profileName) {
 		if ( !context.getSession().getFactory().containsFetchProfileDefinition( profileName ) ) {
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
@@ -34,18 +34,16 @@
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.supportsSqlArrayType;
 
 /**
  * Single-attribute NaturalIdMapping implementation
  */
 public class SimpleNaturalIdMapping extends AbstractNaturalIdMapping
-		implements JavaType.CoercionContext, BasicValuedMapping {
+		implements BasicValuedMapping {
 	private final SingularAttributeMapping attribute;
 	private final SessionFactoryImplementor sessionFactory;
-	private final TypeConfiguration typeConfiguration;
 
 	public SimpleNaturalIdMapping(
 			SingularAttributeMapping attribute,
@@ -54,7 +52,6 @@ public SimpleNaturalIdMapping(
 		super( declaringType, attribute.getAttributeMetadata().isUpdatable() );
 		this.attribute = attribute;
 		this.sessionFactory = creationProcess.getCreationContext().getSessionFactory();
-		this.typeConfiguration = creationProcess.getCreationContext().getTypeConfiguration();
 	}
 
 	public SingularAttributeMapping getAttribute() {
@@ -143,7 +140,7 @@ public Object normalizeInput(Object incoming) {
 		final Object normalizedValue = normalizedValue( incoming );
 		return isLoadByIdComplianceEnabled()
 				? normalizedValue
-				: getJavaType().coerce( normalizedValue, this );
+				: getJavaType().coerce( normalizedValue );
 	}
 
 	private Object normalizedValue(Object incoming) {
@@ -295,11 +292,6 @@ private Dialect getDialect() {
 		return sessionFactory.getJdbcServices().getDialect();
 	}
 
-	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return typeConfiguration;
-	}
-
 	@Override
 	public AttributeMapping asAttributeMapping() {
 		return getAttribute();
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
@@ -31,7 +31,7 @@
  *
  * @author Steve Ebersole
  */
-public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T>, JavaType.CoercionContext {
+public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T> {
 	private final QueryParameter<T> queryParameter;
 	private final SessionFactoryImplementor sessionFactory;
 
@@ -296,7 +296,6 @@ private void validate(Object value, TemporalType clarifiedTemporalType) {
 		QueryParameterBindingValidator.INSTANCE.validate( getBindType(), value, clarifiedTemporalType, getCriteriaBuilder() );
 	}
 
-	@Override
 	public TypeConfiguration getTypeConfiguration() {
 		return sessionFactory.getTypeConfiguration();
 	}
@@ -337,7 +336,7 @@ private Object coerce(T value, BindableType<? super T> parameterType) {
 		}
 		else {
 			return getCriteriaBuilder().resolveExpressible( parameterType )
-					.getExpressibleJavaType().coerce( value, this );
+					.getExpressibleJavaType().coerce( value );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -5812,8 +5812,7 @@ else if ( Character.class.isAssignableFrom( valueConverter.getRelationalJavaType
 		// so we allow coercion between the number types
 		else if ( Number.class.isAssignableFrom( valueConverter.getRelationalJavaType().getJavaTypeClass() )
 				&& value instanceof Number ) {
-			return valueConverter.getRelationalJavaType()
-					.coerce( value );
+			return valueConverter.getRelationalJavaType().coerce( value );
 		}
 		else {
 			throw new SemanticException(
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java
@@ -29,9 +29,6 @@ public CoercingResultAssembler(
 	 */
 	@Override
 	public Object extractRawValue(RowProcessingState rowProcessingState) {
-		return assembledJavaType.coerce(
-				super.extractRawValue( rowProcessingState ),
-				rowProcessingState.getSession()
-		);
+		return assembledJavaType.coerce( super.extractRawValue( rowProcessingState ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
@@ -258,7 +258,7 @@ public final String toLoggableString(Object value, SessionFactoryImplementor fac
 			|| !Hibernate.isInitialized( value )
 				? "<uninitialized>"
 				: javaType.extractLoggableRepresentation(
-						javaType.coerce( value, factory::getTypeConfiguration ) );
+						javaType.cast( javaType.coerce( value ) ) );
 	}
 
 	@Override
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
@@ -128,8 +128,8 @@ public boolean areEqual(Object[] one, Object[] another) {
 					// Horrible hack around the fact that java.sql.Timestamps
 					// can be represented as instances of java.util.Date
 					// (Why do we even allow this? We deprecated java.sql stuff!)
-					elementJavaType.coerce( one[i], null ),
-					elementJavaType.coerce( another[i], null ) )) {
+					elementJavaType.cast( elementJavaType.coerce( one[i] ) ),
+					elementJavaType.cast( elementJavaType.coerce( another[i] ) ) ) ) {
 				return false;
 			}
 		}
@@ -448,7 +448,7 @@ public T[] deepCopy(Object[] value) {
 							// Horrible hack around the fact that java.sql.Timestamps
 							// can be represented as instances of java.util.Date
 							// (Why do we even allow this? We deprecated java.sql stuff!)
-							baseDescriptor.coerce( value[i], null ) );
+							baseDescriptor.cast( baseDescriptor.coerce( value[i] ) ) );
 				}
 				return copy;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java
@@ -130,7 +130,7 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> BigDecimal coerce(X value, CoercionContext coercionContext) {
+	public BigDecimal coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java
@@ -132,7 +132,7 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> BigInteger coerce(X value, CoercionContext coercionContext) {
+	public BigInteger coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java
@@ -136,7 +136,7 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> Byte coerce(X value, CoercionContext coercionContext) {
+	public Byte coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java
@@ -164,7 +164,7 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> Double coerce(X value, CoercionContext coercionContext) {
+	public Double coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java
@@ -162,7 +162,7 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> Float coerce(X value, CoercionContext coercionContext) {
+	public Float coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java
@@ -152,7 +152,7 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public Integer coerce(Object value, CoercionContext coercionContext) {
+	public Integer coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
@@ -315,32 +315,22 @@ default boolean isWider(JavaType<?> javaType) {
 	}
 
 	@FunctionalInterface
+	@Deprecated(forRemoval = true, since = "7.2")
 	interface CoercionContext {
 		TypeConfiguration getTypeConfiguration();
 	}
 
 	/**
 	 * Coerce the given value to this type, if possible.
-	 * The default implementation defined her simply
-	 * performs an unchecked cast. Subclasses may override
-	 * to perform meaningful coercion.
-	 *
-	 * @apiNote This operation is currently unsound. It
-	 * should throw {@link CoercionException} when coercion
-	 * fails, or its return value should be changed to
-	 * {@link Object}. However, both of those changes had
-	 * too much impact for now.
 	 *
 	 * @param value The value to coerce
-	 * @param coercionContext The coercion context
 	 * @return The coerced value, or the given value
 	 *         if no coercion was possible
-	 * @param <X> The type of the value
+	 * @throws CoercionException if coercion fails
 	 */
 	@Incubating
-	default <X> T coerce(X value, CoercionContext coercionContext) {
-		//noinspection unchecked
-		return (T) value;
+	default Object coerce(Object value) {
+		return value;
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java
@@ -115,45 +115,44 @@ public int extractHashCode(Date value) {
 	}
 
 	@Override
-	public Date coerce(Object value, CoercionContext coercionContext) {
+	public Date coerce(Object value) {
 		return wrap( value, null );
 	}
 
-	@SuppressWarnings({"unchecked", "rawtypes"})
 	@Override
-	public Object unwrap(Date value, Class type, WrapperOptions options) {
+	public <X> X unwrap(Date value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
 		if ( LocalDate.class.isAssignableFrom( type ) ) {
-			return unwrapLocalDate( value );
+			return type.cast( unwrapLocalDate( value ) );
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return unwrapSqlDate( value );
+			return type.cast( unwrapSqlDate( value ) );
 		}
 
 		if ( java.util.Date.class.isAssignableFrom( type ) ) {
-			return value;
+			return type.cast( value );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return unwrapDateEpoch( value );
+			return type.cast( unwrapDateEpoch( value ) );
 		}
 
 		if ( String.class.isAssignableFrom( type ) ) {
-			return toString( value );
+			return type.cast( toString( value ) );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
 			final var gregorianCalendar = new GregorianCalendar();
 			gregorianCalendar.setTimeInMillis( unwrapDateEpoch( value ) );
-			return gregorianCalendar;
+			return type.cast( gregorianCalendar );
 		}
 
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return new java.sql.Timestamp( unwrapDateEpoch( value ) );
+			return type.cast( new java.sql.Timestamp( unwrapDateEpoch( value ) ) );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java
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
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
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public static <K> K[] normalizeKeys(`
`188`	`188`	`}`
`189`	`189`	`else {`
`190`	`190`	`for ( int i = 0; i < keys.length; i++ ) {`
`191`		`- typedArray[i] = keyJavaType.coerce( keys[i], session );`
	`191`	`+ typedArray[i] = keyJavaType.cast( keyJavaType.coerce( keys[i] ) );`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`	`return typedArray;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`*`
`32`	`32`	`* @author Steve Ebersole`
`33`	`33`	`*/`
`34`		`-public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T>, JavaType.CoercionContext {`
	`34`	`+public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T> {`
`35`	`35`	`private final QueryParameter<T> queryParameter;`
`36`	`36`	`private final SessionFactoryImplementor sessionFactory;`
`37`	`37`
`@@ -296,7 +296,6 @@ private void validate(Object value, TemporalType clarifiedTemporalType) {`
`296`	`296`	`QueryParameterBindingValidator.INSTANCE.validate( getBindType(), value, clarifiedTemporalType, getCriteriaBuilder() );`
`297`	`297`	`}`
`298`	`298`
`299`		`- @Override`
`300`	`299`	`public TypeConfiguration getTypeConfiguration() {`
`301`	`300`	`return sessionFactory.getTypeConfiguration();`
`302`	`301`	`}`
`@@ -337,7 +336,7 @@ private Object coerce(T value, BindableType<? super T> parameterType) {`
`337`	`336`	`}`
`338`	`337`	`else {`
`339`	`338`	`return getCriteriaBuilder().resolveExpressible( parameterType )`
`340`		`- .getExpressibleJavaType().coerce( value, this );`
	`339`	`+ .getExpressibleJavaType().coerce( value );`
`341`	`340`	`}`
`342`	`341`	`}`
`343`	`342`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,6 @@ public CoercingResultAssembler(`
`29`	`29`	`*/`
`30`	`30`	`@Override`
`31`	`31`	`public Object extractRawValue(RowProcessingState rowProcessingState) {`
`32`		`- return assembledJavaType.coerce(`
`33`		`- super.extractRawValue( rowProcessingState ),`
`34`		`- rowProcessingState.getSession()`
`35`		`- );`
	`32`	`+ return assembledJavaType.coerce( super.extractRawValue( rowProcessingState ) );`
`36`	`33`	`}`
`37`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public final String toLoggableString(Object value, SessionFactoryImplementor fac`
`258`	`258`	`\|\| !Hibernate.isInitialized( value )`
`259`	`259`	`? "<uninitialized>"`
`260`	`260`	`: javaType.extractLoggableRepresentation(`
`261`		`- javaType.coerce( value, factory::getTypeConfiguration ) );`
	`261`	`+ javaType.cast( javaType.coerce( value ) ) );`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`@Override`