don't use a raw type in JdbcMapping

gavinking · gavinking · commit eb5b9c58d79c · 2025-06-01T21:18:31.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -268,9 +268,9 @@ public SessionFactoryImpl(
 			final JdbcMapping jdbcMapping = tenantFilter.getParameterJdbcMapping( TenantIdBinder.PARAMETER_NAME );
 			assert jdbcMapping != null;
 			//noinspection unchecked
-			tenantIdentifierJavaType = jdbcMapping.getJavaTypeDescriptor();
+			tenantIdentifierJavaType = (JavaType<Object>) jdbcMapping.getJavaTypeDescriptor();
 		}
-		for ( Map.Entry<String, FilterDefinition> filterEntry : filters.entrySet() ) {
+		for ( var filterEntry : filters.entrySet() ) {
 			if ( filterEntry.getValue().isAutoEnabled() ) {
 				autoEnabledFilters.add( filterEntry.getValue() );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java
@@ -54,7 +54,7 @@ public interface JdbcMapping extends MappingType, JdbcMappingContainer {
 	 * The descriptor for the Java type represented by this
 	 * expressible type
 	 */
-	JavaType getJavaTypeDescriptor();
+	JavaType<?> getJavaTypeDescriptor();
 
 	/**
 	 * The descriptor for the SQL type represented by this
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java
@@ -124,9 +124,12 @@ public SoftDeleteMappingImpl(
 		}
 		else {
 			//noinspection unchecked
-			final BasicValueConverter<Boolean, Object> converter = (BasicValueConverter<Boolean, Object>) resolution.getValueConverter();
+			final BasicValueConverter<Boolean, ?> converter =
+					(BasicValueConverter<Boolean, ?>)
+							resolution.getValueConverter();
 			//noinspection unchecked
-			final JdbcLiteralFormatter<Object> literalFormatter = resolution.getJdbcMapping().getJdbcLiteralFormatter();
+			final JdbcLiteralFormatter<Object> literalFormatter =
+					resolution.getJdbcMapping().getJdbcLiteralFormatter();
 
 			if ( converter == null ) {
 				// the database column is BIT or BOOLEAN : pass-thru
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java
@@ -46,14 +46,14 @@ public CompleteResultBuilderBasicValuedConverted(
 			BasicValuedMapping underlyingMapping) {
 		this.explicitColumnName = explicitColumnName;
 		this.underlyingMapping = underlyingMapping;
-		@SuppressWarnings("unchecked")
-		final JavaType<R> relationalType =
-				underlyingMapping.getJdbcMapping().getJavaTypeDescriptor();
-		this.valueConverter = new AttributeConverterBean<>(
+		final JavaType<?> relationalType =
+				underlyingMapping.getJdbcMapping()
+						.getJavaTypeDescriptor();
+		this.valueConverter = new JpaAttributeConverterImpl<>(
 				converterBean,
 				converterJtd,
 				domainJavaType,
-				relationalType
+				(JavaType<R>) relationalType
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java
@@ -79,7 +79,7 @@ public void bindParameterValue(
 	// MappingModelExpressible
 
 	@Override
-	public MappingModelExpressible getExpressionType() {
+	public MappingModelExpressible<T> getExpressionType() {
 		return this;
 	}
 
@@ -114,14 +114,20 @@ public Object disassemble(Object value, SharedSessionContractImplementor session
 
 	@Override
 	public void addToCacheKey(MutableCacheKeyBuilder cacheKey, Object value, SharedSessionContractImplementor session) {
-		if ( value == null ) {
-			return;
+		if ( value != null ) {
+			cacheKey.addValue( disassemble( value, jdbcMapping.getJdbcJavaType().getMutabilityPlan(), session ) );
+			cacheKey.addHashCode( hashCode( value, jdbcMapping.getJavaTypeDescriptor() ) );
 		}
-		final Serializable disassemble = ( (MutabilityPlan<Object>) jdbcMapping.getJdbcJavaType().getMutabilityPlan() )
-				.disassemble( value, session );
-		final int hashCode = jdbcMapping.getJavaTypeDescriptor().extractHashCode( value );
-		cacheKey.addValue( disassemble );
-		cacheKey.addHashCode( hashCode );
+	}
+
+	private static <T> int hashCode(Object value, JavaType<T> javaTypeDescriptor) {
+		return javaTypeDescriptor.extractHashCode( (T) value );
+	}
+
+	private static <T> Serializable disassemble(
+			Object value, MutabilityPlan<T> mutabilityPlan,
+			SharedSessionContractImplementor session) {
+		return mutabilityPlan.disassemble( (T) value, session );
 	}
 
 	@Override
@@ -182,6 +188,7 @@ public void applySqlSelections(DomainResultCreationState creationState) {
 
 	@Override
 	public JavaType<T> getExpressibleJavaType() {
-		return jdbcMapping.getJavaTypeDescriptor();
+		return (JavaType<T>)
+				jdbcMapping.getJavaTypeDescriptor();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java
@@ -11,6 +11,7 @@
 
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
+import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * Executable JDBC command
@@ -77,17 +78,21 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 			if ( jdbcParameterBindings == null ) {
 				return false;
 			}
-			for ( Map.Entry<JdbcParameter, JdbcParameterBinding> entry : appliedParameters.entrySet() ) {
+			for ( var entry : appliedParameters.entrySet() ) {
 				final JdbcParameterBinding binding = jdbcParameterBindings.getBinding( entry.getKey() );
 				final JdbcParameterBinding appliedBinding = entry.getValue();
-				//noinspection unchecked
-				if ( binding == null || !appliedBinding.getBindType()
-						.getJavaTypeDescriptor()
-						.areEqual( binding.getBindValue(), appliedBinding.getBindValue() ) ) {
+				if ( binding == null
+						|| !equal( appliedBinding, binding, appliedBinding.getBindType().getJavaTypeDescriptor() ) ) {
 					return false;
 				}
 			}
 		}
 		return true;
 	}
+
+	@SuppressWarnings("unchecked")
+	static <T> boolean equal(JdbcParameterBinding appliedBinding, JdbcParameterBinding binding, JavaType<T> type) {
+		return type.isInstance( appliedBinding.getBindValue() )
+			&& type.areEqual( (T) binding.getBindValue(), (T) appliedBinding.getBindValue() );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java
@@ -13,7 +13,6 @@
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
-import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * Executable JDBC command
@@ -101,7 +100,7 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 			if ( jdbcParameterBindings == null ) {
 				return false;
 			}
-			for ( Map.Entry<JdbcParameter, JdbcParameterBinding> entry : appliedParameters.entrySet() ) {
+			for ( var entry : appliedParameters.entrySet() ) {
 				final JdbcParameter parameter = entry.getKey();
 				final JdbcParameterBinding appliedBinding = entry.getValue();
 				// This is a special case where the rendered SQL depends on the presence of the parameter,
@@ -128,7 +127,8 @@ else if ( jdbcParameterBindings.getBinding( parameter ) == null ) {
 				if ( parameter != offsetParameter && parameter != limitParameter ) {
 					final JdbcParameterBinding binding = jdbcParameterBindings.getBinding( parameter );
 					// TODO: appliedBinding can be null here, resulting in NPE
-					if ( binding == null || !areEqualBindings( appliedBinding, binding ) ) {
+					if ( binding == null
+							|| !equal( appliedBinding, binding, appliedBinding.getBindType().getJavaTypeDescriptor() ) ) {
 						return false;
 					}
 				}
@@ -140,11 +140,6 @@ && isCompatible( offsetParameter, limit == null ? null : limit.getFirstRow(), 0
 			&& isCompatible( limitParameter, limit == null ? null : limit.getMaxRows(), Integer.MAX_VALUE );
 	}
 
-	private static boolean areEqualBindings(JdbcParameterBinding appliedBinding, JdbcParameterBinding binding) {
-		final JavaType<Object> javaTypeDescriptor = appliedBinding.getBindType().getJavaTypeDescriptor();
-		return javaTypeDescriptor.areEqual( binding.getBindValue(), appliedBinding.getBindValue() );
-	}
-
 	private boolean isCompatible(JdbcParameter parameter, Integer requestedValue, int defaultValue) {
 		if ( parameter == null ) {
 			return requestedValue == null;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java
@@ -214,31 +214,29 @@ private void bindKeyValues(
 			final JdbcValueDescriptor valueDescriptor = jdbcValueDescriptors.get( binding.getPosition() - 1 );
 
 			// key bindings would have a usage of RESTRICT relative to the UPDATE
-			if ( valueDescriptor.getUsage() != ParameterUsage.RESTRICT ) {
-				continue;
-			}
-
-			while ( keyBindingsItr.hasNext() ) {
-				final ColumnValueBinding valueBinding = keyBindingsItr.next();
-
-				if ( Objects.equals( valueBinding.getColumnReference().getColumnExpression(), binding.getColumnName() ) ) {
-					// `binding` is for a key column
-					foundKeyBindings = true;
-					bindKeyValue(
-							jdbcBindingPosition++,
-							binding,
-							valueDescriptor,
-							statement,
-							jdbcDelete.getSqlString(),
-							tableMapping,
-							session
-					);
-					break;
-				}
-				else {
-					if ( foundKeyBindings ) {
-						// we are now "beyond" the key bindings
-						break bindings;
+			if ( valueDescriptor.getUsage() == ParameterUsage.RESTRICT ) {
+				while ( keyBindingsItr.hasNext() ) {
+					final ColumnValueBinding valueBinding = keyBindingsItr.next();
+					if ( Objects.equals( valueBinding.getColumnReference().getColumnExpression(),
+							binding.getColumnName() ) ) {
+						// `binding` is for a key column
+						foundKeyBindings = true;
+						bindKeyValue(
+								jdbcBindingPosition++,
+								binding,
+								valueDescriptor,
+								statement,
+								jdbcDelete.getSqlString(),
+								tableMapping,
+								session
+						);
+						break;
+					}
+					else {
+						if ( foundKeyBindings ) {
+							// we are now "beyond" the key bindings
+							break bindings;
+						}
 					}
 				}
 			}
@@ -327,8 +325,9 @@ private boolean performUpdate(
 
 			jdbcValueBindings.beforeStatement( statementDetails );
 
-			final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
-					.executeUpdate( updateStatement, statementDetails.getSqlString() );
+			final int rowCount =
+					session.getJdbcCoordinator().getResultSetReturn()
+							.executeUpdate( updateStatement, statementDetails.getSqlString() );
 
 			if ( rowCount == 0 ) {
 				return false;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java
@@ -54,7 +54,8 @@ public BasicResult(
 		this(
 				jdbcValuesArrayPosition,
 				resultVariable,
-				jdbcMapping.getJavaTypeDescriptor(),
+				(JavaType<T>)
+						jdbcMapping.getJavaTypeDescriptor(),
 				(BasicValueConverter<T,?>)
 						jdbcMapping.getValueConverter(),
 				navigablePath,

Original file line number	Diff line number	Diff line change
`@@ -268,9 +268,9 @@ public SessionFactoryImpl(`
`268`	`268`	`final JdbcMapping jdbcMapping = tenantFilter.getParameterJdbcMapping( TenantIdBinder.PARAMETER_NAME );`
`269`	`269`	`assert jdbcMapping != null;`
`270`	`270`	`//noinspection unchecked`
`271`		`- tenantIdentifierJavaType = jdbcMapping.getJavaTypeDescriptor();`
	`271`	`+ tenantIdentifierJavaType = (JavaType<Object>) jdbcMapping.getJavaTypeDescriptor();`
`272`	`272`	`}`
`273`		`- for ( Map.Entry<String, FilterDefinition> filterEntry : filters.entrySet() ) {`
	`273`	`+ for ( var filterEntry : filters.entrySet() ) {`
`274`	`274`	`if ( filterEntry.getValue().isAutoEnabled() ) {`
`275`	`275`	`autoEnabledFilters.add( filterEntry.getValue() );`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`import org.hibernate.query.spi.QueryOptions;`
`13`	`13`	`import org.hibernate.sql.ast.tree.expression.JdbcParameter;`
	`14`	`+import org.hibernate.type.descriptor.java.JavaType;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* Executable JDBC command`
`@@ -77,17 +78,21 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que`
`77`	`78`	`if ( jdbcParameterBindings == null ) {`
`78`	`79`	`return false;`
`79`	`80`	`}`
`80`		`- for ( Map.Entry<JdbcParameter, JdbcParameterBinding> entry : appliedParameters.entrySet() ) {`
	`81`	`+ for ( var entry : appliedParameters.entrySet() ) {`
`81`	`82`	`final JdbcParameterBinding binding = jdbcParameterBindings.getBinding( entry.getKey() );`
`82`	`83`	`final JdbcParameterBinding appliedBinding = entry.getValue();`
`83`		`- //noinspection unchecked`
`84`		`- if ( binding == null \|\| !appliedBinding.getBindType()`
`85`		`- .getJavaTypeDescriptor()`
`86`		`- .areEqual( binding.getBindValue(), appliedBinding.getBindValue() ) ) {`
	`84`	`+ if ( binding == null`
	`85`	`+ \|\| !equal( appliedBinding, binding, appliedBinding.getBindType().getJavaTypeDescriptor() ) ) {`
`87`	`86`	`return false;`
`88`	`87`	`}`
`89`	`88`	`}`
`90`	`89`	`}`
`91`	`90`	`return true;`
`92`	`91`	`}`
	`92`	`+`
	`93`	`+ @SuppressWarnings("unchecked")`
	`94`	`+ static <T> boolean equal(JdbcParameterBinding appliedBinding, JdbcParameterBinding binding, JavaType<T> type) {`
	`95`	`+ return type.isInstance( appliedBinding.getBindValue() )`
	`96`	`+ && type.areEqual( (T) binding.getBindValue(), (T) appliedBinding.getBindValue() );`
	`97`	`+ }`
`93`	`98`	`}`