clean up some generic typing

along with some other compiler warnings
hibernate · Jan 24, 2025 · f83a721 · f83a721
1 parent 8d2c875
commit f83a721
Show file tree

Hide file tree

Showing 10 changed files with 291 additions and 271 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
@@ -112,8 +112,8 @@ public enum Kind {
 	private Map<String,String> explicitLocalTypeParams;
 
 	private Function<TypeConfiguration, JdbcType> explicitJdbcTypeAccess;
-	private Function<TypeConfiguration, BasicJavaType> explicitJavaTypeAccess;
-	private Function<TypeConfiguration, MutabilityPlan> explicitMutabilityAccess;
+	private Function<TypeConfiguration, BasicJavaType<?>> explicitJavaTypeAccess;
+	private Function<TypeConfiguration, MutabilityPlan<?>> explicitMutabilityAccess;
 	private Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess;
 
 	private MemberDetails memberDetails;
@@ -749,8 +749,7 @@ private void prepareCollectionElement(
 		if ( elementCollectionAnn != null ) {
 			final Class<?> targetClassDetails = elementCollectionAnn.targetClass();
 			if ( targetClassDetails != void.class) {
-				//noinspection rawtypes
-				final Function<TypeConfiguration, BasicJavaType> original = explicitJavaTypeAccess;
+				final Function<TypeConfiguration, BasicJavaType<?>> original = explicitJavaTypeAccess;
 				explicitJavaTypeAccess = typeConfiguration -> {
 					final BasicJavaType<?> originalResult = original.apply( typeConfiguration );
 					if ( originalResult != null ) {

diff --git a/...src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java b/...src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java
@@ -25,7 +25,7 @@ public class InferredBasicValueResolution<J,T> implements BasicValue.Resolution<
 	private final JdbcMapping jdbcMapping;
 
 	private final BasicType<J> legacyType;
-	private BasicType<?> updatedType;
+	private BasicType<J> updatedType;
 
 	public InferredBasicValueResolution(
 			JdbcMapping jdbcMapping,
@@ -49,7 +49,7 @@ public JdbcMapping getJdbcMapping() {
 
 	@Override
 	public BasicType<J> getLegacyResolvedBasicType() {
-		return updatedType == null ? legacyType : (BasicType<J>) updatedType;
+		return updatedType == null ? legacyType : updatedType;
 	}
 
 	@Override
@@ -67,11 +67,10 @@ public JdbcType getJdbcType() {
 		return updatedType == null ? jdbcType : updatedType.getJdbcType();
 	}
 
-	@Override
+	@Override @SuppressWarnings("unchecked")
 	public BasicValueConverter<J,T> getValueConverter() {
-		//noinspection unchecked
 		return updatedType == null
-				? (BasicValueConverter<J, T>) jdbcMapping.getValueConverter()
+				? jdbcMapping.getValueConverter()
 				: (BasicValueConverter<J, T>) updatedType.getValueConverter();
 	}
 
@@ -80,8 +79,8 @@ public MutabilityPlan<J> getMutabilityPlan() {
 		return mutabilityPlan;
 	}
 
-	@Override
+	@Override @SuppressWarnings("unchecked")
 	public void updateResolution(BasicType<?> type) {
-		this.updatedType = type;
+		updatedType = (BasicType<J>) type;
 	}
 }